From c224589d46f9e28a6e71762c67f69316673303b4 Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Tue, 6 Aug 2024 19:00:20 +0300 Subject: [PATCH 01/21] refactor: split syscalls into separate files --- .../syscalls/syscall_tests/get_block_hash.rs | 5 +--- .../syscall_tests/get_execution_info.rs | 29 ++++--------------- .../syscalls/syscall_tests/library_call.rs | 8 ++--- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs index 64acd45360..10d4c4fee3 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs @@ -18,10 +18,7 @@ use crate::test_utils::contracts::FeatureContract; use crate::test_utils::dict_state_reader::DictStateReader; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - trivial_external_entry_point_new, - CairoVersion, - BALANCE, - CURRENT_BLOCK_NUMBER, + trivial_external_entry_point_new, CairoVersion, BALANCE, CURRENT_BLOCK_NUMBER, }; use crate::{check_entry_point_execution_error_for_custom_hint, retdata}; diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs index 51ef403aa8..2fbd47eb2b 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs @@ -3,17 +3,8 @@ use num_traits::Pow; use starknet_api::core::ChainId; use starknet_api::data_availability::DataAvailabilityMode; use starknet_api::transaction::{ - AccountDeploymentData, - Calldata, - Fee, - PaymasterData, - Resource, - ResourceBounds, - Tip, - TransactionHash, - TransactionVersion, - ValidResourceBounds, - QUERY_VERSION_BASE_BIT, + AccountDeploymentData, Calldata, Fee, PaymasterData, Resource, ResourceBounds, Tip, + TransactionHash, TransactionVersion, ValidResourceBounds, QUERY_VERSION_BASE_BIT, }; use starknet_api::{felt, nonce}; use starknet_types_core::felt::Felt; @@ -26,20 +17,12 @@ use crate::execution::entry_point::CallEntryPoint; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - trivial_external_entry_point_with_address, - CairoVersion, - BALANCE, - CURRENT_BLOCK_NUMBER, - CURRENT_BLOCK_NUMBER_FOR_VALIDATE, - CURRENT_BLOCK_TIMESTAMP, - CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE, - TEST_SEQUENCER_ADDRESS, + trivial_external_entry_point_with_address, CairoVersion, BALANCE, CURRENT_BLOCK_NUMBER, + CURRENT_BLOCK_NUMBER_FOR_VALIDATE, CURRENT_BLOCK_TIMESTAMP, + CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE, TEST_SEQUENCER_ADDRESS, }; use crate::transaction::objects::{ - CommonAccountFields, - CurrentTransactionInfo, - DeprecatedTransactionInfo, - TransactionInfo, + CommonAccountFields, CurrentTransactionInfo, DeprecatedTransactionInfo, TransactionInfo, }; #[test_case( diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs index b5eb86a10a..9a3a103d2d 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs @@ -15,18 +15,14 @@ use crate::execution::call_info::{CallExecution, CallInfo, Retdata}; use crate::execution::entry_point::{CallEntryPoint, CallType}; use crate::execution::execution_utils::format_panic_data; use crate::execution::syscalls::syscall_tests::constants::{ - REQUIRED_GAS_LIBRARY_CALL_TEST, - REQUIRED_GAS_STORAGE_READ_WRITE_TEST, + REQUIRED_GAS_LIBRARY_CALL_TEST, REQUIRED_GAS_STORAGE_READ_WRITE_TEST, }; use crate::execution::syscalls::SyscallSelector; use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - get_syscall_resources, - trivial_external_entry_point_new, - CairoVersion, - BALANCE, + get_syscall_resources, trivial_external_entry_point_new, CairoVersion, BALANCE, }; use crate::versioned_constants::VersionedConstants; From 211c1e532fb25b1d92272bdc65b2997aed4b7d92 Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Thu, 29 Aug 2024 16:17:46 +0300 Subject: [PATCH 02/21] fix: ci --- .github/workflows/blockifier_ci.yml | 2 +- .../workflows/blockifier_compiled_cairo.yml | 27 +++++----- .github/workflows/clean_stale_prs.yml | 2 +- .github/workflows/committer_ci.yml | 40 +++++++------- .github/workflows/lock_closed_prs.yml | 46 ++++++++-------- .github/workflows/merge_paths_ci.yml | 2 +- .github/workflows/papyrus/helm-install.yml | 2 +- .github/workflows/papyrus_benchmark.yaml | 2 +- .github/workflows/papyrus_ci.yml | 52 +++++++++---------- .github/workflows/papyrus_docker-publish.yml | 13 ++--- .github/workflows/papyrus_nightly-tests.yml | 6 +-- .github/workflows/verify-deps.yml | 4 +- 12 files changed, 99 insertions(+), 99 deletions(-) diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml index 335a6cedbb..aac05489d9 100644 --- a/.github/workflows/blockifier_ci.yml +++ b/.github/workflows/blockifier_ci.yml @@ -41,7 +41,7 @@ concurrency: jobs: featureless-build: - runs-on: starkware-ubuntu-20-04-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index 5703f3e3e1..49dea9894b 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -7,12 +7,12 @@ on: - reopened - synchronize paths: - - '.github/workflows/blockifier_compiled_cairo.yml' - - 'crates/blockifier/feature_contracts/**' - - 'crates/blockifier/src/test_utils/cairo_compile.rs' - - 'crates/blockifier/tests/feature_contracts_compatibility_test.rs' - - 'crates/blockifier/tests/requirements.txt' - - 'scripts/dependencies.sh' + - ".github/workflows/blockifier_compiled_cairo.yml" + - "crates/blockifier/feature_contracts/**" + - "crates/blockifier/src/test_utils/cairo_compile.rs" + - "crates/blockifier/tests/feature_contracts_compatibility_test.rs" + - "crates/blockifier/tests/requirements.txt" + - "scripts/dependencies.sh" # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -21,7 +21,7 @@ concurrency: jobs: verify_cairo_file_dependencies: - runs-on: starkware-ubuntu-20-04-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-python@v5 id: setup-pypy with: - python-version: 'pypy3.9' + python-version: "pypy3.9" - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9 - env: LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin @@ -40,16 +40,16 @@ jobs: - name: checkout sequencer into `sequencer` directory. uses: actions/checkout@v4 with: - repository: 'starkware-libs/sequencer' - path: 'sequencer' + repository: "starkware-libs/sequencer" + path: "sequencer" - name: checkout cairo1 repo in order to compile cairo1 contracts. uses: actions/checkout@v4 with: - repository: 'starkware-libs/cairo' + repository: "starkware-libs/cairo" fetch-depth: 0 fetch-tags: true - path: 'cairo' + path: "cairo" - name: install toolchain for legacy contract compilation (old compiler tag) uses: actions-rs/toolchain@master @@ -57,7 +57,6 @@ jobs: toolchain: nightly-2023-07-05 - name: Verify cairo contract recompilation (both cairo versions). - run: - cd sequencer && + run: cd sequencer && pip install -r crates/blockifier/tests/requirements.txt && cargo test -p blockifier --test feature_contracts_compatibility_test --features testing -- --include-ignored diff --git a/.github/workflows/clean_stale_prs.yml b/.github/workflows/clean_stale_prs.yml index 1ccbe73ac8..a30494b701 100644 --- a/.github/workflows/clean_stale_prs.yml +++ b/.github/workflows/clean_stale_prs.yml @@ -9,7 +9,7 @@ on: jobs: stale: name: ๐Ÿงน Clean up stale issues and PRs - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 steps: - name: ๐Ÿš€ Run stale uses: actions/stale@v3 diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index c4cf79d2fe..1b97391ee3 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -8,14 +8,14 @@ on: tags: - v[0-9].** paths: - - '.github/workflows/committer_ci.yml' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/committer_cli/**' - - 'crates/starknet_api/**' - - 'crates/starknet_committer/**' - - 'crates/starknet_patricia/**' - - 'scripts/dependencies.sh' + - ".github/workflows/committer_ci.yml" + - "Cargo.toml" + - "Cargo.lock" + - "crates/committer_cli/**" + - "crates/starknet_api/**" + - "crates/starknet_committer/**" + - "crates/starknet_patricia/**" + - "scripts/dependencies.sh" pull_request: types: @@ -25,14 +25,14 @@ on: - auto_merge_enabled - edited paths: - - '.github/workflows/committer_ci.yml' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/committer_cli/**' - - 'crates/starknet_api/**' - - 'crates/starknet_committer/**' - - 'crates/starknet_patricia/**' - - 'scripts/dependencies.sh' + - ".github/workflows/committer_ci.yml" + - "Cargo.toml" + - "Cargo.lock" + - "crates/committer_cli/**" + - "crates/starknet_api/**" + - "crates/starknet_committer/**" + - "crates/starknet_patricia/**" + - "scripts/dependencies.sh" # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -51,7 +51,7 @@ jobs: uses: "google-github-actions/auth@v2" with: credentials_json: ${{ secrets.COMMITER_PRODUCTS_EXT_WRITER_JSON }} - - uses: 'google-github-actions/setup-gcloud@v2' + - uses: "google-github-actions/setup-gcloud@v2" - run: echo "BENCH_INPUT_FILES_PREFIX=$(cat ./crates/committer_cli/src/tests/flow_test_files_prefix)" >> $GITHUB_ENV - run: gcloud storage cp -r gs://committer-testing-artifacts/$BENCH_INPUT_FILES_PREFIX/* ./crates/committer_cli/test_inputs - run: cargo test -p committer_cli --release -- --include-ignored test_regression @@ -70,7 +70,7 @@ jobs: uses: "google-github-actions/auth@v2" with: credentials_json: ${{ secrets.COMMITER_PRODUCTS_EXT_WRITER_JSON }} - - uses: 'google-github-actions/setup-gcloud@v2' + - uses: "google-github-actions/setup-gcloud@v2" - run: echo "OLD_BENCH_INPUT_FILES_PREFIX=$(cat ./crates/committer_cli/src/tests/flow_test_files_prefix)" >> $GITHUB_ENV - run: gcloud storage cp -r gs://committer-testing-artifacts/$OLD_BENCH_INPUT_FILES_PREFIX/* ./crates/committer_cli/test_inputs @@ -123,7 +123,7 @@ jobs: }) gcs-push: - runs-on: starkware-ubuntu-20-04-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -143,7 +143,7 @@ jobs: run: echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV - name: Build CLI binary - run: ./build_native_in_docker.sh cargo build -p committer_cli -r --bin committer_cli --target-dir CLI_TARGET + run: cargo build -p committer_cli -r --bin committer_cli --target-dir CLI_TARGET - id: auth uses: "google-github-actions/auth@v2" diff --git a/.github/workflows/lock_closed_prs.yml b/.github/workflows/lock_closed_prs.yml index 91b0175ffd..e49213b874 100644 --- a/.github/workflows/lock_closed_prs.yml +++ b/.github/workflows/lock_closed_prs.yml @@ -7,26 +7,26 @@ on: workflow_dispatch: jobs: - lock: - name: ๐Ÿ”’ Lock closed issues and PRs - runs-on: starkware-ubuntu-latest-small - steps: - - uses: dessant/lock-threads@v2.0.3 - with: - github-token: ${{ github.token }} - issue-lock-inactive-days: "30" - issue-lock-reason: "" - issue-comment: > - Issue closed and locked due to lack of activity. - - If you encounter this same issue, please open a new issue and refer - to this closed one. - pr-lock-inactive-days: "1" - pr-lock-reason: "" - pr-comment: > - Pull Request closed and locked due to lack of activity. - - If you'd like to build on this closed PR, you can clone it using - this method: https://stackoverflow.com/a/14969986 - - Then open a new PR, referencing this closed PR in your message. + # lock: + name: ๐Ÿ”’ Lock closed issues and PRs + runs-on: ubuntu-22.04 + steps: + - uses: dessant/lock-threads@v2.0.3 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: "30" + issue-lock-reason: "" + issue-comment: > + Issue closed and locked due to lack of activity. + + If you encounter this same issue, please open a new issue and refer + to this closed one. + pr-lock-inactive-days: "1" + pr-lock-reason: "" + pr-comment: > + Pull Request closed and locked due to lack of activity. + + If you'd like to build on this closed PR, you can clone it using + this method: https://stackoverflow.com/a/14969986 + + Then open a new PR, referencing this closed PR in your message. diff --git a/.github/workflows/merge_paths_ci.yml b/.github/workflows/merge_paths_ci.yml index 200aa1b573..3b222ef1fa 100644 --- a/.github/workflows/merge_paths_ci.yml +++ b/.github/workflows/merge_paths_ci.yml @@ -23,7 +23,7 @@ concurrency: jobs: merge-paths-test: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/papyrus/helm-install.yml b/.github/workflows/papyrus/helm-install.yml index 886f307f09..280bb54b53 100644 --- a/.github/workflows/papyrus/helm-install.yml +++ b/.github/workflows/papyrus/helm-install.yml @@ -14,7 +14,7 @@ on: jobs: deploy-teardown: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 permissions: contents: "read" id-token: "write" diff --git a/.github/workflows/papyrus_benchmark.yaml b/.github/workflows/papyrus_benchmark.yaml index b7912e4957..6a1a4edede 100644 --- a/.github/workflows/papyrus_benchmark.yaml +++ b/.github/workflows/papyrus_benchmark.yaml @@ -8,7 +8,7 @@ on: jobs: storage-benchmark: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index b93df49923..cbb75559c7 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -4,15 +4,15 @@ on: push: branches: [main] paths: - - '.github/workflows/papyrus_ci.yml' - - 'Dockerfile' - - 'papyrus_utilities.Dockerfile' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/papyrus**/**' - - 'crates/sequencing/**' - - 'crates/starknet_client/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_ci.yml" + - "Dockerfile" + - "papyrus_utilities.Dockerfile" + - "Cargo.toml" + - "Cargo.lock" + - "crates/papyrus**/**" + - "crates/sequencing/**" + - "crates/starknet_client/**" + - "scripts/dependencies.sh" pull_request: types: @@ -22,15 +22,15 @@ on: - auto_merge_enabled - edited # for when the PR title is edited paths: - - '.github/workflows/papyrus_ci.yml' - - 'Dockerfile' - - 'papyrus_utilities.Dockerfile' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/papyrus**/**' - - 'crates/sequencing/**' - - 'crates/starknet_client/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_ci.yml" + - "Dockerfile" + - "papyrus_utilities.Dockerfile" + - "Cargo.toml" + - "Cargo.lock" + - "crates/papyrus**/**" + - "crates/sequencing/**" + - "crates/starknet_client/**" + - "scripts/dependencies.sh" merge_group: types: [checks_requested] @@ -42,7 +42,7 @@ concurrency: jobs: executable-run: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -57,7 +57,7 @@ jobs: & sleep 30 ; kill $! executable-run-no-rpc: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -72,7 +72,7 @@ jobs: & sleep 30 ; kill $! p2p-sync-e2e-test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -84,7 +84,7 @@ jobs: run: scripts/papyrus/p2p_sync_e2e_test/main.sh ${{ secrets.CI_BASE_LAYER_NODE_URL }} integration-test: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -97,7 +97,7 @@ jobs: cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream" test-no-rpc: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -107,7 +107,7 @@ jobs: SEED: 0 check-starknet_api-dependency: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 if: github.base_ref == 'main' # this step is only run if the pr is to the main branch steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: - run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main build-papyrus-utilities-image: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx @@ -131,7 +131,7 @@ jobs: cache-to: type=gha,mode=max,scope=buildkit-ci random-table-test: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 # run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes. diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 294bd71fb7..9b2110997c 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -6,15 +6,15 @@ on: branches: [main] tags: ["v*.*.*"] paths: - - '.github/workflows/papyrus_docker-publish.yml' - - 'crates/papyrus**/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_docker-publish.yml" + - "crates/papyrus**/**" + - "scripts/dependencies.sh" pull_request: paths: - - '.github/workflows/papyrus_docker-publish.yml' - - 'crates/papyrus**/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_docker-publish.yml" + - "crates/papyrus**/**" + - "scripts/dependencies.sh" # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -71,6 +71,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3.2.0 with: + file: dynamic.Dockerfile context: . push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml index 0592f28e3e..03bb55fe1f 100644 --- a/.github/workflows/papyrus_nightly-tests.yml +++ b/.github/workflows/papyrus_nightly-tests.yml @@ -2,9 +2,9 @@ name: Papyrus-Nightly-Tests # We run gateway_integration_test at different times, to avoid a nonce race between parallel runs. on: schedule: - - cron: '30 22 * * *' # Uses ubuntu runner. - - cron: '30 0 * * *' # Uses macos runner. - workflow_dispatch: # Uses ubuntu runner. + - cron: "30 22 * * *" # Uses ubuntu runner. + - cron: "30 0 * * *" # Uses macos runner. + workflow_dispatch: # Uses ubuntu runner. jobs: GW-integration-test-ubuntu: diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index 8582cb1b6b..a918e4ce3e 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -2,12 +2,12 @@ name: Nightly Latest Dependencies Check on: schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day + - cron: "0 0 * * *" # Runs at 00:00 UTC every day jobs: latest_deps: name: Latest Dependencies - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 continue-on-error: true steps: - uses: actions/checkout@v4 From 109e2e41fb49bda557ad6765d0dd565a2a7d3bfe Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Thu, 29 Aug 2024 16:42:19 +0300 Subject: [PATCH 03/21] fix: return back old images in the CI --- .github/workflows/blockifier_ci.yml | 2 +- .../workflows/blockifier_compiled_cairo.yml | 2 +- .github/workflows/clean_stale_prs.yml | 2 +- .github/workflows/committer_ci.yml | 9 +++- .github/workflows/lock_closed_prs.yml | 46 +++++++++---------- .github/workflows/merge_paths_ci.yml | 2 +- .github/workflows/papyrus/helm-install.yml | 2 +- .github/workflows/papyrus_benchmark.yaml | 2 +- .github/workflows/papyrus_ci.yml | 16 +++---- .github/workflows/papyrus_docker-publish.yml | 1 - .github/workflows/verify-deps.yml | 2 +- 11 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml index aac05489d9..335a6cedbb 100644 --- a/.github/workflows/blockifier_ci.yml +++ b/.github/workflows/blockifier_ci.yml @@ -41,7 +41,7 @@ concurrency: jobs: featureless-build: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index 49dea9894b..3e50259a10 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -21,7 +21,7 @@ concurrency: jobs: verify_cairo_file_dependencies: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap diff --git a/.github/workflows/clean_stale_prs.yml b/.github/workflows/clean_stale_prs.yml index a30494b701..1ccbe73ac8 100644 --- a/.github/workflows/clean_stale_prs.yml +++ b/.github/workflows/clean_stale_prs.yml @@ -9,7 +9,7 @@ on: jobs: stale: name: ๐Ÿงน Clean up stale issues and PRs - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small steps: - name: ๐Ÿš€ Run stale uses: actions/stale@v3 diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index 1b97391ee3..c3c65313ce 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -39,6 +39,11 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} +# On PR events, cancel existing CI runs on this same PR for this workflow. +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: run-regression-tests: runs-on: starkware-ubuntu-latest-medium @@ -123,7 +128,7 @@ jobs: }) gcs-push: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -143,7 +148,7 @@ jobs: run: echo "SHORT_HASH=${COMMIT_SHA:0:7}" >> $GITHUB_ENV - name: Build CLI binary - run: cargo build -p committer_cli -r --bin committer_cli --target-dir CLI_TARGET + run: ./build_native_in_docker.sh cargo build -p committer_cli -r --bin committer_cli --target-dir CLI_TARGET - id: auth uses: "google-github-actions/auth@v2" diff --git a/.github/workflows/lock_closed_prs.yml b/.github/workflows/lock_closed_prs.yml index e49213b874..91b0175ffd 100644 --- a/.github/workflows/lock_closed_prs.yml +++ b/.github/workflows/lock_closed_prs.yml @@ -7,26 +7,26 @@ on: workflow_dispatch: jobs: - # lock: - name: ๐Ÿ”’ Lock closed issues and PRs - runs-on: ubuntu-22.04 - steps: - - uses: dessant/lock-threads@v2.0.3 - with: - github-token: ${{ github.token }} - issue-lock-inactive-days: "30" - issue-lock-reason: "" - issue-comment: > - Issue closed and locked due to lack of activity. - - If you encounter this same issue, please open a new issue and refer - to this closed one. - pr-lock-inactive-days: "1" - pr-lock-reason: "" - pr-comment: > - Pull Request closed and locked due to lack of activity. - - If you'd like to build on this closed PR, you can clone it using - this method: https://stackoverflow.com/a/14969986 - - Then open a new PR, referencing this closed PR in your message. + lock: + name: ๐Ÿ”’ Lock closed issues and PRs + runs-on: starkware-ubuntu-latest-small + steps: + - uses: dessant/lock-threads@v2.0.3 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: "30" + issue-lock-reason: "" + issue-comment: > + Issue closed and locked due to lack of activity. + + If you encounter this same issue, please open a new issue and refer + to this closed one. + pr-lock-inactive-days: "1" + pr-lock-reason: "" + pr-comment: > + Pull Request closed and locked due to lack of activity. + + If you'd like to build on this closed PR, you can clone it using + this method: https://stackoverflow.com/a/14969986 + + Then open a new PR, referencing this closed PR in your message. diff --git a/.github/workflows/merge_paths_ci.yml b/.github/workflows/merge_paths_ci.yml index 3b222ef1fa..200aa1b573 100644 --- a/.github/workflows/merge_paths_ci.yml +++ b/.github/workflows/merge_paths_ci.yml @@ -23,7 +23,7 @@ concurrency: jobs: merge-paths-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/papyrus/helm-install.yml b/.github/workflows/papyrus/helm-install.yml index 280bb54b53..886f307f09 100644 --- a/.github/workflows/papyrus/helm-install.yml +++ b/.github/workflows/papyrus/helm-install.yml @@ -14,7 +14,7 @@ on: jobs: deploy-teardown: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small permissions: contents: "read" id-token: "write" diff --git a/.github/workflows/papyrus_benchmark.yaml b/.github/workflows/papyrus_benchmark.yaml index 6a1a4edede..b7912e4957 100644 --- a/.github/workflows/papyrus_benchmark.yaml +++ b/.github/workflows/papyrus_benchmark.yaml @@ -8,7 +8,7 @@ on: jobs: storage-benchmark: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index cbb75559c7..c9c01b3a37 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -42,7 +42,7 @@ concurrency: jobs: executable-run: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -57,7 +57,7 @@ jobs: & sleep 30 ; kill $! executable-run-no-rpc: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -72,7 +72,7 @@ jobs: & sleep 30 ; kill $! p2p-sync-e2e-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -84,7 +84,7 @@ jobs: run: scripts/papyrus/p2p_sync_e2e_test/main.sh ${{ secrets.CI_BASE_LAYER_NODE_URL }} integration-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -97,7 +97,7 @@ jobs: cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream" test-no-rpc: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -107,7 +107,7 @@ jobs: SEED: 0 check-starknet_api-dependency: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small if: github.base_ref == 'main' # this step is only run if the pr is to the main branch steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: - run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main build-papyrus-utilities-image: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx @@ -131,7 +131,7 @@ jobs: cache-to: type=gha,mode=max,scope=buildkit-ci random-table-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 # run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes. diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 9b2110997c..9640061afe 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -71,7 +71,6 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3.2.0 with: - file: dynamic.Dockerfile context: . push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index a918e4ce3e..0871886d0e 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -7,7 +7,7 @@ on: jobs: latest_deps: name: Latest Dependencies - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium continue-on-error: true steps: - uses: actions/checkout@v4 From 0617447a39d1e4bd33240458882e15bc4305f53e Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Thu, 29 Aug 2024 19:24:04 +0300 Subject: [PATCH 04/21] chore: update feature contracts --- .../cairo1/compiled/account_faulty.casm.json | 2 +- .../account_with_dummy_validate.casm.json | 2 +- .../account_with_long_validate.casm.json | 2 +- .../cairo1/compiled/empty_contract.casm.json | 2 +- .../cairo1/compiled/test_contract.casm.json | 13920 ++++++---------- 5 files changed, 5061 insertions(+), 8867 deletions(-) diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json index 5d1bb9be09..fd4cce75fa 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.8.2", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json index 7b6b3673ca..7f9921889a 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.8.2", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json index 27ba33d097..831289775f 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.8.2", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json index 10caa8a487..30015279dc 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.8.2", + "compiler_version": "2.7.1", "bytecode": [], "bytecode_segment_lengths": 0, "hints": [], diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json index e83fe5605a..6928947940 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.8.2", + "compiler_version": "2.7.1", "bytecode": [ "0xa0680017fff8000", "0x7", @@ -100,9 +100,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4a6e", + "0x4529", "0x482480017fff8000", - "0x4a6d", + "0x4528", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -275,9 +275,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x49bf", + "0x447a", "0x482480017fff8000", - "0x49be", + "0x4479", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -536,7 +536,7 @@ "0x48127ffa7fff8000", "0x480080007ff88000", "0x1104800180018000", - "0x1810", + "0x1643", "0x20680017fff7ffa", "0xb", "0x48127ff87fff8000", @@ -588,9 +588,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4886", + "0x4341", "0x482480017fff8000", - "0x4885", + "0x4340", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -715,467 +715,6 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2", - "0xa0680017fff8000", - "0x7", - "0x482680017ffa8000", - "0x100000000000000000000000000000000", - "0x400280007ff97fff", - "0x10780017fff7fff", - "0x10c", - "0x4825800180007ffa", - "0x0", - "0x400280007ff97fff", - "0x482680017ff98000", - "0x1", - "0x48297ffc80007ffd", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0xa", - "0x482680017ffc8000", - "0x1", - "0x480a7ffd7fff8000", - "0x480680017fff8000", - "0x0", - "0x480280007ffc8000", - "0x10780017fff7fff", - "0x8", - "0x480a7ffc7fff8000", - "0x480a7ffd7fff8000", - "0x480680017fff8000", - "0x1", - "0x480680017fff8000", - "0x0", - "0x20680017fff7ffe", - "0xe1", - "0x40137fff7fff8001", - "0xa0680017fff8004", - "0xe", - "0x4825800180048001", - "0x800000000000000000000000000000000000000000000000000000000000000", - "0x484480017ffe8000", - "0x110000000000000000", - "0x48307ffe7fff8002", - "0x480080007ff67ffc", - "0x480080017ff57ffc", - "0x402480017ffb7ffd", - "0xffffffffffffffeeffffffffffffffff", - "0x400080027ff47ffd", - "0x10780017fff7fff", - "0xce", - "0x484480017fff8001", - "0x8000000000000000000000000000000", - "0x48317fff80008001", - "0x480080007ff77ffd", - "0x480080017ff67ffd", - "0x402480017ffc7ffe", - "0xf8000000000000000000000000000000", - "0x400080027ff57ffe", - "0x482480017ff58000", - "0x3", - "0x48307ff680007ff7", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0xa", - "0x482480017ff58000", - "0x1", - "0x48127ff57fff8000", - "0x480680017fff8000", - "0x0", - "0x480080007ff28000", - "0x10780017fff7fff", - "0x8", - "0x48127ff57fff8000", - "0x48127ff57fff8000", - "0x480680017fff8000", - "0x1", - "0x480680017fff8000", - "0x0", - "0x20680017fff7ffe", - "0xa1", - "0x40137fff7fff8000", - "0x48307ffc80007ffd", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0xa", - "0x482480017ffb8000", - "0x1", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x0", - "0x48127ff87fff8000", - "0x10780017fff7fff", - "0x8", - "0x48127ffb7fff8000", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x480680017fff8000", - "0x0", - "0x20680017fff7ffe", - "0x20", - "0x40780017fff7fff", - "0x1", - "0x48127ff47fff8000", - "0x48127fe77fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ffb7fff8000", - "0x48127ffa7fff8000", - "0x480080007ff88000", - "0x1104800180018000", - "0x16ed", - "0x20680017fff7ffa", - "0xb", - "0x48127ff87fff8000", - "0x48127ff87fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x10780017fff7fff", - "0x14", - "0x48127ff87fff8000", - "0x48127ff87fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x48127ff57fff8000", - "0x48127fe87fff8000", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x480680017fff8000", - "0x1", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x20680017fff7ffd", - "0x53", - "0x48307ffb80007ffc", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x10", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x496e70757420746f6f206c6f6e6720666f7220617267756d656e7473", - "0x400080007ffe7fff", - "0x48127ff67fff8000", - "0x48127ff67fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x1104800180018000", - "0x4763", - "0x482480017fff8000", - "0x4762", - "0x480080007fff8000", - "0xa0680017fff8000", - "0x9", - "0x4824800180007ff4", - "0x602c", - "0x482480017fff8000", - "0x100000000000000000000000000000000", - "0x400080007ff17fff", - "0x10780017fff7fff", - "0x23", - "0x4824800180007ff4", - "0x602c", - "0x400080007ff27fff", - "0x482480017ff28000", - "0x1", - "0x48127ffe7fff8000", - "0x480a7ffb7fff8000", - "0x480a80017fff8000", - "0x480a80007fff8000", - "0x48127ff27fff8000", - "0x48127ff27fff8000", - "0x1104800180018000", - "0x16fc", - "0x20680017fff7ffd", - "0xc", - "0x40780017fff7fff", - "0x1", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x480680017fff8000", - "0x0", - "0x48127ffb7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7574206f6620676173", - "0x400080007ffe7fff", - "0x482480017fef8000", - "0x1", - "0x48127fef7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4661696c656420746f20646573657269616c697a6520706172616d202333", - "0x400080007ffe7fff", - "0x48127ff77fff8000", - "0x48127ff77fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4661696c656420746f20646573657269616c697a6520706172616d202332", - "0x400080007ffe7fff", - "0x48127ff87fff8000", - "0x48127feb7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x482480017ff48000", - "0x3", - "0x10780017fff7fff", - "0x5", - "0x40780017fff7fff", - "0x6", - "0x48127ff47fff8000", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4661696c656420746f20646573657269616c697a6520706172616d202331", - "0x400080007ffe7fff", - "0x48127ffd7fff8000", - "0x48127fef7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7574206f6620676173", - "0x400080007ffe7fff", - "0x482680017ff98000", - "0x1", - "0x480a7ffa7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0xa0680017fff8000", - "0x7", - "0x482680017ffa8000", - "0x100000000000000000000000000000000", - "0x400280007ff97fff", - "0x10780017fff7fff", - "0x97", - "0x4825800180007ffa", - "0x0", - "0x400280007ff97fff", - "0x482680017ff98000", - "0x1", - "0x48297ffc80007ffd", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0xa", - "0x482680017ffc8000", - "0x1", - "0x480a7ffd7fff8000", - "0x480680017fff8000", - "0x0", - "0x480280007ffc8000", - "0x10780017fff7fff", - "0x8", - "0x480a7ffc7fff8000", - "0x480a7ffd7fff8000", - "0x480680017fff8000", - "0x1", - "0x480680017fff8000", - "0x0", - "0x20680017fff7ffe", - "0x6c", - "0xa0680017fff8004", - "0xe", - "0x4824800180047ffe", - "0x800000000000000000000000000000000000000000000000000000000000000", - "0x484480017ffe8000", - "0x110000000000000000", - "0x48307ffe7fff8002", - "0x480080007ff67ffc", - "0x480080017ff57ffc", - "0x402480017ffb7ffd", - "0xffffffffffffffeeffffffffffffffff", - "0x400080027ff47ffd", - "0x10780017fff7fff", - "0x5a", - "0x484480017fff8001", - "0x8000000000000000000000000000000", - "0x48307fff80007ffd", - "0x480080007ff77ffd", - "0x480080017ff67ffd", - "0x402480017ffc7ffe", - "0xf8000000000000000000000000000000", - "0x400080027ff57ffe", - "0x482480017ff58000", - "0x3", - "0x48307ff680007ff7", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x10", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x496e70757420746f6f206c6f6e6720666f7220617267756d656e7473", - "0x400080007ffe7fff", - "0x48127ffc7fff8000", - "0x48127fef7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x1104800180018000", - "0x4699", - "0x482480017fff8000", - "0x4698", - "0x480080007fff8000", - "0xa0680017fff8000", - "0x9", - "0x4824800180007fed", - "0x9e66", - "0x482480017fff8000", - "0x100000000000000000000000000000000", - "0x400080007ff77fff", - "0x10780017fff7fff", - "0x20", - "0x4824800180007fed", - "0x9e66", - "0x400080007ff87fff", - "0x482480017ff88000", - "0x1", - "0x48127ffe7fff8000", - "0x480a7ffb7fff8000", - "0x48127fef7fff8000", - "0x1104800180018000", - "0x16c3", - "0x20680017fff7ffd", - "0xc", - "0x40780017fff7fff", - "0x1", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x48127ff97fff8000", - "0x480680017fff8000", - "0x0", - "0x48127ffb7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7574206f6620676173", - "0x400080007ffe7fff", - "0x482480017ff58000", - "0x1", - "0x48127fe87fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x482480017ff48000", - "0x3", - "0x10780017fff7fff", - "0x5", - "0x40780017fff7fff", - "0x6", - "0x48127ff47fff8000", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4661696c656420746f20646573657269616c697a6520706172616d202331", - "0x400080007ffe7fff", - "0x48127ffd7fff8000", - "0x48127fef7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7574206f6620676173", - "0x400080007ffe7fff", - "0x482680017ff98000", - "0x1", - "0x480a7ffa7fff8000", - "0x480a7ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", "0x3", "0xa0680017fff8000", "0x7", @@ -1383,9 +922,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x456b", + "0x41f3", "0x482480017fff8000", - "0x456a", + "0x41f2", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1411,7 +950,7 @@ "0x480a80017fff8000", "0x480a80027fff8000", "0x1104800180018000", - "0x160d", + "0x1501", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -1589,9 +1128,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x449d", + "0x4125", "0x482480017fff8000", - "0x449c", + "0x4124", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1706,7 +1245,7 @@ "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x1550", + "0x1444", "0x20680017fff7ffc", "0xf2", "0x48127ff97fff8000", @@ -1717,7 +1256,7 @@ "0x40137ffa7fff8001", "0x40137ffb7fff8002", "0x1104800180018000", - "0x1612", + "0x1506", "0x20680017fff7feb", "0xdf", "0x20680017fff7fee", @@ -1805,9 +1344,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x43c5", + "0x404d", "0x482480017fff8000", - "0x43c4", + "0x404c", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1849,7 +1388,7 @@ "0x48127fdb7fff8000", "0x48127fdf7fff8000", "0x1104800180018000", - "0x1a43", + "0x1937", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -2143,9 +1682,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4273", + "0x3efb", "0x482480017fff8000", - "0x4272", + "0x3efa", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2430,9 +1969,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4154", + "0x3ddc", "0x482480017fff8000", - "0x4153", + "0x3ddb", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2454,7 +1993,7 @@ "0x48127fee7fff8000", "0x48127ff27fff8000", "0x1104800180018000", - "0x1956", + "0x184a", "0x482480017fc88000", "0x1", "0x48127ffa7fff8000", @@ -2647,9 +2186,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x407b", + "0x3d03", "0x482480017fff8000", - "0x407a", + "0x3d02", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2863,9 +2402,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3fa3", + "0x3c2b", "0x482480017fff8000", - "0x3fa2", + "0x3c2a", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3002,9 +2541,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3f18", + "0x3ba0", "0x482480017fff8000", - "0x3f17", + "0x3b9f", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3036,7 +2575,7 @@ "0x48127ff77fff8000", "0x480080007ffc8000", "0x1104800180018000", - "0x1758", + "0x164c", "0x40780017fff7fff", "0x1", "0x48127ffa7fff8000", @@ -3275,9 +2814,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3e07", + "0x3a8f", "0x482480017fff8000", - "0x3e06", + "0x3a8e", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3453,9 +2992,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3d55", + "0x39dd", "0x482480017fff8000", - "0x3d54", + "0x39dc", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3474,7 +3013,7 @@ "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x1660", + "0x1554", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3557,9 +3096,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3ced", + "0x3975", "0x482480017fff8000", - "0x3cec", + "0x3974", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3578,7 +3117,7 @@ "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x16cc", + "0x15c0", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3662,15 +3201,15 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3c84", + "0x390c", "0x482480017fff8000", - "0x3c83", + "0x390b", "0x480080007fff8000", "0x480080017fff8000", "0x484480017fff8000", "0x8", "0x482480017fff8000", - "0x40312", + "0x4142e", "0xa0680017fff8000", "0x8", "0x48307ffe80007ff5", @@ -3687,7 +3226,7 @@ "0x480a7ff97fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x16b2", + "0x15a6", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -3774,28 +3313,28 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3c14", + "0x389c", "0x482480017fff8000", - "0x3c13", + "0x389b", "0x480080007fff8000", "0xa0680017fff8000", "0x9", "0x4824800180007ff8", - "0x371b8", + "0x382d4", "0x482480017fff8000", "0x100000000000000000000000000000000", "0x400080007ff77fff", "0x10780017fff7fff", "0x1f", "0x4824800180007ff8", - "0x371b8", + "0x382d4", "0x400080007ff87fff", "0x482480017ff88000", "0x1", "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x17a6", + "0x169a", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3920,9 +3459,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3b82", + "0x380a", "0x482480017fff8000", - "0x3b81", + "0x3809", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4122,9 +3661,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3ab8", + "0x3740", "0x482480017fff8000", - "0x3ab7", + "0x373f", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4145,7 +3684,7 @@ "0x48127ff47fff8000", "0x48127ff47fff8000", "0x1104800180018000", - "0x17d1", + "0x16c5", "0x20680017fff7ffd", "0xe", "0x40780017fff7fff", @@ -4244,9 +3783,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3a3e", + "0x36c6", "0x482480017fff8000", - "0x3a3d", + "0x36c5", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4358,9 +3897,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x39cc", + "0x3654", "0x482480017fff8000", - "0x39cb", + "0x3653", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4379,7 +3918,7 @@ "0x48127ffe7fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x1836", + "0x172a", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -4497,9 +4036,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3941", + "0x35c9", "0x482480017fff8000", - "0x3940", + "0x35c8", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4518,7 +4057,7 @@ "0x48127ffe7fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x17db", + "0x16cf", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -4702,9 +4241,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3874", + "0x34fc", "0x482480017fff8000", - "0x3873", + "0x34fb", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4946,9 +4485,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3780", + "0x3408", "0x482480017fff8000", - "0x377f", + "0x3407", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -4974,7 +4513,7 @@ "0x48127feb7fff8000", "0x48127fef7fff8000", "0x1104800180018000", - "0x163f", + "0x1533", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5089,7 +4628,7 @@ "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x168f", + "0x1583", "0x20680017fff7ffc", "0x63", "0x48307ffa80007ffb", @@ -5114,9 +4653,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x36d8", + "0x3360", "0x482480017fff8000", - "0x36d7", + "0x335f", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -5147,7 +4686,7 @@ "0x48127feb7fff8000", "0x48127feb7fff8000", "0x1104800180018000", - "0x1719", + "0x160d", "0x20680017fff7ffd", "0xe", "0x40780017fff7fff", @@ -5282,7 +4821,7 @@ "0x48127ff67fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x15ce", + "0x14c2", "0x20680017fff7ffc", "0x60", "0x48307ffa80007ffb", @@ -5305,9 +4844,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3619", + "0x32a1", "0x482480017fff8000", - "0x3618", + "0x32a0", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5462,9 +5001,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x357c", + "0x3204", "0x482480017fff8000", - "0x357b", + "0x3203", "0x480080007fff8000", "0x480080027fff8000", "0x482480017fff8000", @@ -5485,7 +5024,7 @@ "0x48127ffd7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x16e9", + "0x15dd", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5594,9 +5133,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x34f8", + "0x3180", "0x482480017fff8000", - "0x34f7", + "0x317f", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -5620,7 +5159,7 @@ "0x480a7ffb7fff8000", "0x48127ff17fff8000", "0x1104800180018000", - "0x1784", + "0x1678", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5743,9 +5282,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3463", + "0x30eb", "0x482480017fff8000", - "0x3462", + "0x30ea", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5881,9 +5420,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x33d9", + "0x3061", "0x482480017fff8000", - "0x33d8", + "0x3060", "0x480080007fff8000", "0x480080047fff8000", "0x484480017fff8000", @@ -5911,7 +5450,7 @@ "0x480a7ff77fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0x178f", + "0x1683", "0x20680017fff7ffd", "0xf", "0x40780017fff7fff", @@ -6007,9 +5546,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x335b", + "0x2fe3", "0x482480017fff8000", - "0x335a", + "0x2fe2", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6025,14 +5564,14 @@ "0x400080007ff87fff", "0x480a7ff97fff8000", "0x1104800180018000", - "0x18ef", + "0x17e3", "0x482480017fe88000", "0x1", "0x20680017fff7ffc", "0x17", "0x48127ffb7fff8000", "0x1104800180018000", - "0x18e8", + "0x17dc", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -6171,9 +5710,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x32b7", + "0x2f3f", "0x482480017fff8000", - "0x32b6", + "0x2f3e", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6377,9 +5916,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x31e9", + "0x2e71", "0x482480017fff8000", - "0x31e8", + "0x2e70", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6582,9 +6121,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x311c", + "0x2da4", "0x482480017fff8000", - "0x311b", + "0x2da3", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6787,274 +6326,6 @@ "0x482480017ff78000", "0x1", "0x208b7fff7fff7ffe", - "0x480680017fff8000", - "0x43616c6c436f6e7472616374", - "0x400280007ff97fff", - "0x400380017ff97ff8", - "0x400380027ff97ffa", - "0x400380037ff97ffb", - "0x400380047ff97ffc", - "0x400380057ff97ffd", - "0x480280077ff98000", - "0x20680017fff7fff", - "0x1c", - "0x40780017fff7fff", - "0xc", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x46a6158a16a947e5916b2a2ca68501a45e93d7110e81aa2d6438b1c57c879a3", - "0x400080007ffe7fff", - "0x480680017fff8000", - "0x0", - "0x400080017ffd7fff", - "0x480680017fff8000", - "0x457870656374656420726576657274", - "0x400080027ffc7fff", - "0x480680017fff8000", - "0xf", - "0x400080037ffb7fff", - "0x480a7ff77fff8000", - "0x480280067ff98000", - "0x482680017ff98000", - "0xa", - "0x480680017fff8000", - "0x1", - "0x48127ff77fff8000", - "0x482480017ff68000", - "0x4", - "0x208b7fff7fff7ffe", - "0x480280087ff98000", - "0x480280097ff98000", - "0x480280067ff98000", - "0x482680017ff98000", - "0xa", - "0x48307ffc80007ffd", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x51", - "0x4824800180007ffc", - "0x1", - "0x480080007fff8000", - "0x4824800180007fff", - "0x454e545259504f494e545f4641494c4544", - "0x20680017fff7fff", - "0x3a", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x1275130f95dda36bcbb6e9d28796c1d7e10b6e9fd5ed083e0ede4b12f613528", - "0x480680017fff8000", - "0x53746f7261676552656164", - "0x400080007ff87fff", - "0x400080017ff87ff7", - "0x400080027ff87ffd", - "0x400080037ff87ffe", - "0x480080057ff88000", - "0x20680017fff7fff", - "0x22", - "0x480080067ff78000", - "0x480080047ff68000", - "0x482480017ff58000", - "0x7", - "0x20680017fff7ffd", - "0xe", - "0x40780017fff7fff", - "0x2", - "0x480a7ff77fff8000", - "0x48127ffb7fff8000", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x76616c7565732073686f756c64206e6f74206368616e67652e", - "0x400080007ffe7fff", - "0x480a7ff77fff8000", - "0x48127ffb7fff8000", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x5", - "0x480a7ff77fff8000", - "0x480080047ff18000", - "0x482480017ff08000", - "0x8", - "0x480680017fff8000", - "0x1", - "0x480080067fee8000", - "0x480080077fed8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x7", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x556e6578706563746564206572726f72", - "0x400080007ffe7fff", - "0x480a7ff77fff8000", - "0x48127ff07fff8000", - "0x48127ff07fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xa", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7074696f6e3a3a756e77726170206661696c65642e", - "0x400080007ffe7fff", - "0x480a7ff77fff8000", - "0x48127ff07fff8000", - "0x48127ff07fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x0", - "0x400080007ffe7fff", - "0x48127ffe7fff8000", - "0x482480017ffd8000", - "0x1", - "0x480680017fff8000", - "0x456d69744576656e74", - "0x400280007ffc7fff", - "0x400380017ffc7ffb", - "0x400280027ffc7ffd", - "0x400280037ffc7ffe", - "0x400280047ffc7ffd", - "0x400280057ffc7ffe", - "0x480280077ffc8000", - "0x20680017fff7fff", - "0x62", - "0x480280067ffc8000", - "0x480680017fff8000", - "0x5265706c616365436c617373", - "0x400280087ffc7fff", - "0x400280097ffc7ffe", - "0x4003800a7ffc7ffd", - "0x4802800c7ffc8000", - "0x20680017fff7fff", - "0x4e", - "0x4802800b7ffc8000", - "0x480680017fff8000", - "0x11", - "0x480680017fff8000", - "0x53656e644d657373616765546f4c31", - "0x4002800d7ffc7fff", - "0x4002800e7ffc7ffd", - "0x4002800f7ffc7ffe", - "0x400280107ffc7ff6", - "0x400280117ffc7ff7", - "0x480280137ffc8000", - "0x20680017fff7fff", - "0x36", - "0x480280127ffc8000", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x1275130f95dda36bcbb6e9d28796c1d7e10b6e9fd5ed083e0ede4b12f613528", - "0x480680017fff8000", - "0x11", - "0x480680017fff8000", - "0x53746f726167655772697465", - "0x400280147ffc7fff", - "0x400280157ffc7ffb", - "0x400280167ffc7ffc", - "0x400280177ffc7ffd", - "0x400280187ffc7ffe", - "0x4802801a7ffc8000", - "0x20680017fff7fff", - "0x1a", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x46a6158a16a947e5916b2a2ca68501a45e93d7110e81aa2d6438b1c57c879a3", - "0x400080007ffe7fff", - "0x480680017fff8000", - "0x0", - "0x400080017ffd7fff", - "0x480680017fff8000", - "0x746573745f7265766572745f68656c706572", - "0x400080027ffc7fff", - "0x480680017fff8000", - "0x12", - "0x400080037ffb7fff", - "0x480a7ffa7fff8000", - "0x480280197ffc8000", - "0x482680017ffc8000", - "0x1b", - "0x480680017fff8000", - "0x1", - "0x48127ff77fff8000", - "0x482480017ff68000", - "0x4", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x5", - "0x480a7ffa7fff8000", - "0x480280197ffc8000", - "0x482680017ffc8000", - "0x1d", - "0x480680017fff8000", - "0x1", - "0x4802801b7ffc8000", - "0x4802801c7ffc8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xb", - "0x480a7ffa7fff8000", - "0x480280127ffc8000", - "0x482680017ffc8000", - "0x16", - "0x480680017fff8000", - "0x1", - "0x480280147ffc8000", - "0x480280157ffc8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xf", - "0x480a7ffa7fff8000", - "0x4802800b7ffc8000", - "0x482680017ffc8000", - "0xf", - "0x480680017fff8000", - "0x1", - "0x4802800d7ffc8000", - "0x4802800e7ffc8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x12", - "0x480a7ffa7fff8000", - "0x480280067ffc8000", - "0x482680017ffc8000", - "0xa", - "0x480680017fff8000", - "0x1", - "0x480280087ffc8000", - "0x480280097ffc8000", - "0x208b7fff7fff7ffe", "0xa0680017fff8000", "0x7", "0x482680017ff68000", @@ -9431,9 +8702,9 @@ "0x20680017fff7ffd", "0x37", "0x1104800180018000", - "0x25df", + "0x2373", "0x482480017fff8000", - "0x25de", + "0x2372", "0x48127ff97fff8000", "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", @@ -9875,15 +9146,15 @@ "0x20680017fff7ffc", "0x12", "0x40780017fff7fff", - "0x30c", + "0x327", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x53686f756c64206265206e6f6e65", "0x400080007ffe7fff", "0x480a7ffb7fff8000", - "0x48127cef7fff8000", - "0x48127cef7fff8000", + "0x48127cd47fff8000", + "0x48127cd47fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9910,15 +9181,15 @@ "0x20680017fff7fff", "0x13", "0x40780017fff7fff", - "0x306", + "0x321", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x53686f756c64206661696c", "0x400080007ffe7fff", "0x480a7ffb7fff8000", - "0x480080067cf08000", - "0x482480017cef8000", + "0x480080067cd58000", + "0x482480017cd48000", "0xa", "0x480680017fff8000", "0x1", @@ -10000,7 +9271,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x2e6", + "0x301", "0x10780017fff7fff", "0xa", "0x4824800180007ffa", @@ -10010,7 +9281,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x2e5", + "0x300", "0x10780017fff7fff", "0x14", "0x4824800180007ffc", @@ -10020,7 +9291,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x2e4", + "0x2ff", "0x10780017fff7fff", "0xa", "0x4824800180007ffc", @@ -10030,15 +9301,15 @@ "0x10780017fff7fff", "0x12", "0x40780017fff7fff", - "0x2e3", + "0x2fe", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x556e657870656374656420636f6f7264696e61746573", "0x400080007ffe7fff", - "0x48127d047fff8000", - "0x48127d127fff8000", - "0x48127d127fff8000", + "0x48127ce97fff8000", + "0x48127cf77fff8000", + "0x48127cf77fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -10133,15 +9404,15 @@ "0x48127ffa7fff8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2cf", + "0x2ea", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127d287fff8000", - "0x48127d2c7fff8000", - "0x48127d2c7fff8000", + "0x48127d0d7fff8000", + "0x48127d117fff8000", + "0x48127d117fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -10149,37 +9420,37 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2d5", - "0x48127d287fff8000", - "0x480080067d138000", - "0x482480017d128000", + "0x2f0", + "0x48127d0d7fff8000", + "0x480080067cf88000", + "0x482480017cf78000", "0xa", "0x480680017fff8000", "0x1", - "0x480080087d108000", - "0x480080097d0f8000", + "0x480080087cf58000", + "0x480080097cf48000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2ef", - "0x48127d047fff8000", - "0x480080037d0d8000", - "0x482480017d0c8000", + "0x30a", + "0x48127ce97fff8000", + "0x480080037cf28000", + "0x482480017cf18000", "0x7", "0x480680017fff8000", "0x1", - "0x480080057d0a8000", - "0x480080067d098000", + "0x480080057cef8000", + "0x480080067cee8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2ef", + "0x30a", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127d047fff8000", - "0x48127d0c7fff8000", - "0x48127d0c7fff8000", + "0x48127ce97fff8000", + "0x48127cf17fff8000", + "0x48127cf17fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -10187,26 +9458,26 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2f5", - "0x48127d047fff8000", - "0x480080067cfb8000", - "0x482480017cfa8000", + "0x310", + "0x48127ce97fff8000", + "0x480080067ce08000", + "0x482480017cdf8000", "0xa", "0x480680017fff8000", "0x1", - "0x480080087cf88000", - "0x480080097cf78000", + "0x480080087cdd8000", + "0x480080097cdc8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2f9", + "0x314", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x57726f6e67206572726f72206d7367", "0x400080007ffe7fff", - "0x48127d047fff8000", - "0x48127cfa7fff8000", - "0x48127cfa7fff8000", + "0x48127ce97fff8000", + "0x48127cdf7fff8000", + "0x48127cdf7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -10214,7 +9485,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2fe", + "0x319", "0x40780017fff7fff", "0x1", "0x480680017fff8000", @@ -10222,8 +9493,8 @@ "0x400080007ffe7fff", "0x482680017ffb8000", "0x1", - "0x48127cfa7fff8000", - "0x48127cfa7fff8000", + "0x48127cdf7fff8000", + "0x48127cdf7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -10231,7 +9502,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x312", + "0x32d", "0x480a7ffb7fff8000", "0x480280067ffd8000", "0x482680017ffd8000", @@ -12033,9 +11304,9 @@ "0x20680017fff7fff", "0x14d", "0x1104800180018000", - "0x1bbe", + "0x1952", "0x482480017fff8000", - "0x1bbd", + "0x1951", "0x480680017fff8000", "0x2", "0x482480017ffe8000", @@ -12117,7 +11388,7 @@ "0x480680017fff8000", "0x0", "0x1104800180018000", - "0xbd4", + "0xa11", "0x402580017fd38005", "0x1", "0x20680017fff7fff", @@ -12136,7 +11407,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xbe0", + "0xa1d", "0x20680017fff7ffb", "0x70", "0x48127ffa7fff8000", @@ -12149,7 +11420,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xbd3", + "0xa10", "0x20680017fff7ffb", "0x59", "0x48127ffa7fff8000", @@ -12162,7 +11433,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xbc6", + "0xa03", "0x20680017fff7ffb", "0x42", "0x48127ffa7fff8000", @@ -12175,7 +11446,7 @@ "0x480680017fff8000", "0x2", "0x1104800180018000", - "0xbb9", + "0x9f6", "0x20680017fff7ffb", "0x2b", "0x40780017fff7fff", @@ -12197,7 +11468,7 @@ "0x482480017ff88000", "0x2", "0x1104800180018000", - "0x1013", + "0xe50", "0x20680017fff7ffd", "0x9", "0x400180007fff8003", @@ -12654,7 +11925,7 @@ "0x480a7ff97fff8000", "0x480a7ffa7fff8000", "0x1104800180018000", - "0xe8c", + "0xcc9", "0x20680017fff7ffc", "0x11", "0x400280007ffc7ffd", @@ -13024,7 +12295,7 @@ "0x480080007ffc8000", "0x480080017ffb8000", "0x1104800180018000", - "0xdca", + "0xc07", "0x20680017fff7ffd", "0xb", "0x48127ffc7fff8000", @@ -13273,7 +12544,7 @@ "0x48127ffa7fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0xd6e", + "0xbab", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x1", @@ -13479,7 +12750,7 @@ "0x48127ff27fff8000", "0x48307ffc80007ffd", "0x1104800180018000", - "0xcf3", + "0xb30", "0x484480017f9b8000", "0x20", "0xa0680017fff8000", @@ -13808,7 +13079,7 @@ "0x480a7ffb7fff8000", "0x480a7ffc7fff8000", "0x1104800180018000", - "0xc99", + "0xad6", "0x20680017fff7ffd", "0x3e", "0x20680017fff7ffe", @@ -13819,7 +13090,7 @@ "0x48127ff97fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0x1112", + "0xd8d", "0x20680017fff7ffd", "0x1b", "0x48317fff80007ffd", @@ -13917,7 +13188,7 @@ "0x20680017fff7fff", "0x4", "0x10780017fff7fff", - "0x4c0", + "0x2fd", "0x480680017fff8000", "0xffffffff00000000ffffffffffffffff", "0x48317fff80017ffa", @@ -13938,10 +13209,10 @@ "0x10780017fff7fff", "0x7", "0x40780017fff7fff", - "0x2b8", - "0x48127d467fff8000", + "0x2d3", + "0x48127d2b7fff8000", "0x10780017fff7fff", - "0x4ab", + "0x2e8", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x48317fff80017ff9", @@ -13954,11 +13225,11 @@ "0x9", "0x400080007ffb7fff", "0x40780017fff7fff", - "0x2b5", - "0x482480017d468000", + "0x2d0", + "0x482480017d2b8000", "0x1", "0x10780017fff7fff", - "0x49a", + "0x2d7", "0x482480017ffa8000", "0x1", "0x10780017fff7fff", @@ -14051,7 +13322,7 @@ "0x1", "0x48307ffe80007fff", "0x20680017fff7fff", - "0x435", + "0x272", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x480680017fff8000", @@ -14157,7 +13428,7 @@ "0x40317ff97ffb7ffc", "0x40307ffa7ffc7ff1", "0x10780017fff7fff", - "0x37e", + "0x1bb", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480080097fcb8001", @@ -14404,191 +13675,218 @@ "0x480a7ff87fff8000", "0x48127f597fff8000", "0x48127f597fff8000", + "0x480680017fff8000", + "0xbce6faada7179e84f3b9cac2fc632551", + "0x480680017fff8000", + "0xffffffff00000000ffffffffffffffff", "0x1104800180018000", - "0xf8f", + "0xc06", + "0x48127ffd7fff8000", + "0x480a7ff97fff8000", + "0x480a7ffa7fff8000", + "0x48127e5d7fff8000", + "0x48127e5d7fff8000", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x480680017fff8000", "0xffffffff00000000ffffffffffffffff", - "0x480080007ff98000", - "0x480080017ff88000", - "0x480080027ff78000", - "0x480080037ff68000", - "0x480080047ff58000", - "0x480080057ff48000", - "0x48307fff80007ff9", - "0x40780017fff7fff", - "0xc", - "0x20680017fff7ff3", + "0x1104800180018000", + "0xbfb", + "0x480680017fff8000", + "0x77037d812deb33a0f4a13945d898c296", + "0x480680017fff8000", + "0x6b17d1f2e12c4247f8bce6e563a440f2", + "0x480680017fff8000", + "0x2bce33576b315ececbb6406837bf51f5", + "0x480680017fff8000", + "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e16", + "0x480680017fff8000", + "0x5365637032353672314e6577", + "0x400280007ff67fff", + "0x400380017ff67ff5", + "0x400280027ff67ffb", + "0x400280037ff67ffc", + "0x400280047ff67ffd", + "0x400280057ff67ffe", + "0x480280077ff68000", + "0x20680017fff7fff", + "0x92", + "0x480280087ff68000", + "0x480280097ff68000", + "0x480280067ff68000", + "0x482680017ff68000", + "0xa", + "0x20680017fff7ffc", + "0x7d", + "0x480680017fff8000", + "0x5365637032353672314d756c", + "0x400080007ffe7fff", + "0x400080017ffe7ffd", + "0x400080027ffe7ffc", + "0x400080037ffe7ef7", + "0x400080047ffe7ef8", + "0x480080067ffe8000", + "0x20680017fff7fff", + "0x68", + "0x480080057ffd8000", + "0x480080077ffc8000", + "0x480680017fff8000", + "0x5365637032353672314d756c", + "0x400080087ffa7fff", + "0x400080097ffa7ffd", + "0x4001800a7ffa7ffd", + "0x4000800b7ffa7fef", + "0x4000800c7ffa7ff0", + "0x4800800e7ffa8000", + "0x20680017fff7fff", + "0x51", + "0x4800800d7ff98000", + "0x4800800f7ff88000", + "0x480680017fff8000", + "0x536563703235367231416464", + "0x400080107ff67fff", + "0x400080117ff67ffd", + "0x400080127ff67ffa", + "0x400080137ff67ffe", + "0x480080157ff68000", + "0x20680017fff7fff", + "0x3b", + "0x480080147ff58000", + "0x480080167ff48000", + "0x480680017fff8000", + "0x5365637032353672314765745879", + "0x400080177ff27fff", + "0x400080187ff27ffd", + "0x400080197ff27ffe", + "0x4800801b7ff28000", + "0x20680017fff7fff", + "0x26", + "0x4800801c7ff18000", + "0x4800801d7ff08000", + "0x4800801a7fef8000", + "0x482480017fee8000", + "0x20", + "0x48287ff980007ffc", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", "0x8", - "0x40307ff17ff47feb", - "0x402480017ff57ff4", + "0x40780017fff7fff", "0x1", - "0x400080067fe67ff5", - "0x10780017fff7fff", - "0x3", - "0x400080067fe67ff3", - "0x48307ff17ff68000", - "0x48307fe680007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x40507fff7fff7fff", - "0x48307ff47fff8000", - "0x48307ff47fff8000", - "0x48307ff57fff8000", - "0x48307fec7fff8000", - "0x48307fe180007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080077fdd7fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x400080087fdc7fff", - "0x48307fef7ffe8000", - "0x48307ff07fff8000", - "0x48307ff07fff8000", - "0x48307ff17fff8000", - "0x48307fdb80007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080097fd67fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x4000800a7fd57fff", - "0xa0680017fff7fdf", - "0xc", - "0xa0680017fff8001", - "0x6", - "0x48127fd97fff7ffe", - "0x40127fdb7fff7ffe", + "0x480680017fff8000", + "0x0", "0x10780017fff7fff", - "0x10", - "0x48127fdc7fff7ffe", - "0x40127fd87fff7ffe", + "0xd", + "0x48287ffa80007ffc", + "0x20680017fff7fff", + "0x4", "0x10780017fff7fff", - "0xc", - "0x480680017fff7fda", - "0x0", - "0xa0680017fff8000", "0x6", - "0x40127fd77fff7ffd", - "0x40127fdc7fff7ffe", + "0x480680017fff8000", + "0x0", "0x10780017fff7fff", "0x4", - "0x40127fdc7fff7ffd", - "0x40127fd77fff7ffe", - "0x482480017ffd8000", - "0xffffffffffffffff0000000000000000", - "0x4000800b7fd17fff", - "0x48507ffd7ffc8000", - "0x48307fe97ff98000", - "0x48307fe67fff8000", - "0x40307ffd7fff7fd2", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800800c7fcd8001", - "0x4800800d7fcc7ffe", - "0x4000800e7fcb7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fd3", - "0x48507fcf7ffc8000", - "0x48507fce7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800f7fc78001", - "0x480080107fc67fff", - "0x400080117fc57ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080127fc17fff", - "0x480080137fc07ffd", - "0x400080147fbf7fd7", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fd77ffe7fff", - "0x40307ffc7ff77fd8", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080157fbe8001", - "0x480080167fbd7ffe", - "0x400080177fbc7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fc3", - "0x48507fc17ffc8000", - "0x48507fc07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080187fb88001", - "0x480080197fb77fff", - "0x4000801a7fb67ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800801b7fb27fff", - "0x4800801c7fb17ffd", - "0x4000801d7fb07fc6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fc67ffe7fff", - "0x40307ffc7ff77fc7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800801e7faf8001", - "0x4800801f7fae7ffe", - "0x400080207fad7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fb4", - "0x48507fb17ffc8000", - "0x48507fb07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080217fa98001", - "0x480080227fa87fff", - "0x400080237fa77ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080247fa37fff", - "0x480080257fa27ffd", - "0x400080267fa17fb3", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fb37ffe7fff", - "0x40307ffc7ff77fb4", + "0x480680017fff8000", + "0x1", + "0x48127fde7fff8000", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x7", + "0x48127fde7fff8000", + "0x4800801a7fe98000", + "0x482480017fe88000", + "0x1e", + "0x480680017fff8000", + "0x1", + "0x4800801c7fe68000", + "0x4800801d7fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xb", + "0x48127fde7fff8000", + "0x480080147fe98000", + "0x482480017fe88000", + "0x18", + "0x480680017fff8000", + "0x1", + "0x480080167fe68000", + "0x480080177fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xf", + "0x48127fde7fff8000", + "0x4800800d7fe98000", + "0x482480017fe88000", + "0x11", + "0x480680017fff8000", + "0x1", + "0x4800800f7fe68000", + "0x480080107fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x13", + "0x48127fde7fff8000", + "0x480080057fe98000", + "0x482480017fe88000", + "0x9", + "0x480680017fff8000", + "0x1", + "0x480080077fe68000", + "0x480080087fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xf", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7074696f6e3a3a756e77726170206661696c65642e", + "0x400080007ffe7fff", + "0x48127fed7fff8000", + "0x48127fed7fff8000", + "0x48127ffc7fff8000", + "0x482480017ffb8000", + "0x1", + "0x10780017fff7fff", + "0x9", + "0x40780017fff7fff", + "0x15", + "0x480280067ff68000", + "0x482680017ff68000", + "0xa", + "0x480280087ff68000", + "0x480280097ff68000", + "0x48127fde7fff8000", + "0x48127ffb7fff8000", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x28f", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480080277fa08001", - "0x480080287f9f7ffe", - "0x400080297f9e7ffe", + "0x480080077d5c8001", + "0x480080087d5b7ffe", + "0x400080097d5a7ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7fa4", - "0x48507fa37ffc8000", - "0x48507fa27ffc8000", + "0x40307ffc7fff7d5f", + "0x48507d637ffc8000", + "0x48507d627ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x4800802a7f9a8001", - "0x4800802b7f997fff", - "0x4000802c7f987ffd", + "0x4800800a7d568001", + "0x4800800b7d557fff", + "0x4000800c7d547ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -14597,28 +13895,28 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x4800802d7f947fff", - "0x4800802e7f937ffd", - "0x4000802f7f927fa6", + "0x4800800d7d507fff", + "0x4800800e7d4f7ffd", + "0x4000800f7d4e7d52", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", - "0x40307fa67ffe7fff", - "0x40307ffc7ff77fa7", + "0x40307d527ffe7fff", + "0x40307ffc7ff77d5c", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480080307f918001", - "0x480080317f907ffe", - "0x400080327f8f7ffe", + "0x480080107d4d8001", + "0x480080117d4c7ffe", + "0x400080127d4b7ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7f95", - "0x48507f937ffc8000", - "0x48507f927ffc8000", + "0x40307ffc7fff7d50", + "0x48507d527ffc8000", + "0x48507d517ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x480080337f8b8001", - "0x480080347f8a7fff", - "0x400080357f897ffd", + "0x480080137d478001", + "0x480080147d467fff", + "0x400080157d457ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -14627,497 +13925,19 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x480080367f857fff", - "0x480080377f847ffd", - "0x400080387f837f93", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307f937ffe7fff", - "0x40307ffc7ff77f94", - "0x482480017f838000", - "0x39", - "0x480a7ff97fff8000", - "0x480a7ffa7fff8000", - "0x48127e6b7fff8000", - "0x48127e6b7fff8000", - "0x1104800180018000", - "0xea3", - "0x480680017fff8000", - "0xbce6faada7179e84f3b9cac2fc632551", - "0x480680017fff8000", - "0xffffffff00000000ffffffffffffffff", - "0x480080007ff98000", - "0x480080017ff88000", - "0x480080027ff78000", - "0x480080037ff68000", - "0x480080047ff58000", - "0x480080057ff48000", - "0x48307fff80007ff9", - "0x40780017fff7fff", - "0xc", - "0x20680017fff7ff3", - "0x8", - "0x40307ff17ff47feb", - "0x402480017ff57ff4", - "0x1", - "0x400080067fe67ff5", - "0x10780017fff7fff", - "0x3", - "0x400080067fe67ff3", - "0x48307ff17ff68000", - "0x48307fe680007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x40507fff7fff7fff", - "0x48307ff47fff8000", - "0x48307ff47fff8000", - "0x48307ff57fff8000", - "0x48307fec7fff8000", - "0x48307fe180007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080077fdd7fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x400080087fdc7fff", - "0x48307fef7ffe8000", - "0x48307ff07fff8000", - "0x48307ff07fff8000", - "0x48307ff17fff8000", - "0x48307fdb80007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080097fd67fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x4000800a7fd57fff", - "0xa0680017fff7fdf", - "0xc", - "0xa0680017fff8001", - "0x6", - "0x48127fd97fff7ffe", - "0x40127fdb7fff7ffe", - "0x10780017fff7fff", - "0x10", - "0x48127fdc7fff7ffe", - "0x40127fd87fff7ffe", - "0x10780017fff7fff", - "0xc", - "0x480680017fff7fda", - "0x0", - "0xa0680017fff8000", - "0x6", - "0x40127fd77fff7ffd", - "0x40127fdc7fff7ffe", - "0x10780017fff7fff", - "0x4", - "0x40127fdc7fff7ffd", - "0x40127fd77fff7ffe", - "0x482480017ffd8000", - "0xffffffffffffffff0000000000000000", - "0x4000800b7fd17fff", - "0x48507ffd7ffc8000", - "0x48307fe97ff98000", - "0x48307fe67fff8000", - "0x40307ffd7fff7fd2", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800800c7fcd8001", - "0x4800800d7fcc7ffe", - "0x4000800e7fcb7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fd3", - "0x48507fcf7ffc8000", - "0x48507fce7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800f7fc78001", - "0x480080107fc67fff", - "0x400080117fc57ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080127fc17fff", - "0x480080137fc07ffd", - "0x400080147fbf7fd7", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fd77ffe7fff", - "0x40307ffc7ff77fd8", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080157fbe8001", - "0x480080167fbd7ffe", - "0x400080177fbc7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fc3", - "0x48507fc17ffc8000", - "0x48507fc07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080187fb88001", - "0x480080197fb77fff", - "0x4000801a7fb67ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800801b7fb27fff", - "0x4800801c7fb17ffd", - "0x4000801d7fb07fc6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fc67ffe7fff", - "0x40307ffc7ff77fc7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800801e7faf8001", - "0x4800801f7fae7ffe", - "0x400080207fad7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fb4", - "0x48507fb17ffc8000", - "0x48507fb07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080217fa98001", - "0x480080227fa87fff", - "0x400080237fa77ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080247fa37fff", - "0x480080257fa27ffd", - "0x400080267fa17fb3", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fb37ffe7fff", - "0x40307ffc7ff77fb4", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080277fa08001", - "0x480080287f9f7ffe", - "0x400080297f9e7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fa4", - "0x48507fa37ffc8000", - "0x48507fa27ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800802a7f9a8001", - "0x4800802b7f997fff", - "0x4000802c7f987ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800802d7f947fff", - "0x4800802e7f937ffd", - "0x4000802f7f927fa6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fa67ffe7fff", - "0x40307ffc7ff77fa7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080307f918001", - "0x480080317f907ffe", - "0x400080327f8f7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7f95", - "0x48507f937ffc8000", - "0x48507f927ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080337f8b8001", - "0x480080347f8a7fff", - "0x400080357f897ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080367f857fff", - "0x480080377f847ffd", - "0x400080387f837f93", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307f937ffe7fff", - "0x40307ffc7ff77f94", - "0x480680017fff8000", - "0x77037d812deb33a0f4a13945d898c296", - "0x480680017fff8000", - "0x6b17d1f2e12c4247f8bce6e563a440f2", - "0x480680017fff8000", - "0x2bce33576b315ececbb6406837bf51f5", - "0x480680017fff8000", - "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e16", - "0x482480017f7f8000", - "0x39", - "0x480680017fff8000", - "0x5365637032353672314e6577", - "0x400280007ff67fff", - "0x400380017ff67ff5", - "0x400280027ff67ffa", - "0x400280037ff67ffb", - "0x400280047ff67ffc", - "0x400280057ff67ffd", - "0x480280077ff68000", - "0x20680017fff7fff", - "0x92", - "0x480280087ff68000", - "0x480280097ff68000", - "0x480280067ff68000", - "0x482680017ff68000", - "0xa", - "0x20680017fff7ffc", - "0x7d", - "0x480680017fff8000", - "0x5365637032353672314d756c", - "0x400080007ffe7fff", - "0x400080017ffe7ffd", - "0x400080027ffe7ffc", - "0x400080037ffe7e94", - "0x400080047ffe7e95", - "0x480080067ffe8000", - "0x20680017fff7fff", - "0x68", - "0x480080057ffd8000", - "0x480080077ffc8000", - "0x480680017fff8000", - "0x5365637032353672314d756c", - "0x400080087ffa7fff", - "0x400080097ffa7ffd", - "0x4001800a7ffa7ffd", - "0x4000800b7ffa7f7e", - "0x4000800c7ffa7f7f", - "0x4800800e7ffa8000", - "0x20680017fff7fff", - "0x51", - "0x4800800d7ff98000", - "0x4800800f7ff88000", - "0x480680017fff8000", - "0x536563703235367231416464", - "0x400080107ff67fff", - "0x400080117ff67ffd", - "0x400080127ff67ffa", - "0x400080137ff67ffe", - "0x480080157ff68000", - "0x20680017fff7fff", - "0x3b", - "0x480080147ff58000", - "0x480080167ff48000", - "0x480680017fff8000", - "0x5365637032353672314765745879", - "0x400080177ff27fff", - "0x400080187ff27ffd", - "0x400080197ff27ffe", - "0x4800801b7ff28000", - "0x20680017fff7fff", - "0x26", - "0x4800801c7ff18000", - "0x4800801d7ff08000", - "0x4800801a7fef8000", - "0x482480017fee8000", - "0x20", - "0x48287ff980007ffc", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x8", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x0", - "0x10780017fff7fff", - "0xd", - "0x48287ffa80007ffc", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x6", - "0x480680017fff8000", - "0x0", - "0x10780017fff7fff", - "0x4", - "0x480680017fff8000", - "0x1", - "0x48127fe47fff8000", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x7", - "0x48127fe47fff8000", - "0x4800801a7fe98000", - "0x482480017fe88000", - "0x1e", - "0x480680017fff8000", - "0x1", - "0x4800801c7fe68000", - "0x4800801d7fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xb", - "0x48127fe47fff8000", - "0x480080147fe98000", - "0x482480017fe88000", - "0x18", - "0x480680017fff8000", - "0x1", - "0x480080167fe68000", - "0x480080177fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xf", - "0x48127fe47fff8000", - "0x4800800d7fe98000", - "0x482480017fe88000", - "0x11", - "0x480680017fff8000", - "0x1", - "0x4800800f7fe68000", - "0x480080107fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x13", - "0x48127fe47fff8000", - "0x480080057fe98000", - "0x482480017fe88000", - "0x9", - "0x480680017fff8000", - "0x1", - "0x480080077fe68000", - "0x480080087fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xf", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7074696f6e3a3a756e77726170206661696c65642e", - "0x400080007ffe7fff", - "0x48127fed7fff8000", - "0x48127fed7fff8000", - "0x48127ffc7fff8000", - "0x482480017ffb8000", - "0x1", - "0x10780017fff7fff", - "0x9", - "0x40780017fff7fff", - "0x15", - "0x480280067ff68000", - "0x482680017ff68000", - "0xa", - "0x480280087ff68000", - "0x480280097ff68000", - "0x48127fe47fff8000", - "0x48127ffb7fff8000", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x274", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080077d778001", - "0x480080087d767ffe", - "0x400080097d757ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7d7a", - "0x48507d7e7ffc8000", - "0x48507d7d7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800a7d718001", - "0x4800800b7d707fff", - "0x4000800c7d6f7ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800800d7d6b7fff", - "0x4800800e7d6a7ffd", - "0x4000800f7d697d6d", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307d6d7ffe7fff", - "0x40307ffc7ff77d77", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080107d688001", - "0x480080117d677ffe", - "0x400080127d667ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7d6b", - "0x48507d6d7ffc8000", - "0x48507d6c7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080137d628001", - "0x480080147d617fff", - "0x400080157d607ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080167d5c7fff", - "0x480080177d5b7ffd", - "0x400180187d5a7ffb", + "0x480080167d417fff", + "0x480080177d407ffd", + "0x400180187d3f7ffb", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40287ffb7ffe7fff", - "0x40307ffc7ff77d67", + "0x40307ffc7ff77d4c", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x482480017d588000", + "0x482480017d3d8000", "0x19", "0x480a7ff57fff8000", "0x480a7ff67fff8000", @@ -15128,12 +13948,12 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2a4", - "0x48127d587fff8000", + "0x2bf", + "0x48127d3d7fff8000", "0x10780017fff7fff", "0x5", "0x40780017fff7fff", - "0x2bd", + "0x2d8", "0x480a7ff47fff8000", "0x480a7ff57fff8000", "0x480a7ff67fff8000", @@ -15295,7 +14115,7 @@ "0x1", "0x48127ffe7fff8000", "0x1104800180018000", - "0xd24", + "0xc7b", "0x20680017fff7ffd", "0xb7", "0x20680017fff7fff", @@ -15370,7 +14190,7 @@ "0x7", "0x48127ffe7fff8000", "0x1104800180018000", - "0xcd9", + "0xc30", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -15405,7 +14225,7 @@ "0x6", "0x48127ff67fff8000", "0x1104800180018000", - "0xcb6", + "0xc0d", "0x20680017fff7ffd", "0x34", "0x48127ffc7fff8000", @@ -15547,7 +14367,7 @@ "0x48127ffd7fff8000", "0x48127fef7fff8000", "0x1104800180018000", - "0xc28", + "0xb7f", "0x20680017fff7ffd", "0xdd", "0x20680017fff7fff", @@ -15597,7 +14417,7 @@ "0x5", "0x48127ffe7fff8000", "0x1104800180018000", - "0xbf6", + "0xb4d", "0x20680017fff7ffd", "0x96", "0x480680017fff8000", @@ -15639,7 +14459,7 @@ "0x3", "0x48127ffe7fff8000", "0x1104800180018000", - "0xbcc", + "0xb23", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -15674,7 +14494,7 @@ "0x2", "0x48127ff67fff8000", "0x1104800180018000", - "0xba9", + "0xb00", "0x20680017fff7ffd", "0x34", "0x48127ffc7fff8000", @@ -15859,7 +14679,7 @@ "0x3", "0x48127ffe7fff8000", "0x1104800180018000", - "0xaf0", + "0xa47", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -15894,7 +14714,7 @@ "0x2", "0x48127ff87fff8000", "0x1104800180018000", - "0xacd", + "0xa24", "0x20680017fff7ffd", "0x3a", "0x48127ffc7fff8000", @@ -16029,7 +14849,7 @@ "0x2", "0x48127ffe7fff8000", "0x1104800180018000", - "0xa46", + "0x99d", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -16064,7 +14884,7 @@ "0x1", "0x480a7ffd7fff8000", "0x1104800180018000", - "0xa23", + "0x97a", "0x20680017fff7ffd", "0x3c", "0x48127ffc7fff8000", @@ -16176,7 +14996,7 @@ "0x2", "0x48127ffe7fff8000", "0x1104800180018000", - "0x9b3", + "0x90a", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -16211,7 +15031,7 @@ "0x1", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x990", + "0x8e7", "0x20680017fff7ffd", "0x2d", "0x48127ffc7fff8000", @@ -17041,14 +15861,14 @@ "0x400380047ff67ffd", "0x480280067ff68000", "0x20680017fff7fff", - "0x471", + "0x2af", "0x480280077ff68000", "0x480280087ff68000", "0x480280057ff68000", "0x482680017ff68000", "0x9", "0x20680017fff7ffc", - "0x45e", + "0x29c", "0x480680017fff8000", "0x29bfcdb2dce28d959f2815b16f81798", "0x480680017fff8000", @@ -17067,14 +15887,14 @@ "0x400080057ffa7ffe", "0x480080077ffa8000", "0x20680017fff7fff", - "0x43c", + "0x27a", "0x480080087ff98000", "0x480080097ff88000", "0x480080067ff78000", "0x482480017ff68000", "0xa", "0x20680017fff7ffc", - "0x427", + "0x265", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", @@ -17180,7 +16000,7 @@ "0x40317ff97ffb7ffa", "0x40307ffa7ffc7ff1", "0x10780017fff7fff", - "0x370", + "0x1ae", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280097ff48001", @@ -17427,264 +16247,40 @@ "0x480a7ff87fff8000", "0x48127f597fff8000", "0x48127f597fff8000", - "0x1104800180018000", - "0x3c0", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x480080007ff98000", - "0x480080017ff88000", - "0x480080027ff78000", - "0x480080037ff68000", - "0x480080047ff58000", - "0x480080057ff48000", - "0x48307fff80007ff9", - "0x40780017fff7fff", - "0xc", - "0x20680017fff7ff3", - "0x8", - "0x40307ff17ff47feb", - "0x402480017ff57ff4", - "0x1", - "0x400080067fe67ff5", - "0x10780017fff7fff", - "0x3", - "0x400080067fe67ff3", - "0x48307ff17ff68000", - "0x48307fe680007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x40507fff7fff7fff", - "0x48307ff47fff8000", - "0x48307ff47fff8000", - "0x48307ff57fff8000", - "0x48307fec7fff8000", - "0x48307fe180007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080077fdd7fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x400080087fdc7fff", - "0x48307fef7ffe8000", - "0x48307ff07fff8000", - "0x48307ff07fff8000", - "0x48307ff17fff8000", - "0x48307fdb80007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080097fd67fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x4000800a7fd57fff", - "0xa0680017fff7fdf", - "0xc", - "0xa0680017fff8001", - "0x6", - "0x48127fd97fff7ffe", - "0x40127fdb7fff7ffe", - "0x10780017fff7fff", - "0x10", - "0x48127fdc7fff7ffe", - "0x40127fd87fff7ffe", - "0x10780017fff7fff", - "0xc", - "0x480680017fff7fda", - "0x0", - "0xa0680017fff8000", - "0x6", - "0x40127fd77fff7ffd", - "0x40127fdc7fff7ffe", - "0x10780017fff7fff", - "0x4", - "0x40127fdc7fff7ffd", - "0x40127fd77fff7ffe", - "0x482480017ffd8000", - "0xffffffffffffffff0000000000000000", - "0x4000800b7fd17fff", - "0x48507ffd7ffc8000", - "0x48307fe97ff98000", - "0x48307fe67fff8000", - "0x40307ffd7fff7fd2", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800800c7fcd8001", - "0x4800800d7fcc7ffe", - "0x4000800e7fcb7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fd3", - "0x48507fcf7ffc8000", - "0x48507fce7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800f7fc78001", - "0x480080107fc67fff", - "0x400080117fc57ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080127fc17fff", - "0x480080137fc07ffd", - "0x400080147fbf7fd7", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fd77ffe7fff", - "0x40307ffc7ff77fd8", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080157fbe8001", - "0x480080167fbd7ffe", - "0x400080177fbc7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fc3", - "0x48507fc17ffc8000", - "0x48507fc07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080187fb88001", - "0x480080197fb77fff", - "0x4000801a7fb67ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800801b7fb27fff", - "0x4800801c7fb17ffd", - "0x4000801d7fb07fc6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fc67ffe7fff", - "0x40307ffc7ff77fc7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800801e7faf8001", - "0x4800801f7fae7ffe", - "0x400080207fad7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fb4", - "0x48507fb17ffc8000", - "0x48507fb07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080217fa98001", - "0x480080227fa87fff", - "0x400080237fa77ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080247fa37fff", - "0x480080257fa27ffd", - "0x400080267fa17fb3", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fb37ffe7fff", - "0x40307ffc7ff77fb4", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080277fa08001", - "0x480080287f9f7ffe", - "0x400080297f9e7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fa4", - "0x48507fa37ffc8000", - "0x48507fa27ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800802a7f9a8001", - "0x4800802b7f997fff", - "0x4000802c7f987ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800802d7f947fff", - "0x4800802e7f937ffd", - "0x4000802f7f927fa6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fa67ffe7fff", - "0x40307ffc7ff77fa7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080307f918001", - "0x480080317f907ffe", - "0x400080327f8f7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7f95", - "0x48507f937ffc8000", - "0x48507f927ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080337f8b8001", - "0x480080347f8a7fff", - "0x400080357f897ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080367f857fff", - "0x480080377f847ffd", - "0x400080387f837f93", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307f937ffe7fff", - "0x40307ffc7ff77f94", + "0x1104800180018000", + "0x1fa", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x48307f8e80017fff", + "0x48307ffe80017fff", "0xa0680017fff7fff", "0x7", "0x482480017fff8000", "0x100000000000000000000000000000000", - "0x400080397f7f7fff", + "0x400080007ff97fff", "0x10780017fff7fff", "0xc", - "0x400080397f807fff", + "0x400080007ffa7fff", "0x40780017fff7fff", "0x1", - "0x482480017f7f8000", - "0x3a", + "0x482480017ff98000", + "0x1", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482480017f7f8000", - "0x3a", + "0x482480017ff98000", + "0x1", "0x48127ffe7fff8000", "0x480680017fff8000", "0x1", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", - "0x48307f8680017fff", + "0x48307ff680017fff", "0xa0680017fff7fff", "0x7", "0x482480017fff8000", @@ -17729,330 +16325,104 @@ "0x480680017fff8000", "0x1", "0x20680017fff7fff", - "0x13b", + "0x59", "0x48127ffc7fff8000", "0x480a7ffb7fff8000", "0x480a7ffc7fff8000", - "0x48127e587fff8000", - "0x48127e587fff8000", - "0x1104800180018000", - "0x28c", + "0x48127e4a7fff8000", + "0x48127e4a7fff8000", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x480080007ff98000", - "0x480080017ff88000", - "0x480080027ff78000", - "0x480080037ff68000", - "0x480080047ff58000", - "0x480080057ff48000", - "0x48307fff80007ff9", - "0x40780017fff7fff", - "0xc", - "0x20680017fff7ff3", - "0x8", - "0x40307ff17ff47feb", - "0x402480017ff57ff4", - "0x1", - "0x400080067fe67ff5", - "0x10780017fff7fff", - "0x3", - "0x400080067fe67ff3", - "0x48307ff17ff68000", - "0x48307fe680007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x40507fff7fff7fff", - "0x48307ff47fff8000", - "0x48307ff47fff8000", - "0x48307ff57fff8000", - "0x48307fec7fff8000", - "0x48307fe180007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080077fdd7fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x400080087fdc7fff", - "0x48307fef7ffe8000", - "0x48307ff07fff8000", - "0x48307ff07fff8000", - "0x48307ff17fff8000", - "0x48307fdb80007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080097fd67fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x4000800a7fd57fff", - "0xa0680017fff7fdf", - "0xc", - "0xa0680017fff8001", - "0x6", - "0x48127fd97fff7ffe", - "0x40127fdb7fff7ffe", - "0x10780017fff7fff", - "0x10", - "0x48127fdc7fff7ffe", - "0x40127fd87fff7ffe", - "0x10780017fff7fff", - "0xc", - "0x480680017fff7fda", - "0x0", - "0xa0680017fff8000", - "0x6", - "0x40127fd77fff7ffd", - "0x40127fdc7fff7ffe", - "0x10780017fff7fff", - "0x4", - "0x40127fdc7fff7ffd", - "0x40127fd77fff7ffe", - "0x482480017ffd8000", - "0xffffffffffffffff0000000000000000", - "0x4000800b7fd17fff", - "0x48507ffd7ffc8000", - "0x48307fe97ff98000", - "0x48307fe67fff8000", - "0x40307ffd7fff7fd2", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800800c7fcd8001", - "0x4800800d7fcc7ffe", - "0x4000800e7fcb7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fd3", - "0x48507fcf7ffc8000", - "0x48507fce7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800f7fc78001", - "0x480080107fc67fff", - "0x400080117fc57ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080127fc17fff", - "0x480080137fc07ffd", - "0x400080147fbf7fd7", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fd77ffe7fff", - "0x40307ffc7ff77fd8", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080157fbe8001", - "0x480080167fbd7ffe", - "0x400080177fbc7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fc3", - "0x48507fc17ffc8000", - "0x48507fc07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080187fb88001", - "0x480080197fb77fff", - "0x4000801a7fb67ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800801b7fb27fff", - "0x4800801c7fb17ffd", - "0x4000801d7fb07fc6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fc67ffe7fff", - "0x40307ffc7ff77fc7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800801e7faf8001", - "0x4800801f7fae7ffe", - "0x400080207fad7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fb4", - "0x48507fb17ffc8000", - "0x48507fb07ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080217fa98001", - "0x480080227fa87fff", - "0x400080237fa77ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080247fa37fff", - "0x480080257fa27ffd", - "0x400080267fa17fb3", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fb37ffe7fff", - "0x40307ffc7ff77fb4", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080277fa08001", - "0x480080287f9f7ffe", - "0x400080297f9e7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fa4", - "0x48507fa37ffc8000", - "0x48507fa27ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800802a7f9a8001", - "0x4800802b7f997fff", - "0x4000802c7f987ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800802d7f947fff", - "0x4800802e7f937ffd", - "0x4000802f7f927fa6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fa67ffe7fff", - "0x40307ffc7ff77fa7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080307f918001", - "0x480080317f907ffe", - "0x400080327f8f7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7f95", - "0x48507f937ffc8000", - "0x48507f927ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080337f8b8001", - "0x480080347f8a7fff", - "0x400080357f897ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080367f857fff", - "0x480080377f847ffd", - "0x400080387f837f93", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307f937ffe7fff", - "0x40307ffc7ff77f94", - "0x48127f0f7fff8000", - "0x48127f0f7fff8000", - "0x482480017f818000", - "0x39", + "0x1104800180018000", + "0x1a6", + "0x48127f017fff8000", + "0x48127f017fff8000", "0x480680017fff8000", "0x536563703235366b314d756c", - "0x400080007d647fff", - "0x400080017d647d63", - "0x400080027d647d62", - "0x400080037d647ffc", - "0x400080047d647ffd", - "0x480080067d648000", + "0x400080007d497fff", + "0x400080017d497d48", + "0x400080027d497d47", + "0x400080037d497ffd", + "0x400080047d497ffe", + "0x480080067d498000", "0x20680017fff7fff", "0x37", - "0x480080057d638000", - "0x480080077d628000", + "0x480080057d488000", + "0x480080077d478000", "0x480680017fff8000", "0x536563703235366b314d756c", - "0x400080087d607fff", - "0x400080097d607ffd", - "0x4000800a7d607d54", - "0x4000800b7d607f86", - "0x4000800c7d607f87", - "0x4800800e7d608000", + "0x400080087d457fff", + "0x400080097d457ffd", + "0x4000800a7d457d39", + "0x4000800b7d457ff7", + "0x4000800c7d457ff8", + "0x4800800e7d458000", "0x20680017fff7fff", "0x20", - "0x4800800d7d5f8000", - "0x4800800f7d5e8000", + "0x4800800d7d448000", + "0x4800800f7d438000", "0x480680017fff8000", "0x536563703235366b31416464", - "0x400080107d5c7fff", - "0x400080117d5c7ffd", - "0x400080127d5c7ffa", - "0x400080137d5c7ffe", - "0x480080157d5c8000", + "0x400080107d417fff", + "0x400080117d417ffd", + "0x400080127d417ffa", + "0x400080137d417ffe", + "0x480080157d418000", "0x20680017fff7fff", "0xc", - "0x48127ff57fff8000", - "0x480080147d5a8000", - "0x482480017d598000", + "0x48127ff17fff8000", + "0x480080147d3f8000", + "0x482480017d3e8000", "0x17", "0x480680017fff8000", "0x0", "0x480680017fff8000", "0x0", - "0x480080167d568000", + "0x480080167d3b8000", "0x208b7fff7fff7ffe", - "0x48127ff57fff8000", - "0x480080147d5a8000", - "0x482480017d598000", + "0x48127ff17fff8000", + "0x480080147d3f8000", + "0x482480017d3e8000", "0x18", "0x480680017fff8000", "0x1", - "0x480080167d578000", - "0x480080177d568000", + "0x480080167d3c8000", + "0x480080177d3b8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x4", - "0x48127ff57fff8000", - "0x4800800d7d5a8000", - "0x482480017d598000", + "0x48127ff17fff8000", + "0x4800800d7d3f8000", + "0x482480017d3e8000", "0x11", "0x480680017fff8000", "0x1", - "0x4800800f7d578000", - "0x480080107d568000", + "0x4800800f7d3c8000", + "0x480080107d3b8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x8", - "0x48127ff57fff8000", - "0x480080057d5a8000", - "0x482480017d598000", + "0x48127ff17fff8000", + "0x480080057d3f8000", + "0x482480017d3e8000", "0x9", "0x480680017fff8000", "0x1", - "0x480080077d578000", - "0x480080087d568000", + "0x480080077d3c8000", + "0x480080087d3b8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0xf9", + "0x106", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x753235365f737562204f766572666c6f77", "0x400080007ffe7fff", - "0x48127f017fff8000", - "0x48127d597fff8000", - "0x48127d597fff8000", + "0x48127ef47fff8000", + "0x48127d3e7fff8000", + "0x48127d3e7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -18060,7 +16430,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x274", + "0x28f", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280077ff48001", @@ -18068,9 +16438,9 @@ "0x400280097ff47ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d7a", - "0x48507d7e7ffc8000", - "0x48507d7d7ffc8000", + "0x40307ffc7fff7d5f", + "0x48507d637ffc8000", + "0x48507d627ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x4802800a7ff48001", @@ -18086,11 +16456,11 @@ "0xfffffffffffffffe0000000000000000", "0x4802800d7ff47fff", "0x4802800e7ff47ffd", - "0x4002800f7ff47d6d", + "0x4002800f7ff47d52", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", - "0x40307d6d7ffe7fff", - "0x40307ffc7ff77d77", + "0x40307d527ffe7fff", + "0x40307ffc7ff77d5c", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280107ff48001", @@ -18098,9 +16468,9 @@ "0x400280127ff47ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d6b", - "0x48507d6d7ffc8000", - "0x48507d6c7ffc8000", + "0x40307ffc7fff7d50", + "0x48507d527ffc8000", + "0x48507d517ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480280137ff48001", @@ -18120,7 +16490,7 @@ "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40287ff97ffe7fff", - "0x40307ffc7ff77d67", + "0x40307ffc7ff77d4c", "0x40780017fff7fff", "0x1", "0x480680017fff8000", @@ -18128,8 +16498,8 @@ "0x400080007ffe7fff", "0x482680017ff48000", "0x19", - "0x48127d597fff8000", - "0x48127d597fff8000", + "0x48127d3e7fff8000", + "0x48127d3e7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -18137,26 +16507,26 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x29e", + "0x2b9", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127d5e7fff8000", - "0x48127d5e7fff8000", + "0x48127d437fff8000", + "0x48127d437fff8000", "0x48127ffc7fff8000", "0x482480017ffb8000", "0x1", "0x10780017fff7fff", "0x9", "0x40780017fff7fff", - "0x2a4", - "0x480080067d558000", - "0x482480017d548000", + "0x2bf", + "0x480080067d3a8000", + "0x482480017d398000", "0xa", - "0x480080087d538000", - "0x480080097d528000", + "0x480080087d388000", + "0x480080097d378000", "0x480a7ff47fff8000", "0x48127ffb7fff8000", "0x48127ffb7fff8000", @@ -18166,10 +16536,10 @@ "0x48127ffa7fff8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2ae", + "0x2c9", "0x480a7ff47fff8000", - "0x48127d4f7fff8000", - "0x48127d4f7fff8000", + "0x48127d347fff8000", + "0x48127d347fff8000", "0x480680017fff8000", "0x0", "0x480680017fff8000", @@ -18178,7 +16548,7 @@ "0x0", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2b2", + "0x2cd", "0x480a7ff47fff8000", "0x480280057ff68000", "0x482680017ff68000", @@ -18219,7 +16589,7 @@ "0x402780017ffc8001", "0x9", "0x1104800180018000", - "0x23b", + "0x354", "0x40137ffa7fff8000", "0x20680017fff7ffb", "0x8e", @@ -18232,7 +16602,7 @@ "0x480680017fff8000", "0x0", "0x1104800180018000", - "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffebdc", + "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffef61", "0x20680017fff7ffd", "0x7b", "0x480680017fff8000", @@ -18391,19 +16761,19 @@ "0x2", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480280007ff98001", - "0x480280017ff97ffe", - "0x400280027ff97ffe", + "0x480280007ff78001", + "0x480280017ff77ffe", + "0x400280027ff77ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ffa", - "0x48487ffc7ffc8000", - "0x48487ffc7ffc8000", + "0x40317ffc7fff7ff8", + "0x48487ffa7ffc8000", + "0x48487ffa7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x480280037ff98001", - "0x480280047ff97fff", - "0x400280057ff97ffd", + "0x480280037ff78001", + "0x480280047ff77fff", + "0x400280057ff77ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -18412,9 +16782,9 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x480280067ff97fff", - "0x480280077ff97ffd", - "0x400280087ff97ff0", + "0x480280067ff77fff", + "0x480280077ff77ffd", + "0x400280087ff77ff0", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", @@ -18423,19 +16793,19 @@ "0x2", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480280097ff98001", - "0x4802800a7ff97ffe", - "0x4002800b7ff97ffe", + "0x480280097ff78001", + "0x4802800a7ff77ffe", + "0x4002800b7ff77ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ffa", - "0x48487ffd7ffc8000", - "0x48487ffd7ffc8000", + "0x40317ffc7fff7ff8", + "0x48487ffb7ffc8000", + "0x48487ffb7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x4802800c7ff98001", - "0x4802800d7ff97fff", - "0x4002800e7ff97ffd", + "0x4802800c7ff78001", + "0x4802800d7ff77fff", + "0x4002800e7ff77ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -18444,9 +16814,9 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x4802800f7ff97fff", - "0x480280107ff97ffd", - "0x400280117ff97ff0", + "0x4802800f7ff77fff", + "0x480280107ff77ffd", + "0x400280117ff77ff0", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", @@ -18456,20 +16826,20 @@ "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400280127ff97fff", + "0x400280127ff77fff", "0x10780017fff7fff", "0xc", - "0x400280127ff97fff", + "0x400280127ff77fff", "0x40780017fff7fff", "0x1", - "0x482680017ff98000", + "0x482680017ff78000", "0x13", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482680017ff98000", + "0x482680017ff78000", "0x13", "0x48127ffe7fff8000", "0x480680017fff8000", @@ -18483,9 +16853,9 @@ "0x400080027ff87ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ffb", - "0x48487ffc7ffc8000", - "0x48487ffc7ffc8000", + "0x40317ffc7fff7ff9", + "0x48487ffa7ffc8000", + "0x48487ffa7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480080037ff48001", @@ -18561,9 +16931,9 @@ "0x400080027ff87ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ffb", - "0x48487ffd7ffc8000", - "0x48487ffd7ffc8000", + "0x40317ffc7fff7ff9", + "0x48487ffb7ffc8000", + "0x48487ffb7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480080037ff48001", @@ -18584,149 +16954,430 @@ "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", "0x40307ffc7ff77fef", - "0x48307ff07fed8001", + "0x48307fee7fef8001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", "0x400080097fe97fff", "0x10780017fff7fff", - "0xc", + "0xa", "0x400080097fea7fff", "0x40780017fff7fff", "0x1", "0x482480017fe98000", "0xa", "0x48127ffd7fff8000", - "0x480680017fff8000", - "0x0", "0x10780017fff7fff", - "0x7", + "0x5", "0x482480017fe98000", "0xa", "0x48127ffe7fff8000", - "0x480680017fff8000", - "0x1", - "0x48307fe27fcb8000", - "0x48307fff7ffd8001", + "0x48307feb7fe88001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400080007ff97fff", + "0x400080007ffb7fff", "0x10780017fff7fff", "0xc", - "0x400080007ffa7fff", + "0x400080007ffc7fff", "0x40780017fff7fff", "0x1", - "0x482480017ff98000", + "0x482480017ffb8000", "0x1", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482480017ff98000", + "0x482480017ffb8000", "0x1", "0x48127ffe7fff8000", "0x480680017fff8000", "0x1", - "0x48307ff87fe18000", - "0x48307ffe7fff8000", - "0x48307fff7fe08001", + "0x48307fff7ff98001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400080007ff87fff", + "0x400080007ffa7fff", "0x10780017fff7fff", "0xa", - "0x400080007ff97fff", + "0x400080007ffb7fff", "0x40780017fff7fff", "0x1", - "0x482480017ff88000", + "0x482480017ffa8000", "0x1", "0x48127ffd7fff8000", "0x10780017fff7fff", "0x5", - "0x482480017ff88000", + "0x482480017ffa8000", "0x1", "0x48127ffe7fff8000", - "0x48127ffe7fff8000", - "0x48127f967fff8000", - "0x48127fd17fff8000", - "0x48127ff47fff8000", - "0x48127ffb7fff8000", - "0x208b7fff7fff7ffe", - "0xa0680017fff8000", + "0x48307fd87fc18001", + "0xa0680017fff7fff", "0x7", - "0x4825800180007ffd", - "0x10", - "0x400280007ffc7fff", + "0x4824800180007fff", + "0x100000000000000000000000000000000", + "0x400080007ffb7fff", "0x10780017fff7fff", - "0x6f", - "0x482680017ffd8000", - "0xfffffffffffffffffffffffffffffff0", - "0x400280007ffc7fff", - "0x4825800180007ffd", - "0x400000000000008800000000000000000000000000000000000000000000010", - "0x484480017fff8000", - "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffff", - "0x482680017ffc8000", + "0xa", + "0x400080007ffc7fff", + "0x40780017fff7fff", "0x1", - "0x1137ffe7fff7fff", - "0x10780017fff7fff", - "0x5a", - "0x10780017fff7fff", - "0x54", - "0x10780017fff7fff", - "0x4e", - "0x10780017fff7fff", - "0x48", - "0x10780017fff7fff", - "0x42", - "0x10780017fff7fff", - "0x3c", - "0x10780017fff7fff", - "0x36", - "0x10780017fff7fff", - "0x30", - "0x10780017fff7fff", - "0x2a", - "0x10780017fff7fff", - "0x24", - "0x10780017fff7fff", - "0x1e", - "0x10780017fff7fff", - "0x18", + "0x482480017ffb8000", + "0x1", + "0x48127ffd7fff8000", "0x10780017fff7fff", - "0x12", + "0x5", + "0x482480017ffb8000", + "0x1", + "0x48127ffe7fff8000", + "0x48307fff7ff48001", + "0xa0680017fff7fff", + "0x7", + "0x4824800180007fff", + "0x100000000000000000000000000000000", + "0x400080007ffb7fff", "0x10780017fff7fff", "0xc", - "0x10780017fff7fff", - "0x6", - "0x480680017fff8000", + "0x400080007ffc7fff", + "0x40780017fff7fff", "0x1", - "0x10780017fff7fff", - "0x3c", + "0x482480017ffb8000", + "0x1", + "0x48127ffd7fff8000", "0x480680017fff8000", - "0x100", + "0x0", "0x10780017fff7fff", - "0x38", + "0x7", + "0x482480017ffb8000", + "0x1", + "0x48127ffe7fff8000", "0x480680017fff8000", - "0x10000", + "0x1", + "0x48307fff7ff48001", + "0xa0680017fff7fff", + "0x7", + "0x4824800180007fff", + "0x100000000000000000000000000000000", + "0x400080007ffa7fff", "0x10780017fff7fff", - "0x34", - "0x480680017fff8000", - "0x1000000", + "0xa", + "0x400080007ffb7fff", + "0x40780017fff7fff", + "0x1", + "0x482480017ffa8000", + "0x1", + "0x48127ffd7fff8000", "0x10780017fff7fff", - "0x30", - "0x480680017fff8000", - "0x100000000", + "0x5", + "0x482480017ffa8000", + "0x1", + "0x48127ffe7fff8000", + "0x48127f8b7fff8000", + "0x48127fc67fff8000", + "0x48127ff77fff8000", + "0x48127ffc7fff8000", + "0x480080007ffa8000", + "0x480080017ff98000", + "0x480080027ff88000", + "0x480080037ff78000", + "0x480080047ff68000", + "0x480080057ff58000", + "0x48317fff80007ffd", + "0x40780017fff7fff", + "0xc", + "0x20680017fff7ff3", + "0x8", + "0x40317ff17ff47ffc", + "0x402480017ff57ff4", + "0x1", + "0x400080067fe77ff5", "0x10780017fff7fff", - "0x2c", - "0x480680017fff8000", - "0x10000000000", + "0x3", + "0x400080067fe77ff3", + "0x48307ff17ff68000", + "0x48307fe880007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x40507fff7fff7fff", + "0x48307ff47fff8000", + "0x48307ff47fff8000", + "0x48307ff57fff8000", + "0x48307fec7fff8000", + "0x48307fe380007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080077fde7fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x400080087fdd7fff", + "0x48307fef7ffe8000", + "0x48307ff07fff8000", + "0x48307ff07fff8000", + "0x48307ff17fff8000", + "0x48307fdd80007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080097fd77fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x4000800a7fd67fff", + "0xa0680017fff7fdf", + "0xc", + "0xa0680017fff8001", + "0x6", + "0x480a7ffd7fff7ffe", + "0x40127fdb7fff7ffe", + "0x10780017fff7fff", + "0x10", + "0x48127fdc7fff7ffe", + "0x400a7ffd7fff7ffe", + "0x10780017fff7fff", + "0xc", + "0x480780017fff7ffd", + "0x0", + "0xa0680017fff8000", + "0x6", + "0x400a7ffc7fff7ffd", + "0x40127fdc7fff7ffe", + "0x10780017fff7fff", + "0x4", + "0x40127fdc7fff7ffd", + "0x400a7ffc7fff7ffe", + "0x482480017ffd8000", + "0xffffffffffffffff0000000000000000", + "0x4000800b7fd27fff", + "0x48507ffd7ffc8000", + "0x48307fe97ff98000", + "0x48307fe67fff8000", + "0x40307ffd7fff7fd4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800800c7fce8001", + "0x4800800d7fcd7ffe", + "0x4000800e7fcc7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fd3", + "0x48487ffc7ffc8000", + "0x48487ffc7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800800f7fc88001", + "0x480080107fc77fff", + "0x400080117fc67ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080127fc27fff", + "0x480080137fc17ffd", + "0x400080147fc07fd7", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fd77ffe7fff", + "0x40307ffc7ff77fd8", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080157fbf8001", + "0x480080167fbe7ffe", + "0x400080177fbd7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fc3", + "0x48487ffd7ffc8000", + "0x48487ffd7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080187fb98001", + "0x480080197fb87fff", + "0x4000801a7fb77ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800801b7fb37fff", + "0x4800801c7fb27ffd", + "0x4000801d7fb17fc6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fc67ffe7fff", + "0x40307ffc7ff77fc7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800801e7fb08001", + "0x4800801f7faf7ffe", + "0x400080207fae7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fb4", + "0x48487ffc7ffc8000", + "0x48487ffc7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080217faa8001", + "0x480080227fa97fff", + "0x400080237fa87ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080247fa47fff", + "0x480080257fa37ffd", + "0x400080267fa27fb3", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fb37ffe7fff", + "0x40307ffc7ff77fb4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080277fa18001", + "0x480080287fa07ffe", + "0x400080297f9f7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fa4", + "0x48487ffd7ffc8000", + "0x48487ffd7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800802a7f9b8001", + "0x4800802b7f9a7fff", + "0x4000802c7f997ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800802d7f957fff", + "0x4800802e7f947ffd", + "0x4000802f7f937fa6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fa67ffe7fff", + "0x40307ffc7ff77fa7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080307f928001", + "0x480080317f917ffe", + "0x400080327f907ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7f95", + "0x48487ffc7ffc8000", + "0x48487ffc7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080337f8c8001", + "0x480080347f8b7fff", + "0x400080357f8a7ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080367f867fff", + "0x480080377f857ffd", + "0x400080387f847f93", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307f937ffe7fff", + "0x40307ffc7ff77f94", + "0x482480017f848000", + "0x39", + "0x48127f8d7fff8000", + "0x48127f8d7fff8000", + "0x208b7fff7fff7ffe", + "0xa0680017fff8000", + "0x7", + "0x4825800180007ffd", + "0x10", + "0x400280007ffc7fff", + "0x10780017fff7fff", + "0x6f", + "0x482680017ffd8000", + "0xfffffffffffffffffffffffffffffff0", + "0x400280007ffc7fff", + "0x4825800180007ffd", + "0x400000000000008800000000000000000000000000000000000000000000010", + "0x484480017fff8000", + "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffff", + "0x482680017ffc8000", + "0x1", + "0x1137ffe7fff7fff", + "0x10780017fff7fff", + "0x5a", + "0x10780017fff7fff", + "0x54", + "0x10780017fff7fff", + "0x4e", + "0x10780017fff7fff", + "0x48", + "0x10780017fff7fff", + "0x42", + "0x10780017fff7fff", + "0x3c", + "0x10780017fff7fff", + "0x36", + "0x10780017fff7fff", + "0x30", + "0x10780017fff7fff", + "0x2a", + "0x10780017fff7fff", + "0x24", + "0x10780017fff7fff", + "0x1e", + "0x10780017fff7fff", + "0x18", + "0x10780017fff7fff", + "0x12", + "0x10780017fff7fff", + "0xc", + "0x10780017fff7fff", + "0x6", + "0x480680017fff8000", + "0x1", + "0x10780017fff7fff", + "0x3c", + "0x480680017fff8000", + "0x100", + "0x10780017fff7fff", + "0x38", + "0x480680017fff8000", + "0x10000", + "0x10780017fff7fff", + "0x34", + "0x480680017fff8000", + "0x1000000", + "0x10780017fff7fff", + "0x30", + "0x480680017fff8000", + "0x100000000", + "0x10780017fff7fff", + "0x2c", + "0x480680017fff8000", + "0x10000000000", "0x10780017fff7fff", "0x28", "0x480680017fff8000", @@ -19158,8 +17809,6 @@ 241, 180, 291, - 290, - 171, 336, 178, 289, @@ -19191,8 +17840,6 @@ 250, 187, 92, - 142, - 126, 106, 205, 1205, @@ -19222,7 +17869,7 @@ 258, 97, 220, - 1242, + 791, 31, 1136, 66, @@ -19230,9 +17877,9 @@ 157, 83, 239, - 1156, + 706, 199, - 271, + 552, 131, 104, 232, @@ -19939,7 +18586,7 @@ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0xc94" }, "rhs": { "Deref": { @@ -19961,17 +18608,23 @@ { "TestLessThan": { "lhs": { - "Deref": { - "register": "FP", - "offset": 1 + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": 0 + }, + "b": { + "Immediate": "0x0" + } } }, "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } @@ -19985,49 +18638,81 @@ "value": { "Deref": { "register": "AP", - "offset": 3 + "offset": -1 } }, "scalar": { - "Immediate": "0x110000000000000000" + "Immediate": "0x8000000000000110000000000000000" }, "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" + "Immediate": "0xfffffffffffffffffffffffffffffffe" }, "x": { "register": "AP", - "offset": -2 + "offset": 0 }, "y": { "register": "AP", - "offset": -1 + "offset": 1 } } } ] ], [ - 762, + 793, [ { - "LinearSplit": { - "value": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 858, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 905, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 924, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x87a" + }, + "rhs": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -11 } }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "dst": { "register": "AP", "offset": 0 } @@ -20036,7 +18721,7 @@ ] ], [ - 815, + 951, [ { "AllocSegment": { @@ -20049,7 +18734,7 @@ ] ], [ - 862, + 969, [ { "AllocSegment": { @@ -20062,42 +18747,7 @@ ] ], [ - 881, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x602c" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -11 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 905, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 923, + 984, [ { "AllocSegment": { @@ -20110,7 +18760,7 @@ ] ], [ - 938, + 998, [ { "AllocSegment": { @@ -20123,7 +18773,7 @@ ] ], [ - 952, + 1019, [ { "AllocSegment": { @@ -20136,7 +18786,7 @@ ] ], [ - 973, + 1033, [ { "AllocSegment": { @@ -20149,20 +18799,7 @@ ] ], [ - 987, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 1002, + 1048, [ { "TestLessThanOrEqual": { @@ -20184,87 +18821,64 @@ ] ], [ - 1035, + 1082, [ { "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } } }, "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 1039, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 1049, + 1086, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": -2 + "offset": -1 } }, "scalar": { - "Immediate": "0x8000000000000000000000000000000" + "Immediate": "0x8000000000000110000000000000000" }, "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" + "Immediate": "0xfffffffffffffffffffffffffffffffe" }, "x": { "register": "AP", - "offset": -1 + "offset": 0 }, "y": { "register": "AP", - "offset": 0 + "offset": 1 } } } ] ], [ - 1064, + 1111, [ { "AllocSegment": { @@ -20277,17 +18891,17 @@ ] ], [ - 1083, + 1130, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x9e66" + "Immediate": "0x1248" }, "rhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": -16 } }, "dst": { @@ -20299,7 +18913,22 @@ ] ], [ - 1104, + 1149, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 1152, [ { "AllocSegment": { @@ -20312,7 +18941,7 @@ ] ], [ - 1122, + 1175, [ { "AllocSegment": { @@ -20325,7 +18954,7 @@ ] ], [ - 1144, + 1197, [ { "AllocSegment": { @@ -20338,7 +18967,7 @@ ] ], [ - 1158, + 1211, [ { "AllocSegment": { @@ -20351,12 +18980,12 @@ ] ], [ - 1175, + 1228, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0xc94" + "Immediate": "0x8d54" }, "rhs": { "Deref": { @@ -20373,25 +19002,10 @@ ] ], [ - 1209, + 1327, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": 0 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20401,39 +19015,19 @@ ] ], [ - 1213, + 1346, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x8070" + }, + "rhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -42 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 1254, - [ - { - "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20443,7 +19037,7 @@ ] ], [ - 1319, + 1389, [ { "AllocSegment": { @@ -20456,7 +19050,7 @@ ] ], [ - 1366, + 1407, [ { "AllocSegment": { @@ -20469,29 +19063,7 @@ ] ], [ - 1385, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x87a" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -11 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 1412, + 1422, [ { "AllocSegment": { @@ -20504,7 +19076,7 @@ ] ], [ - 1430, + 1436, [ { "AllocSegment": { @@ -20517,7 +19089,7 @@ ] ], [ - 1445, + 1450, [ { "AllocSegment": { @@ -20530,7 +19102,7 @@ ] ], [ - 1459, + 1464, [ { "AllocSegment": { @@ -20543,7 +19115,7 @@ ] ], [ - 1480, + 1486, [ { "AllocSegment": { @@ -20556,7 +19128,7 @@ ] ], [ - 1494, + 1500, [ { "AllocSegment": { @@ -20569,7 +19141,7 @@ ] ], [ - 1509, + 1517, [ { "TestLessThanOrEqual": { @@ -20591,64 +19163,87 @@ ] ], [ - 1543, + 1551, [ { "TestLessThan": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } + "Deref": { + "register": "FP", + "offset": 1 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 1547, + 1555, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 3 } }, "scalar": { - "Immediate": "0x8000000000000110000000000000000" + "Immediate": "0x110000000000000000" }, "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" + "Immediate": "0xffffffffffffffffffffffffffffffff" }, "x": { "register": "AP", - "offset": 0 + "offset": -2 }, "y": { "register": "AP", - "offset": 1 + "offset": -1 + } + } + } + ] + ], + [ + 1565, + [ + { + "LinearSplit": { + "value": { + "Deref": { + "register": "FP", + "offset": 1 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 } } } ] ], [ - 1572, + 1618, [ { "AllocSegment": { @@ -20661,17 +19256,30 @@ ] ], [ - 1591, + 1665, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 1684, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1248" + "Immediate": "0x28b4" }, "rhs": { "Deref": { "register": "AP", - "offset": -16 + "offset": -11 } }, "dst": { @@ -20683,7 +19291,7 @@ ] ], [ - 1610, + 1706, [ { "SystemCall": { @@ -20698,7 +19306,7 @@ ] ], [ - 1613, + 1727, [ { "AllocSegment": { @@ -20711,7 +19319,7 @@ ] ], [ - 1636, + 1742, [ { "AllocSegment": { @@ -20724,7 +19332,7 @@ ] ], [ - 1658, + 1756, [ { "AllocSegment": { @@ -20737,7 +19345,7 @@ ] ], [ - 1672, + 1777, [ { "AllocSegment": { @@ -20750,12 +19358,25 @@ ] ], [ - 1689, + 1791, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 1806, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x8d54" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -20772,33 +19393,78 @@ ] ], [ - 1788, + 1839, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 1807, + 1843, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x8070" + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } }, - "rhs": { + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 1853, + [ + { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -42 + "offset": -2 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -20807,7 +19473,7 @@ ] ], [ - 1850, + 1952, [ { "AllocSegment": { @@ -20820,7 +19486,29 @@ ] ], [ - 1868, + 1971, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x5622" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -38 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2000, [ { "AllocSegment": { @@ -20833,7 +19521,7 @@ ] ], [ - 1883, + 2015, [ { "AllocSegment": { @@ -20846,7 +19534,7 @@ ] ], [ - 1897, + 2029, [ { "AllocSegment": { @@ -20859,7 +19547,7 @@ ] ], [ - 1911, + 2043, [ { "AllocSegment": { @@ -20872,7 +19560,7 @@ ] ], [ - 1925, + 2057, [ { "AllocSegment": { @@ -20885,7 +19573,7 @@ ] ], [ - 1947, + 2078, [ { "AllocSegment": { @@ -20898,7 +19586,7 @@ ] ], [ - 1961, + 2092, [ { "AllocSegment": { @@ -20911,7 +19599,7 @@ ] ], [ - 1978, + 2107, [ { "TestLessThanOrEqual": { @@ -20933,14 +19621,14 @@ ] ], [ - 2012, + 2140, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -1 } }, "rhs": { @@ -20955,7 +19643,7 @@ ] ], [ - 2016, + 2144, [ { "LinearSplit": { @@ -20984,14 +19672,14 @@ ] ], [ - 2026, + 2154, [ { "LinearSplit": { "value": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -2 } }, "scalar": { @@ -21013,7 +19701,7 @@ ] ], [ - 2079, + 2169, [ { "AllocSegment": { @@ -21026,30 +19714,17 @@ ] ], [ - 2126, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2145, + 2188, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x28b4" + "Immediate": "0x128e" }, "rhs": { "Deref": { "register": "AP", - "offset": -11 + "offset": -18 } }, "dst": { @@ -21061,7 +19736,7 @@ ] ], [ - 2167, + 2207, [ { "SystemCall": { @@ -21076,7 +19751,7 @@ ] ], [ - 2188, + 2210, [ { "AllocSegment": { @@ -21089,7 +19764,7 @@ ] ], [ - 2203, + 2230, [ { "AllocSegment": { @@ -21102,7 +19777,7 @@ ] ], [ - 2217, + 2252, [ { "AllocSegment": { @@ -21115,7 +19790,7 @@ ] ], [ - 2238, + 2266, [ { "AllocSegment": { @@ -21128,7 +19803,29 @@ ] ], [ - 2252, + 2283, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2338, [ { "AllocSegment": { @@ -21141,17 +19838,30 @@ ] ], [ - 2267, + 2385, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2404, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x213e" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -11 } }, "dst": { @@ -21163,78 +19873,65 @@ ] ], [ - 2300, + 2425, [ { - "TestLessThan": { - "lhs": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -5 } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + } + } + } + ] + ], + [ + 2428, + [ + { + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 2304, + 2448, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 2314, + 2463, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 2477, + [ + { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -21243,7 +19940,7 @@ ] ], [ - 2413, + 2491, [ { "AllocSegment": { @@ -21256,17 +19953,17 @@ ] ], [ - 2432, + 2506, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x5622" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "AP", - "offset": -38 + "register": "FP", + "offset": -6 } }, "dst": { @@ -21278,7 +19975,7 @@ ] ], [ - 2461, + 2523, [ { "AllocSegment": { @@ -21291,10 +19988,19 @@ ] ], [ - 2476, + 2543, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x41a" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, "dst": { "register": "AP", "offset": 0 @@ -21304,20 +20010,22 @@ ] ], [ - 2490, + 2555, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "AllocFelt252Dict": { + "segment_arena_ptr": { + "Deref": { + "register": "FP", + "offset": -7 + } } } } ] ], [ - 2504, + 2574, [ { "AllocSegment": { @@ -21330,7 +20038,7 @@ ] ], [ - 2518, + 2585, [ { "AllocSegment": { @@ -21343,20 +20051,7 @@ ] ], [ - 2539, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2553, + 2601, [ { "AllocSegment": { @@ -21369,12 +20064,12 @@ ] ], [ - 2568, + 2619, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x460" }, "rhs": { "Deref": { @@ -21391,14 +20086,14 @@ ] ], [ - 2601, + 2653, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": 1 } }, "rhs": { @@ -21413,7 +20108,7 @@ ] ], [ - 2605, + 2657, [ { "LinearSplit": { @@ -21442,14 +20137,14 @@ ] ], [ - 2615, + 2667, [ { "LinearSplit": { "value": { "Deref": { - "register": "AP", - "offset": -2 + "register": "FP", + "offset": 1 } }, "scalar": { @@ -21471,7 +20166,7 @@ ] ], [ - 2630, + 2720, [ { "AllocSegment": { @@ -21484,12 +20179,25 @@ ] ], [ - 2649, + 2797, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2816, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x128e" + "Immediate": "0x2a94" }, "rhs": { "Deref": { @@ -21506,7 +20214,7 @@ ] ], [ - 2668, + 2842, [ { "SystemCall": { @@ -21521,7 +20229,7 @@ ] ], [ - 2671, + 2845, [ { "AllocSegment": { @@ -21534,7 +20242,7 @@ ] ], [ - 2691, + 2865, [ { "AllocSegment": { @@ -21547,7 +20255,7 @@ ] ], [ - 2713, + 2880, [ { "AllocSegment": { @@ -21560,7 +20268,7 @@ ] ], [ - 2727, + 2894, [ { "AllocSegment": { @@ -21573,19 +20281,10 @@ ] ], [ - 2744, + 2908, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -21595,7 +20294,7 @@ ] ], [ - 2799, + 2929, [ { "AllocSegment": { @@ -21608,7 +20307,7 @@ ] ], [ - 2846, + 2943, [ { "AllocSegment": { @@ -21621,17 +20320,17 @@ ] ], [ - 2865, + 2958, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x213e" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "AP", - "offset": -11 + "register": "FP", + "offset": -6 } }, "dst": { @@ -21643,22 +20342,42 @@ ] ], [ - 2886, + 2975, [ { - "SystemCall": { - "system": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2994, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x76ca" + }, + "rhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -7 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 2889, + 3014, [ { "AllocSegment": { @@ -21671,7 +20390,7 @@ ] ], [ - 2909, + 3032, [ { "AllocSegment": { @@ -21684,7 +20403,7 @@ ] ], [ - 2924, + 3047, [ { "AllocSegment": { @@ -21697,10 +20416,19 @@ ] ], [ - 2938, + 3062, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -21710,7 +20438,7 @@ ] ], [ - 2952, + 3079, [ { "AllocSegment": { @@ -21723,17 +20451,17 @@ ] ], [ - 2967, + 3098, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x3c5a" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -7 } }, "dst": { @@ -21745,7 +20473,33 @@ ] ], [ - 2984, + 3118, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3136, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3151, [ { "AllocSegment": { @@ -21758,17 +20512,17 @@ ] ], [ - 3004, + 3166, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x41a" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "AP", - "offset": -7 + "register": "FP", + "offset": -6 } }, "dst": { @@ -21780,22 +20534,45 @@ ] ], [ - 3016, + 3183, [ { - "AllocFelt252Dict": { - "segment_arena_ptr": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3208, + [ + { + "TestLessThanOrEqual": { + "lhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": -1 } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -10 + } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 3035, + 3227, [ { "AllocSegment": { @@ -21808,7 +20585,7 @@ ] ], [ - 3046, + 3247, [ { "AllocSegment": { @@ -21821,7 +20598,7 @@ ] ], [ - 3062, + 3263, [ { "AllocSegment": { @@ -21834,12 +20611,12 @@ ] ], [ - 3080, + 3279, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x460" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -21856,78 +20633,94 @@ ] ], [ - 3114, + 3296, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 1 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 3118, + 3315, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x382d4" + }, + "rhs": { "Deref": { "register": "AP", - "offset": 3 + "offset": -7 } }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { + "dst": { "register": "AP", - "offset": -2 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 3335, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 3128, + 3353, [ { - "LinearSplit": { - "value": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3368, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3383, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { "Deref": { "register": "FP", - "offset": 1 + "offset": -6 } }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "dst": { "register": "AP", "offset": 0 } @@ -21936,7 +20729,7 @@ ] ], [ - 3181, + 3442, [ { "AllocSegment": { @@ -21949,30 +20742,17 @@ ] ], [ - 3258, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 3277, + 3461, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x2a94" + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": -17 } }, "dst": { @@ -21984,22 +20764,7 @@ ] ], [ - 3303, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } - } - } - } - ] - ], - [ - 3306, + 3478, [ { "AllocSegment": { @@ -22012,7 +20777,7 @@ ] ], [ - 3326, + 3492, [ { "AllocSegment": { @@ -22025,7 +20790,7 @@ ] ], [ - 3341, + 3506, [ { "AllocSegment": { @@ -22038,7 +20803,7 @@ ] ], [ - 3355, + 3521, [ { "AllocSegment": { @@ -22051,7 +20816,7 @@ ] ], [ - 3369, + 3535, [ { "AllocSegment": { @@ -22064,7 +20829,7 @@ ] ], [ - 3390, + 3549, [ { "AllocSegment": { @@ -22077,10 +20842,19 @@ ] ], [ - 3404, + 3564, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22090,19 +20864,10 @@ ] ], [ - 3419, + 3597, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22112,7 +20877,7 @@ ] ], [ - 3436, + 3644, [ { "AllocSegment": { @@ -22125,17 +20890,17 @@ ] ], [ - 3455, + 3663, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x76ca" + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -11 } }, "dst": { @@ -22147,7 +20912,7 @@ ] ], [ - 3475, + 3685, [ { "AllocSegment": { @@ -22160,7 +20925,7 @@ ] ], [ - 3493, + 3705, [ { "AllocSegment": { @@ -22173,7 +20938,7 @@ ] ], [ - 3508, + 3720, [ { "AllocSegment": { @@ -22186,7 +20951,20 @@ ] ], [ - 3523, + 3734, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3749, [ { "TestLessThanOrEqual": { @@ -22208,7 +20986,7 @@ ] ], [ - 3540, + 3766, [ { "AllocSegment": { @@ -22221,12 +20999,12 @@ ] ], [ - 3559, + 3785, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x3c5a" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -22243,7 +21021,7 @@ ] ], [ - 3579, + 3797, [ { "AllocSegment": { @@ -22256,7 +21034,7 @@ ] ], [ - 3597, + 3812, [ { "AllocSegment": { @@ -22269,7 +21047,7 @@ ] ], [ - 3612, + 3827, [ { "AllocSegment": { @@ -22282,7 +21060,7 @@ ] ], [ - 3627, + 3842, [ { "TestLessThanOrEqual": { @@ -22304,7 +21082,7 @@ ] ], [ - 3644, + 3880, [ { "AllocSegment": { @@ -22317,20 +21095,17 @@ ] ], [ - 3669, + 3899, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -10 + "offset": -12 } }, "dst": { @@ -22342,7 +21117,7 @@ ] ], [ - 3688, + 3919, [ { "AllocSegment": { @@ -22355,7 +21130,7 @@ ] ], [ - 3708, + 3937, [ { "AllocSegment": { @@ -22368,7 +21143,7 @@ ] ], [ - 3724, + 3952, [ { "AllocSegment": { @@ -22381,7 +21156,20 @@ ] ], [ - 3740, + 3966, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3981, [ { "TestLessThanOrEqual": { @@ -22403,7 +21191,7 @@ ] ], [ - 3757, + 4019, [ { "AllocSegment": { @@ -22416,17 +21204,17 @@ ] ], [ - 3776, + 4038, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x371b8" + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -12 } }, "dst": { @@ -22438,7 +21226,20 @@ ] ], [ - 3796, + 4058, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 4076, [ { "AllocSegment": { @@ -22451,7 +21252,7 @@ ] ], [ - 3814, + 4091, [ { "AllocSegment": { @@ -22464,7 +21265,7 @@ ] ], [ - 3829, + 4105, [ { "AllocSegment": { @@ -22477,7 +21278,7 @@ ] ], [ - 3844, + 4120, [ { "TestLessThanOrEqual": { @@ -22499,46 +21300,78 @@ ] ], [ - 3903, + 4153, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 3922, + 4157, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -17 + "offset": 3 } }, - "dst": { + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 3939, + 4167, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -22547,7 +21380,7 @@ ] ], [ - 3953, + 4224, [ { "AllocSegment": { @@ -22560,10 +21393,19 @@ ] ], [ - 3967, + 4243, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x1de2" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -28 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22573,7 +21415,7 @@ ] ], [ - 3982, + 4265, [ { "AllocSegment": { @@ -22586,20 +21428,22 @@ ] ], [ - 3996, + 4283, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } } } } ] ], [ - 4010, + 4289, [ { "AllocSegment": { @@ -22612,19 +21456,10 @@ ] ], [ - 4025, + 4308, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22634,7 +21469,7 @@ ] ], [ - 4058, + 4323, [ { "AllocSegment": { @@ -22647,7 +21482,7 @@ ] ], [ - 4105, + 4337, [ { "AllocSegment": { @@ -22660,19 +21495,10 @@ ] ], [ - 4124, + 4358, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -11 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22682,7 +21508,7 @@ ] ], [ - 4146, + 4372, [ { "AllocSegment": { @@ -22695,10 +21521,19 @@ ] ], [ - 4166, + 4387, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22708,7 +21543,7 @@ ] ], [ - 4181, + 4467, [ { "AllocSegment": { @@ -22721,10 +21556,22 @@ ] ], [ - 4195, + 4492, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -25 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22734,19 +21581,10 @@ ] ], [ - 4210, + 4514, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22756,7 +21594,7 @@ ] ], [ - 4227, + 4534, [ { "AllocSegment": { @@ -22769,19 +21607,10 @@ ] ], [ - 4246, + 4550, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22791,7 +21620,7 @@ ] ], [ - 4258, + 4565, [ { "AllocSegment": { @@ -22804,7 +21633,7 @@ ] ], [ - 4273, + 4580, [ { "AllocSegment": { @@ -22817,7 +21646,7 @@ ] ], [ - 4288, + 4595, [ { "AllocSegment": { @@ -22830,7 +21659,7 @@ ] ], [ - 4303, + 4611, [ { "TestLessThanOrEqual": { @@ -22852,7 +21681,7 @@ ] ], [ - 4341, + 4634, [ { "AllocSegment": { @@ -22865,126 +21694,20 @@ ] ], [ - 4360, + 4664, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" - }, - "rhs": { "Deref": { "register": "AP", - "offset": -12 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4380, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4398, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4413, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4427, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4442, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 + "offset": -1 } }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4480, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4499, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, "rhs": { "Deref": { "register": "AP", - "offset": -12 + "offset": -55 } }, "dst": { @@ -22996,7 +21719,7 @@ ] ], [ - 4519, + 4687, [ { "AllocSegment": { @@ -23009,7 +21732,7 @@ ] ], [ - 4537, + 4709, [ { "AllocSegment": { @@ -23022,7 +21745,7 @@ ] ], [ - 4552, + 4726, [ { "AllocSegment": { @@ -23035,7 +21758,7 @@ ] ], [ - 4566, + 4742, [ { "AllocSegment": { @@ -23048,12 +21771,12 @@ ] ], [ - 4581, + 4759, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x33e" }, "rhs": { "Deref": { @@ -23070,7 +21793,7 @@ ] ], [ - 4614, + 4792, [ { "TestLessThan": { @@ -23092,7 +21815,7 @@ ] ], [ - 4618, + 4796, [ { "LinearSplit": { @@ -23121,7 +21844,7 @@ ] ], [ - 4628, + 4806, [ { "LinearSplit": { @@ -23150,7 +21873,7 @@ ] ], [ - 4685, + 4827, [ { "AllocSegment": { @@ -23163,17 +21886,17 @@ ] ], [ - 4704, + 4846, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1de2" + "Immediate": "0x2c24" }, "rhs": { "Deref": { "register": "AP", - "offset": -28 + "offset": -60 } }, "dst": { @@ -23185,7 +21908,7 @@ ] ], [ - 4726, + 4858, [ { "AllocSegment": { @@ -23198,7 +21921,7 @@ ] ], [ - 4744, + 4878, [ { "SystemCall": { @@ -23213,20 +21936,7 @@ ] ], [ - 4750, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4769, + 4881, [ { "AllocSegment": { @@ -23239,7 +21949,7 @@ ] ], [ - 4784, + 4901, [ { "AllocSegment": { @@ -23252,7 +21962,7 @@ ] ], [ - 4798, + 4916, [ { "AllocSegment": { @@ -23265,7 +21975,7 @@ ] ], [ - 4819, + 4937, [ { "AllocSegment": { @@ -23278,7 +21988,7 @@ ] ], [ - 4833, + 4951, [ { "AllocSegment": { @@ -23291,7 +22001,7 @@ ] ], [ - 4848, + 4966, [ { "TestLessThanOrEqual": { @@ -23313,7 +22023,7 @@ ] ], [ - 4928, + 4983, [ { "AllocSegment": { @@ -23326,7 +22036,7 @@ ] ], [ - 4953, + 5006, [ { "TestLessThanOrEqual": { @@ -23339,7 +22049,7 @@ "rhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -9 } }, "dst": { @@ -23351,7 +22061,7 @@ ] ], [ - 4975, + 5025, [ { "AllocSegment": { @@ -23364,7 +22074,7 @@ ] ], [ - 4995, + 5045, [ { "AllocSegment": { @@ -23377,7 +22087,7 @@ ] ], [ - 5011, + 5061, [ { "AllocSegment": { @@ -23390,46 +22100,7 @@ ] ], [ - 5026, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 5041, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 5056, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 5072, + 5077, [ { "TestLessThanOrEqual": { @@ -23451,7 +22122,7 @@ ] ], [ - 5095, + 5115, [ { "AllocSegment": { @@ -23464,7 +22135,7 @@ ] ], [ - 5125, + 5140, [ { "TestLessThanOrEqual": { @@ -23477,7 +22148,7 @@ "rhs": { "Deref": { "register": "AP", - "offset": -55 + "offset": -15 } }, "dst": { @@ -23489,7 +22160,7 @@ ] ], [ - 5148, + 5160, [ { "AllocSegment": { @@ -23502,7 +22173,7 @@ ] ], [ - 5170, + 5180, [ { "AllocSegment": { @@ -23515,7 +22186,7 @@ ] ], [ - 5187, + 5196, [ { "AllocSegment": { @@ -23528,7 +22199,7 @@ ] ], [ - 5203, + 5211, [ { "AllocSegment": { @@ -23541,12 +22212,12 @@ ] ], [ - 5220, + 5227, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x33e" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -23563,78 +22234,33 @@ ] ], [ - 5253, + 5265, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 5257, + 5284, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x1220" }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 5267, - [ - { - "LinearSplit": { - "value": { + "rhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -12 } }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "dst": { "register": "AP", "offset": 0 } @@ -23643,7 +22269,7 @@ ] ], [ - 5288, + 5296, [ { "AllocSegment": { @@ -23656,22 +22282,15 @@ ] ], [ - 5307, + 5316, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x2c24" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": -60 + "register": "FP", + "offset": -5 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } @@ -23694,19 +22313,17 @@ 5339, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 5342, + 5354, [ { "AllocSegment": { @@ -23719,7 +22336,7 @@ ] ], [ - 5362, + 5368, [ { "AllocSegment": { @@ -23732,10 +22349,19 @@ ] ], [ - 5377, + 5383, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -23745,7 +22371,7 @@ ] ], [ - 5398, + 5400, [ { "AllocSegment": { @@ -23758,7 +22384,45 @@ ] ], [ - 5412, + 5431, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -13 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5451, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5475, [ { "AllocSegment": { @@ -23771,7 +22435,20 @@ ] ], [ - 5427, + 5493, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5511, [ { "TestLessThanOrEqual": { @@ -23793,7 +22470,7 @@ ] ], [ - 5444, + 5528, [ { "AllocSegment": { @@ -23806,20 +22483,17 @@ ] ], [ - 5467, + 5548, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -9 + "offset": -7 } }, "dst": { @@ -23831,7 +22505,7 @@ ] ], [ - 5486, + 5572, [ { "AllocSegment": { @@ -23844,7 +22518,7 @@ ] ], [ - 5506, + 5602, [ { "AllocSegment": { @@ -23857,7 +22531,7 @@ ] ], [ - 5522, + 5618, [ { "AllocSegment": { @@ -23870,7 +22544,7 @@ ] ], [ - 5538, + 5634, [ { "TestLessThanOrEqual": { @@ -23892,7 +22566,7 @@ ] ], [ - 5576, + 5693, [ { "AllocSegment": { @@ -23905,20 +22579,17 @@ ] ], [ - 5601, + 5712, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -15 + "offset": -17 } }, "dst": { @@ -23930,7 +22601,7 @@ ] ], [ - 5621, + 5724, [ { "AllocSegment": { @@ -23943,7 +22614,7 @@ ] ], [ - 5641, + 5737, [ { "AllocSegment": { @@ -23956,7 +22627,7 @@ ] ], [ - 5657, + 5752, [ { "AllocSegment": { @@ -23969,7 +22640,7 @@ ] ], [ - 5672, + 5766, [ { "AllocSegment": { @@ -23982,7 +22653,20 @@ ] ], [ - 5688, + 5780, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5795, [ { "TestLessThanOrEqual": { @@ -24004,33 +22688,78 @@ ] ], [ - 5726, + 5849, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 5745, + 5853, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1220" + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } }, - "rhs": { + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 5863, + [ + { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -12 + "offset": -2 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -24039,7 +22768,7 @@ ] ], [ - 5757, + 5899, [ { "AllocSegment": { @@ -24052,7 +22781,29 @@ ] ], [ - 5777, + 5918, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x1a5e" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -28 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5941, [ { "SystemCall": { @@ -24067,7 +22818,33 @@ ] ], [ - 5780, + 5944, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5966, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5981, [ { "AllocSegment": { @@ -24080,7 +22857,7 @@ ] ], [ - 5800, + 6002, [ { "AllocSegment": { @@ -24093,7 +22870,7 @@ ] ], [ - 5815, + 6016, [ { "AllocSegment": { @@ -24106,7 +22883,7 @@ ] ], [ - 5829, + 6030, [ { "AllocSegment": { @@ -24119,7 +22896,7 @@ ] ], [ - 5844, + 6045, [ { "TestLessThanOrEqual": { @@ -24141,7 +22918,7 @@ ] ], [ - 5861, + 6104, [ { "AllocSegment": { @@ -24154,20 +22931,17 @@ ] ], [ - 5892, + 6123, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x1414" }, "rhs": { "Deref": { "register": "AP", - "offset": -13 + "offset": -17 } }, "dst": { @@ -24179,7 +22953,22 @@ ] ], [ - 5912, + 6149, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 6152, [ { "AllocSegment": { @@ -24192,7 +22981,7 @@ ] ], [ - 5936, + 6174, [ { "AllocSegment": { @@ -24205,7 +22994,7 @@ ] ], [ - 5954, + 6189, [ { "AllocSegment": { @@ -24218,19 +23007,10 @@ ] ], [ - 5972, + 6203, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -24240,7 +23020,7 @@ ] ], [ - 5989, + 6217, [ { "AllocSegment": { @@ -24253,17 +23033,17 @@ ] ], [ - 6009, + 6232, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x942" }, "rhs": { "Deref": { - "register": "AP", - "offset": -7 + "register": "FP", + "offset": -8 } }, "dst": { @@ -24275,7 +23055,7 @@ ] ], [ - 6033, + 6304, [ { "AllocSegment": { @@ -24288,10 +23068,19 @@ ] ], [ - 6063, + 6324, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x3480" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -10 + } + }, "dst": { "register": "AP", "offset": 0 @@ -24301,31 +23090,42 @@ ] ], [ - 6079, + 6349, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -9 + } } } } ] ], [ - 6095, + 6357, [ { - "TestLessThanOrEqual": { + "TestLessThan": { "lhs": { - "Immediate": "0x0" + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -8 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -3 + } + } + } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", @@ -24336,7 +23136,7 @@ ] ], [ - 6154, + 6382, [ { "AllocSegment": { @@ -24349,29 +23149,7 @@ ] ], [ - 6173, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -17 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 6185, + 6415, [ { "AllocSegment": { @@ -24384,10 +23162,25 @@ ] ], [ - 6198, + 6452, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24397,36 +23190,54 @@ ] ], [ - 6213, + 6456, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 - } - } - } - ] - ], - [ - 6227, - [ - { - "AllocSegment": { - "dst": { + }, + "y": { "register": "AP", - "offset": 0 + "offset": 1 } } } ] ], [ - 6241, + 6498, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24436,29 +23247,36 @@ ] ], [ - 6256, + 6502, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -1 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 6310, + 6543, [ { "TestLessThan": { @@ -24480,7 +23298,7 @@ ] ], [ - 6314, + 6547, [ { "LinearSplit": { @@ -24509,7 +23327,7 @@ ] ], [ - 6324, + 6557, [ { "LinearSplit": { @@ -24538,60 +23356,99 @@ ] ], [ - 6360, + 6681, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "FP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 6379, + 6685, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1a5e" - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -28 + "offset": 3 } }, - "dst": { + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 6402, + 6695, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { "register": "FP", - "offset": -5 + "offset": 2 } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 } } } ] ], [ - 6405, + 6727, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "FP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24601,20 +23458,33 @@ ] ], [ - 6427, + 6729, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "FP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 } } } ] ], [ - 6442, + 6849, [ { "AllocSegment": { @@ -24627,10 +23497,19 @@ ] ], [ - 6463, + 6963, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24640,23 +23519,51 @@ ] ], [ - 6477, + 6965, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 } } } ] ], [ - 6491, + 7018, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24666,32 +23573,54 @@ ] ], [ - 6506, + 7022, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -1 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 6565, + 7064, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24701,36 +23630,43 @@ ] ], [ - 6584, + 7068, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1414" - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -17 + "offset": -1 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 6610, + 7846, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -5 + "offset": -26 } } } @@ -24738,7 +23674,7 @@ ] ], [ - 6613, + 8079, [ { "AllocSegment": { @@ -24751,7 +23687,7 @@ ] ], [ - 6635, + 8093, [ { "AllocSegment": { @@ -24764,7 +23700,7 @@ ] ], [ - 6650, + 8107, [ { "AllocSegment": { @@ -24777,7 +23713,7 @@ ] ], [ - 6664, + 8171, [ { "AllocSegment": { @@ -24790,7 +23726,7 @@ ] ], [ - 6678, + 8185, [ { "AllocSegment": { @@ -24803,29 +23739,35 @@ ] ], [ - 6693, + 8208, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x942" - }, - "rhs": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 8232, + [ + { + "SystemCall": { + "system": { "Deref": { "register": "FP", "offset": -8 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 6765, + 8235, [ { "AllocSegment": { @@ -24838,80 +23780,127 @@ ] ], [ - 6793, + 8251, [ { "SystemCall": { "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -8 + }, + "b": { + "Immediate": "0xa" + } + } + } + } + } + ] + ], + [ + 8288, + [ + { + "GetSegmentArenaIndex": { + "dict_end_ptr": { "Deref": { "register": "FP", - "offset": -7 + "offset": -3 } + }, + "dict_index": { + "register": "FP", + "offset": 0 } } } ] ], [ - 6798, + 8329, [ { "AllocSegment": { "dst": { - "register": "AP", - "offset": 0 + "register": "FP", + "offset": 3 } } } ] ], [ - 6849, + 8337, [ { - "SystemCall": { - "system": { + "InitSquashData": { + "dict_accesses": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "ptr_diff": { + "Deref": { + "register": "FP", + "offset": 0 + } + }, + "n_accesses": { "Deref": { "register": "AP", - "offset": -8 + "offset": -1 } + }, + "big_keys": { + "register": "FP", + "offset": 2 + }, + "first_key": { + "register": "FP", + "offset": 1 } } } ] ], [ - 6870, + 8356, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "GetCurrentAccessIndex": { + "range_check_ptr": { + "Deref": { + "register": "FP", + "offset": -9 + } } } } ] ], [ - 6897, + 8369, [ { - "AllocSegment": { - "dst": { + "ShouldSkipSquashLoop": { + "should_skip_loop": { "register": "AP", - "offset": 0 + "offset": -4 } } } ] ], [ - 6913, + 8371, [ { - "AllocSegment": { - "dst": { + "GetCurrentAccessDelta": { + "index_delta_minus1": { "register": "AP", "offset": 0 } @@ -24920,98 +23909,92 @@ ] ], [ - 6927, + 8382, [ { - "AllocSegment": { - "dst": { + "ShouldContinueSquashLoop": { + "should_continue": { "register": "AP", - "offset": 0 + "offset": -4 } } } ] ], [ - 6943, + 8396, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -4 - } + "GetNextDictKey": { + "next_key": { + "register": "FP", + "offset": 0 } } } ] ], [ - 6952, + 8415, [ { - "SystemCall": { - "system": { + "AssertLeFindSmallArcs": { + "range_check_ptr": { "BinOp": { "op": "Add", "a": { - "register": "FP", + "register": "AP", "offset": -4 }, "b": { - "Immediate": "0x8" + "Immediate": "0x1" } } + }, + "a": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "b": { + "Deref": { + "register": "FP", + "offset": 0 + } } } } ] ], [ - 6965, + 8427, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -4 - }, - "b": { - "Immediate": "0xd" - } - } + "AssertLeIsFirstArcExcluded": { + "skip_exclude_a_flag": { + "register": "AP", + "offset": 0 } } } ] ], [ - 6982, + 8439, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -4 - }, - "b": { - "Immediate": "0x14" - } - } + "AssertLeIsSecondArcExcluded": { + "skip_exclude_b_minus_a": { + "register": "AP", + "offset": 0 } } } ] ], [ - 6985, + 8470, [ { "AllocSegment": { @@ -25024,19 +24007,10 @@ ] ], [ - 7053, + 8478, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x3480" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -10 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -25046,14 +24020,14 @@ ] ], [ - 7078, + 8509, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -9 + "offset": -3 } } } @@ -25061,28 +24035,10 @@ ] ], [ - 7086, + 8523, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -8 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -3 - } - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -25092,7 +24048,7 @@ ] ], [ - 7111, + 8543, [ { "AllocSegment": { @@ -25105,7 +24061,7 @@ ] ], [ - 7144, + 8557, [ { "AllocSegment": { @@ -25118,82 +24074,25 @@ ] ], [ - 7181, + 8571, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 7185, - [ - { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -1 + "offset": -9 } - }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 7227, + 8574, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -25203,107 +24102,49 @@ ] ], [ - 7231, + 8597, [ { - "LinearSplit": { - "value": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -4 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 7272, - [ - { - "TestLessThan": { - "lhs": { + "rhs": { "Deref": { "register": "AP", "offset": -1 } }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 7276, + 8625, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 7286, + 8639, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -25312,99 +24153,51 @@ ] ], [ - 7410, + 8682, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 7414, + 8721, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 7424, + 8781, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { "register": "FP", - "offset": 2 + "offset": -3 } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { - "register": "AP", - "offset": 0 } } } ] ], [ - 7456, + 8791, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -25414,33 +24207,22 @@ ] ], [ - 7458, + 8822, [ { - "DivMod": { - "lhs": { + "SystemCall": { + "system": { "Deref": { - "register": "FP", - "offset": 0 + "register": "AP", + "offset": -6 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 } } } ] ], [ - 7578, + 8825, [ { "AllocSegment": { @@ -25453,18 +24235,21 @@ ] ], [ - 7692, + 8849, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -4 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "dst": { "register": "AP", @@ -25475,162 +24260,101 @@ ] ], [ - 7694, + 8883, [ { - "DivMod": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -2 + "offset": -14 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 } } } ] ], [ - 7747, + 8898, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } + "SystemCall": { + "system": { + "Deref": { + "register": "AP", + "offset": -2 } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 7751, + 8944, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 7793, + 8963, [ { - "TestLessThan": { + "DivMod": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } + "Deref": { + "register": "AP", + "offset": -2 } }, "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 7797, - [ - { - "LinearSplit": { - "value": { "Deref": { "register": "AP", "offset": -1 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "quotient": { "register": "AP", - "offset": 0 + "offset": 5 }, - "y": { + "remainder": { "register": "AP", - "offset": 1 + "offset": 6 } } } ] ], [ - 8575, + 8969, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "Deref": { - "register": "FP", - "offset": -26 + "register": "AP", + "offset": 0 } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": -3 } } } ] ], [ - 8808, + 9020, [ { "AllocSegment": { @@ -25643,7 +24367,7 @@ ] ], [ - 8822, + 9051, [ { "AllocSegment": { @@ -25656,7 +24380,7 @@ ] ], [ - 8836, + 9076, [ { "AllocSegment": { @@ -25669,7 +24393,7 @@ ] ], [ - 8900, + 9091, [ { "AllocSegment": { @@ -25682,20 +24406,22 @@ ] ], [ - 8914, + 9133, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -3 + } } } } ] ], [ - 8937, + 9145, [ { "AllocSegment": { @@ -25708,14 +24434,14 @@ ] ], [ - 8961, + 9175, [ { "SystemCall": { "system": { "Deref": { - "register": "FP", - "offset": -8 + "register": "AP", + "offset": -6 } } } @@ -25723,7 +24449,7 @@ ] ], [ - 8964, + 9180, [ { "AllocSegment": { @@ -25736,20 +24462,39 @@ ] ], [ - 8980, + 9203, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 9237, [ { "SystemCall": { "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -8 - }, - "b": { - "Immediate": "0xa" - } + "Deref": { + "register": "AP", + "offset": -14 } } } @@ -25757,81 +24502,93 @@ ] ], [ - 9017, + 9252, [ { - "GetSegmentArenaIndex": { - "dict_end_ptr": { + "SystemCall": { + "system": { "Deref": { - "register": "FP", - "offset": -3 + "register": "AP", + "offset": -2 } - }, - "dict_index": { - "register": "FP", - "offset": 0 } } } ] ], [ - 9058, + 9300, [ { "AllocSegment": { "dst": { - "register": "FP", - "offset": 3 + "register": "AP", + "offset": 0 } } } ] ], [ - 9066, + 9318, [ { - "InitSquashData": { - "dict_accesses": { + "DivMod": { + "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -2 } }, - "ptr_diff": { + "rhs": { "Deref": { - "register": "FP", - "offset": 0 + "register": "AP", + "offset": -1 } }, - "n_accesses": { + "quotient": { + "register": "AP", + "offset": 5 + }, + "remainder": { + "register": "AP", + "offset": 6 + } + } + } + ] + ], + [ + 9324, + [ + { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, - "big_keys": { - "register": "FP", - "offset": 2 + "rhs": { + "Immediate": "0x10000000000000000" }, - "first_key": { - "register": "FP", - "offset": 1 + "dst": { + "register": "AP", + "offset": -3 } } } ] ], [ - 9085, + 9353, [ { - "GetCurrentAccessIndex": { - "range_check_ptr": { + "SystemCall": { + "system": { "Deref": { - "register": "FP", - "offset": -9 + "register": "AP", + "offset": -22 } } } @@ -25839,24 +24596,24 @@ ] ], [ - 9098, + 9403, [ { - "ShouldSkipSquashLoop": { - "should_skip_loop": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -4 + "offset": 0 } } } ] ], [ - 9100, + 9441, [ { - "GetCurrentAccessDelta": { - "index_delta_minus1": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -25865,25 +24622,25 @@ ] ], [ - 9111, + 9468, [ { - "ShouldContinueSquashLoop": { - "should_continue": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -4 + "offset": 0 } } } ] ], [ - 9125, + 9484, [ { - "GetNextDictKey": { - "next_key": { - "register": "FP", + "AllocSegment": { + "dst": { + "register": "AP", "offset": 0 } } @@ -25891,83 +24648,122 @@ ] ], [ - 9144, + 9510, [ { - "AssertLeFindSmallArcs": { - "range_check_ptr": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -4 - }, - "b": { - "Immediate": "0x1" - } - } + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x3a84" }, - "a": { + "rhs": { "Deref": { "register": "FP", "offset": -6 } }, - "b": { - "Deref": { - "register": "FP", - "offset": 0 - } + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9156, + 9524, [ { - "AssertLeIsFirstArcExcluded": { - "skip_exclude_a_flag": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 9168, + 9599, [ { - "AssertLeIsSecondArcExcluded": { - "skip_exclude_b_minus_a": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -11 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, + "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 9199, + 9603, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9207, + 9613, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -12 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -25976,14 +24772,14 @@ ] ], [ - 9238, + 9631, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -3 + "offset": -5 } } } @@ -25991,7 +24787,7 @@ ] ], [ - 9252, + 9649, [ { "AllocSegment": { @@ -26004,76 +24800,105 @@ ] ], [ - 9272, + 9668, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -12 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 9286, + 9672, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9300, + 9682, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -9 + "offset": -13 } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9303, + 9700, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } } } } ] ], [ - 9326, + 9718, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -26083,7 +24908,7 @@ ] ], [ - 9354, + 9749, [ { "AllocSegment": { @@ -26096,7 +24921,7 @@ ] ], [ - 9368, + 9773, [ { "AllocSegment": { @@ -26109,7 +24934,7 @@ ] ], [ - 9411, + 9787, [ { "AllocSegment": { @@ -26122,7 +24947,7 @@ ] ], [ - 9450, + 9801, [ { "AllocSegment": { @@ -26135,22 +24960,20 @@ ] ], [ - 9510, + 9815, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -3 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9520, + 9830, [ { "AllocSegment": { @@ -26163,22 +24986,29 @@ ] ], [ - 9551, + 9845, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x42e" + }, + "rhs": { "Deref": { - "register": "AP", - "offset": -6 + "register": "FP", + "offset": -4 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9554, + 9859, [ { "AllocSegment": { @@ -26191,22 +25021,10 @@ ] ], [ - 9578, + 9879, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -26216,37 +25034,29 @@ ] ], [ - 9612, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -14 - } - } - } - } - ] - ], - [ - 9627, + 9893, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x42e" + }, + "rhs": { "Deref": { - "register": "AP", - "offset": -2 + "register": "FP", + "offset": -4 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9673, + 9923, [ { "AllocSegment": { @@ -26259,145 +25069,216 @@ ] ], [ - 9692, + 9942, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" }, - "quotient": { + "dst": { "register": "AP", "offset": 5 - }, - "remainder": { - "register": "AP", - "offset": 6 } } } ] ], [ - 9698, + 9946, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 0 + "offset": 4 } }, - "rhs": { - "Immediate": "0x10000000000000000" + "scalar": { + "Immediate": "0x110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": -3 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9749, + 9957, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9780, + 9983, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -6 + } } } } ] ], [ - 9805, + 9998, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -6 + }, + "b": { + "Immediate": "0x7" + } + } } } } ] ], [ - 9820, + 10006, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 5 } } } ] ], [ - 9862, + 10010, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { - "register": "FP", - "offset": -3 + "register": "AP", + "offset": 4 } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9874, + 10021, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 9904, + 10051, [ { "SystemCall": { "system": { - "Deref": { - "register": "AP", - "offset": -6 + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -6 + }, + "b": { + "Immediate": "0xe" + } } } } @@ -26405,34 +25286,39 @@ ] ], [ - 9909, + 10067, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -6 + }, + "b": { + "Immediate": "0x15" + } + } } } } ] ], [ - 9932, + 10175, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -4 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "dst": { "register": "AP", @@ -26443,40 +25329,45 @@ ] ], [ - 9966, + 10177, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -14 + "offset": -2 } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 } } } ] ], [ - 9981, + 10222, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -1 } - } - } - } - ] - ], - [ - 10029, - [ - { - "AllocSegment": { + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -26486,7 +25377,7 @@ ] ], [ - 10047, + 10224, [ { "DivMod": { @@ -26497,171 +25388,177 @@ } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 5 + "offset": 3 }, "remainder": { "register": "AP", - "offset": 6 + "offset": 4 } } } ] ], [ - 10053, + 10333, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -1 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" }, "dst": { "register": "AP", - "offset": -3 + "offset": 5 } } } ] ], [ - 10082, + 10337, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -22 + "offset": 4 } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 10132, + 10348, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 10170, + 10374, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -6 + } } } } ] ], [ - 10197, + 10389, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10213, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10239, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x3a84" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -6 + }, + "b": { + "Immediate": "0x7" + } } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 10253, + 10396, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -6 } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x100000000000000000000000000000000" }, "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10328, + 10398, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -11 + "offset": -7 } }, "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { "register": "AP", "offset": 4 } @@ -26670,122 +25567,84 @@ ] ], [ - 10332, + 10419, [ { - "LinearSplit": { - "value": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": 3 + "offset": -2 } }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 + "rhs": { + "Immediate": "0x100000000000000000000000000000000" }, - "y": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10342, + 10421, [ { - "LinearSplit": { - "value": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -12 + "offset": -3 } }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" + "rhs": { + "Immediate": "0x100000000000000000000000000000000" }, - "x": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 3 }, - "y": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10360, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } - } - } - } - ] - ], - [ - 10378, - [ - { - "AllocSegment": { - "dst": { + "remainder": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 10397, + 10451, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -12 + "offset": -1 } }, "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" }, "dst": { "register": "AP", - "offset": 4 + "offset": 5 } } } ] ], [ - 10401, + 10455, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": 3 + "offset": 4 } }, "scalar": { @@ -26807,43 +25666,43 @@ ] ], [ - 10411, + 10466, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": -13 + "offset": 4 } }, "scalar": { "Immediate": "0x8000000000000000000000000000000" }, "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" + "Immediate": "0xfffffffffffffffffffffffffffffffe" }, "x": { "register": "AP", - "offset": -1 + "offset": -2 }, "y": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 10429, + 10497, [ { "SystemCall": { "system": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -20 } } } @@ -26851,20 +25710,28 @@ ] ], [ - 10447, + 10512, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -25 + }, + "b": { + "Immediate": "0x7" + } + } } } } ] ], [ - 10478, + 10556, [ { "AllocSegment": { @@ -26877,7 +25744,7 @@ ] ], [ - 10502, + 10575, [ { "AllocSegment": { @@ -26890,94 +25757,63 @@ ] ], [ - 10516, + 10657, [ { - "AllocSegment": { - "dst": { + "RandomEcPoint": { + "x": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10530, - [ - { - "AllocSegment": { - "dst": { + "offset": 4 + }, + "y": { "register": "AP", - "offset": 0 + "offset": 5 } } - } - ] - ], - [ - 10544, - [ + }, { - "AllocSegment": { + "AllocConstantSize": { + "size": { + "Immediate": "0x2" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 6 } } } ] ], [ - 10559, + 10721, [ { - "AllocSegment": { - "dst": { + "RandomEcPoint": { + "x": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10574, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x42e" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "offset": 4 }, - "dst": { + "y": { "register": "AP", - "offset": 0 + "offset": 5 } } - } - ] - ], - [ - 10588, - [ + }, { - "AllocSegment": { + "AllocConstantSize": { + "size": { + "Immediate": "0x2" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 6 } } } ] ], [ - 10608, + 10791, [ { "AllocSegment": { @@ -26990,150 +25826,76 @@ ] ], [ - 10622, + 10817, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x42e" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { "register": "FP", - "offset": -4 + "offset": -3 } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 10652, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 10671, + 10834, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -3 + }, + "b": { + "Immediate": "0x7" + } } - }, - "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" - }, - "dst": { - "register": "AP", - "offset": 5 } } } ] ], [ - 10675, + 10876, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10686, + 10893, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10712, + 10912, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -6 - } - } - } - } - ] - ], - [ - 10727, - [ - { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -6 - }, - "b": { - "Immediate": "0x7" - } + "offset": -4 } } } @@ -27141,7 +25903,7 @@ ] ], [ - 10735, + 10922, [ { "TestLessThan": { @@ -27163,7 +25925,7 @@ ] ], [ - 10739, + 10926, [ { "LinearSplit": { @@ -27192,7 +25954,7 @@ ] ], [ - 10750, + 10937, [ { "LinearSplit": { @@ -27221,7 +25983,7 @@ ] ], [ - 10780, + 10981, [ { "SystemCall": { @@ -27230,10 +25992,10 @@ "op": "Add", "a": { "register": "FP", - "offset": -6 + "offset": -4 }, "b": { - "Immediate": "0xe" + "Immediate": "0x5" } } } @@ -27242,7 +26004,7 @@ ] ], [ - 10796, + 10996, [ { "SystemCall": { @@ -27251,10 +26013,10 @@ "op": "Add", "a": { "register": "FP", - "offset": -6 + "offset": -4 }, "b": { - "Immediate": "0x15" + "Immediate": "0xc" } } } @@ -27263,18 +26025,21 @@ ] ], [ - 10904, + 11006, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -5 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "dst": { "register": "AP", @@ -27285,45 +26050,22 @@ ] ], [ - 10906, + 11021, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -3 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 10951, - [ - { - "TestLessThan": { - "lhs": { "Deref": { "register": "AP", "offset": -1 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, "dst": { "register": "AP", "offset": 0 @@ -27333,33 +26075,7 @@ ] ], [ - 10953, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 11062, + 11037, [ { "TestLessThan": { @@ -27381,7 +26097,7 @@ ] ], [ - 11066, + 11041, [ { "LinearSplit": { @@ -27410,7 +26126,7 @@ ] ], [ - 11077, + 11052, [ { "LinearSplit": { @@ -27439,14 +26155,14 @@ ] ], [ - 11103, + 11081, [ { "SystemCall": { "system": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -29 } } } @@ -27454,7 +26170,7 @@ ] ], [ - 11118, + 11097, [ { "SystemCall": { @@ -27462,8 +26178,8 @@ "BinOp": { "op": "Add", "a": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -35 }, "b": { "Immediate": "0x7" @@ -27475,19 +26191,10 @@ ] ], [ - 11125, + 11139, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -6 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -27497,45 +26204,23 @@ ] ], [ - 11127, + 11157, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 11148, + 11259, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -27545,149 +26230,53 @@ ] ], [ - 11150, + 11334, [ { - "DivMod": { - "lhs": { + "EvalCircuit": { + "n_add_mods": { "Deref": { "register": "AP", - "offset": -3 + "offset": -6 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "add_mod_builtin": { + "Deref": { + "register": "FP", + "offset": -6 + } }, - "quotient": { - "register": "AP", - "offset": 3 + "n_mul_mods": { + "Deref": { + "register": "AP", + "offset": -4 + } }, - "remainder": { - "register": "AP", - "offset": 4 + "mul_mod_builtin": { + "Deref": { + "register": "FP", + "offset": -5 + } } } } ] ], [ - 11180, + 11391, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } } ] ], [ - 11184, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 11195, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 11226, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -20 - } - } - } - } - ] - ], - [ - 11241, - [ - { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -25 - }, - "b": { - "Immediate": "0x7" - } - } - } - } - } - ] - ], - [ - 11285, + 11447, [ { "AllocSegment": { @@ -27700,7 +26289,7 @@ ] ], [ - 11304, + 11540, [ { "AllocSegment": { @@ -27713,63 +26302,33 @@ ] ], [ - 11386, + 11561, [ { - "RandomEcPoint": { - "x": { - "register": "AP", - "offset": 4 - }, - "y": { - "register": "AP", - "offset": 5 - } - } - }, - { - "AllocConstantSize": { - "size": { - "Immediate": "0x2" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 6 + "offset": 0 } } } ] ], [ - 11450, + 11632, [ { - "RandomEcPoint": { - "x": { - "register": "AP", - "offset": 4 - }, - "y": { - "register": "AP", - "offset": 5 - } - } - }, - { - "AllocConstantSize": { - "size": { - "Immediate": "0x2" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 6 + "offset": 0 } } } ] ], [ - 11520, + 11660, [ { "AllocSegment": { @@ -27782,46 +26341,25 @@ ] ], [ - 11546, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -3 - } - } - } - } - ] - ], - [ - 11563, + 11731, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "BinOp": { "op": "Add", "a": { - "register": "FP", - "offset": -3 + "register": "AP", + "offset": -1 }, "b": { - "Immediate": "0x7" + "Immediate": "0x0" } } - } - } - } - ] - ], - [ - 11605, - [ - { - "AllocSegment": { + }, + "rhs": { + "Immediate": "0x100000000" + }, "dst": { "register": "AP", "offset": 0 @@ -27831,170 +26369,157 @@ ] ], [ - 11622, + 11735, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 11641, + 11757, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -2 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 11651, + 11771, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + "Immediate": "0x100000000" }, "dst": { "register": "AP", - "offset": 5 + "offset": -1 } } } ] ], [ - 11655, + 11781, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { "Deref": { "register": "AP", - "offset": 4 + "offset": -1 } }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 + "rhs": { + "Deref": { + "register": "AP", + "offset": -2 + } }, - "y": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 11666, + 11804, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 11710, + 11825, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -4 - }, - "b": { - "Immediate": "0x5" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 11725, + 11846, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -4 - }, - "b": { - "Immediate": "0xc" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 11735, + 11894, [ { - "TestLessThan": { + "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -5 - } + "Immediate": "0x1e28" }, "rhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -8 } }, "dst": { @@ -28006,22 +26531,10 @@ ] ], [ - 11750, + 11954, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -28031,123 +26544,90 @@ ] ], [ - 11766, + 11974, [ { - "TestLessThan": { + "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0xcc6" }, "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + "Deref": { + "register": "FP", + "offset": -7 + } }, "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } } ] ], [ - 11770, + 12053, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 11781, + 12083, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 11810, + 12103, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x10ae" + }, + "rhs": { "Deref": { - "register": "AP", - "offset": -29 + "register": "FP", + "offset": -7 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 11826, + 12204, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -35 - }, - "b": { - "Immediate": "0x7" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 11868, + 12234, [ { "AllocSegment": { @@ -28160,10 +26640,19 @@ ] ], [ - 11886, + 12254, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x22ce" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -7 + } + }, "dst": { "register": "AP", "offset": 0 @@ -28173,7 +26662,7 @@ ] ], [ - 11988, + 12325, [ { "AllocSegment": { @@ -28186,40 +26675,36 @@ ] ], [ - 12063, + 12346, [ { - "EvalCircuit": { - "n_add_mods": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -6 - } - }, - "add_mod_builtin": { - "Deref": { - "register": "FP", - "offset": -6 + "offset": -2 } }, - "n_mul_mods": { + "rhs": { "Deref": { "register": "AP", - "offset": -4 + "offset": -1 } }, - "mul_mod_builtin": { - "Deref": { - "register": "FP", - "offset": -5 - } + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 } } } ] ], [ - 12120, + 12404, [ { "AllocSegment": { @@ -28232,7 +26717,7 @@ ] ], [ - 12176, + 12457, [ { "AllocSegment": { @@ -28245,10 +26730,57 @@ ] ], [ - 12269, + 12470, [ { - "AllocSegment": { + "DivMod": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 12478, + [ + { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -6 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -1 + } + } + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -28258,7 +26790,7 @@ ] ], [ - 12290, + 12495, [ { "AllocSegment": { @@ -28271,20 +26803,29 @@ ] ], [ - 12361, + 12527, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 12389, + 12544, [ { "AllocSegment": { @@ -28297,7 +26838,7 @@ ] ], [ - 12460, + 12560, [ { "TestLessThan": { @@ -28309,12 +26850,15 @@ "offset": -1 }, "b": { - "Immediate": "0x0" + "Deref": { + "register": "AP", + "offset": -3 + } } } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", @@ -28325,300 +26869,7 @@ ] ], [ - 12464, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 12486, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12500, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 12510, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12533, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12554, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12575, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12623, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1e28" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -8 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12683, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12703, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0xcc6" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12782, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12812, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12832, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x10ae" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12933, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12963, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12983, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x22ce" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13054, + 12582, [ { "AllocSegment": { @@ -28631,214 +26882,7 @@ ] ], [ - 13075, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 13133, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13186, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13199, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 13207, - [ - { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -6 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -1 - } - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13224, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13256, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 13273, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13289, - [ - { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -3 - } - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13311, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 13368, + 12639, [ { "DivMod": { @@ -28867,7 +26911,7 @@ ] ], [ - 13377, + 12648, [ { "TestLessThan": { @@ -28889,7 +26933,7 @@ ] ], [ - 13387, + 12658, [ { "TestLessThan": { @@ -28920,7 +26964,7 @@ ] ], [ - 13409, + 12680, [ { "AllocSegment": { @@ -28933,7 +26977,7 @@ ] ], [ - 13424, + 12695, [ { "AllocSegment": { @@ -28946,7 +26990,7 @@ ] ], [ - 13449, + 12720, [ { "TestLessThan": { @@ -28977,7 +27021,7 @@ ] ], [ - 13463, + 12734, [ { "DivMod": { @@ -29006,7 +27050,7 @@ ] ], [ - 13480, + 12751, [ { "TestLessThan": { @@ -29028,7 +27072,7 @@ ] ], [ - 13492, + 12763, [ { "TestLessThan": { @@ -29050,7 +27094,7 @@ ] ], [ - 13502, + 12773, [ { "TestLessThan": { @@ -29081,7 +27125,7 @@ ] ], [ - 13525, + 12796, [ { "AllocSegment": { @@ -29094,7 +27138,7 @@ ] ], [ - 13540, + 12811, [ { "AllocSegment": { @@ -29107,7 +27151,7 @@ ] ], [ - 13555, + 12826, [ { "AllocSegment": { @@ -29120,7 +27164,7 @@ ] ], [ - 13570, + 12841, [ { "AllocSegment": { @@ -29133,7 +27177,7 @@ ] ], [ - 13583, + 12854, [ { "TestLessThanOrEqual": { @@ -29155,7 +27199,7 @@ ] ], [ - 13593, + 12864, [ { "TestLessThanOrEqualAddress": { @@ -29186,7 +27230,7 @@ ] ], [ - 13630, + 12901, [ { "SystemCall": { @@ -29201,7 +27245,7 @@ ] ], [ - 13663, + 12934, [ { "AllocSegment": { @@ -29214,7 +27258,7 @@ ] ], [ - 13697, + 12968, [ { "TestLessThan": { @@ -29236,7 +27280,7 @@ ] ], [ - 13719, + 12990, [ { "TestLessThan": { @@ -29258,7 +27302,7 @@ ] ], [ - 13756, + 13027, [ { "TestLessThan": { @@ -29280,7 +27324,7 @@ ] ], [ - 13778, + 13049, [ { "TestLessThan": { @@ -29302,7 +27346,7 @@ ] ], [ - 13854, + 13125, [ { "AllocSegment": { @@ -29315,7 +27359,7 @@ ] ], [ - 13919, + 13190, [ { "TestLessThan": { @@ -29337,7 +27381,7 @@ ] ], [ - 13943, + 13214, [ { "TestLessThan": { @@ -29359,7 +27403,7 @@ ] ], [ - 13984, + 13255, [ { "TestLessThan": { @@ -29381,7 +27425,7 @@ ] ], [ - 14010, + 13281, [ { "TestLessThan": { @@ -29403,7 +27447,7 @@ ] ], [ - 14054, + 13325, [ { "U256InvModN": { @@ -29460,7 +27504,7 @@ ] ], [ - 14072, + 13343, [ { "WideMul128": { @@ -29657,7 +27701,7 @@ ] ], [ - 14125, + 13396, [ { "WideMul128": { @@ -29710,7 +27754,7 @@ ] ], [ - 14129, + 13400, [ { "TestLessThan": { @@ -29732,7 +27776,7 @@ ] ], [ - 14143, + 13414, [ { "TestLessThan": { @@ -29754,7 +27798,7 @@ ] ], [ - 14156, + 13427, [ { "DivMod": { @@ -29780,7 +27824,7 @@ ] ], [ - 14166, + 13437, [ { "DivMod": { @@ -29806,7 +27850,7 @@ ] ], [ - 14177, + 13448, [ { "DivMod": { @@ -29832,7 +27876,7 @@ ] ], [ - 14186, + 13457, [ { "DivMod": { @@ -29858,7 +27902,7 @@ ] ], [ - 14196, + 13467, [ { "DivMod": { @@ -29884,7 +27928,7 @@ ] ], [ - 14207, + 13478, [ { "DivMod": { @@ -29910,7 +27954,7 @@ ] ], [ - 14216, + 13487, [ { "DivMod": { @@ -29936,7 +27980,7 @@ ] ], [ - 14226, + 13497, [ { "DivMod": { @@ -29962,7 +28006,7 @@ ] ], [ - 14237, + 13508, [ { "DivMod": { @@ -29988,7 +28032,7 @@ ] ], [ - 14246, + 13517, [ { "DivMod": { @@ -30014,7 +28058,7 @@ ] ], [ - 14256, + 13527, [ { "DivMod": { @@ -30040,7 +28084,7 @@ ] ], [ - 14267, + 13538, [ { "DivMod": { @@ -30066,7 +28110,7 @@ ] ], [ - 14276, + 13547, [ { "DivMod": { @@ -30092,7 +28136,7 @@ ] ], [ - 14286, + 13557, [ { "DivMod": { @@ -30118,7 +28162,7 @@ ] ], [ - 14297, + 13568, [ { "DivMod": { @@ -30144,7 +28188,7 @@ ] ], [ - 14306, + 13577, [ { "DivMod": { @@ -30170,7 +28214,7 @@ ] ], [ - 14316, + 13587, [ { "DivMod": { @@ -30196,7 +28240,7 @@ ] ], [ - 14327, + 13598, [ { "DivMod": { @@ -30222,7 +28266,7 @@ ] ], [ - 14336, + 13607, [ { "DivMod": { @@ -30248,7 +28292,7 @@ ] ], [ - 14346, + 13617, [ { "DivMod": { @@ -30274,7 +28318,7 @@ ] ], [ - 14357, + 13628, [ { "DivMod": { @@ -30300,7 +28344,7 @@ ] ], [ - 14366, + 13637, [ { "DivMod": { @@ -30326,7 +28370,7 @@ ] ], [ - 14376, + 13647, [ { "DivMod": { @@ -30352,7 +28396,7 @@ ] ], [ - 14387, + 13658, [ { "DivMod": { @@ -30378,241 +28422,103 @@ ] ], [ - 14408, + 13706, [ { - "Uint512DivModByUint256": { - "dividend0": { - "Deref": { - "register": "AP", - "offset": -6 - } - }, - "dividend1": { - "Deref": { - "register": "AP", - "offset": -5 - } - }, - "dividend2": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "dividend3": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "divisor0": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "divisor1": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -10 } - }, - "quotient0": { - "register": "AP", - "offset": 0 - }, - "quotient1": { - "register": "AP", - "offset": 1 - }, - "quotient2": { - "register": "AP", - "offset": 2 - }, - "quotient3": { - "register": "AP", - "offset": 3 - }, - "remainder0": { - "register": "AP", - "offset": 4 - }, - "remainder1": { - "register": "AP", - "offset": 5 } } } ] ], [ - 14426, + 13723, [ { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "high": { - "register": "AP", - "offset": -9 - }, - "low": { - "register": "AP", - "offset": -10 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "high": { - "register": "AP", - "offset": -7 - }, - "low": { - "register": "AP", - "offset": -8 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -20 + "offset": -2 } - }, - "high": { - "register": "AP", - "offset": -5 - }, - "low": { - "register": "AP", - "offset": -6 } } - }, + } + ] + ], + [ + 13735, + [ { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -6 + }, + "b": { + "Immediate": "0x8" + } } - }, - "high": { - "register": "AP", - "offset": -3 - }, - "low": { - "register": "AP", - "offset": -4 } } - }, + } + ] + ], + [ + 13746, + [ { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -17 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -10 + }, + "b": { + "Immediate": "0x10" + } } - }, - "high": { - "register": "AP", - "offset": -1 - }, - "low": { - "register": "AP", - "offset": -2 } } } ] ], [ - 14455, + 13756, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -38 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -14 + }, + "b": { + "Immediate": "0x17" + } } - }, - "dst": { - "register": "AP", - "offset": 1 } } } ] ], [ - 14467, + 13841, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -40 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -30622,14 +28528,14 @@ ] ], [ - 14482, + 13870, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -41 + "offset": -669 } }, "rhs": { @@ -30648,7 +28554,7 @@ ] ], [ - 14492, + 13880, [ { "DivMod": { @@ -30674,7 +28580,7 @@ ] ], [ - 14503, + 13891, [ { "DivMod": { @@ -30693,21 +28599,21 @@ }, "remainder": { "register": "AP", - "offset": -38 + "offset": -683 } } } ] ], [ - 14512, + 13900, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -57 + "offset": -684 } }, "rhs": { @@ -30726,7 +28632,7 @@ ] ], [ - 14522, + 13910, [ { "DivMod": { @@ -30752,7 +28658,7 @@ ] ], [ - 14533, + 13921, [ { "DivMod": { @@ -30770,32 +28676,50 @@ "offset": -1 }, "remainder": { + "register": "FP", + "offset": -5 + } + } + } + ] + ], + [ + 13930, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -55 + "offset": 0 } } } ] ], [ - 14542, + 13999, [ { - "DivMod": { + "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": -72 + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -5 + }, + "b": { + "Deref": { + "register": "FP", + "offset": -3 + } + } } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", "offset": 0 } @@ -30804,118 +28728,102 @@ ] ], [ - 14552, + 14014, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 14563, + 14033, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x100000000" }, - "quotient": { + "dst": { "register": "AP", "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -74 } } } ] ], [ - 14572, + 14052, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -88 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 14582, + 14062, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -4 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, - "quotient": { + "dst": { "register": "AP", "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 } } } ] ], [ - 14593, + 14064, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "FP", + "offset": -4 } }, "rhs": { @@ -30923,35 +28831,44 @@ }, "quotient": { "register": "AP", - "offset": -1 + "offset": 3 }, "remainder": { "register": "AP", - "offset": -87 + "offset": 4 } } } ] ], [ - 14602, + 14101, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000" }, - "quotient": { + "dst": { "register": "AP", - "offset": 1 - }, - "remainder": { + "offset": -1 + } + } + } + ] + ], + [ + 14120, + [ + { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -30960,293 +28877,233 @@ ] ], [ - 14612, + 14131, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -18 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "quotient": { "register": "AP", - "offset": 0 + "offset": 5 }, "remainder": { "register": "AP", - "offset": 1 + "offset": 6 } } } ] ], [ - 14623, + 14137, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 + "Immediate": "0x10000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": -106 + "offset": -3 } } } ] ], [ - 14644, + 14151, [ { - "Uint512DivModByUint256": { - "dividend0": { - "Deref": { - "register": "AP", - "offset": -6 - } - }, - "dividend1": { - "Deref": { - "register": "AP", - "offset": -5 - } - }, - "dividend2": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "dividend3": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -3 + "offset": 0 } }, - "divisor0": { - "Deref": { - "register": "AP", - "offset": -2 - } + "rhs": { + "Immediate": "0x100000000" }, - "divisor1": { + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 14165, + [ + { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, - "quotient0": { - "register": "AP", - "offset": 0 - }, - "quotient1": { - "register": "AP", - "offset": 1 - }, - "quotient2": { - "register": "AP", - "offset": 2 - }, - "quotient3": { - "register": "AP", - "offset": 3 - }, - "remainder0": { - "register": "AP", - "offset": 4 + "rhs": { + "Immediate": "0x100000000" }, - "remainder1": { + "dst": { "register": "AP", - "offset": 5 + "offset": -1 } } } ] ], [ - 14662, + 14176, [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -19 + "offset": 0 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } + "Immediate": "0x100000000" }, - "high": { + "dst": { "register": "AP", - "offset": -9 - }, - "low": { + "offset": -1 + } + } + } + ] + ], + [ + 14205, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -10 + "offset": 0 } } - }, + } + ] + ], + [ + 14230, + [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } + "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" }, - "high": { + "dst": { "register": "AP", - "offset": -7 - }, - "low": { - "register": "AP", - "offset": -8 + "offset": 4 } } - }, + } + ] + ], + [ + 14234, + [ { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "rhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -20 + "offset": 3 } }, - "high": { - "register": "AP", - "offset": -5 - }, - "low": { - "register": "AP", - "offset": -6 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } + "scalar": { + "Immediate": "0x7000000000000110000000000000000" }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" }, - "high": { + "x": { "register": "AP", - "offset": -3 + "offset": -2 }, - "low": { + "y": { "register": "AP", - "offset": -4 + "offset": -1 } } - }, + } + ] + ], + [ + 14244, + [ { - "WideMul128": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -17 + "offset": -2 } }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } + "scalar": { + "Immediate": "0x1000000000000000000000000000000" }, - "high": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", "offset": -1 }, - "low": { + "y": { "register": "AP", - "offset": -2 + "offset": 0 } } } ] ], [ - 14691, + 14264, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -38 - } - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 1 + "offset": 0 } } } ] ], [ - 14703, + 14285, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -40 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -31256,24 +29113,11 @@ ] ], [ - 14718, + 14306, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -41 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -31282,40 +29126,36 @@ ] ], [ - 14728, + 14326, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -4 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, - "quotient": { + "dst": { "register": "AP", "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 } } } ] ], [ - 14739, + 14328, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "FP", + "offset": -4 } }, "rhs": { @@ -31323,35 +29163,22 @@ }, "quotient": { "register": "AP", - "offset": -1 + "offset": 3 }, "remainder": { "register": "AP", - "offset": -38 + "offset": 4 } } } ] ], [ - 14748, + 14372, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -57 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -31360,389 +29187,290 @@ ] ], [ - 14758, + 14383, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -16 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 14769, - [ - { - "DivMod": { - "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -1 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, "quotient": { "register": "AP", - "offset": -1 + "offset": 5 }, "remainder": { "register": "AP", - "offset": -55 + "offset": 6 } } } ] ], [ - 14778, + 14389, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -72 + "offset": 0 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -3 } } } ] ], [ - 14788, + 14403, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 14799, + 14421, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x100000000" }, - "quotient": { + "dst": { "register": "AP", "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -74 } } } ] ], [ - 14808, + 14434, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -88 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 14818, + 14445, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 14829, + 14474, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -87 + "offset": 0 } } } ] ], [ - 14838, + 14499, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -1 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 14848, + 14503, [ { - "DivMod": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 3 } }, - "rhs": { - "Immediate": "0x10000000000000000" + "scalar": { + "Immediate": "0x7000000000000110000000000000000" }, - "quotient": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 }, - "remainder": { + "y": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 14859, + 14513, [ { - "DivMod": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 2 + "offset": -2 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "scalar": { + "Immediate": "0x1000000000000000000000000000000" }, - "quotient": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", "offset": -1 }, - "remainder": { + "y": { "register": "AP", - "offset": -106 - } - } - } - ] - ], - [ - 14886, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -10 - } + "offset": 0 } } } ] ], [ - 14903, + 14533, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -2 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 14915, + 14554, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -6 - }, - "b": { - "Immediate": "0x8" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 14926, + 14575, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -10 - }, - "b": { - "Immediate": "0x10" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 14936, + 14604, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -14 - }, - "b": { - "Immediate": "0x17" - } + "TestLessThan": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -4 } - } - } - } - ] - ], - [ - 15021, - [ - { - "AllocSegment": { + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -31752,285 +29480,221 @@ ] ], [ - 15050, + 14606, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -642 + "register": "FP", + "offset": -4 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 1 + "offset": 3 }, "remainder": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 15060, + 14643, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 15071, + 14654, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x100000000" }, - "quotient": { + "dst": { "register": "AP", "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -656 } } } ] ], [ - 15080, + 14665, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -657 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 15090, + 14694, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 } } } ] ], [ - 15101, + 14719, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" }, - "quotient": { + "dst": { "register": "AP", - "offset": -1 - }, - "remainder": { - "register": "FP", - "offset": -5 + "offset": 4 } } } ] ], [ - 15110, + 14723, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 15179, - [ - { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -5 - }, - "b": { - "Deref": { - "register": "FP", - "offset": -3 - } - } + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 } }, - "rhs": { - "Immediate": "0x100000000" + "scalar": { + "Immediate": "0x7000000000000110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 15194, + 14733, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 0 + "offset": -2 } }, - "rhs": { - "Immediate": "0x100000000" + "scalar": { + "Immediate": "0x1000000000000000000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 } } } ] ], [ - 15213, + 14759, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15232, + 14780, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15242, + 14802, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -32040,33 +29704,29 @@ ] ], [ - 15244, + 14824, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 + "Immediate": "0x100000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 4 + "offset": -1 } } } ] ], [ - 15281, + 14835, [ { "TestLessThan": { @@ -32088,7 +29748,7 @@ ] ], [ - 15300, + 14864, [ { "AllocSegment": { @@ -32101,80 +29761,100 @@ ] ], [ - 15311, + 14889, [ { - "DivMod": { + "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } - }, - "rhs": { "Deref": { "register": "AP", "offset": -1 } }, - "quotient": { - "register": "AP", - "offset": 5 + "rhs": { + "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 6 + "offset": 4 } } } ] ], [ - 15317, + 14893, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 0 + "offset": 3 } }, - "rhs": { - "Immediate": "0x10000000000000000" + "scalar": { + "Immediate": "0x7000000000000110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": -3 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 15331, + 14903, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 0 + "offset": -2 } }, - "rhs": { - "Immediate": "0x100000000" + "scalar": { + "Immediate": "0x1000000000000000000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14926, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 15345, + 14971, [ { "TestLessThan": { @@ -32196,7 +29876,7 @@ ] ], [ - 15356, + 14982, [ { "TestLessThan": { @@ -32218,7 +29898,7 @@ ] ], [ - 15385, + 15011, [ { "AllocSegment": { @@ -32231,78 +29911,77 @@ ] ], [ - 15410, + 15034, [ { "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -5 + }, + "b": { + "Deref": { + "register": "FP", + "offset": -3 + } + } } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x100000000" }, "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 15414, + 15058, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x7000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -2 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 15102, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15424, + 15129, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x8de" + }, + "rhs": { "Deref": { - "register": "AP", - "offset": -2 + "register": "FP", + "offset": -7 } }, - "scalar": { - "Immediate": "0x1000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "dst": { "register": "AP", "offset": 0 } @@ -32311,7 +29990,7 @@ ] ], [ - 15444, + 15181, [ { "AllocSegment": { @@ -32324,10 +30003,25 @@ ] ], [ - 15465, + 15238, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -32337,27 +30031,43 @@ ] ], [ - 15486, + 15242, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 15506, + 15284, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -1 } }, "rhs": { @@ -32372,14 +30082,14 @@ ] ], [ - 15508, + 15286, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -2 } }, "rhs": { @@ -32398,27 +30108,14 @@ ] ], [ - 15552, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 15563, + 15373, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -16 + "register": "FP", + "offset": -4 } }, "rhs": { @@ -32440,7 +30137,7 @@ ] ], [ - 15569, + 15379, [ { "TestLessThan": { @@ -32462,73 +30159,80 @@ ] ], [ - 15583, + 15390, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -2 } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15601, + 15400, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -3 } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15614, + 15414, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 0 + "register": "FP", + "offset": -3 } }, "rhs": { - "Immediate": "0x100000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 5 + }, + "remainder": { + "register": "AP", + "offset": 6 } } } ] ], [ - 15625, + 15420, [ { "TestLessThan": { @@ -32539,102 +30243,53 @@ } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 15654, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "offset": -3 } } } ] ], [ - 15679, + 15434, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -4 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 15683, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x7000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15693, + 15444, [ { - "LinearSplit": { - "value": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -5 } }, - "scalar": { - "Immediate": "0x1000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 + "rhs": { + "Immediate": "0x10000000000000000" }, - "y": { + "dst": { "register": "AP", "offset": 0 } @@ -32643,7 +30298,7 @@ ] ], [ - 15713, + 15466, [ { "AllocSegment": { @@ -32656,7 +30311,7 @@ ] ], [ - 15734, + 15480, [ { "AllocSegment": { @@ -32669,7 +30324,7 @@ ] ], [ - 15755, + 15498, [ { "AllocSegment": { @@ -32682,19 +30337,10 @@ ] ], [ - 15784, + 15512, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -32704,33 +30350,29 @@ ] ], [ - 15786, + 15528, [ { - "DivMod": { + "TestLessThanOrEqual": { "lhs": { + "Immediate": "0x8c0" + }, + "rhs": { "Deref": { "register": "FP", - "offset": -4 + "offset": -6 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 15823, + 15555, [ { "TestLessThan": { @@ -32752,1755 +30394,421 @@ ] ], [ - 15834, + 15572, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15845, + 15597, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 15874, + 15857, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -10 + } } } } ] ], [ - 15899, + 15883, [ { - "TestLessThan": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -1 + "offset": -6 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": 4 } } } ] ], [ - 15903, + 15897, [ { - "LinearSplit": { - "value": { + "U256InvModN": { + "b0": { "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x7000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 15913, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x1000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 15939, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 15960, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 15982, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16004, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16015, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16044, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16069, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 16073, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x7000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16083, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x1000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16106, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16151, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16162, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16191, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16214, - [ - { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -5 - }, - "b": { - "Deref": { - "register": "FP", - "offset": -3 - } - } - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16238, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16282, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16309, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x8de" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16361, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16418, - [ - { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16422, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 16464, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16466, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 - } - } - } - ] - ], - [ - 16553, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "quotient": { - "register": "AP", - "offset": 5 - }, - "remainder": { - "register": "AP", - "offset": 6 - } - } - } - ] - ], - [ - 16559, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": -3 - } - } - } - ] - ], - [ - 16570, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16580, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16594, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -3 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "quotient": { - "register": "AP", - "offset": 5 - }, - "remainder": { - "register": "AP", - "offset": 6 - } - } - } - ] - ], - [ - 16600, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": -3 - } - } - } - ] - ], - [ - 16614, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16624, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -5 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16646, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16660, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16678, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16692, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16708, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x8c0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16735, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16752, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16777, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 17037, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -10 - } - } - } - } - ] - ], - [ - 17063, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -6 - } - } - } - } - ] - ], - [ - 17077, - [ - { - "U256InvModN": { - "b0": { - "Deref": { - "register": "FP", - "offset": -7 + "register": "FP", + "offset": -7 } }, "b1": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "n0": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "n1": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "g0_or_no_inv": { - "register": "AP", - "offset": 0 - }, - "g1_option": { - "register": "AP", - "offset": 1 - }, - "s_or_r0": { - "register": "AP", - "offset": 2 - }, - "s_or_r1": { - "register": "AP", - "offset": 3 - }, - "t_or_k0": { - "register": "AP", - "offset": 4 - }, - "t_or_k1": { - "register": "AP", - "offset": 5 - } - } - } - ] - ], - [ - 17095, - [ - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -22 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "high": { - "register": "AP", - "offset": -14 - }, - "low": { - "register": "AP", - "offset": -15 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -22 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "high": { - "register": "AP", - "offset": -12 - }, - "low": { - "register": "AP", - "offset": -13 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "high": { - "register": "AP", - "offset": -10 - }, - "low": { - "register": "AP", - "offset": -11 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "high": { - "register": "AP", - "offset": -8 - }, - "low": { - "register": "AP", - "offset": -9 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -26 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } - }, - "high": { - "register": "AP", - "offset": -6 - }, - "low": { - "register": "AP", - "offset": -7 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -26 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "high": { - "register": "AP", - "offset": -4 - }, - "low": { - "register": "AP", - "offset": -5 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -25 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } - }, - "high": { - "register": "AP", - "offset": -2 - }, - "low": { - "register": "AP", - "offset": -3 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -25 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "high": { - "register": "AP", - "offset": 0 - }, - "low": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 17148, - [ - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -5 - } - }, - "high": { - "register": "AP", - "offset": 0 - }, - "low": { - "register": "FP", - "offset": -7 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "high": { - "register": "AP", - "offset": 1 - }, - "low": { - "register": "AP", - "offset": -9 - } - } - } - ] - ], - [ - 17152, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -10 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 2 - } - } - } - ] - ], - [ - 17166, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -11 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 17179, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -47 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 17189, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 17200, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 2 + "Deref": { + "register": "FP", + "offset": -6 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -35 - } - } - } - ] - ], - [ - 17209, - [ - { - "DivMod": { - "lhs": { + "n0": { "Deref": { "register": "AP", - "offset": -62 + "offset": -2 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 17219, - [ - { - "DivMod": { - "lhs": { + "n1": { "Deref": { "register": "AP", "offset": -1 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { + "g0_or_no_inv": { "register": "AP", "offset": 0 }, - "remainder": { + "g1_option": { "register": "AP", "offset": 1 - } - } - } - ] - ], - [ - 17230, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 2 - } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "s_or_r0": { + "register": "AP", + "offset": 2 }, - "quotient": { + "s_or_r1": { "register": "AP", - "offset": -1 + "offset": 3 }, - "remainder": { + "t_or_k0": { "register": "AP", - "offset": -52 + "offset": 4 + }, + "t_or_k1": { + "register": "AP", + "offset": 5 } } } ] ], [ - 17239, + 15915, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -78 + "offset": -22 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -7 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -14 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -15 } } - } - ] - ], - [ - 17249, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -22 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -6 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 0 + "offset": -12 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -13 } } - } - ] - ], - [ - 17260, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -21 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -7 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": -10 }, - "remainder": { + "low": { "register": "AP", - "offset": -69 + "offset": -11 } } - } - ] - ], - [ - 17269, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -93 + "offset": -21 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -6 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -8 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -9 } } - } - ] - ], - [ - 17279, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -26 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -20 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 0 + "offset": -6 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -7 } } - } - ] - ], - [ - 17290, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -26 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -19 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": -4 }, - "remainder": { + "low": { "register": "AP", - "offset": -86 + "offset": -5 } } - } - ] - ], - [ - 17299, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -25 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -20 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -2 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -3 } } - } - ] - ], - [ - 17309, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -25 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -19 + } }, - "quotient": { + "high": { "register": "AP", "offset": 0 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 17320, + 15968, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -7 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -5 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": 0 }, - "remainder": { - "register": "AP", - "offset": -103 + "low": { + "register": "FP", + "offset": -7 } } - } - ] - ], - [ - 17329, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -118 + "offset": -7 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -3 + } }, - "quotient": { + "high": { "register": "AP", "offset": 1 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -9 } } } ] ], [ - 17339, + 15972, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -10 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": 2 } } } ] ], [ - 17350, + 15986, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -11 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 + "Immediate": "0x10000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": -120 + "offset": 0 } } } ] ], [ - 17359, + 15999, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -134 + "offset": -47 } }, "rhs": { @@ -34519,7 +30827,7 @@ ] ], [ - 17369, + 16009, [ { "DivMod": { @@ -34545,7 +30853,7 @@ ] ], [ - 17380, + 16020, [ { "DivMod": { @@ -34564,21 +30872,21 @@ }, "remainder": { "register": "AP", - "offset": -137 + "offset": -35 } } } ] ], [ - 17389, + 16029, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -149 + "offset": -62 } }, "rhs": { @@ -34597,7 +30905,7 @@ ] ], [ - 17399, + 16039, [ { "DivMod": { @@ -34623,7 +30931,7 @@ ] ], [ - 17410, + 16050, [ { "DivMod": { @@ -34642,224 +30950,57 @@ }, "remainder": { "register": "AP", - "offset": -154 - } - } - } - ] - ], - [ - 17431, - [ - { - "Uint512DivModByUint256": { - "dividend0": { - "Deref": { - "register": "AP", - "offset": -6 - } - }, - "dividend1": { - "Deref": { - "register": "AP", - "offset": -5 - } - }, - "dividend2": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "dividend3": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "divisor0": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "divisor1": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "quotient0": { - "register": "AP", - "offset": 0 - }, - "quotient1": { - "register": "AP", - "offset": 1 - }, - "quotient2": { - "register": "AP", - "offset": 2 - }, - "quotient3": { - "register": "AP", - "offset": 3 - }, - "remainder0": { - "register": "AP", - "offset": 4 - }, - "remainder1": { - "register": "AP", - "offset": 5 + "offset": -52 } } } ] ], [ - 17449, + 16059, [ { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "high": { - "register": "AP", - "offset": -9 - }, - "low": { - "register": "AP", - "offset": -10 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "high": { - "register": "AP", - "offset": -7 - }, - "low": { - "register": "AP", - "offset": -8 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -19 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } - }, - "high": { - "register": "AP", - "offset": -5 - }, - "low": { - "register": "AP", - "offset": -6 - } - } - }, - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -18 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } - }, - "high": { - "register": "AP", - "offset": -3 - }, - "low": { - "register": "AP", - "offset": -4 - } - } - }, - { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": -78 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -2 + "offset": 0 } } } ] ], [ - 17478, + 16069, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -35 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -38 - } + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { "register": "AP", "offset": 1 } @@ -34868,39 +31009,40 @@ ] ], [ - 17490, + 16080, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -35 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -40 - } + "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -69 } } } ] ], [ - 17505, + 16089, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -41 + "offset": -93 } }, "rhs": { @@ -34919,7 +31061,7 @@ ] ], [ - 17515, + 16099, [ { "DivMod": { @@ -34945,7 +31087,7 @@ ] ], [ - 17526, + 16110, [ { "DivMod": { @@ -34964,21 +31106,21 @@ }, "remainder": { "register": "AP", - "offset": -38 + "offset": -86 } } } ] ], [ - 17535, + 16119, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -57 + "offset": -103 } }, "rhs": { @@ -34997,7 +31139,7 @@ ] ], [ - 17545, + 16129, [ { "DivMod": { @@ -35023,7 +31165,7 @@ ] ], [ - 17556, + 16140, [ { "DivMod": { @@ -35042,21 +31184,21 @@ }, "remainder": { "register": "AP", - "offset": -55 + "offset": -103 } } } ] ], [ - 17565, + 16149, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -72 + "offset": -118 } }, "rhs": { @@ -35075,7 +31217,7 @@ ] ], [ - 17575, + 16159, [ { "DivMod": { @@ -35101,7 +31243,7 @@ ] ], [ - 17586, + 16170, [ { "DivMod": { @@ -35120,21 +31262,21 @@ }, "remainder": { "register": "AP", - "offset": -74 + "offset": -120 } } } ] ], [ - 17595, + 16179, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -88 + "offset": -134 } }, "rhs": { @@ -35153,7 +31295,7 @@ ] ], [ - 17605, + 16189, [ { "DivMod": { @@ -35179,7 +31321,7 @@ ] ], [ - 17616, + 16200, [ { "DivMod": { @@ -35198,21 +31340,21 @@ }, "remainder": { "register": "AP", - "offset": -87 + "offset": -137 } } } ] ], [ - 17625, + 16209, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -149 } }, "rhs": { @@ -35231,7 +31373,7 @@ ] ], [ - 17635, + 16219, [ { "DivMod": { @@ -35257,7 +31399,7 @@ ] ], [ - 17646, + 16230, [ { "DivMod": { @@ -35276,14 +31418,14 @@ }, "remainder": { "register": "AP", - "offset": -106 + "offset": -154 } } } ] ], [ - 17658, + 16254, [ { "TestLessThan": { @@ -35305,7 +31447,7 @@ ] ], [ - 17683, + 16279, [ { "TestLessThan": { @@ -35327,7 +31469,7 @@ ] ], [ - 17703, + 16299, [ { "TestLessThan": { @@ -35349,258 +31491,512 @@ ] ], [ - 17739, + 16344, [ { - "Uint512DivModByUint256": { - "dividend0": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -6 + "offset": -695 } - }, - "dividend1": { + } + } + } + ] + ], + [ + 16356, + [ + { + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -699 + }, + "b": { + "Immediate": "0x8" + } + } + } + } + } + ] + ], + [ + 16367, + [ + { + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -703 + }, + "b": { + "Immediate": "0x10" + } + } + } + } + } + ] + ], + [ + 16413, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 16429, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -5 + "offset": -669 } }, - "dividend2": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 16439, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -4 + "offset": -1 } }, - "dividend3": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 16450, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -3 + "offset": 2 } }, - "divisor0": { + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -683 + } + } + } + ] + ], + [ + 16459, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -684 } }, - "divisor1": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 16469, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", "offset": -1 } }, - "quotient0": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { "register": "AP", "offset": 0 }, - "quotient1": { + "remainder": { "register": "AP", "offset": 1 + } + } + } + ] + ], + [ + 16480, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } }, - "quotient2": { - "register": "AP", - "offset": 2 + "rhs": { + "Immediate": "0x100000000000000000000000000000000" }, - "quotient3": { + "quotient": { "register": "AP", - "offset": 3 + "offset": -1 }, - "remainder0": { + "remainder": { + "register": "FP", + "offset": -7 + } + } + } + ] + ], + [ + 16489, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 + } + } + } + ] + ], + [ + 16506, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 16563, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -4 + } + } + } + } + ] + ], + [ + 16570, + [ + { + "AllocConstantSize": { + "size": { + "Immediate": "0x4" }, - "remainder1": { + "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } } ] ], [ - 17757, + 16574, [ { - "WideMul128": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 16609, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": 1 + } + } + } + } + ] + ], + [ + 16682, + [ + { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -19 + "offset": -2 } }, "rhs": { "Deref": { "register": "AP", - "offset": -21 + "offset": -1 } }, - "high": { + "quotient": { "register": "AP", - "offset": -9 + "offset": 5 }, - "low": { + "remainder": { "register": "AP", - "offset": -10 + "offset": 6 } } - }, + } + ] + ], + [ + 16688, + [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": 0 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } - }, - "high": { - "register": "AP", - "offset": -7 + "Immediate": "0x10000000000000000" }, - "low": { + "dst": { "register": "AP", - "offset": -8 + "offset": -3 } } - }, + } + ] + ], + [ + 16755, + [ { "WideMul128": { "lhs": { "Deref": { - "register": "AP", - "offset": -19 + "register": "FP", + "offset": -8 } }, "rhs": { "Deref": { - "register": "AP", - "offset": -20 + "register": "FP", + "offset": -6 } }, "high": { "register": "AP", - "offset": -5 + "offset": 0 }, "low": { "register": "AP", - "offset": -6 + "offset": 1 } } - }, + } + ] + ], + [ + 16757, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -18 + "register": "FP", + "offset": -8 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -3 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -4 + "offset": 0 } } - }, + } + ] + ], + [ + 16767, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -21 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -2 + "offset": 1 } } } ] ], [ - 17786, + 16778, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -35 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -38 - } + "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 1 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -13 } } } ] ], [ - 17798, + 16787, [ { - "TestLessThan": { + "WideMul128": { "lhs": { "Deref": { - "register": "AP", - "offset": -35 + "register": "FP", + "offset": -8 } }, "rhs": { "Deref": { - "register": "AP", - "offset": -40 + "register": "FP", + "offset": -5 } }, - "dst": { + "high": { "register": "AP", "offset": 0 + }, + "low": { + "register": "AP", + "offset": 1 } } } ] ], [ - 17813, + 16789, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -41 + "register": "FP", + "offset": -8 } }, "rhs": { @@ -35619,7 +32015,7 @@ ] ], [ - 17823, + 16799, [ { "DivMod": { @@ -35645,40 +32041,91 @@ ] ], [ - 17834, + 16810, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -13 + } + } + } + ] + ], + [ + 16820, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 16842, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -7 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -6 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": 0 }, - "remainder": { + "low": { "register": "AP", - "offset": -38 + "offset": 1 } } } ] ], [ - 17843, + 16844, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -57 + "register": "FP", + "offset": -7 } }, "rhs": { @@ -35697,7 +32144,7 @@ ] ], [ - 17853, + 16854, [ { "DivMod": { @@ -35723,7 +32170,7 @@ ] ], [ - 17864, + 16865, [ { "DivMod": { @@ -35742,99 +32189,94 @@ }, "remainder": { "register": "AP", - "offset": -55 + "offset": -13 } } } ] ], [ - 17873, + 16875, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -72 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 17883, + 16898, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 17894, + 16920, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "FP", + "offset": -7 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -5 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": 0 }, - "remainder": { + "low": { "register": "AP", - "offset": -74 + "offset": 1 } } } ] ], [ - 17903, + 16922, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -88 + "register": "FP", + "offset": -7 } }, "rhs": { @@ -35853,7 +32295,7 @@ ] ], [ - 17913, + 16932, [ { "DivMod": { @@ -35879,7 +32321,7 @@ ] ], [ - 17924, + 16943, [ { "DivMod": { @@ -35898,364 +32340,379 @@ }, "remainder": { "register": "AP", - "offset": -87 + "offset": -13 } } } ] ], [ - 17933, + 16953, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 + "Immediate": "0x100000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 17943, + 16972, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Immediate": "0x100000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 17954, + 16995, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": 0 } }, "rhs": { "Immediate": "0x100000000000000000000000000000000" }, - "quotient": { + "dst": { "register": "AP", "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -106 } } } ] ], [ - 17974, + 17014, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": -668 + "offset": 0 } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 } } } ] ], [ - 17986, + 17033, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -672 - }, - "b": { - "Immediate": "0x8" - } + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 } } } ] ], [ - 17997, + 17056, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -676 - }, - "b": { - "Immediate": "0x10" - } + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 } - } - } - } - ] - ], - [ - 18043, - [ - { - "AllocSegment": { + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 18059, + 17078, [ { - "DivMod": { - "lhs": { + "Uint512DivModByUint256": { + "dividend0": { "Deref": { "register": "AP", - "offset": -642 + "offset": -4 } }, - "rhs": { - "Immediate": "0x10000000000000000" + "dividend1": { + "Deref": { + "register": "AP", + "offset": -3 + } }, - "quotient": { + "dividend2": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "dividend3": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "divisor0": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "divisor1": { + "Deref": { + "register": "FP", + "offset": -3 + } + }, + "quotient0": { + "register": "AP", + "offset": 0 + }, + "quotient1": { "register": "AP", "offset": 1 }, - "remainder": { + "quotient2": { "register": "AP", - "offset": 0 + "offset": 2 + }, + "quotient3": { + "register": "AP", + "offset": 3 + }, + "remainder0": { + "register": "AP", + "offset": 4 + }, + "remainder1": { + "register": "AP", + "offset": 5 } } } ] ], [ - 18069, + 17096, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -19 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -4 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 0 + "offset": -9 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -10 } } - } - ] - ], - [ - 18080, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -18 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -4 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": -7 }, - "remainder": { + "low": { "register": "AP", - "offset": -656 + "offset": -8 } } - } - ] - ], - [ - 18089, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -657 + "offset": -19 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -3 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -5 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -6 } } - } - ] - ], - [ - 18099, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -18 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -3 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 0 + "offset": -3 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -4 } } - } - ] - ], - [ - 18110, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -17 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -4 + } }, - "quotient": { + "high": { "register": "AP", "offset": -1 }, - "remainder": { - "register": "FP", - "offset": -7 - } - } - } - ] - ], - [ - 18119, - [ - { - "AllocSegment": { - "dst": { + "low": { "register": "AP", - "offset": 0 + "offset": -2 } } } ] ], [ - 18136, + 17125, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -35 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -3 + } + }, "dst": { "register": "AP", - "offset": 0 + "offset": 1 } } } ] ], [ - 18193, + 17137, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -35 + } + }, + "rhs": { "Deref": { "register": "FP", "offset": -4 } - } - } - } - ] - ], - [ - 18200, - [ - { - "AllocConstantSize": { - "size": { - "Immediate": "0x4" }, "dst": { "register": "AP", @@ -36266,11 +32723,24 @@ ] ], [ - 18204, + 17152, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -41 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { "register": "AP", "offset": 0 } @@ -36279,93 +32749,102 @@ ] ], [ - 18239, + 17162, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -1 } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 18312, + 17173, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 5 + "offset": -1 }, "remainder": { "register": "AP", - "offset": 6 + "offset": -38 } } } ] ], [ - 18318, + 17182, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -57 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -3 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 18385, + 17192, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -1 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", "offset": 0 }, - "low": { + "remainder": { "register": "AP", "offset": 1 } @@ -36374,40 +32853,40 @@ ] ], [ - 18387, + 17203, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": 2 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 1 + "offset": -1 }, "remainder": { "register": "AP", - "offset": 0 + "offset": -55 } } } ] ], [ - 18397, + 17212, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -72 } }, "rhs": { @@ -36415,80 +32894,77 @@ }, "quotient": { "register": "AP", - "offset": 0 + "offset": 1 }, "remainder": { "register": "AP", - "offset": 1 + "offset": 0 } } } ] ], [ - 18408, + 17222, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "quotient": { "register": "AP", - "offset": -1 + "offset": 0 }, "remainder": { "register": "AP", - "offset": -13 + "offset": 1 } } } ] ], [ - 18417, + 17233, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -3 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": 1 + "offset": -74 } } } ] ], [ - 18419, + 17242, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -88 } }, "rhs": { @@ -36507,7 +32983,7 @@ ] ], [ - 18429, + 17252, [ { "DivMod": { @@ -36533,7 +33009,7 @@ ] ], [ - 18440, + 17263, [ { "DivMod": { @@ -36552,223 +33028,21 @@ }, "remainder": { "register": "AP", - "offset": -13 - } - } - } - ] - ], - [ - 18450, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 18472, - [ - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -5 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "high": { - "register": "AP", - "offset": 0 - }, - "low": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 18474, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -5 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 18484, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 + "offset": -87 } } } ] ], [ - 18495, + 17272, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -13 - } - } - } - ] - ], - [ - 18505, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 18528, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 18550, - [ - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -5 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -3 - } - }, - "high": { - "register": "AP", - "offset": 0 - }, - "low": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 18552, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -5 + "offset": -103 } }, "rhs": { @@ -36787,7 +33061,7 @@ ] ], [ - 18562, + 17282, [ { "DivMod": { @@ -36813,7 +33087,7 @@ ] ], [ - 18573, + 17293, [ { "DivMod": { @@ -36832,80 +33106,14 @@ }, "remainder": { "register": "AP", - "offset": -13 - } - } - } - ] - ], - [ - 18583, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 18607, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 18632, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 + "offset": -106 } } } ] ], [ - 18656, + 17307, [ { "TestLessThan": { @@ -36927,7 +33135,7 @@ ] ], [ - 18774, + 17425, [ { "AllocSegment": { @@ -36940,7 +33148,7 @@ ] ], [ - 18797, + 17448, [ { "TestLessThanOrEqual": { @@ -36965,7 +33173,7 @@ ] ], [ - 18872, + 17523, [ { "AllocSegment": { @@ -36978,7 +33186,7 @@ ] ], [ - 18927, + 17578, [ { "DivMod": { @@ -37007,7 +33215,7 @@ ] ], [ - 18933, + 17584, [ { "TestLessThan": { @@ -37029,7 +33237,7 @@ ] ], [ - 18946, + 17597, [ { "TestLessThan": { @@ -37051,7 +33259,7 @@ ] ], [ - 18956, + 17607, [ { "TestLessThan": { @@ -37073,7 +33281,7 @@ ] ], [ - 19004, + 17655, [ { "DivMod": { @@ -37102,7 +33310,7 @@ ] ], [ - 19010, + 17661, [ { "TestLessThan": { @@ -37124,7 +33332,7 @@ ] ], [ - 19026, + 17677, [ { "TestLessThan": { @@ -37146,7 +33354,7 @@ ] ], [ - 19036, + 17687, [ { "TestLessThan": { @@ -37168,7 +33376,7 @@ ] ], [ - 19059, + 17710, [ { "AllocSegment": { @@ -37181,7 +33389,7 @@ ] ], [ - 19073, + 17724, [ { "AllocSegment": { @@ -37194,7 +33402,7 @@ ] ], [ - 19092, + 17743, [ { "AllocSegment": { @@ -37207,7 +33415,7 @@ ] ], [ - 19106, + 17757, [ { "AllocSegment": { @@ -37224,14 +33432,14 @@ "EXTERNAL": [ { "selector": "0x1143aa89c8e3ebf8ed14df2a3606c1cd2dd513fac8040b0f8ab441f5c52fe4", - "offset": 4442, + "offset": 3981, "builtins": [ "range_check" ] }, { "selector": "0x3541591104188daef4379e06e92ecce09094a3b381da2e654eb041d00566d8", - "offset": 5972, + "offset": 5511, "builtins": [ "range_check", "range_check96" @@ -37239,35 +33447,35 @@ }, { "selector": "0x3c118a68e16e12e97ed25cb4901c12f4d3162818669cc44c391d8049924c14", - "offset": 1687, + "offset": 1226, "builtins": [ "range_check" ] }, { "selector": "0x5562b3e932b4d139366854d5a2e578382e6a3b6572ac9943d55e7efbe43d00", - "offset": 3844, + "offset": 3383, "builtins": [ "range_check" ] }, { "selector": "0x600c98a299d72ef1e09a2e1503206fbc76081233172c65f7e2438ef0069d8d", - "offset": 4581, + "offset": 4120, "builtins": [ "range_check" ] }, { "selector": "0x62c83572d28cb834a3de3c1e94977a4191469a4a8c26d1d7bc55305e640ed5", - "offset": 4025, + "offset": 3564, "builtins": [ "range_check" ] }, { "selector": "0x679c22735055a10db4f275395763a3752a1e3a3043c192299ab6b574fba8d6", - "offset": 5427, + "offset": 4966, "builtins": [ "range_check", "ec_op" @@ -37275,7 +33483,7 @@ }, { "selector": "0x7772be8b80a8a33dc6c1f9a6ab820c02e537c73e859de67f288c70f92571bb", - "offset": 5072, + "offset": 4611, "builtins": [ "pedersen", "range_check", @@ -37291,21 +33499,21 @@ }, { "selector": "0xe7510edcf6e9f1b70f7bd1f488767b50f0363422f3c563160ab77adf62467b", - "offset": 2568, + "offset": 2107, "builtins": [ "range_check" ] }, { "selector": "0xf818e4530ec36b83dfe702489b4df537308c3b798b0cc120e32c2056d68b7d", - "offset": 3419, + "offset": 2958, "builtins": [ "range_check" ] }, { "selector": "0x10d2fede95e3ec06a875a67219425c27c5bd734d57f1b221d729a2337b6b556", - "offset": 2967, + "offset": 2506, "builtins": [ "range_check", "segment_arena" @@ -37313,43 +33521,36 @@ }, { "selector": "0x12ead94ae9d3f9d2bdb6b847cf255f1f398193a1f88884a0ae8e18f24a037b6", - "offset": 5688, + "offset": 5227, "builtins": [ "range_check" ] }, { "selector": "0x14dae1999ae9ab799bc72def6dc6e90890cf8ac0d64525021b7e71d05cb13e8", - "offset": 1173, + "offset": 712, "builtins": [ "range_check" ] }, { "selector": "0x169f135eddda5ab51886052d777a57f2ea9c162d713691b5e04a6d4ed71d47f", - "offset": 3078, + "offset": 2617, "builtins": [ "range_check" ] }, { "selector": "0x1ae1a515cf2d214b29bdf63a79ee2d490efd4dd1acc99d383a8e549c3cecb5d", - "offset": 5538, + "offset": 5077, "builtins": [ "pedersen", "range_check" ] }, - { - "selector": "0x1e4089d1f1349077b1970f9937c904e27c4582b49a60b6078946dba95bc3c08", - "offset": 1002, - "builtins": [ - "range_check" - ] - }, { "selector": "0x23039bef544cff56442d9f61ae9b13cf9e36fcce009102c5b678aac93f37b36", - "offset": 1509, + "offset": 1048, "builtins": [ "range_check" ] @@ -37363,28 +33564,21 @@ }, { "selector": "0x2d7cf5d5a324a320f9f37804b1615a533fde487400b41af80f13f7ac5581325", - "offset": 2742, + "offset": 2281, "builtins": [ "range_check" ] }, { "selector": "0x30f842021fbf02caf80d09a113997c1e00a32870eee0c6136bed27acb348bea", - "offset": 5220, - "builtins": [ - "range_check" - ] - }, - { - "selector": "0x31401f504973a5e8e1bb41e9c592519e3aa0b8cf6bbfb9c91b532aab8db54b0", - "offset": 712, + "offset": 4759, "builtins": [ "range_check" ] }, { "selector": "0x317eb442b72a9fae758d4fb26830ed0d9f31c8e7da4dbff4e8c59ea6a158e7f", - "offset": 4848, + "offset": 4387, "builtins": [ "pedersen", "range_check" @@ -37392,28 +33586,28 @@ }, { "selector": "0x32564d7e0fe091d49b4c20f4632191e4ed6986bf993849879abfef9465def25", - "offset": 4210, + "offset": 3749, "builtins": [ "range_check" ] }, { "selector": "0x3604cea1cdb094a73a31144f14a3e5861613c008e1e879939ebc4827d10cd50", - "offset": 1976, + "offset": 1515, "builtins": [ "range_check" ] }, { "selector": "0x382be990ca34815134e64a9ac28f41a907c62e5ad10547f97174362ab94dc89", - "offset": 3523, + "offset": 3062, "builtins": [ "range_check" ] }, { "selector": "0x38be5d5f7bf135b52888ba3e440a457d11107aca3f6542e574b016bf3f074d8", - "offset": 3627, + "offset": 3166, "builtins": [ "range_check", "bitwise" @@ -37421,7 +33615,7 @@ }, { "selector": "0x3a6a8bae4c51d5959683ae246347ffdd96aa5b2bfa68cc8c3a6a7c2ed0be331", - "offset": 2267, + "offset": 1806, "builtins": [ "range_check" ] @@ -37435,7 +33629,7 @@ }, { "selector": "0x3d3da80997f8be5d16e9ae7ee6a4b5f7191d60765a1a6c219ab74269c85cf97", - "offset": 5844, + "offset": 5383, "builtins": [ "range_check", "range_check96", @@ -37445,14 +33639,14 @@ }, { "selector": "0x3d95049b565ec2d4197a55108ef03996381d31c84acf392a0a42b28163d69d1", - "offset": 3740, + "offset": 3279, "builtins": [ "range_check" ] }, { "selector": "0x3eb640b15f75fcc06d43182cdb94ed38c8e71755d5fb57c16dd673b466db1d4", - "offset": 4303, + "offset": 3842, "builtins": [ "range_check" ] @@ -37461,14 +33655,14 @@ "L1_HANDLER": [ { "selector": "0x205500a208d0d49d79197fea83cc3f5fde99ac2e1909ae0a5d9f394c0c52ed0", - "offset": 6256, + "offset": 5795, "builtins": [ "range_check" ] }, { "selector": "0x39edbbb129ad752107a94d40c3873cae369a46fd2fc578d075679aa67e85d12", - "offset": 6095, + "offset": 5634, "builtins": [ "range_check" ] @@ -37477,7 +33671,7 @@ "CONSTRUCTOR": [ { "selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194", - "offset": 6506, + "offset": 6045, "builtins": [ "range_check" ] From 91262c2ae40bba0e566c39d2e268d665e667469f Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Wed, 18 Sep 2024 15:03:43 +0300 Subject: [PATCH 05/21] refactor: make `verify_constructor` be part of `CallEntryPoint` --- crates/blockifier/src/execution/entry_point.rs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/blockifier/src/execution/entry_point.rs b/crates/blockifier/src/execution/entry_point.rs index ef5a56356f..18ee0fef04 100644 --- a/crates/blockifier/src/execution/entry_point.rs +++ b/crates/blockifier/src/execution/entry_point.rs @@ -20,9 +20,7 @@ use crate::execution::call_info::CallInfo; use crate::execution::common_hints::ExecutionMode; use crate::execution::contract_class::TrackedResource; use crate::execution::errors::{ - ConstructorEntryPointExecutionError, - EntryPointExecutionError, - PreExecutionError, + ConstructorEntryPointExecutionError, EntryPointExecutionError, PreExecutionError, }; use crate::execution::execution_utils::execute_entry_point_call_wrapper; use crate::state::state_api::{State, StateResult}; @@ -174,6 +172,7 @@ impl CallEntryPoint { execution_result } + pub fn verify_constructor(&self) -> Result<(), PreExecutionError> { if self.entry_point_type == EntryPointType::Constructor && self.entry_point_selector != selector_from_name(CONSTRUCTOR_ENTRY_POINT_NAME) From e4c052ef91f42249f8dd68dcd489e84fa39333a4 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Wed, 2 Oct 2024 14:58:01 -0400 Subject: [PATCH 06/21] fix: compilation errors --- .../src/transaction/transactions.rs | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/crates/blockifier/src/transaction/transactions.rs b/crates/blockifier/src/transaction/transactions.rs index d20abdf981..5ef7e20d4a 100644 --- a/crates/blockifier/src/transaction/transactions.rs +++ b/crates/blockifier/src/transaction/transactions.rs @@ -4,15 +4,8 @@ use cairo_vm::vm::runners::cairo_runner::ExecutionResources; use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce}; use starknet_api::deprecated_contract_class::EntryPointType; use starknet_api::transaction::{ - AccountDeploymentData, - Calldata, - ContractAddressSalt, - DeclareTransactionV2, - DeclareTransactionV3, - Fee, - TransactionHash, - TransactionSignature, - TransactionVersion, + AccountDeploymentData, Calldata, ContractAddressSalt, DeclareTransactionV2, + DeclareTransactionV3, Fee, TransactionHash, TransactionSignature, TransactionVersion, }; use crate::abi::abi_utils::selector_from_name; @@ -20,10 +13,7 @@ use crate::context::{BlockContext, TransactionContext}; use crate::execution::call_info::CallInfo; use crate::execution::contract_class::{ClassInfo, ContractClass}; use crate::execution::entry_point::{ - CallEntryPoint, - CallType, - ConstructorContext, - EntryPointExecutionContext, + CallEntryPoint, CallType, ConstructorContext, EntryPointExecutionContext, }; use crate::execution::execution_utils::{execute_deployment, update_remaining_gas}; use crate::state::cached_state::TransactionalState; @@ -32,14 +22,8 @@ use crate::state::state_api::{State, UpdatableState}; use crate::transaction::constants; use crate::transaction::errors::TransactionExecutionError; use crate::transaction::objects::{ - CommonAccountFields, - CurrentTransactionInfo, - DeprecatedTransactionInfo, - HasRelatedFeeType, - TransactionExecutionInfo, - TransactionExecutionResult, - TransactionInfo, - TransactionInfoCreator, + CommonAccountFields, CurrentTransactionInfo, DeprecatedTransactionInfo, HasRelatedFeeType, + TransactionExecutionInfo, TransactionExecutionResult, TransactionInfo, TransactionInfoCreator, }; #[cfg(test)] #[path = "transactions_test.rs"] From 03985cee61bbc6b119d24b8743f63232627625f3 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Wed, 2 Oct 2024 15:17:26 -0400 Subject: [PATCH 07/21] chore: fmt --- .../syscalls/syscall_tests/get_block_hash.rs | 5 +++- .../syscall_tests/get_execution_info.rs | 29 +++++++++++++++---- .../syscalls/syscall_tests/library_call.rs | 8 +++-- .../src/transaction/transactions.rs | 26 +++++++++++++---- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs index 10d4c4fee3..64acd45360 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_block_hash.rs @@ -18,7 +18,10 @@ use crate::test_utils::contracts::FeatureContract; use crate::test_utils::dict_state_reader::DictStateReader; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - trivial_external_entry_point_new, CairoVersion, BALANCE, CURRENT_BLOCK_NUMBER, + trivial_external_entry_point_new, + CairoVersion, + BALANCE, + CURRENT_BLOCK_NUMBER, }; use crate::{check_entry_point_execution_error_for_custom_hint, retdata}; diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs index 2fbd47eb2b..51ef403aa8 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/get_execution_info.rs @@ -3,8 +3,17 @@ use num_traits::Pow; use starknet_api::core::ChainId; use starknet_api::data_availability::DataAvailabilityMode; use starknet_api::transaction::{ - AccountDeploymentData, Calldata, Fee, PaymasterData, Resource, ResourceBounds, Tip, - TransactionHash, TransactionVersion, ValidResourceBounds, QUERY_VERSION_BASE_BIT, + AccountDeploymentData, + Calldata, + Fee, + PaymasterData, + Resource, + ResourceBounds, + Tip, + TransactionHash, + TransactionVersion, + ValidResourceBounds, + QUERY_VERSION_BASE_BIT, }; use starknet_api::{felt, nonce}; use starknet_types_core::felt::Felt; @@ -17,12 +26,20 @@ use crate::execution::entry_point::CallEntryPoint; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - trivial_external_entry_point_with_address, CairoVersion, BALANCE, CURRENT_BLOCK_NUMBER, - CURRENT_BLOCK_NUMBER_FOR_VALIDATE, CURRENT_BLOCK_TIMESTAMP, - CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE, TEST_SEQUENCER_ADDRESS, + trivial_external_entry_point_with_address, + CairoVersion, + BALANCE, + CURRENT_BLOCK_NUMBER, + CURRENT_BLOCK_NUMBER_FOR_VALIDATE, + CURRENT_BLOCK_TIMESTAMP, + CURRENT_BLOCK_TIMESTAMP_FOR_VALIDATE, + TEST_SEQUENCER_ADDRESS, }; use crate::transaction::objects::{ - CommonAccountFields, CurrentTransactionInfo, DeprecatedTransactionInfo, TransactionInfo, + CommonAccountFields, + CurrentTransactionInfo, + DeprecatedTransactionInfo, + TransactionInfo, }; #[test_case( diff --git a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs index 9a3a103d2d..b5eb86a10a 100644 --- a/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs +++ b/crates/blockifier/src/execution/syscalls/syscall_tests/library_call.rs @@ -15,14 +15,18 @@ use crate::execution::call_info::{CallExecution, CallInfo, Retdata}; use crate::execution::entry_point::{CallEntryPoint, CallType}; use crate::execution::execution_utils::format_panic_data; use crate::execution::syscalls::syscall_tests::constants::{ - REQUIRED_GAS_LIBRARY_CALL_TEST, REQUIRED_GAS_STORAGE_READ_WRITE_TEST, + REQUIRED_GAS_LIBRARY_CALL_TEST, + REQUIRED_GAS_STORAGE_READ_WRITE_TEST, }; use crate::execution::syscalls::SyscallSelector; use crate::retdata; use crate::test_utils::contracts::FeatureContract; use crate::test_utils::initial_test_state::test_state; use crate::test_utils::{ - get_syscall_resources, trivial_external_entry_point_new, CairoVersion, BALANCE, + get_syscall_resources, + trivial_external_entry_point_new, + CairoVersion, + BALANCE, }; use crate::versioned_constants::VersionedConstants; diff --git a/crates/blockifier/src/transaction/transactions.rs b/crates/blockifier/src/transaction/transactions.rs index 5ef7e20d4a..d20abdf981 100644 --- a/crates/blockifier/src/transaction/transactions.rs +++ b/crates/blockifier/src/transaction/transactions.rs @@ -4,8 +4,15 @@ use cairo_vm::vm::runners::cairo_runner::ExecutionResources; use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce}; use starknet_api::deprecated_contract_class::EntryPointType; use starknet_api::transaction::{ - AccountDeploymentData, Calldata, ContractAddressSalt, DeclareTransactionV2, - DeclareTransactionV3, Fee, TransactionHash, TransactionSignature, TransactionVersion, + AccountDeploymentData, + Calldata, + ContractAddressSalt, + DeclareTransactionV2, + DeclareTransactionV3, + Fee, + TransactionHash, + TransactionSignature, + TransactionVersion, }; use crate::abi::abi_utils::selector_from_name; @@ -13,7 +20,10 @@ use crate::context::{BlockContext, TransactionContext}; use crate::execution::call_info::CallInfo; use crate::execution::contract_class::{ClassInfo, ContractClass}; use crate::execution::entry_point::{ - CallEntryPoint, CallType, ConstructorContext, EntryPointExecutionContext, + CallEntryPoint, + CallType, + ConstructorContext, + EntryPointExecutionContext, }; use crate::execution::execution_utils::{execute_deployment, update_remaining_gas}; use crate::state::cached_state::TransactionalState; @@ -22,8 +32,14 @@ use crate::state::state_api::{State, UpdatableState}; use crate::transaction::constants; use crate::transaction::errors::TransactionExecutionError; use crate::transaction::objects::{ - CommonAccountFields, CurrentTransactionInfo, DeprecatedTransactionInfo, HasRelatedFeeType, - TransactionExecutionInfo, TransactionExecutionResult, TransactionInfo, TransactionInfoCreator, + CommonAccountFields, + CurrentTransactionInfo, + DeprecatedTransactionInfo, + HasRelatedFeeType, + TransactionExecutionInfo, + TransactionExecutionResult, + TransactionInfo, + TransactionInfoCreator, }; #[cfg(test)] #[path = "transactions_test.rs"] From 29b030d285c91907984c2a43247348f1f24e76e6 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 11:07:49 -0400 Subject: [PATCH 08/21] chore: swap string delimeters in .ymls --- .../workflows/blockifier_compiled_cairo.yml | 22 ++++++------ .github/workflows/papyrus_ci.yml | 36 +++++++++---------- .github/workflows/papyrus_docker-publish.yml | 12 +++---- .github/workflows/papyrus_nightly-tests.yml | 4 +-- .github/workflows/verify-deps.yml | 2 +- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index 3e50259a10..de045e77a4 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -7,12 +7,12 @@ on: - reopened - synchronize paths: - - ".github/workflows/blockifier_compiled_cairo.yml" - - "crates/blockifier/feature_contracts/**" - - "crates/blockifier/src/test_utils/cairo_compile.rs" - - "crates/blockifier/tests/feature_contracts_compatibility_test.rs" - - "crates/blockifier/tests/requirements.txt" - - "scripts/dependencies.sh" + - '.github/workflows/blockifier_compiled_cairo.yml' + - 'crates/blockifier/feature_contracts/**' + - 'crates/blockifier/src/test_utils/cairo_compile.rs' + - 'crates/blockifier/tests/feature_contracts_compatibility_test.rs' + - 'crates/blockifier/tests/requirements.txt' + - 'scripts/dependencies.sh' # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-python@v5 id: setup-pypy with: - python-version: "pypy3.9" + python-version: 'pypy3.9' - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9 - env: LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin @@ -40,16 +40,16 @@ jobs: - name: checkout sequencer into `sequencer` directory. uses: actions/checkout@v4 with: - repository: "starkware-libs/sequencer" - path: "sequencer" + repository: 'starkware-libs/sequencer' + path: 'sequencer' - name: checkout cairo1 repo in order to compile cairo1 contracts. uses: actions/checkout@v4 with: - repository: "starkware-libs/cairo" + repository: 'starkware-libs/cairo' fetch-depth: 0 fetch-tags: true - path: "cairo" + path: 'cairo' - name: install toolchain for legacy contract compilation (old compiler tag) uses: actions-rs/toolchain@master diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index c9c01b3a37..b93df49923 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -4,15 +4,15 @@ on: push: branches: [main] paths: - - ".github/workflows/papyrus_ci.yml" - - "Dockerfile" - - "papyrus_utilities.Dockerfile" - - "Cargo.toml" - - "Cargo.lock" - - "crates/papyrus**/**" - - "crates/sequencing/**" - - "crates/starknet_client/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_ci.yml' + - 'Dockerfile' + - 'papyrus_utilities.Dockerfile' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/papyrus**/**' + - 'crates/sequencing/**' + - 'crates/starknet_client/**' + - 'scripts/dependencies.sh' pull_request: types: @@ -22,15 +22,15 @@ on: - auto_merge_enabled - edited # for when the PR title is edited paths: - - ".github/workflows/papyrus_ci.yml" - - "Dockerfile" - - "papyrus_utilities.Dockerfile" - - "Cargo.toml" - - "Cargo.lock" - - "crates/papyrus**/**" - - "crates/sequencing/**" - - "crates/starknet_client/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_ci.yml' + - 'Dockerfile' + - 'papyrus_utilities.Dockerfile' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/papyrus**/**' + - 'crates/sequencing/**' + - 'crates/starknet_client/**' + - 'scripts/dependencies.sh' merge_group: types: [checks_requested] diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 9640061afe..294bd71fb7 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -6,15 +6,15 @@ on: branches: [main] tags: ["v*.*.*"] paths: - - ".github/workflows/papyrus_docker-publish.yml" - - "crates/papyrus**/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_docker-publish.yml' + - 'crates/papyrus**/**' + - 'scripts/dependencies.sh' pull_request: paths: - - ".github/workflows/papyrus_docker-publish.yml" - - "crates/papyrus**/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_docker-publish.yml' + - 'crates/papyrus**/**' + - 'scripts/dependencies.sh' # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml index 03bb55fe1f..8f9d9ef0b0 100644 --- a/.github/workflows/papyrus_nightly-tests.yml +++ b/.github/workflows/papyrus_nightly-tests.yml @@ -2,8 +2,8 @@ name: Papyrus-Nightly-Tests # We run gateway_integration_test at different times, to avoid a nonce race between parallel runs. on: schedule: - - cron: "30 22 * * *" # Uses ubuntu runner. - - cron: "30 0 * * *" # Uses macos runner. + - cron: '30 22 * * *' # Uses ubuntu runner. + - cron: '30 0 * * *' # Uses macos runner. workflow_dispatch: # Uses ubuntu runner. jobs: diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index 0871886d0e..8582cb1b6b 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -2,7 +2,7 @@ name: Nightly Latest Dependencies Check on: schedule: - - cron: "0 0 * * *" # Runs at 00:00 UTC every day + - cron: '0 0 * * *' # Runs at 00:00 UTC every day jobs: latest_deps: From 2f6a4f4b23415ca88a2325b970d6d379180ee1d7 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 15:44:42 -0400 Subject: [PATCH 09/21] chore: restore blockifier_compiled_cairo.yml, blockifier_post-merge.yml and main.yml workflows --- .github/workflows/blockifier_compiled_cairo.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index de045e77a4..5703f3e3e1 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -57,6 +57,7 @@ jobs: toolchain: nightly-2023-07-05 - name: Verify cairo contract recompilation (both cairo versions). - run: cd sequencer && + run: + cd sequencer && pip install -r crates/blockifier/tests/requirements.txt && cargo test -p blockifier --test feature_contracts_compatibility_test --features testing -- --include-ignored From 252c66a55420607a4260552c2cfc5d74dc8b583b Mon Sep 17 00:00:00 2001 From: Bohdan Ohorodnii Date: Thu, 29 Aug 2024 16:17:46 +0300 Subject: [PATCH 10/21] fix: ci --- .github/workflows/blockifier_ci.yml | 2 +- .../workflows/blockifier_compiled_cairo.yml | 24 +- .github/workflows/clean_stale_prs.yml | 2 +- .github/workflows/lock_closed_prs.yml | 46 +- .github/workflows/merge_paths_ci.yml | 2 +- .github/workflows/papyrus/helm-install.yml | 2 +- .github/workflows/papyrus_benchmark.yaml | 2 +- .github/workflows/papyrus_ci.yml | 52 +- .github/workflows/papyrus_docker-publish.yml | 13 +- .github/workflows/verify-deps.yml | 4 +- Cargo.lock | 3606 ++++++----------- 11 files changed, 1279 insertions(+), 2476 deletions(-) diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml index 335a6cedbb..aac05489d9 100644 --- a/.github/workflows/blockifier_ci.yml +++ b/.github/workflows/blockifier_ci.yml @@ -41,7 +41,7 @@ concurrency: jobs: featureless-build: - runs-on: starkware-ubuntu-20-04-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index 5703f3e3e1..d7362ab489 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -7,12 +7,12 @@ on: - reopened - synchronize paths: - - '.github/workflows/blockifier_compiled_cairo.yml' - - 'crates/blockifier/feature_contracts/**' - - 'crates/blockifier/src/test_utils/cairo_compile.rs' - - 'crates/blockifier/tests/feature_contracts_compatibility_test.rs' - - 'crates/blockifier/tests/requirements.txt' - - 'scripts/dependencies.sh' + - ".github/workflows/blockifier_compiled_cairo.yml" + - "crates/blockifier/feature_contracts/**" + - "crates/blockifier/src/test_utils/cairo_compile.rs" + - "crates/blockifier/tests/feature_contracts_compatibility_test.rs" + - "crates/blockifier/tests/requirements.txt" + - "scripts/dependencies.sh" # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -21,7 +21,7 @@ concurrency: jobs: verify_cairo_file_dependencies: - runs-on: starkware-ubuntu-20-04-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-python@v5 id: setup-pypy with: - python-version: 'pypy3.9' + python-version: "pypy3.9" - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9 - env: LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin @@ -40,16 +40,16 @@ jobs: - name: checkout sequencer into `sequencer` directory. uses: actions/checkout@v4 with: - repository: 'starkware-libs/sequencer' - path: 'sequencer' + repository: "starkware-libs/sequencer" + path: "sequencer" - name: checkout cairo1 repo in order to compile cairo1 contracts. uses: actions/checkout@v4 with: - repository: 'starkware-libs/cairo' + repository: "starkware-libs/cairo" fetch-depth: 0 fetch-tags: true - path: 'cairo' + path: "cairo" - name: install toolchain for legacy contract compilation (old compiler tag) uses: actions-rs/toolchain@master diff --git a/.github/workflows/clean_stale_prs.yml b/.github/workflows/clean_stale_prs.yml index 1ccbe73ac8..a30494b701 100644 --- a/.github/workflows/clean_stale_prs.yml +++ b/.github/workflows/clean_stale_prs.yml @@ -9,7 +9,7 @@ on: jobs: stale: name: ๐Ÿงน Clean up stale issues and PRs - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 steps: - name: ๐Ÿš€ Run stale uses: actions/stale@v3 diff --git a/.github/workflows/lock_closed_prs.yml b/.github/workflows/lock_closed_prs.yml index 91b0175ffd..e49213b874 100644 --- a/.github/workflows/lock_closed_prs.yml +++ b/.github/workflows/lock_closed_prs.yml @@ -7,26 +7,26 @@ on: workflow_dispatch: jobs: - lock: - name: ๐Ÿ”’ Lock closed issues and PRs - runs-on: starkware-ubuntu-latest-small - steps: - - uses: dessant/lock-threads@v2.0.3 - with: - github-token: ${{ github.token }} - issue-lock-inactive-days: "30" - issue-lock-reason: "" - issue-comment: > - Issue closed and locked due to lack of activity. - - If you encounter this same issue, please open a new issue and refer - to this closed one. - pr-lock-inactive-days: "1" - pr-lock-reason: "" - pr-comment: > - Pull Request closed and locked due to lack of activity. - - If you'd like to build on this closed PR, you can clone it using - this method: https://stackoverflow.com/a/14969986 - - Then open a new PR, referencing this closed PR in your message. + # lock: + name: ๐Ÿ”’ Lock closed issues and PRs + runs-on: ubuntu-22.04 + steps: + - uses: dessant/lock-threads@v2.0.3 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: "30" + issue-lock-reason: "" + issue-comment: > + Issue closed and locked due to lack of activity. + + If you encounter this same issue, please open a new issue and refer + to this closed one. + pr-lock-inactive-days: "1" + pr-lock-reason: "" + pr-comment: > + Pull Request closed and locked due to lack of activity. + + If you'd like to build on this closed PR, you can clone it using + this method: https://stackoverflow.com/a/14969986 + + Then open a new PR, referencing this closed PR in your message. diff --git a/.github/workflows/merge_paths_ci.yml b/.github/workflows/merge_paths_ci.yml index 200aa1b573..3b222ef1fa 100644 --- a/.github/workflows/merge_paths_ci.yml +++ b/.github/workflows/merge_paths_ci.yml @@ -23,7 +23,7 @@ concurrency: jobs: merge-paths-test: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/papyrus/helm-install.yml b/.github/workflows/papyrus/helm-install.yml index 886f307f09..280bb54b53 100644 --- a/.github/workflows/papyrus/helm-install.yml +++ b/.github/workflows/papyrus/helm-install.yml @@ -14,7 +14,7 @@ on: jobs: deploy-teardown: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 permissions: contents: "read" id-token: "write" diff --git a/.github/workflows/papyrus_benchmark.yaml b/.github/workflows/papyrus_benchmark.yaml index b7912e4957..6a1a4edede 100644 --- a/.github/workflows/papyrus_benchmark.yaml +++ b/.github/workflows/papyrus_benchmark.yaml @@ -8,7 +8,7 @@ on: jobs: storage-benchmark: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index b93df49923..cbb75559c7 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -4,15 +4,15 @@ on: push: branches: [main] paths: - - '.github/workflows/papyrus_ci.yml' - - 'Dockerfile' - - 'papyrus_utilities.Dockerfile' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/papyrus**/**' - - 'crates/sequencing/**' - - 'crates/starknet_client/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_ci.yml" + - "Dockerfile" + - "papyrus_utilities.Dockerfile" + - "Cargo.toml" + - "Cargo.lock" + - "crates/papyrus**/**" + - "crates/sequencing/**" + - "crates/starknet_client/**" + - "scripts/dependencies.sh" pull_request: types: @@ -22,15 +22,15 @@ on: - auto_merge_enabled - edited # for when the PR title is edited paths: - - '.github/workflows/papyrus_ci.yml' - - 'Dockerfile' - - 'papyrus_utilities.Dockerfile' - - 'Cargo.toml' - - 'Cargo.lock' - - 'crates/papyrus**/**' - - 'crates/sequencing/**' - - 'crates/starknet_client/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_ci.yml" + - "Dockerfile" + - "papyrus_utilities.Dockerfile" + - "Cargo.toml" + - "Cargo.lock" + - "crates/papyrus**/**" + - "crates/sequencing/**" + - "crates/starknet_client/**" + - "scripts/dependencies.sh" merge_group: types: [checks_requested] @@ -42,7 +42,7 @@ concurrency: jobs: executable-run: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -57,7 +57,7 @@ jobs: & sleep 30 ; kill $! executable-run-no-rpc: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -72,7 +72,7 @@ jobs: & sleep 30 ; kill $! p2p-sync-e2e-test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -84,7 +84,7 @@ jobs: run: scripts/papyrus/p2p_sync_e2e_test/main.sh ${{ secrets.CI_BASE_LAYER_NODE_URL }} integration-test: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -97,7 +97,7 @@ jobs: cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream" test-no-rpc: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -107,7 +107,7 @@ jobs: SEED: 0 check-starknet_api-dependency: - runs-on: starkware-ubuntu-latest-small + runs-on: ubuntu-22.04 if: github.base_ref == 'main' # this step is only run if the pr is to the main branch steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: - run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main build-papyrus-utilities-image: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx @@ -131,7 +131,7 @@ jobs: cache-to: type=gha,mode=max,scope=buildkit-ci random-table-test: - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 # run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes. diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 294bd71fb7..9b2110997c 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -6,15 +6,15 @@ on: branches: [main] tags: ["v*.*.*"] paths: - - '.github/workflows/papyrus_docker-publish.yml' - - 'crates/papyrus**/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_docker-publish.yml" + - "crates/papyrus**/**" + - "scripts/dependencies.sh" pull_request: paths: - - '.github/workflows/papyrus_docker-publish.yml' - - 'crates/papyrus**/**' - - 'scripts/dependencies.sh' + - ".github/workflows/papyrus_docker-publish.yml" + - "crates/papyrus**/**" + - "scripts/dependencies.sh" # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -71,6 +71,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3.2.0 with: + file: dynamic.Dockerfile context: . push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index 8582cb1b6b..a918e4ce3e 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -2,12 +2,12 @@ name: Nightly Latest Dependencies Check on: schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day + - cron: "0 0 * * *" # Runs at 00:00 UTC every day jobs: latest_deps: name: Latest Dependencies - runs-on: starkware-ubuntu-latest-medium + runs-on: ubuntu-22.04 continue-on-error: true steps: - uses: actions/checkout@v4 diff --git a/Cargo.lock b/Cargo.lock index a1eea94bce..ec78d62265 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,18 +14,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] [[package]] -name = "adler2" -version = "2.0.0" +name = "adler" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aead" @@ -91,421 +91,6 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" -[[package]] -name = "alloy-chains" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94c225801d42099570d0674701dddd4142f0ef715282aeb5985042e2ec962df7" -dependencies = [ - "num_enum", - "strum 0.26.3", -] - -[[package]] -name = "alloy-consensus" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "c-kzg", - "serde", -] - -[[package]] -name = "alloy-contract" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eefe64fd344cffa9cf9e3435ec4e93e6e9c3481bc37269af988bf497faf4a6a" -dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network", - "alloy-network-primitives", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-eth", - "alloy-sol-types", - "alloy-transport", - "futures", - "futures-util", - "thiserror", -] - -[[package]] -name = "alloy-dyn-abi" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1109c57718022ac84c194f775977a534e1b3969b405e55693a61c42187cc0612" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", - "const-hex", - "itoa", - "serde", - "serde_json", - "winnow 0.6.20", -] - -[[package]] -name = "alloy-eip2930" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "serde", -] - -[[package]] -name = "alloy-eip7702" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" -dependencies = [ - "alloy-primitives", - "alloy-rlp", - "serde", -] - -[[package]] -name = "alloy-eips" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" -dependencies = [ - "alloy-eip2930", - "alloy-eip7702", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "c-kzg", - "derive_more 1.0.0", - "once_cell", - "serde", - "sha2", -] - -[[package]] -name = "alloy-json-abi" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cc0e59c803dd44d14fc0cfa9fea1f74cfa8fd9fb60ca303ced390c58c28d4e" -dependencies = [ - "alloy-primitives", - "alloy-sol-type-parser", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-json-rpc" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" -dependencies = [ - "alloy-primitives", - "alloy-sol-types", - "serde", - "serde_json", - "thiserror", - "tracing", -] - -[[package]] -name = "alloy-network" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "alloy-signer", - "alloy-sol-types", - "async-trait", - "auto_impl", - "futures-utils-wasm", - "thiserror", -] - -[[package]] -name = "alloy-network-primitives" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" -dependencies = [ - "alloy-eips", - "alloy-primitives", - "alloy-serde", - "serde", -] - -[[package]] -name = "alloy-primitives" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a289ffd7448036f2f436b377f981c79ce0b2090877bad938d43387dc09931877" -dependencies = [ - "alloy-rlp", - "bytes", - "cfg-if", - "const-hex", - "derive_more 1.0.0", - "foldhash", - "hashbrown 0.15.0", - "hex-literal", - "indexmap 2.6.0", - "itoa", - "k256", - "keccak-asm", - "paste", - "proptest", - "rand 0.8.5", - "ruint", - "rustc-hash 2.0.0", - "serde", - "sha3", - "tiny-keccak", -] - -[[package]] -name = "alloy-provider" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" -dependencies = [ - "alloy-chains", - "alloy-consensus", - "alloy-eips", - "alloy-json-rpc", - "alloy-network", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-client", - "alloy-rpc-types-eth", - "alloy-transport", - "alloy-transport-http", - "async-stream", - "async-trait", - "auto_impl", - "dashmap", - "futures", - "futures-utils-wasm", - "lru", - "pin-project", - "reqwest 0.12.8", - "serde", - "serde_json", - "thiserror", - "tokio", - "tracing", - "url", -] - -[[package]] -name = "alloy-rlp" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" -dependencies = [ - "alloy-rlp-derive", - "arrayvec", - "bytes", -] - -[[package]] -name = "alloy-rlp-derive" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "alloy-rpc-client" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" -dependencies = [ - "alloy-json-rpc", - "alloy-transport", - "alloy-transport-http", - "futures", - "pin-project", - "reqwest 0.12.8", - "serde", - "serde_json", - "tokio", - "tokio-stream", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-rpc-types-eth" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rlp", - "alloy-serde", - "alloy-sol-types", - "cfg-if", - "derive_more 1.0.0", - "hashbrown 0.14.5", - "itertools 0.13.0", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-serde" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" -dependencies = [ - "alloy-primitives", - "serde", - "serde_json", -] - -[[package]] -name = "alloy-signer" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" -dependencies = [ - "alloy-primitives", - "async-trait", - "auto_impl", - "elliptic-curve", - "k256", - "thiserror", -] - -[[package]] -name = "alloy-sol-macro" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0409e3ba5d1de409997a7db8b8e9d679d52088c1dee042a85033affd3cadeab4" -dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "alloy-sol-macro-expander" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18372ef450d59f74c7a64a738f546ba82c92f816597fed1802ef559304c81f1" -dependencies = [ - "alloy-sol-macro-input", - "const-hex", - "heck 0.5.0", - "indexmap 2.6.0", - "proc-macro-error2", - "proc-macro2", - "quote", - "syn 2.0.79", - "syn-solidity", - "tiny-keccak", -] - -[[package]] -name = "alloy-sol-macro-input" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7bad89dd0d5f109e8feeaf787a9ed7a05a91a9a0efc6687d147a70ebca8eff7" -dependencies = [ - "const-hex", - "dunce", - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.79", - "syn-solidity", -] - -[[package]] -name = "alloy-sol-type-parser" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd3548d5262867c2c4be6223fe4f2583e21ade0ca1c307fd23bc7f28fca479e" -dependencies = [ - "serde", - "winnow 0.6.20", -] - -[[package]] -name = "alloy-sol-types" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa666f1036341b46625e72bd36878bf45ad0185f1b88601223e1ec6ed4b72b1" -dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-macro", - "const-hex", - "serde", -] - -[[package]] -name = "alloy-transport" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" -dependencies = [ - "alloy-json-rpc", - "base64 0.22.1", - "futures-util", - "futures-utils-wasm", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower 0.5.1", - "tracing", - "url", -] - -[[package]] -name = "alloy-transport-http" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" -dependencies = [ - "alloy-json-rpc", - "alloy-transport", - "reqwest 0.12.8", - "serde_json", - "tower 0.5.1", - "tracing", - "url", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -529,9 +114,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", @@ -544,33 +129,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -578,9 +163,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "aquamarine" @@ -593,7 +178,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -608,10 +193,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "ark-ff 0.4.2", + "ark-ff", "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", "itertools 0.10.5", @@ -619,54 +204,26 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ark-ff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" -dependencies = [ - "ark-ff-asm 0.3.0", - "ark-ff-macros 0.3.0", - "ark-serialize 0.3.0", - "ark-std 0.3.0", - "derivative", - "num-bigint 0.4.6", - "num-traits 0.2.19", - "paste", - "rustc_version 0.3.3", - "zeroize", -] - [[package]] name = "ark-ff" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm 0.4.2", - "ark-ff-macros 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "paste", - "rustc_version 0.4.1", + "rustc_version", "zeroize", ] -[[package]] -name = "ark-ff-asm" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -677,25 +234,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" -dependencies = [ - "num-bigint 0.4.6", - "num-traits 0.2.19", - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-ff-macros" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "proc-macro2", "quote", @@ -708,9 +253,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", ] @@ -722,8 +267,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c02e954eaeb4ddb29613fee20840c2bbc85ca4396d53e33837e11905363c5f2" dependencies = [ "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-std", ] [[package]] @@ -733,18 +278,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3975a01b0a6e3eae0f72ec7ca8598a6620fc72fa5981f6f5cca33b7cd788f633" dependencies = [ "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-serialize" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" -dependencies = [ - "ark-std 0.3.0", - "digest 0.9.0", + "ark-ff", + "ark-std", ] [[package]] @@ -754,9 +289,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", - "ark-std 0.4.0", + "ark-std", "digest 0.10.7", - "num-bigint 0.4.6", + "num-bigint 0.4.5", ] [[package]] @@ -770,16 +305,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-std" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" -dependencies = [ - "num-traits 0.2.19", - "rand 0.8.5", -] - [[package]] name = "ark-std" version = "0.4.0" @@ -792,15 +317,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.9" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.6" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ascii-canvas" @@ -813,9 +338,9 @@ dependencies = [ [[package]] name = "asn1-rs" -version = "0.6.2" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -829,25 +354,25 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.5.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" +checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 1.0.109", "synstructure", ] [[package]] name = "asn1-rs-impl" -version = "0.2.0" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" +checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 1.0.109", ] [[package]] @@ -879,21 +404,22 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.3.1" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" dependencies = [ "concurrent-queue", - "event-listener-strategy", + "event-listener 5.3.0", + "event-listener-strategy 0.5.2", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.13" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" +checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" dependencies = [ "flate2", "futures-core", @@ -904,13 +430,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" +checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-lite 2.3.0", "slab", ] @@ -922,7 +448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ "async-lock 2.8.0", - "autocfg 1.4.0", + "autocfg 1.3.0", "blocking", "futures-lite 1.13.0", ] @@ -933,10 +459,10 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.3.1", + "async-channel 2.2.1", "async-executor", - "async-io 2.3.4", - "async-lock 3.4.0", + "async-io 2.3.2", + "async-lock 3.3.0", "blocking", "futures-lite 2.3.0", "once_cell", @@ -949,14 +475,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", - "autocfg 1.4.0", + "autocfg 1.3.0", "cfg-if", "concurrent-queue", "futures-lite 1.13.0", "log", "parking", - "polling 2.5.2", - "rustix 0.37.13", + "polling 2.8.0", + "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", @@ -964,21 +490,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.4" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "async-lock 3.4.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.3", - "rustix 0.38.37", + "polling 3.7.0", + "rustix 0.38.34", "slab", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -992,12 +518,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.4.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", "pin-project-lite", ] @@ -1025,7 +551,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.37", + "rustix 0.38.34", "windows-sys 0.48.0", ] @@ -1037,43 +563,43 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "async-signal" -version = "0.2.10" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" +checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" dependencies = [ - "async-io 2.3.4", - "async-lock 3.4.0", + "async-io 2.3.2", + "async-lock 3.3.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.37", + "rustix 0.38.34", "signal-hook-registry", "slab", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "async-std" -version = "1.13.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" +checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io 2.3.4", - "async-lock 3.4.0", + "async-io 1.13.0", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 2.3.0", - "gloo-timers 0.3.0", + "futures-lite 1.13.0", + "gloo-timers", "kv-log-macro", "log", "memchr", @@ -1086,9 +612,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ "async-stream-impl", "futures-core", @@ -1097,13 +623,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.6" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -1114,13 +640,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -1131,7 +657,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.1", + "rustc_version", ] [[package]] @@ -1172,7 +698,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http 0.2.12", + "http", "log", "url", ] @@ -1185,7 +711,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -1194,14 +720,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.4.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" @@ -1211,12 +737,12 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.2.1", + "bitflags 1.3.2", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", + "http", + "http-body", + "hyper", "itoa", "matchit", "memchr", @@ -1228,9 +754,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 0.1.2", + "sync_wrapper", "tokio", - "tower 0.4.13", + "tower", "tower-layer", "tower-service", ] @@ -1244,8 +770,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http 0.2.12", - "http-body 0.4.6", + "http", + "http-body", "mime", "rustversion", "tower-layer", @@ -1254,17 +780,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.74" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ "addr2line", + "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", - "windows-targets 0.52.6", ] [[package]] @@ -1324,7 +850,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "serde", @@ -1354,7 +880,7 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cexpr", "clang-sys", "lazy_static", @@ -1363,9 +889,9 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -1374,7 +900,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -1385,30 +911,12 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 1.1.0", + "rustc-hash", "shlex", - "syn 2.0.79", + "syn 2.0.61", "which", ] -[[package]] -name = "bindgen" -version = "0.70.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" -dependencies = [ - "bitflags 2.6.0", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "proc-macro2", - "quote", - "regex", - "rustc-hash 1.1.0", - "shlex", - "syn 2.0.79", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -1426,15 +934,15 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "bitvec" @@ -1481,26 +989,25 @@ version = "0.0.0" dependencies = [ "anyhow", "ark-ec", - "ark-ff 0.4.2", + "ark-ff", "ark-secp256k1", "ark-secp256r1", "assert_matches", "cached", "cairo-lang-casm", "cairo-lang-runner", - "cairo-lang-sierra", "cairo-lang-starknet-classes", "cairo-lang-utils", "cairo-native", "cairo-vm", "criterion", - "derive_more 0.99.18", + "derive_more", "glob", - "indexmap 2.6.0", + "indexmap 2.2.6", "itertools 0.12.1", "keccak", "log", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-rational 0.4.2", "num-traits 0.2.19", @@ -1511,7 +1018,6 @@ dependencies = [ "rand 0.8.5", "regex", "rstest", - "semver 1.0.23", "serde", "serde_json", "sha2", @@ -1527,52 +1033,20 @@ dependencies = [ "toml", ] -[[package]] -name = "blockifier_regression_test" -version = "0.0.0" -dependencies = [ - "assert_matches", - "blockifier", - "cairo-lang-starknet-classes", - "cairo-lang-utils", - "cairo-vm", - "flate2", - "papyrus_execution", - "pretty_assertions", - "rstest", - "serde", - "serde_json", - "starknet-core", - "starknet-types-core", - "starknet_api", - "starknet_gateway", -] - [[package]] name = "blocking" -version = "1.6.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" +checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" dependencies = [ - "async-channel 2.3.1", + "async-channel 2.2.1", + "async-lock 3.3.0", "async-task", "futures-io", "futures-lite 2.3.0", "piper", ] -[[package]] -name = "blst" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" -dependencies = [ - "cc", - "glob", - "threadpool", - "zeroize", -] - [[package]] name = "bs58" version = "0.5.1" @@ -1585,9 +1059,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.10.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" +checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", "serde", @@ -1629,9 +1103,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -1657,21 +1131,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "c-kzg" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" -dependencies = [ - "blst", - "cc", - "glob", - "hex", - "libc", - "once_cell", - "serde", -] - [[package]] name = "cached" version = "0.44.0" @@ -1710,13 +1169,13 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-lang-casm" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4d6659539ace9649c8e8a7434e51b0c50a7a700111d0a2b967dde220ddff49" +checksum = "e4425280959f189d8a5ebf1f5363c10663bc9f843a4819253e6be87d183b583e" dependencies = [ "cairo-lang-utils", "indoc 2.0.5", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "parity-scale-codec", "schemars", @@ -1725,9 +1184,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5852668d1c6966b34d6e4fe249732769ab9cb2012c201e3889d8119f206760a0" +checksum = "2698e2ca73db964e6d496a648fcbb2ace5559941b5179ab3310c9a0b6872b348" dependencies = [ "anyhow", "cairo-lang-defs", @@ -1742,27 +1201,26 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "indoc 2.0.5", - "rayon", - "rust-analyzer-salsa", - "semver 1.0.23", + "salsa", + "semver", "smol_str", "thiserror", ] [[package]] name = "cairo-lang-debug" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c804649297ca417206435ee3e8041d2100cc31ebf4a95bc4b92ed02dc63469" +checksum = "6ac7332f2b041ca28b24b0311a0b4a35f426bb52836a2d268a8374ea262e9e6b" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fbda467ac36f73bb1879e1f741898fc719d6f9239a01cc422e6a023281319b" +checksum = "079a34b560a82b463cd12ae62022d70981e8ab56b6505f9499348ebeaf460de8" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -1771,15 +1229,15 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "itertools 0.12.1", - "rust-analyzer-salsa", + "salsa", "smol_str", ] [[package]] name = "cairo-lang-diagnostics" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c843ef4715e3d21de5388d02206db2506e2d2ec0e80e2629e0ae9900a08b8674" +checksum = "c29625349297ad791942377763f5b04c779ea694f436488dc6ad194720b89487" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1789,9 +1247,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a416c5871960fb4823160ebef2abc51e0c1b86fef1e97a1ebb2e5f3c3795d3" +checksum = "9cb26cd75126db6eaf94d5dffe0ce750d030ac879a88de5a621551969e9b59e3" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1799,24 +1257,24 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47189e0cb84b21defd201af4cf24a94c6b0d09f48706cf659c9ffa0def8a7a43" +checksum = "651012f2956bea884c7a3ab9df21dc76112d7edd3f403b37ca5be62fc3f41b09" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", "path-clean", - "rust-analyzer-salsa", - "semver 1.0.23", + "salsa", + "semver", "serde", "smol_str", ] [[package]] name = "cairo-lang-formatter" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6409ff1f4a93ce7c0968d9d857d2a8c03657617a827159d33f978110b718b31d" +checksum = "0d09ffb9498368cf4e95d0b28662596331aef1677e4f759ab5e609d27dfcb587" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1827,7 +1285,7 @@ dependencies = [ "diffy", "ignore", "itertools 0.12.1", - "rust-analyzer-salsa", + "salsa", "serde", "smol_str", "thiserror", @@ -1835,9 +1293,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e224e006c82ef21bd9e243390992de2be25ae6fbbdaa8544067b3f0c31977f1" +checksum = "da4ffe6c197c35dec665029fcf695422f02c55b5118b4da1142e182b9fe77f87" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1851,17 +1309,18 @@ dependencies = [ "id-arena", "itertools 0.12.1", "log", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", - "rust-analyzer-salsa", + "once_cell", + "salsa", "smol_str", ] [[package]] name = "cairo-lang-parser" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb260ba349c2b699639e56f9b64deb969ff01179a0253087e2c8ceec7e32157" +checksum = "f262ad5f1110ff70c93deb81cce024cf160f4a4518762e7deb2047fe73846789" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1870,18 +1329,18 @@ dependencies = [ "cairo-lang-utils", "colored", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", - "rust-analyzer-salsa", + "salsa", "smol_str", "unescaper", ] [[package]] name = "cairo-lang-plugins" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a2e500dc8ddea4d25a866d8a839158b0e4c41a6c023f21911e2da252bd91b3" +checksum = "18024b44b5edbc1f378ba85c1a4ff04e880ea465a33251053aec507f08250668" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1892,26 +1351,26 @@ dependencies = [ "indent", "indoc 2.0.5", "itertools 0.12.1", - "rust-analyzer-salsa", + "salsa", "smol_str", ] [[package]] name = "cairo-lang-proc-macros" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d72f17373740f242d6995e896b9195c2cedff7e8b14e496afdd16b405039d1fb" +checksum = "124402d8fad2a033bb36910dd7d0651f3100845c63dce679c58797a8cb0448c2" dependencies = [ "cairo-lang-debug", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "cairo-lang-project" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13294f08d2013fcd6e815e7235935680963dec3390e5baf454f33da866fc44b6" +checksum = "1f37dba9653eabf4dcb43a5e1436cd6bc093b5ad6f28ff42eaaef12549014213" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1923,11 +1382,11 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528a247ac59cb35b2f99d64605a81de815fa5fb0b0e7f7ece1d4e7fcf267d4ea" +checksum = "18df87ee986ca0e02e2ea63483875b791602809873c908bbf7b3d592e3833a3a" dependencies = [ - "ark-ff 0.4.2", + "ark-ff", "ark-secp256k1", "ark-secp256r1", "cairo-lang-casm", @@ -1942,7 +1401,7 @@ dependencies = [ "cairo-vm", "itertools 0.12.1", "keccak", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "rand 0.8.5", @@ -1954,9 +1413,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6936215bca75c23e71873998420a3d46c322507a09917ce676c8d39f8c1bd6fe" +checksum = "a1612476b548e9ab8ae89ee38a73d9875339f62f2f59d9ce8a719bc1761c54c3" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1971,18 +1430,19 @@ dependencies = [ "id-arena", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", - "rust-analyzer-salsa", + "once_cell", + "salsa", "smol_str", "toml", ] [[package]] name = "cairo-lang-sierra" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891488c1a3184ce91679f5bdb63015a1d24769a48bd07e5d51a1779d0031dfbe" +checksum = "8209be8cf22263bf8a55df334a642b74fe563beecbbbefa55cda39fa4b131a61" dependencies = [ "anyhow", "cairo-lang-utils", @@ -1992,11 +1452,12 @@ dependencies = [ "itertools 0.12.1", "lalrpop", "lalrpop-util", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", + "once_cell", "regex", - "rust-analyzer-salsa", + "salsa", "serde", "serde_json", "sha3", @@ -2007,41 +1468,41 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7752cd48c86b2cde8603b753a6df4da086dacd16a73d288854d5f040b51171" +checksum = "1c9d1350366c23e4a9f6e18ea95939f18df52df455f06c0e3d7889f80ce18a94" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", "cairo-lang-sierra-type-size", "cairo-lang-utils", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "thiserror", ] [[package]] name = "cairo-lang-sierra-gas" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "340892a09c9421414b2ac45b03c705f16e2bd737e4559dfd98ee1d20718dec9e" +checksum = "9fe1ff15052b173537360b7dca5f9b2ccb10392b2a1c11af99add35d42632115" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", "cairo-lang-sierra-type-size", "cairo-lang-utils", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "thiserror", ] [[package]] name = "cairo-lang-sierra-generator" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5cc616e8df44c4d685fe3c5f81f35ebbda57225098b35cea8602457c45c9e96" +checksum = "2d3802e7b6722fabc9cc0a61c86e7ad53138f6f41880aca80a60f889739fbf55" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -2055,7 +1516,8 @@ dependencies = [ "cairo-lang-utils", "itertools 0.12.1", "num-traits 0.2.19", - "rust-analyzer-salsa", + "once_cell", + "salsa", "serde", "serde_json", "smol_str", @@ -2063,9 +1525,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c22ff7e8113a46a907f82f191096c96935cc48247e3079971ddf536ccc2f4f8" +checksum = "355bde3b0a835bac2457af133a9042a7d039c934e678905b843bb6b420884428" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -2076,7 +1538,7 @@ dependencies = [ "cairo-lang-utils", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "starknet-types-core", "thiserror", @@ -2084,9 +1546,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf41941776e7410a8853a8e2a116292fc24d219df1989a92ffe5ab0e98037eb" +checksum = "7ddddaacc814e0ffda9f176c913fb2a9cd74fe6594dea789e8281eef10cac201" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -2094,9 +1556,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5508fa5ee8d24adf7d2c65505d0ac35efc892eac16d1449c6f7e314a0288cb8" +checksum = "10be5fd5fe78db232b032e25e4be786f8061606be4ab26371c869c5ab267699c" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -2115,6 +1577,7 @@ dependencies = [ "indent", "indoc 2.0.5", "itertools 0.12.1", + "once_cell", "serde", "serde_json", "smol_str", @@ -2124,9 +1587,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "482b8f9d7f8cc7140f1260ee71f3308a66d15bd228a06281067ca3f8f4410db2" +checksum = "b7bf919d0919fce727c6d53ee5cb37459c9db35c258521284523c53f5f907c07" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -2134,9 +1597,10 @@ dependencies = [ "cairo-lang-utils", "convert_case 0.6.0", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", + "once_cell", "serde", "serde_json", "sha3", @@ -2147,25 +1611,25 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cebe67c0d68f9acf8709d170c1308ca57a778d22f70da38a57f74ae250eee28a" +checksum = "b2a376f88d815b63505be54a6afa93d75b67cfd65835922ec648cfcbb0a5e4b4" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", "cairo-lang-utils", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", - "rust-analyzer-salsa", + "salsa", "smol_str", "unescaper", ] [[package]] name = "cairo-lang-syntax-codegen" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31cef5b4347626e61bad8f070495cd35d637a5cb6744c34d20dd382c7431aff8" +checksum = "01f276bc28f6302fc63032046a12b60d18498906e65f646acb963244eed97f7c" dependencies = [ "genco", "xshell", @@ -2173,14 +1637,15 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.8.2" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f1597b8229a3649183ff33b19f0aeca5d86505253ebbbce377b271d1732835" +checksum = "e4cc569e35642d48ba2c75ba500397887a54fa5ead441e005b59968445851b99" dependencies = [ "anyhow", "cairo-lang-compiler", "cairo-lang-debug", "cairo-lang-defs", + "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", "cairo-lang-semantic", @@ -2192,7 +1657,7 @@ dependencies = [ "cairo-lang-utils", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "serde", "starknet-types-core", @@ -2200,9 +1665,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "060c61ac4a3ae0428771244ff8db903105f127392b7d725d919fe3fb1ec4132f" +checksum = "21e90b6236439e19077ec913351a17a33c7be199dcafdacd8389c4c5199400d6" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -2213,14 +1678,14 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.8.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bfc6372538143afad658c853a35bdc9f5210c5cb54e0c8f04ab78e268139466" +checksum = "55a394e545f1500bea093d01be40895d3234faaa24d9585d08a509c514cabd88" dependencies = [ "hashbrown 0.14.5", - "indexmap 2.6.0", + "indexmap 2.2.6", "itertools 0.12.1", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "parity-scale-codec", "schemars", @@ -2230,14 +1695,13 @@ dependencies = [ [[package]] name = "cairo-native" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=2be717cba74c63628cb68b619ff2022c70d0cdd2#2be717cba74c63628cb68b619ff2022c70d0cdd2" +source = "git+https://github.com/lambdaclass/cairo_native?rev=354ef2b8088785e859a618418c62bfb8c995faff#354ef2b8088785e859a618418c62bfb8c995faff" dependencies = [ "anyhow", "aquamarine", "bumpalo", "cairo-lang-compiler", "cairo-lang-defs", - "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-runner", "cairo-lang-semantic", @@ -2263,12 +1727,10 @@ dependencies = [ "llvm-sys", "melior", "mlir-sys", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "p256", "sec1", - "serde", - "serde_json", "sha2", "starknet-types-core", "stats_alloc", @@ -2281,14 +1743,14 @@ dependencies = [ [[package]] name = "cairo-native-runtime" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=2be717cba74c63628cb68b619ff2022c70d0cdd2#2be717cba74c63628cb68b619ff2022c70d0cdd2" +source = "git+https://github.com/lambdaclass/cairo_native?rev=354ef2b8088785e859a618418c62bfb8c995faff#354ef2b8088785e859a618418c62bfb8c995faff" dependencies = [ "cairo-lang-sierra-gas", "lazy_static", "libc", "rand 0.8.5", - "starknet-crypto 0.7.2", - "starknet-curve 0.5.1", + "starknet-crypto 0.7.1", + "starknet-curve 0.5.0", "starknet-types-core", ] @@ -2307,7 +1769,7 @@ dependencies = [ "keccak", "lazy_static", "nom", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-prime", "num-traits 0.2.19", @@ -2331,9 +1793,9 @@ checksum = "02d88a780e6aa14b75d7be99f374d8b5c315aaf9c12ada1e2b1cb281468584c9" [[package]] name = "camino" -version = "1.1.9" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] @@ -2355,7 +1817,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver 1.0.23", + "semver", "serde", "serde_json", "thiserror", @@ -2379,9 +1841,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.28" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", @@ -2405,9 +1867,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chacha20" @@ -2445,7 +1907,7 @@ dependencies = [ "num-traits 0.2.19", "serde", "wasm-bindgen", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -2488,9 +1950,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" dependencies = [ "glob", "libc", @@ -2499,9 +1961,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -2509,9 +1971,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -2521,21 +1983,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloudabi" @@ -2543,7 +2005,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -2600,9 +2062,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" [[package]] name = "colored" @@ -2620,10 +2082,10 @@ version = "0.0.0" dependencies = [ "clap", "criterion", - "derive_more 0.99.18", + "derive_more", "ethnum", "futures", - "indexmap 2.6.0", + "indexmap 2.2.6", "pretty_assertions", "rand 0.8.5", "rand_distr", @@ -2689,9 +2151,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" [[package]] name = "const-hex" -version = "1.13.1" +version = "1.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" +checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78" dependencies = [ "cfg-if", "cpufeatures", @@ -2708,18 +2170,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.33" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -2787,9 +2249,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.7" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -2802,18 +2264,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] @@ -2884,9 +2346,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -2928,26 +2390,27 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.5" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.29.0", - "windows-sys 0.59.0", + "nix 0.28.0", + "windows-sys 0.52.0", ] [[package]] name = "curve25519-dalek" -version = "4.1.3" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "rustc_version 0.4.1", + "platforms", + "rustc_version", "subtle", "zeroize", ] @@ -2960,7 +2423,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -2975,12 +2438,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.10" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", + "darling_core 0.20.8", + "darling_macro 0.20.8", ] [[package]] @@ -2999,16 +2462,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.10" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.79", + "strsim 0.10.0", + "syn 2.0.61", ] [[package]] @@ -3024,27 +2487,27 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.10" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ - "darling_core 0.20.10", + "darling_core 0.20.8", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "dashmap" -version = "6.1.0" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", "crossbeam-utils", "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.10", ] [[package]] @@ -3102,14 +2565,14 @@ dependencies = [ [[package]] name = "der-parser" -version = "9.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "rusticata-macros", ] @@ -3136,67 +2599,46 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" -dependencies = [ - "darling 0.20.10", - "proc-macro2", - "quote", - "syn 2.0.79", -] - -[[package]] -name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" dependencies = [ - "derive_builder_core", - "syn 2.0.79", + "derive_builder_macro", ] [[package]] -name = "derive_more" -version = "0.99.18" +name = "derive_builder_core" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "convert_case 0.4.0", + "darling 0.20.8", "proc-macro2", "quote", - "rustc_version 0.4.1", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] -name = "derive_more" -version = "1.0.0" +name = "derive_builder_macro" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ - "derive_more-impl", + "derive_builder_core", + "syn 2.0.61", ] [[package]] -name = "derive_more-impl" -version = "1.0.0" +name = "derive_more" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ + "convert_case 0.4.0", "proc-macro2", "quote", - "syn 2.0.79", - "unicode-xid", + "rustc_version", + "syn 1.0.109", ] [[package]] @@ -3285,13 +2727,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -3314,9 +2756,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dunce" -version = "1.0.5" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "dyn-clone" @@ -3372,14 +2814,14 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "either" -version = "1.13.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" [[package]] name = "elliptic-curve" @@ -3451,14 +2893,14 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -3489,7 +2931,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -3509,23 +2951,23 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "env_filter" -version = "0.1.2" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" dependencies = [ "log", ] [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ "anstream", "anstyle", @@ -3682,10 +3124,10 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", - "syn 2.0.79", + "syn 2.0.61", "toml", "walkdir", ] @@ -3703,7 +3145,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -3728,8 +3170,8 @@ dependencies = [ "rlp", "serde", "serde_json", - "strum 0.26.3", - "syn 2.0.79", + "strum 0.26.2", + "syn 2.0.61", "tempfile", "thiserror", "tiny-keccak", @@ -3744,8 +3186,8 @@ checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649" dependencies = [ "chrono", "ethers-core", - "reqwest 0.11.27", - "semver 1.0.23", + "reqwest", + "semver", "serde", "serde_json", "thiserror", @@ -3769,7 +3211,7 @@ dependencies = [ "futures-locks", "futures-util", "instant", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "thiserror", @@ -3796,12 +3238,12 @@ dependencies = [ "futures-timer", "futures-util", "hashers", - "http 0.2.12", + "http", "instant", "jsonwebtoken", "once_cell", "pin-project", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "thiserror", @@ -3854,7 +3296,7 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.23", + "semver", "serde", "serde_json", "solang-parser", @@ -3864,7 +3306,7 @@ dependencies = [ "tokio", "tracing", "walkdir", - "yansi 0.5.1", + "yansi", ] [[package]] @@ -3892,22 +3334,43 @@ dependencies = [ [[package]] name = "event-listener" -version = "5.3.1" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.1", + "event-listener 5.3.0", "pin-project-lite", ] @@ -3942,20 +3405,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" - -[[package]] -name = "fastrlp" -version = "0.3.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "ff" @@ -3969,20 +3421,20 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" +checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" [[package]] name = "filetime" -version = "0.2.25" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "libredox", - "windows-sys 0.59.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -4005,9 +3457,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.34" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -4031,12 +3483,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" - [[package]] name = "foreign-types" version = "0.3.2" @@ -4101,9 +3547,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -4116,9 +3562,9 @@ dependencies = [ [[package]] name = "futures-bounded" -version = "0.2.4" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e" +checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173" dependencies = [ "futures-timer", "futures-util", @@ -4126,9 +3572,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -4136,15 +3582,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -4154,9 +3600,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -4179,7 +3625,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-core", "futures-io", "parking", @@ -4198,37 +3644,36 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "futures-rustls" -version = "0.26.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" +checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls 0.23.14", - "rustls-pki-types", + "rustls", ] [[package]] name = "futures-sink" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-ticker" @@ -4247,15 +3692,15 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ - "gloo-timers 0.2.6", + "gloo-timers", "send_wrapper 0.4.0", ] [[package]] name = "futures-util" -version = "0.3.31" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -4269,12 +3714,6 @@ dependencies = [ "slab", ] -[[package]] -name = "futures-utils-wasm" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" - [[package]] name = "fxhash" version = "0.2.1" @@ -4286,9 +3725,9 @@ dependencies = [ [[package]] name = "genco" -version = "0.17.9" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afac3cbb14db69ac9fef9cdb60d8a87e39a7a527f85a81a923436efa40ad42c6" +checksum = "98d7af598790738fee616426e669360fa361273b1b9c9b7f30c92fa627605cad" dependencies = [ "genco-macros", "relative-path", @@ -4297,13 +3736,13 @@ dependencies = [ [[package]] name = "genco-macros" -version = "0.17.9" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553630feadf7b76442b0849fd25fdf89b860d933623aec9693fed19af0400c78" +checksum = "d4cf186fea4af17825116f72932fe52cce9a13bae39ff63b4dc0cfdb3fb4bde1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -4342,9 +3781,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.1" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -4354,15 +3793,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.15" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -4375,7 +3814,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils", - "http 0.2.12", + "http", "js-sys", "pin-project", "serde", @@ -4398,18 +3837,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gloo-timers" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gloo-utils" version = "0.2.0" @@ -4446,14 +3873,14 @@ dependencies = [ "flume", "futures", "gumdrop", - "http 0.2.12", + "http", "itertools 0.11.0", "lazy_static", "log", "num-format", "rand 0.8.5", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "simplelog", @@ -4507,27 +3934,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http 0.2.12", - "indexmap 2.6.0", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "h2" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.6.0", + "http", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -4570,18 +3978,6 @@ dependencies = [ "serde", ] -[[package]] -name = "hashbrown" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash", - "serde", -] - [[package]] name = "hashers" version = "1.0.1" @@ -4601,6 +3997,15 @@ dependencies = [ "num-traits 0.2.19", ] +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "heck" version = "0.4.1" @@ -4619,26 +4024,11 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" -[[package]] -name = "hermit-abi" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -dependencies = [ - "serde", -] - -[[package]] -name = "hex-literal" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hex_fmt" @@ -4683,7 +4073,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot", + "parking_lot 0.12.2", "rand 0.8.5", "resolv-conf", "smallvec", @@ -4741,17 +4131,6 @@ 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" @@ -4759,38 +4138,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http 0.2.12", - "pin-project-lite", -] - -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -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.1", + "http", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.9.5" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -4806,17 +4162,17 @@ checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", + "h2", + "http", + "http-body", "httparse", "httpdate", "itoa", @@ -4828,27 +4184,6 @@ 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.6", - "http 1.1.0", - "http-body 1.0.1", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", -] - [[package]] name = "hyper-rustls" version = "0.24.2" @@ -4856,10 +4191,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "log", - "rustls 0.21.12", + "rustls", "rustls-native-certs", "tokio", "tokio-rustls", @@ -4872,52 +4207,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.4.1", - "hyper-util", + "hyper", "native-tls", "tokio", "tokio-native-tls", - "tower-service", -] - -[[package]] -name = "hyper-util" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "hyper 1.4.1", - "pin-project-lite", - "socket2 0.5.7", - "tokio", - "tower-service", - "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -5005,7 +4305,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io 2.3.4", + "async-io 2.3.2", "core-foundation", "fnv", "futures", @@ -5035,8 +4335,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "log", "rand 0.8.5", "tokio", @@ -5046,15 +4346,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.23" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.8", + "regex-automata 0.4.6", "same-file", "walkdir", "winapi-util", @@ -5135,19 +4435,19 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "hashbrown 0.12.3", "serde", ] [[package]] name = "indexmap" -version = "2.6.0" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.15.0", + "hashbrown 0.14.5", "serde", ] @@ -5174,9 +4474,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" dependencies = [ "console", "lazy_static", @@ -5187,9 +4487,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.13" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if", ] @@ -5206,7 +4506,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -5225,26 +4525,26 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.1" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.13" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.4.0", + "hermit-abi", "libc", "windows-sys 0.52.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.1" +version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] name = "iso8601" @@ -5299,27 +4599,27 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" +checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -5335,14 +4635,14 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" +checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http 0.2.12", + "http", "jsonrpsee-core", "pin-project", "rustls-native-certs", @@ -5353,14 +4653,14 @@ dependencies = [ "tokio-util", "tracing", "url", - "webpki-roots 0.25.4", + "webpki-roots", ] [[package]] name = "jsonrpsee-core" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" +checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -5368,11 +4668,11 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper 0.14.30", + "hyper", "jsonrpsee-types", - "parking_lot", + "parking_lot 0.12.2", "rand 0.8.5", - "rustc-hash 1.1.0", + "rustc-hash", "serde", "serde_json", "soketto", @@ -5384,12 +4684,12 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" +checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", - "hyper 0.14.30", + "hyper", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -5397,16 +4697,16 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower 0.4.13", + "tower", "tracing", "url", ] [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" +checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -5417,13 +4717,13 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" +checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ "futures-util", - "http 0.2.12", - "hyper 0.14.30", + "http", + "hyper", "jsonrpsee-core", "jsonrpsee-types", "route-recognizer", @@ -5434,15 +4734,15 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower 0.4.13", + "tower", "tracing", ] [[package]] name = "jsonrpsee-types" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" +checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" dependencies = [ "anyhow", "beef", @@ -5454,9 +4754,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9437dd0e8728897d0aa5a0075b8710266300e55ced07101ca0930fac4a611384" +checksum = "7c7cbb3447cf14fd4d2f407c3cc96e6c9634d5440aa1fbed868a31f3c02b27f0" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -5465,11 +4765,11 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.4" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" +checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ - "http 0.2.12", + "http", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -5495,15 +4795,15 @@ dependencies = [ "memchr", "num-cmp", "once_cell", - "parking_lot", + "parking_lot 0.12.2", "percent-encoding", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "time", "url", - "uuid 1.10.0", + "uuid 1.8.0", ] [[package]] @@ -5522,9 +4822,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.4" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", "ecdsa", @@ -5543,16 +4843,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "keccak-asm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" -dependencies = [ - "digest 0.10.7", - "sha3-asm", -] - [[package]] name = "kv-log-macro" version = "1.0.7" @@ -5562,15 +4852,6 @@ dependencies = [ "log", ] -[[package]] -name = "l1-provider" -version = "0.0.0" -dependencies = [ - "papyrus_base_layer", - "starknet_api", - "thiserror", -] - [[package]] name = "lalrpop" version = "0.20.2" @@ -5585,7 +4866,7 @@ dependencies = [ "petgraph", "pico-args", "regex", - "regex-syntax 0.8.5", + "regex-syntax 0.8.3", "string_cache", "term", "tiny-keccak", @@ -5599,14 +4880,14 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.8", + "regex-automata 0.4.6", ] [[package]] name = "lambdaworks-crypto" -version = "0.10.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbc2a4da0d9e52ccfe6306801a112e81a8fc0c76aa3e4449fefeda7fef72bb34" +checksum = "7fb5d4f22241504f7c7b8d2c3a7d7835d7c07117f10bff2a7d96a9ef6ef217c3" dependencies = [ "lambdaworks-math", "serde", @@ -5616,9 +4897,9 @@ dependencies = [ [[package]] name = "lambdaworks-math" -version = "0.10.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1bd2632acbd9957afc5aeec07ad39f078ae38656654043bf16e046fa2730e23" +checksum = "358e172628e713b80a530a59654154bfc45783a6ed70ea284839800cebdf8f97" dependencies = [ "serde", "serde_json", @@ -5641,18 +4922,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -5667,14 +4948,14 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f0bee397dc9a7003e7bd34fffc1dc2d4c4fdc96530a0c439a5f98c9402bc7bf" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "byteorder", - "derive_more 0.99.18", + "derive_more", "indexmap 1.9.3", "libc", "lifetimed-bytes", "mdbx-sys", - "parking_lot", + "parking_lot 0.12.2", "thiserror", ] @@ -5738,20 +5019,21 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.3" +version = "0.41.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" +checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05" dependencies = [ "either", "fnv", "futures", "futures-timer", + "instant", "libp2p-identity", "multiaddr", "multihash", "multistream-select", "once_cell", - "parking_lot", + "parking_lot 0.12.2", "pin-project", "quick-protobuf", "rand 0.8.5", @@ -5762,7 +5044,6 @@ dependencies = [ "tracing", "unsigned-varint 0.8.0", "void", - "web-time", ] [[package]] @@ -5776,7 +5057,7 @@ dependencies = [ "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot", + "parking_lot 0.12.2", "smallvec", "tracing", ] @@ -5838,9 +5119,9 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.9" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" +checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "bs58", "ed25519-dalek", @@ -5968,9 +5249,9 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.10.3" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" +checksum = "a0375cdfee57b47b313ef1f0fdb625b78aed770d33a40cf1c294a371ff5e6666" dependencies = [ "bytes", "futures", @@ -5979,11 +5260,11 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot", + "parking_lot 0.12.2", "quinn", "rand 0.8.5", - "ring 0.17.8", - "rustls 0.23.14", + "ring 0.16.20", + "rustls", "socket2 0.5.7", "thiserror", "tokio", @@ -6024,7 +5305,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -6066,18 +5347,18 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.4.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" +checksum = "93ce7e3c2e7569d685d08ec795157981722ff96e9e9f9eae75df3c29d02b07a5" dependencies = [ "futures", "futures-rustls", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.17.8", - "rustls 0.23.14", - "rustls-webpki 0.101.7", + "ring 0.16.20", + "rustls", + "rustls-webpki", "thiserror", "x509-parser", "yasna", @@ -6101,9 +5382,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.45.2" +version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd5265f6b80f94d48a3963541aad183cc598a645755d2f1805a373e41e0716b" +checksum = "200cbe50349a44760927d50b431d77bed79b9c0a3959de1af8d24a63434b71e5" dependencies = [ "either", "futures", @@ -6111,16 +5392,16 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.3", + "yamux 0.13.2", ] [[package]] name = "libproc" -version = "0.14.10" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb" +checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" dependencies = [ - "bindgen 0.70.1", + "bindgen 0.69.4", "errno", "libc", ] @@ -6131,9 +5412,8 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "libc", - "redox_syscall", ] [[package]] @@ -6159,22 +5439,22 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "llvm-sys" -version = "181.2.0" +version = "181.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d320f9d2723c97d4b78f9190a61ed25cc7cfbe456668c08e6e7dd8e50ceb8500" +checksum = "1d255b36907416971229095a8465c0b69f5f1c6fb8421b6dcdbb64eb47e1be90" dependencies = [ "anyhow", "cc", "lazy_static", "libc", "regex-lite", - "semver 1.0.23", + "semver", ] [[package]] @@ -6183,26 +5463,26 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.22" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" dependencies = [ "value-bag", ] [[package]] name = "lru" -version = "0.12.5" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.15.0", + "hashbrown 0.14.5", ] [[package]] @@ -6304,33 +5584,24 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.79", + "syn 2.0.61", "tblgen-alt", "unindent 0.2.3", ] [[package]] name = "memchr" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "memmap2" -version = "0.8.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" -[[package]] -name = "memoffset" -version = "0.6.5" +[[package]] +name = "memmap2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" dependencies = [ - "autocfg 1.4.0", + "libc", ] [[package]] @@ -6339,16 +5610,14 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", ] [[package]] name = "mempool_test_utils" version = "0.0.0" dependencies = [ - "assert_matches", "blockifier", - "pretty_assertions", "serde_json", "starknet-types-core", "starknet_api", @@ -6382,7 +5651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64 0.21.7", - "hyper 0.14.30", + "hyper", "indexmap 1.9.3", "ipnet", "metrics 0.21.1", @@ -6401,7 +5670,7 @@ checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -6458,23 +5727,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ - "adler2", + "adler", ] [[package]] name = "mio" -version = "1.0.2" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] @@ -6510,7 +5778,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -6533,19 +5801,14 @@ dependencies = [ [[package]] name = "mockito" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d" +checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" dependencies = [ "assert-json-diff", - "bytes", "colored", - "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-util", + "futures-core", + "hyper", "log", "rand 0.8.5", "regex", @@ -6557,9 +5820,9 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.18.2" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" +checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" dependencies = [ "arrayref", "byteorder", @@ -6570,7 +5833,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.8.0", + "unsigned-varint 0.7.2", "url", ] @@ -6627,10 +5890,11 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.12" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ + "lazy_static", "libc", "log", "openssl", @@ -6650,9 +5914,9 @@ dependencies = [ "cached", "cairo-lang-starknet-classes", "cairo-vm", - "indexmap 2.6.0", + "indexmap 2.2.6", "log", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "papyrus_storage", "pretty_assertions", "pyo3", @@ -6697,7 +5961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags 1.2.1", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -6751,37 +6015,24 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nix" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" -dependencies = [ - "bitflags 1.2.1", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "cfg-if", "libc", ] [[package]] name = "nix" -version = "0.29.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cfg-if", "cfg_aliases", "libc", @@ -6842,7 +6093,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-complex 0.4.6", "num-integer", "num-iter", @@ -6856,16 +6107,16 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "num-integer", "num-traits 0.2.19", ] [[package]] name = "num-bigint" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" dependencies = [ "num-integer", "num-traits 0.2.19", @@ -6885,7 +6136,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "num-traits 0.2.19", ] @@ -6929,7 +6180,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "num-integer", "num-traits 0.2.19", ] @@ -6940,7 +6191,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", ] @@ -6954,7 +6205,7 @@ dependencies = [ "bitvec", "either", "lru", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-modular", "num-traits 0.2.19", @@ -6967,7 +6218,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "num-bigint 0.2.6", "num-integer", "num-traits 0.2.19", @@ -6979,7 +6230,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "serde", @@ -7000,7 +6251,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", "libm", ] @@ -7010,29 +6261,29 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] [[package]] name = "num_enum" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -7046,33 +6297,33 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.7.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" +checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.20.2" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" -version = "11.1.4" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -7107,11 +6358,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "cfg-if", "foreign-types", "libc", @@ -7128,7 +6379,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -7139,9 +6390,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" dependencies = [ "cc", "libc", @@ -7198,19 +6449,12 @@ dependencies = [ name = "papyrus_base_layer" version = "0.0.0" dependencies = [ - "alloy-contract", - "alloy-dyn-abi", - "alloy-json-rpc", - "alloy-primitives", - "alloy-provider", - "alloy-sol-types", - "alloy-transport", - "alloy-transport-http", "async-trait", "ethers", "ethers-core", "papyrus_config", "pretty_assertions", + "rustc-hex", "serde", "serde_json", "starknet-types-core", @@ -7223,13 +6467,27 @@ dependencies = [ "url", ] +[[package]] +name = "papyrus_block_builder" +version = "0.0.0" +dependencies = [ + "papyrus_storage", + "papyrus_test_utils", + "pretty_assertions", + "starknet_api", + "thiserror", + "tracing", +] + [[package]] name = "papyrus_common" version = "0.0.0" dependencies = [ "assert_matches", "cairo-lang-starknet-classes", - "indexmap 2.6.0", + "hex", + "indexmap 2.2.6", + "itertools 0.12.1", "lazy_static", "papyrus_test_utils", "pretty_assertions", @@ -7239,6 +6497,7 @@ dependencies = [ "sha3", "starknet-types-core", "starknet_api", + "thiserror", ] [[package]] @@ -7263,18 +6522,14 @@ name = "papyrus_consensus" version = "0.0.0" dependencies = [ "async-trait", - "clap", - "fs2", "futures", "lazy_static", "lru", "metrics 0.21.1", "mockall", - "nix 0.20.2", "papyrus_common", "papyrus_config", "papyrus_network", - "papyrus_network_types", "papyrus_protobuf", "papyrus_storage", "papyrus_test_utils", @@ -7287,24 +6542,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "papyrus_consensus_orchestrator" -version = "0.0.0" -dependencies = [ - "async-trait", - "futures", - "mockall", - "papyrus_consensus", - "papyrus_network", - "papyrus_protobuf", - "papyrus_storage", - "papyrus_test_utils", - "starknet_api", - "test-case", - "tokio", - "tracing", -] - [[package]] name = "papyrus_execution" version = "0.0.0" @@ -7316,7 +6553,7 @@ dependencies = [ "cairo-lang-starknet-classes", "cairo-lang-utils", "cairo-vm", - "indexmap 2.6.0", + "indexmap 2.2.6", "itertools 0.12.1", "lazy_static", "papyrus_common", @@ -7345,7 +6582,7 @@ dependencies = [ "once_cell", "pretty_assertions", "rand 0.8.5", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "tokio", @@ -7356,8 +6593,8 @@ name = "papyrus_monitoring_gateway" version = "0.0.0" dependencies = [ "axum", - "http-body 0.4.6", - "hyper 0.14.30", + "http-body", + "hyper", "metrics 0.21.1", "metrics-exporter-prometheus", "metrics-process", @@ -7370,7 +6607,7 @@ dependencies = [ "starknet_client", "thiserror", "tokio", - "tower 0.4.13", + "tower", "tracing", "validator", ] @@ -7381,11 +6618,10 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-stream", - "async-trait", "bytes", "deadqueue", "defaultmap", - "derive_more 0.99.18", + "derive_more", "futures", "lazy_static", "libp2p", @@ -7394,7 +6630,6 @@ dependencies = [ "mockall", "papyrus_common", "papyrus_config", - "papyrus_network_types", "pretty_assertions", "replace_with", "serde", @@ -7409,16 +6644,6 @@ dependencies = [ "void", ] -[[package]] -name = "papyrus_network_types" -version = "0.0.0" -dependencies = [ - "libp2p", - "papyrus_test_utils", - "rand_chacha 0.3.1", - "serde", -] - [[package]] name = "papyrus_node" version = "0.0.0" @@ -7439,7 +6664,6 @@ dependencies = [ "papyrus_common", "papyrus_config", "papyrus_consensus", - "papyrus_consensus_orchestrator", "papyrus_monitoring_gateway", "papyrus_network", "papyrus_p2p_sync", @@ -7448,7 +6672,7 @@ dependencies = [ "papyrus_sync", "papyrus_test_utils", "pretty_assertions", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "starknet_api", @@ -7471,7 +6695,7 @@ dependencies = [ "chrono", "enum-iterator", "futures", - "indexmap 2.6.0", + "indexmap 2.2.6", "lazy_static", "metrics 0.21.1", "papyrus_common", @@ -7503,7 +6727,7 @@ dependencies = [ "papyrus_test_utils", "prometheus-parse", "quote", - "syn 2.0.79", + "syn 2.0.61", "tracing", ] @@ -7511,15 +6735,13 @@ dependencies = [ name = "papyrus_protobuf" version = "0.0.0" dependencies = [ - "futures", - "indexmap 2.6.0", + "indexmap 2.2.6", "lazy_static", "papyrus_common", "papyrus_test_utils", "primitive-types", "prost", "prost-build", - "protoc-prebuilt", "rand 0.8.5", "rand_chacha 0.3.1", "starknet-types-core", @@ -7538,14 +6760,14 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-starknet-classes", "camelpaste", - "derive_more 0.99.18", + "derive_more", "enum-iterator", "ethers", "flate2", "futures-util", "hex", - "hyper 0.14.30", - "indexmap 2.6.0", + "hyper", + "indexmap 2.2.6", "insta", "itertools 0.12.1", "jsonrpsee", @@ -7565,7 +6787,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "starknet-core", @@ -7575,7 +6797,7 @@ dependencies = [ "strum 0.25.0", "strum_macros 0.25.3", "tokio", - "tower 0.4.13", + "tower", "tracing", "validator", ] @@ -7592,7 +6814,7 @@ dependencies = [ "camelpaste", "clap", "human_bytes", - "indexmap 2.6.0", + "indexmap 2.2.6", "insta", "integer-encoding", "lazy_static", @@ -7600,7 +6822,7 @@ dependencies = [ "memmap2", "metrics 0.21.1", "metrics-exporter-prometheus", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "page_size", "papyrus_common", @@ -7642,7 +6864,7 @@ dependencies = [ "chrono", "futures", "futures-util", - "indexmap 2.6.0", + "indexmap 2.2.6", "itertools 0.12.1", "lru", "metrics 0.21.1", @@ -7654,7 +6876,7 @@ dependencies = [ "papyrus_storage", "papyrus_test_utils", "pretty_assertions", - "reqwest 0.11.27", + "reqwest", "serde", "simple_logger", "starknet-types-core", @@ -7673,14 +6895,14 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-starknet-classes", "cairo-lang-utils", - "indexmap 2.6.0", - "num-bigint 0.4.6", + "indexmap 2.2.6", + "num-bigint 0.4.5", "pretty_assertions", "primitive-types", "prometheus-parse", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "starknet-types-core", @@ -7707,7 +6929,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -7715,18 +6937,43 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.3" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.10", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -7737,9 +6984,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.5.1", "smallvec", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -7833,17 +7080,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - [[package]] name = "petgraph" version = "0.6.5" @@ -7851,7 +7087,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.6.0", + "indexmap 2.2.6", ] [[package]] @@ -7861,7 +7097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.1", + "rustc_version", ] [[package]] @@ -7894,7 +7130,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -7923,22 +7159,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.6" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.6" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -7966,12 +7202,12 @@ dependencies = [ [[package]] name = "piper" -version = "0.2.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.1.1", + "fastrand 2.1.0", "futures-io", ] @@ -7987,15 +7223,21 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.31" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "platforms" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" +checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" [[package]] name = "plotters" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" dependencies = [ "num-traits 0.2.19", "plotters-backend", @@ -8006,46 +7248,48 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" [[package]] name = "plotters-svg" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" dependencies = [ "plotters-backend", ] [[package]] name = "polling" -version = "2.5.2" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite", + "windows-sys 0.48.0", ] [[package]] name = "polling" -version = "3.7.3" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" +checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.4.0", + "hermit-abi", "pin-project-lite", - "rustix 0.38.37", + "rustix 0.38.34", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -8073,9 +7317,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.9.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "powerfmt" @@ -8085,12 +7329,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" -dependencies = [ - "zerocopy", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "precomputed-hash" @@ -8100,9 +7341,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.1.2" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" dependencies = [ "anstyle", "predicates-core", @@ -8110,15 +7351,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.8" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.11" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -8126,22 +7367,22 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ "diff", - "yansi 1.0.1", + "yansi", ] [[package]] name = "prettyplease" -version = "0.2.22" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -8179,11 +7420,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.2.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "toml_edit 0.22.22", + "toml_edit 0.21.1", ] [[package]] @@ -8210,33 +7451,11 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "proc-macro-error2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" -dependencies = [ - "proc-macro-error-attr2", - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" dependencies = [ "unicode-ident", ] @@ -8247,11 +7466,11 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "hex", "lazy_static", "procfs-core", - "rustix 0.38.37", + "rustix 0.38.34", ] [[package]] @@ -8260,19 +7479,19 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "hex", ] [[package]] name = "prometheus-client" -version = "0.22.3" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" +checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", - "parking_lot", + "parking_lot 0.12.2", "prometheus-client-derive-encode", ] @@ -8284,7 +7503,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -8301,21 +7520,17 @@ dependencies = [ [[package]] name = "proptest" -version = "1.5.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ - "bit-set", - "bit-vec", - "bitflags 2.6.0", + "bitflags 2.5.0", "lazy_static", "num-traits 0.2.19", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift 0.3.0", - "regex-syntax 0.8.5", - "rusty-fork", - "tempfile", + "regex-syntax 0.8.3", "unarray", ] @@ -8331,9 +7546,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ "bytes", "heck 0.5.0", @@ -8346,7 +7561,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.79", + "syn 2.0.61", "tempfile", ] @@ -8360,28 +7575,18 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "prost-types" -version = "0.12.6" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ "prost", ] -[[package]] -name = "protoc-prebuilt" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d85d4641fe3b8c6e853dfd09fe35379bc6b6e66bd692ac29ed4f7087de69ed5" -dependencies = [ - "ureq", - "zip", -] - [[package]] name = "psl-types" version = "2.0.11" @@ -8408,9 +7613,9 @@ dependencies = [ "hashbrown 0.14.5", "indoc 1.0.9", "libc", - "memoffset 0.9.1", - "num-bigint 0.4.6", - "parking_lot", + "memoffset", + "num-bigint 0.4.5", + "parking_lot 0.12.2", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -8530,18 +7735,17 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.5" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" +checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" dependencies = [ "bytes", "futures-io", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.0.0", - "rustls 0.23.14", - "socket2 0.5.7", + "rustc-hash", + "rustls", "thiserror", "tokio", "tracing", @@ -8549,15 +7753,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.8" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" +checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.17.8", - "rustc-hash 2.0.0", - "rustls 0.23.14", + "ring 0.16.20", + "rustc-hash", + "rustls", "slab", "thiserror", "tinyvec", @@ -8566,22 +7770,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" +checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" dependencies = [ + "bytes", "libc", - "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -8620,7 +7824,6 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", - "serde", ] [[package]] @@ -8754,7 +7957,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", ] [[package]] @@ -8806,18 +8009,36 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", ] [[package]] name = "redox_users" -version = "0.4.6" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ "getrandom", "libredox", @@ -8826,14 +8047,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.8", - "regex-syntax 0.8.5", + "regex-automata 0.4.6", + "regex-syntax 0.8.3", ] [[package]] @@ -8847,13 +8068,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax 0.8.3", ] [[package]] @@ -8870,9 +8091,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.5" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "relative-path" @@ -8888,68 +8109,24 @@ checksum = "e3a8614ee435691de62bcffcf4a66d91b3594bf1428a5722e79103249a095690" [[package]] name = "reqwest" -version = "0.11.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" -dependencies = [ - "async-compression", - "base64 0.21.7", - "bytes", - "cookie", - "cookie_store", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-rustls", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots 0.25.4", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.12.8" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ - "base64 0.22.1", + "async-compression", + "base64 0.21.7", "bytes", + "cookie", + "cookie_store", + "encoding_rs", "futures-core", "futures-util", - "http 1.1.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.4.1", - "hyper-tls 0.6.0", - "hyper-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "hyper-tls", "ipnet", "js-sys", "log", @@ -8958,19 +8135,24 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls-pemfile 2.2.0", + "rustls", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", + "system-configuration", "tokio", "tokio-native-tls", + "tokio-rustls", + "tokio-util", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows-registry", + "webpki-roots", + "winreg", ] [[package]] @@ -9034,9 +8216,9 @@ dependencies = [ [[package]] name = "rlimit" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" +checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" dependencies = [ "libc", ] @@ -9078,7 +8260,7 @@ dependencies = [ "futures", "futures-timer", "rstest_macros", - "rustc_version 0.4.1", + "rustc_version", ] [[package]] @@ -9090,7 +8272,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "rustc_version 0.4.1", + "rustc_version", "syn 1.0.109", "unicode-ident", ] @@ -9111,70 +8293,11 @@ dependencies = [ "tokio", ] -[[package]] -name = "ruint" -version = "1.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" -dependencies = [ - "alloy-rlp", - "ark-ff 0.3.0", - "ark-ff 0.4.2", - "bytes", - "fastrlp", - "num-bigint 0.4.6", - "num-traits 0.2.19", - "parity-scale-codec", - "primitive-types", - "proptest", - "rand 0.8.5", - "rlp", - "ruint-macro", - "serde", - "valuable", - "zeroize", -] - -[[package]] -name = "ruint-macro" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" - -[[package]] -name = "rust-analyzer-salsa" -version = "0.17.0-pre.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719825638c59fd26a55412a24561c7c5bcf54364c88b9a7a04ba08a6eafaba8d" -dependencies = [ - "indexmap 2.6.0", - "lock_api", - "oorandom", - "parking_lot", - "rust-analyzer-salsa-macros", - "rustc-hash 1.1.0", - "smallvec", - "tracing", - "triomphe", -] - -[[package]] -name = "rust-analyzer-salsa-macros" -version = "0.17.0-pre.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d96498e9684848c6676c399032ebc37c52da95ecbefa83d71ccc53b9f8a4a8e" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "rust_decimal" -version = "1.36.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" +checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" dependencies = [ "arrayvec", "num-traits 0.2.19", @@ -9192,12 +8315,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc-hash" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - [[package]] name = "rustc-hex" version = "2.1.0" @@ -9206,20 +8323,11 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" [[package]] name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - -[[package]] -name = "rustc_version" -version = "0.4.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.23", + "semver", ] [[package]] @@ -9233,11 +8341,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.13" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -9247,14 +8355,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] @@ -9266,25 +8374,10 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki 0.101.7", + "rustls-webpki", "sct", ] -[[package]] -name = "rustls" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" -dependencies = [ - "log", - "once_cell", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.102.8", - "subtle", - "zeroize", -] - [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -9292,7 +8385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.4", + "rustls-pemfile", "schannel", "security-framework", ] @@ -9306,21 +8399,6 @@ dependencies = [ "base64 0.21.7", ] -[[package]] -name = "rustls-pemfile" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "rustls-pki-types" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -9331,34 +8409,11 @@ dependencies = [ "untrusted 0.9.0", ] -[[package]] -name = "rustls-webpki" -version = "0.102.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" -dependencies = [ - "ring 0.17.8", - "rustls-pki-types", - "untrusted 0.9.0", -] - [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - -[[package]] -name = "rusty-fork" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" -dependencies = [ - "fnv", - "quick-error", - "tempfile", - "wait-timeout", -] +checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" [[package]] name = "rw-stream-sink" @@ -9377,6 +8432,35 @@ version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +[[package]] +name = "salsa" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" +dependencies = [ + "crossbeam-utils", + "indexmap 1.9.3", + "lock_api", + "log", + "oorandom", + "parking_lot 0.11.2", + "rustc-hash", + "salsa-macros", + "smallvec", +] + +[[package]] +name = "salsa-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "salsa20" version = "0.10.2" @@ -9402,7 +8486,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more 0.99.18", + "derive_more", "parity-scale-codec", "scale-info-derive", ] @@ -9413,7 +8497,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.2.0", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 1.0.109", @@ -9421,18 +8505,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.26" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] name = "schemars" -version = "0.8.21" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" +checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -9443,14 +8527,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.21" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" +checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -9497,11 +8581,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.1" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" +checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.5.0", "core-foundation", "core-foundation-sys", "libc", @@ -9510,23 +8594,14 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" dependencies = [ "core-foundation-sys", "libc", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.23" @@ -9536,15 +8611,6 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "send_wrapper" version = "0.4.0" @@ -9559,43 +8625,42 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.201" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "serde_derive_internals" -version = "0.29.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" +checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" dependencies = [ "itoa", - "memchr", "ryu", "serde", ] @@ -9629,14 +8694,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "serde_spanned" -version = "0.6.8" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -9674,10 +8739,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.10", + "darling 0.20.8", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -9725,16 +8790,6 @@ dependencies = [ "keccak", ] -[[package]] -name = "sha3-asm" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" -dependencies = [ - "cc", - "cfg-if", -] - [[package]] name = "sharded-slab" version = "0.1.7" @@ -9771,9 +8826,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.6.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" [[package]] name = "simple_asn1" @@ -9781,7 +8836,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-traits 0.2.19", "thiserror", "time", @@ -9828,7 +8883,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.4.0", + "autocfg 1.3.0", ] [[package]] @@ -9866,9 +8921,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" +checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" dependencies = [ "serde", ] @@ -9885,7 +8940,7 @@ dependencies = [ "curve25519-dalek", "rand_core 0.6.4", "ring 0.17.8", - "rustc_version 0.4.1", + "rustc_version", "sha2", "subtle", ] @@ -9919,7 +8974,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http 0.2.12", + "http", "httparse", "log", "rand 0.8.5", @@ -9976,12 +9031,6 @@ dependencies = [ "num-traits 0.1.43", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "starknet-core" version = "0.6.1" @@ -10000,6 +9049,26 @@ dependencies = [ "starknet-ff", ] +[[package]] +name = "starknet-crypto" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3f2175b0b3fc24ff2ec6dc07f5a720498994effca7e78b11a6e1c1bd02cad52" +dependencies = [ + "crypto-bigint", + "hex", + "hmac", + "num-bigint 0.4.5", + "num-integer", + "num-traits 0.2.19", + "rfc6979", + "sha2", + "starknet-crypto-codegen 0.3.3", + "starknet-curve 0.3.0", + "starknet-ff", + "zeroize", +] + [[package]] name = "starknet-crypto" version = "0.6.2" @@ -10009,12 +9078,12 @@ dependencies = [ "crypto-bigint", "hex", "hmac", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "rfc6979", "sha2", - "starknet-crypto-codegen", + "starknet-crypto-codegen 0.3.3", "starknet-curve 0.4.2", "starknet-ff", "zeroize", @@ -10022,19 +9091,20 @@ dependencies = [ [[package]] name = "starknet-crypto" -version = "0.7.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a5064173a8e8d2675e67744fd07f310de44573924b6b7af225a6bdd8102913" +checksum = "ff2a821ad8d98c6c3e4d0e5097f3fe6e2ed120ada9d32be87cd1330c7923a2f0" dependencies = [ "crypto-bigint", "hex", "hmac", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "rfc6979", "sha2", - "starknet-curve 0.5.1", + "starknet-crypto-codegen 0.4.0", + "starknet-curve 0.5.0", "starknet-types-core", "zeroize", ] @@ -10047,7 +9117,27 @@ checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f" dependencies = [ "starknet-curve 0.4.2", "starknet-ff", - "syn 2.0.79", + "syn 2.0.61", +] + +[[package]] +name = "starknet-crypto-codegen" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e179dedc3fa6da064e56811d3e05d446aa2f7459e4eb0e3e49378a337235437" +dependencies = [ + "starknet-curve 0.5.0", + "starknet-types-core", + "syn 2.0.61", +] + +[[package]] +name = "starknet-curve" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "252610baff59e4c4332ce3569f7469c5d3f9b415a2240d698fb238b2b4fc0942" +dependencies = [ + "starknet-ff", ] [[package]] @@ -10061,9 +9151,9 @@ dependencies = [ [[package]] name = "starknet-curve" -version = "0.5.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcde6bd74269b8161948190ace6cf069ef20ac6e79cd2ba09b320efa7500b6de" +checksum = "56935b306dcf0b8f14bb2a1257164b8478bb8be4801dfae0923f5b266d1b457c" dependencies = [ "starknet-types-core", ] @@ -10074,7 +9164,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abf1b44ec5b18d87c1ae5f54590ca9d0699ef4dd5b2ffa66fc97f24613ec585" dependencies = [ - "ark-ff 0.4.2", + "ark-ff", "bigdecimal", "crypto-bigint", "getrandom", @@ -10084,14 +9174,14 @@ dependencies = [ [[package]] name = "starknet-types-core" -version = "0.1.7" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1b9e01ccb217ab6d475c5cda05dbb22c30029f7bb52b192a010a00d77a3d74" +checksum = "ce6bacf0ba19bc721e518bc4bf389ff13daa8a7c5db5fd320600473b8aa9fcbd" dependencies = [ "lambdaworks-crypto", "lambdaworks-math", "lazy_static", - "num-bigint 0.4.6", + "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", "serde", @@ -10104,18 +9194,16 @@ dependencies = [ "assert_matches", "bitvec", "cairo-lang-starknet-classes", - "derive_more 0.99.18", + "derive_more", "hex", - "indexmap 2.6.0", + "indexmap 2.2.6", "itertools 0.12.1", - "num-bigint 0.4.6", - "pretty_assertions", "primitive-types", "rstest", "serde", "serde_json", "sha3", - "starknet-crypto 0.7.2", + "starknet-crypto 0.5.2", "starknet-types-core", "strum 0.25.0", "strum_macros 0.25.3", @@ -10128,24 +9216,15 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-trait", - "blockifier", - "chrono", - "futures", - "indexmap 2.6.0", - "mempool_test_utils", "mockall", "papyrus_config", - "papyrus_storage", - "rstest", "serde", - "starknet-types-core", "starknet_api", "starknet_batcher_types", "starknet_mempool_infra", "starknet_mempool_types", "thiserror", "tokio", - "tokio-stream", "tracing", "validator", ] @@ -10155,13 +9234,9 @@ name = "starknet_batcher_types" version = "0.0.0" dependencies = [ "async-trait", - "blockifier", - "chrono", "mockall", "papyrus_proc_macros", "serde", - "starknet_api", - "starknet_consensus_manager_types", "starknet_mempool_infra", "thiserror", ] @@ -10174,8 +9249,8 @@ dependencies = [ "async-trait", "cairo-lang-starknet-classes", "enum-iterator", - "http 0.2.12", - "indexmap 2.6.0", + "http", + "indexmap 2.2.6", "mockall", "mockito 0.31.1", "os_info", @@ -10185,7 +9260,7 @@ dependencies = [ "pretty_assertions", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "serde_repr", @@ -10226,6 +9301,7 @@ dependencies = [ "starknet_batcher_types", "starknet_consensus_manager_types", "starknet_mempool_infra", + "tokio", "validator", ] @@ -10234,7 +9310,6 @@ name = "starknet_consensus_manager_types" version = "0.0.0" dependencies = [ "async-trait", - "derive_more 0.99.18", "mockall", "papyrus_proc_macros", "serde", @@ -10250,65 +9325,31 @@ dependencies = [ "async-trait", "axum", "blockifier", - "cairo-lang-sierra-to-casm", - "cairo-lang-starknet-classes", - "hyper 0.14.30", - "mempool_test_utils", - "mockall", - "mockito 1.5.0", - "num-bigint 0.4.6", - "papyrus_config", - "papyrus_rpc", - "pretty_assertions", - "reqwest 0.11.27", - "rstest", - "serde", - "serde_json", - "starknet-types-core", - "starknet_api", - "starknet_gateway_types", - "starknet_mempool", - "starknet_mempool_infra", - "starknet_mempool_types", - "starknet_sierra_compile", - "thiserror", - "tokio", - "tracing", - "tracing-test", - "validator", -] - -[[package]] -name = "starknet_gateway_types" -version = "0.0.0" -dependencies = [ - "async-trait", - "axum", - "enum-assoc", - "mockall", - "papyrus_rpc", - "serde", - "serde_json", - "starknet_api", - "starknet_mempool_infra", - "thiserror", - "tracing", -] - -[[package]] -name = "starknet_http_server" -version = "0.0.0" -dependencies = [ - "axum", + "cairo-lang-sierra-to-casm", + "cairo-lang-starknet-classes", + "enum-assoc", + "hyper", + "mempool_test_utils", + "mockall", + "mockito 1.4.0", + "num-bigint 0.4.5", "papyrus_config", + "papyrus_rpc", + "pretty_assertions", + "reqwest", + "rstest", "serde", "serde_json", + "starknet-types-core", "starknet_api", - "starknet_gateway", - "starknet_gateway_types", + "starknet_mempool", "starknet_mempool_infra", + "starknet_mempool_types", + "starknet_sierra_compile", + "thiserror", "tokio", "tracing", + "tracing-test", "validator", ] @@ -10318,14 +9359,13 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-trait", - "derive_more 0.99.18", + "derive_more", "itertools 0.12.1", "mempool_test_utils", "pretty_assertions", "rstest", "starknet-types-core", "starknet_api", - "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", "tokio", @@ -10338,12 +9378,11 @@ dependencies = [ "assert_matches", "async-trait", "bincode 1.3.3", - "hyper 0.14.30", + "hyper", "papyrus_config", "pretty_assertions", "rstest", "serde", - "starknet-types-core", "thiserror", "tokio", "tracing", @@ -10355,26 +9394,23 @@ dependencies = [ name = "starknet_mempool_integration_tests" version = "0.0.0" dependencies = [ - "assert_matches", "axum", "blockifier", "cairo-lang-starknet-classes", - "indexmap 2.6.0", + "indexmap 2.2.6", + "itertools 0.12.1", "mempool_test_utils", "papyrus_common", "papyrus_rpc", "papyrus_storage", "pretty_assertions", - "reqwest 0.11.27", + "reqwest", "rstest", "serde_json", "starknet-types-core", "starknet_api", - "starknet_batcher", "starknet_client", "starknet_gateway", - "starknet_gateway_types", - "starknet_http_server", "starknet_mempool_infra", "starknet_mempool_node", "starknet_mempool_types", @@ -10401,14 +9437,11 @@ dependencies = [ "rstest", "serde", "serde_json", - "starknet_api", "starknet_batcher", "starknet_batcher_types", "starknet_consensus_manager", "starknet_consensus_manager_types", "starknet_gateway", - "starknet_gateway_types", - "starknet_http_server", "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", @@ -10418,36 +9451,12 @@ dependencies = [ "validator", ] -[[package]] -name = "starknet_mempool_p2p" -version = "0.0.0" -dependencies = [ - "async-trait", - "papyrus_network", - "starknet_mempool_infra", - "starknet_mempool_p2p_types", -] - -[[package]] -name = "starknet_mempool_p2p_types" -version = "0.0.0" -dependencies = [ - "async-trait", - "papyrus_network_types", - "papyrus_proc_macros", - "serde", - "starknet_api", - "starknet_mempool_infra", - "thiserror", -] - [[package]] name = "starknet_mempool_types" version = "0.0.0" dependencies = [ "async-trait", "mockall", - "papyrus_network_types", "papyrus_proc_macros", "serde", "starknet_api", @@ -10460,7 +9469,7 @@ name = "starknet_patricia" version = "0.0.0" dependencies = [ "async-recursion", - "derive_more 0.99.18", + "derive_more", "ethnum", "hex", "pretty_assertions", @@ -10491,7 +9500,6 @@ dependencies = [ "serde_json", "starknet-types-core", "starknet_api", - "tempfile", "thiserror", "validator", ] @@ -10536,7 +9544,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot", + "parking_lot 0.12.2", "phf_shared 0.10.0", "precomputed-hash", ] @@ -10561,11 +9569,11 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.3" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.4", + "strum_macros 0.26.2", ] [[package]] @@ -10578,27 +9586,27 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" dependencies = [ - "heck 0.5.0", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "subtle" -version = "2.6.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "svm-rs" @@ -10610,8 +9618,8 @@ dependencies = [ "fs2", "hex", "once_cell", - "reqwest 0.11.27", - "semver 1.0.23", + "reqwest", + "semver", "serde", "serde_json", "sha2", @@ -10633,51 +9641,31 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.79" +version = "2.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn-solidity" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a850d65181df41b83c6be01a7d91f5e9377c43d48faa5af7d95816f437f5a3" -dependencies = [ - "paste", - "proc-macro2", - "quote", - "syn 2.0.79", -] - [[package]] name = "sync_wrapper" 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 = "synstructure" -version = "0.13.1" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 1.0.109", + "unicode-xid", ] [[package]] @@ -10701,7 +9689,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.2.1", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -10724,9 +9712,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.42" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -10735,9 +9723,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.16" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" [[package]] name = "tblgen-alt" @@ -10753,15 +9741,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.13.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.1.1", - "once_cell", - "rustix 0.38.37", - "windows-sys 0.59.0", + "fastrand 2.1.0", + "rustix 0.38.34", + "windows-sys 0.52.0", ] [[package]] @@ -10808,7 +9795,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -10819,7 +9806,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", "test-case-core", ] @@ -10842,7 +9829,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -10858,8 +9845,8 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest 0.11.27", - "syn 2.0.79", + "reqwest", + "syn 2.0.61", "sysinfo", "users", "which", @@ -10867,22 +9854,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -10915,15 +9902,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tikv-jemalloc-sys" version = "0.5.4+5.3.0-patched" @@ -10998,9 +9976,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -11013,31 +9991,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", "bytes", "libc", "mio", - "parking_lot", + "num_cpus", + "parking_lot 0.12.2", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -11067,20 +10046,19 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.12", + "rustls", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", ] [[package]] @@ -11104,18 +10082,18 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.12", + "rustls", "tokio", "tokio-rustls", "tungstenite", - "webpki-roots 0.25.4", + "webpki-roots", ] [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", @@ -11127,21 +10105,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.19" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.22", + "toml_edit 0.22.12", ] [[package]] name = "toml_datetime" -version = "0.6.8" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -11152,22 +10130,33 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.2.6", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.40", ] [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.20", + "winnow 0.6.8", ] [[package]] @@ -11191,31 +10180,17 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper 0.1.2", - "tower-layer", - "tower-service", -] - [[package]] name = "tower-layer" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.3" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -11237,7 +10212,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -11320,17 +10295,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.79", -] - -[[package]] -name = "triomphe" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" -dependencies = [ - "serde", - "stable_deref_trait", + "syn 2.0.61", ] [[package]] @@ -11348,11 +10313,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http 0.2.12", + "http", "httparse", "log", "rand 0.8.5", - "rustls 0.21.12", + "rustls", "sha1", "thiserror", "url", @@ -11371,12 +10336,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "ucd-trie" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" - [[package]] name = "uint" version = "0.9.5" @@ -11397,45 +10356,45 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unescaper" -version = "0.1.5" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" +checksum = "0adf6ad32eb5b3cadff915f7b770faaac8f7ff0476633aa29eb0d9584d889d34" dependencies = [ "thiserror", ] [[package]] name = "unicode-bidi" -version = "0.3.17" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.24" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-xid" -version = "0.2.6" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unicode_categories" @@ -11493,31 +10452,15 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" -[[package]] -name = "ureq" -version = "2.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" -dependencies = [ - "base64 0.22.1", - "log", - "once_cell", - "rustls 0.23.14", - "rustls-pki-types", - "url", - "webpki-roots 0.26.6", -] - [[package]] name = "url" -version = "2.5.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding", - "serde", ] [[package]] @@ -11544,9 +10487,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" @@ -11560,9 +10503,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.10.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "validator" @@ -11623,9 +10566,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.5" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "void" @@ -11633,20 +10576,11 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - [[package]] name = "waker-fn" -version = "1.2.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" @@ -11675,35 +10609,34 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", - "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -11713,9 +10646,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11723,38 +10656,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.70" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "web-time" -version = "1.1.0" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -11766,24 +10689,6 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" -[[package]] -name = "webpki-roots" -version = "0.26.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "which" version = "4.4.2" @@ -11793,7 +10698,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.37", + "rustix 0.38.34", ] [[package]] @@ -11820,11 +10725,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -11850,7 +10755,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -11868,7 +10773,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -11877,62 +10782,17 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result 0.1.2", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-registry" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" -dependencies = [ - "windows-result 0.2.0", - "windows-strings", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-result" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" -dependencies = [ - "windows-targets 0.52.6", + "windows-result", + "windows-targets 0.52.5", ] [[package]] name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.5", ] [[package]] @@ -11950,16 +10810,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.59.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" -dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.52.5", ] [[package]] @@ -11979,26 +10830,20 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -12007,15 +10852,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" [[package]] name = "windows_aarch64_msvc" @@ -12025,15 +10864,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" [[package]] name = "windows_i686_gnu" @@ -12043,21 +10876,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" [[package]] name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" [[package]] name = "windows_i686_msvc" @@ -12067,15 +10894,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" [[package]] name = "windows_x86_64_gnu" @@ -12085,15 +10906,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" [[package]] name = "windows_x86_64_gnullvm" @@ -12103,15 +10918,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" [[package]] name = "windows_x86_64_msvc" @@ -12121,9 +10930,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.6" +version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winnow" @@ -12136,9 +10945,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.20" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" dependencies = [ "memchr", ] @@ -12172,7 +10981,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.1", + "rustc_version", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -12203,9 +11012,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.16.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ "asn1-rs", "data-encoding", @@ -12225,15 +11034,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.14", - "rustix 0.38.37", + "linux-raw-sys 0.4.13", + "rustix 0.38.34", ] [[package]] name = "xml-rs" -version = "0.8.22" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" +checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" [[package]] name = "xmltree" @@ -12268,7 +11077,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.2", "pin-project", "rand 0.8.5", "static_assertions", @@ -12276,18 +11085,18 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" +checksum = "5f97202f6b125031b95d83e01dc57292b529384f80bfae4677e4bbc10178cf72" dependencies = [ "futures", + "instant", "log", "nohash-hasher", - "parking_lot", + "parking_lot 0.12.2", "pin-project", "rand 0.8.5", "static_assertions", - "web-time", ] [[package]] @@ -12296,12 +11105,6 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" -[[package]] -name = "yansi" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" - [[package]] name = "yasna" version = "0.5.2" @@ -12313,30 +11116,29 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.7.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] name = "zeroize" -version = "1.8.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -12349,7 +11151,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.79", + "syn 2.0.61", ] [[package]] @@ -12387,7 +11189,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.2.1", + "zstd-safe 7.2.0", ] [[package]] @@ -12402,18 +11204,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", "pkg-config", From 25c3fb2bc0ba5c2b2b306ad23dec3c8b3752ed60 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Thu, 3 Oct 2024 09:52:59 -0400 Subject: [PATCH 11/21] feat: add native syscall handler --- crates/blockifier/src/execution/native.rs | 4 + .../src/execution/native/syscall_handler.rs | 323 ++++++++++++++++++ .../blockifier/src/execution/native/utils.rs | 39 +++ .../src/execution/native/utils_test.rs | 43 +++ 4 files changed, 409 insertions(+) create mode 100644 crates/blockifier/src/execution/native/syscall_handler.rs create mode 100644 crates/blockifier/src/execution/native/utils_test.rs diff --git a/crates/blockifier/src/execution/native.rs b/crates/blockifier/src/execution/native.rs index b5614dd823..7c3dd35b21 100644 --- a/crates/blockifier/src/execution/native.rs +++ b/crates/blockifier/src/execution/native.rs @@ -1 +1,5 @@ +pub mod syscall_handler; pub mod utils; + +#[cfg(test)] +pub mod utils_test; diff --git a/crates/blockifier/src/execution/native/syscall_handler.rs b/crates/blockifier/src/execution/native/syscall_handler.rs new file mode 100644 index 0000000000..6ed2758251 --- /dev/null +++ b/crates/blockifier/src/execution/native/syscall_handler.rs @@ -0,0 +1,323 @@ +use std::collections::HashSet; +use std::hash::RandomState; + +use cairo_native::starknet::{ + ExecutionInfo, + ExecutionInfoV2, + Secp256k1Point, + Secp256r1Point, + StarknetSyscallHandler, + SyscallResult, + U256, +}; +use cairo_vm::vm::runners::cairo_runner::ExecutionResources; +use starknet_api::core::{ContractAddress, EntryPointSelector}; +use starknet_api::state::StorageKey; +use starknet_types_core::felt::Felt; + +use crate::execution::call_info::{CallInfo, OrderedEvent, OrderedL2ToL1Message, Retdata}; +use crate::execution::entry_point::{CallEntryPoint, EntryPointExecutionContext}; +use crate::execution::execution_utils::update_remaining_gas; +use crate::execution::native::utils::encode_str_as_felts; +use crate::execution::syscalls::hint_processor::OUT_OF_GAS_ERROR; +use crate::state::state_api::State; + +pub struct NativeSyscallHandler<'state> { + // Input for execution. + pub state: &'state mut dyn State, + pub resources: &'state mut ExecutionResources, + pub context: &'state mut EntryPointExecutionContext, + + // Call information. + pub caller_address: ContractAddress, + pub contract_address: ContractAddress, + pub entry_point_selector: Felt, + + // Execution results. + pub events: Vec, + pub l2_to_l1_messages: Vec, + pub inner_calls: Vec, + + // Additional information gathered during execution. + pub read_values: Vec, + pub accessed_keys: HashSet, +} + +impl<'state> NativeSyscallHandler<'state> { + pub fn new( + state: &'state mut dyn State, + caller_address: ContractAddress, + contract_address: ContractAddress, + entry_point_selector: EntryPointSelector, + resources: &'state mut ExecutionResources, + context: &'state mut EntryPointExecutionContext, + ) -> NativeSyscallHandler<'state> { + NativeSyscallHandler { + state, + caller_address, + contract_address, + entry_point_selector: entry_point_selector.0, + resources, + context, + events: Vec::new(), + l2_to_l1_messages: Vec::new(), + inner_calls: Vec::new(), + read_values: Vec::new(), + accessed_keys: HashSet::new(), + } + } + + pub fn execute_inner_call( + &mut self, + entry_point: CallEntryPoint, + remaining_gas: &mut u128, + ) -> SyscallResult { + let call_info = entry_point + .execute(self.state, self.resources, self.context) + .map_err(|e| encode_str_as_felts(&e.to_string()))?; + let retdata = call_info.execution.retdata.0.clone(); + + if call_info.execution.failed { + // In VM it's wrapped into `SyscallExecutionError::SyscallError`. + return Err(retdata); + } + + self.update_remaining_gas(remaining_gas, &call_info); + + let retdata = call_info.execution.retdata.clone(); + + self.inner_calls.push(call_info); + + Ok(retdata) + } + + pub fn update_remaining_gas(&mut self, remaining_gas: &mut u128, call_info: &CallInfo) { + // Create a new variable with converted type. + let mut remaining_gas_u64 = u64::try_from(*remaining_gas).unwrap(); + + // Pass the reference to the function. + update_remaining_gas(&mut remaining_gas_u64, call_info); + + // Change the remaining gas value. + *remaining_gas = u128::from(remaining_gas_u64); + } + + // Handles gas related logic when executing a syscall. Required because Native calls the + // syscalls directly unlike the VM where the `execute_syscall` method perform this operation + // first. + pub fn substract_syscall_gas_cost( + &mut self, + remaining_gas: &mut u128, + syscall_gas_cost: u64, + ) -> SyscallResult<()> { + // Refund `SYSCALL_BASE_GAS_COST` as it was pre-charged. + let required_gas = + u128::from(syscall_gas_cost - self.context.gas_costs().syscall_base_gas_cost); + + if *remaining_gas < required_gas { + // Out of gas failure. + return Err(vec![ + Felt::from_hex(OUT_OF_GAS_ERROR) + .expect("Failed to parse OUT_OF_GAS_ERROR hex string"), + ]); + } + + *remaining_gas -= required_gas; + + Ok(()) + } +} + +impl<'state> StarknetSyscallHandler for &mut NativeSyscallHandler<'state> { + fn get_block_hash( + &mut self, + _block_number: u64, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement get_block_hash syscall."); + } + + fn get_execution_info(&mut self, _remaining_gas: &mut u128) -> SyscallResult { + todo!("Implement get_execution_info syscall."); + } + + fn get_execution_info_v2( + &mut self, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement get_execution_info_v2 syscall."); + } + + fn deploy( + &mut self, + _class_hash: Felt, + _contract_address_salt: Felt, + _calldata: &[Felt], + _deploy_from_zero: bool, + _remaining_gas: &mut u128, + ) -> SyscallResult<(Felt, Vec)> { + todo!("Implement deploy syscall."); + } + + fn replace_class(&mut self, _class_hash: Felt, _remaining_gas: &mut u128) -> SyscallResult<()> { + todo!("Implement replace_class syscall."); + } + + fn library_call( + &mut self, + _class_hash: Felt, + _function_selector: Felt, + _calldata: &[Felt], + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement library_call syscall."); + } + + fn call_contract( + &mut self, + _address: Felt, + _entry_point_selector: Felt, + _calldata: &[Felt], + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement call_contract syscall."); + } + + fn storage_read( + &mut self, + _address_domain: u32, + _address: Felt, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement storage_read syscall."); + } + + fn storage_write( + &mut self, + _address_domain: u32, + _address: Felt, + _value: Felt, + _remaining_gas: &mut u128, + ) -> SyscallResult<()> { + todo!("Implement storage_write syscall."); + } + + fn emit_event( + &mut self, + _keys: &[Felt], + _data: &[Felt], + _remaining_gas: &mut u128, + ) -> SyscallResult<()> { + todo!("Implement emit_event syscall."); + } + + fn send_message_to_l1( + &mut self, + _to_address: Felt, + _payload: &[Felt], + _remaining_gas: &mut u128, + ) -> SyscallResult<()> { + todo!("Implement send_message_to_l1 syscall."); + } + + fn keccak(&mut self, _input: &[u64], _remaining_gas: &mut u128) -> SyscallResult { + todo!("Implement keccak syscall."); + } + + fn secp256k1_new( + &mut self, + _x: U256, + _y: U256, + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement secp256k1_new syscall."); + } + + fn secp256k1_add( + &mut self, + _p0: Secp256k1Point, + _p1: Secp256k1Point, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement secp256k1_add syscall."); + } + + fn secp256k1_mul( + &mut self, + _p: Secp256k1Point, + _m: U256, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement secp256k1_mul syscall."); + } + + fn secp256k1_get_point_from_x( + &mut self, + _x: U256, + _y_parity: bool, + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement secp256k1_get_point_from_x syscall."); + } + + fn secp256k1_get_xy( + &mut self, + _p: Secp256k1Point, + _remaining_gas: &mut u128, + ) -> SyscallResult<(U256, U256)> { + todo!("Implement secp256k1_get_xy syscall."); + } + + fn secp256r1_new( + &mut self, + _x: U256, + _y: U256, + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement secp256r1_new syscall."); + } + + fn secp256r1_add( + &mut self, + _p0: Secp256r1Point, + _p1: Secp256r1Point, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement secp256r1_add syscall."); + } + + fn secp256r1_mul( + &mut self, + _p: Secp256r1Point, + _m: U256, + _remaining_gas: &mut u128, + ) -> SyscallResult { + todo!("Implement secp256r1_mul syscall."); + } + + fn secp256r1_get_point_from_x( + &mut self, + _x: U256, + _y_parity: bool, + _remaining_gas: &mut u128, + ) -> SyscallResult> { + todo!("Implement secp256r1_get_point_from_x syscall."); + } + + fn secp256r1_get_xy( + &mut self, + _p: Secp256r1Point, + _remaining_gas: &mut u128, + ) -> SyscallResult<(U256, U256)> { + todo!("Implement secp256r1_get_xy syscall."); + } + + fn sha256_process_block( + &mut self, + _prev_state: &[u32; 8], + _current_block: &[u32; 16], + _remaining_gas: &mut u128, + ) -> SyscallResult<[u32; 8]> { + todo!("Implement sha256_process_block syscall."); + } +} diff --git a/crates/blockifier/src/execution/native/utils.rs b/crates/blockifier/src/execution/native/utils.rs index addcbcc3ad..2aeb969e9d 100644 --- a/crates/blockifier/src/execution/native/utils.rs +++ b/crates/blockifier/src/execution/native/utils.rs @@ -1,4 +1,5 @@ use cairo_lang_starknet_classes::contract_class::ContractEntryPoint; +use itertools::Itertools; use starknet_api::core::EntryPointSelector; use starknet_types_core::felt::Felt; @@ -7,3 +8,41 @@ pub fn contract_entrypoint_to_entrypoint_selector( ) -> EntryPointSelector { EntryPointSelector(Felt::from(&entrypoint.selector)) } + +pub fn encode_str_as_felts(msg: &str) -> Vec { + const CHUNK_SIZE: usize = 32; + + let data = msg.as_bytes().chunks(CHUNK_SIZE - 1); + let mut encoding = vec![Felt::default(); data.len()]; + for (i, data_chunk) in data.enumerate() { + let mut chunk = [0_u8; CHUNK_SIZE]; + chunk[1..data_chunk.len() + 1].copy_from_slice(data_chunk); + encoding[i] = Felt::from_bytes_be(&chunk); + } + encoding +} + +// Todo(rodrigo): This is an opinionated way of interpretting error messages. It's ok for now but I +// think it can be improved; (for example) trying to make the output similar to a Cairo VM panic +pub fn decode_felts_as_str(encoding: &[Felt]) -> String { + let bytes_err: Vec<_> = + encoding.iter().flat_map(|felt| felt.to_bytes_be()[1..32].to_vec()).collect(); + + match String::from_utf8(bytes_err) { + // If the string is utf8 make sure it is not prefixed by no null chars. Null chars in + // between can still happen + Ok(s) => s.trim_matches('\0').to_owned(), + // If the string is non-utf8 overall, try to decode them as utf8 chunks of it and keep the + // original bytes for the non-utf8 chunks + Err(_) => { + let err_msgs = encoding + .iter() + .map(|felt| match String::from_utf8(felt.to_bytes_be()[1..32].to_vec()) { + Ok(s) => format!("{} ({})", s.trim_matches('\0'), felt), + Err(_) => felt.to_string(), + }) + .join(", "); + format!("[{}]", err_msgs) + } + } +} diff --git a/crates/blockifier/src/execution/native/utils_test.rs b/crates/blockifier/src/execution/native/utils_test.rs new file mode 100644 index 0000000000..f2fa3125c3 --- /dev/null +++ b/crates/blockifier/src/execution/native/utils_test.rs @@ -0,0 +1,43 @@ +use cairo_lang_starknet_classes::contract_class::ContractEntryPoint; +use num_bigint::BigUint; +use pretty_assertions::assert_eq; +use starknet_api::core::EntryPointSelector; +use starknet_types_core::felt::Felt; + +use crate::execution::native::utils::{ + contract_entrypoint_to_entrypoint_selector, + encode_str_as_felts, +}; + +#[test] +fn test_contract_entrypoint_to_entrypoint_selector() { + const NUM: u128 = 123; + + let entrypoint = ContractEntryPoint { selector: BigUint::from(NUM), function_idx: 0 }; + let expected_entrypoint_selector = EntryPointSelector(Felt::from(NUM)); + let actual_entrypoint_selector = contract_entrypoint_to_entrypoint_selector(&entrypoint); + + assert_eq!(actual_entrypoint_selector, expected_entrypoint_selector); +} + +#[test] +fn test_encode_decode_str() { + const STR: &str = "normal utf8 string:"; + + let encoded_felt_array = encode_str_as_felts(STR); + + let decoded_felt_array = decode_felts_as_str(encoded_felt_array.as_slice()); + + assert_eq!(&decoded_felt_array, STR); +} + +#[test] +fn test_decode_non_utf8_str() { + let v1 = Felt::from_dec_str("1234").unwrap(); + let v2_msg = "i am utf8"; + let v2 = Felt::from_bytes_be_slice(v2_msg.as_bytes()); + let v3 = Felt::from_dec_str("13299428").unwrap(); + let felts = [v1, v2, v3]; + + assert_eq!(decode_felts_as_str(&felts), format!("[{}, {} ({}), {}]", v1, v2_msg, v2, v3)) +} From 2b4afe1245704866dab2f023f200c3472064a262 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Thu, 3 Oct 2024 18:02:20 -0400 Subject: [PATCH 12/21] fix: compilation error --- crates/blockifier/src/execution/native/utils_test.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/blockifier/src/execution/native/utils_test.rs b/crates/blockifier/src/execution/native/utils_test.rs index f2fa3125c3..bffd39b6ca 100644 --- a/crates/blockifier/src/execution/native/utils_test.rs +++ b/crates/blockifier/src/execution/native/utils_test.rs @@ -6,6 +6,7 @@ use starknet_types_core::felt::Felt; use crate::execution::native::utils::{ contract_entrypoint_to_entrypoint_selector, + decode_felts_as_str, encode_str_as_felts, }; From 1ff3bf4708cb6d70ff1b461e077c6008415b79be Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 11:52:30 -0400 Subject: [PATCH 13/21] chore: update Cargo.lock --- Cargo.lock | 1945 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 1541 insertions(+), 404 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec78d62265..3d74baaf59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,6 +91,421 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" +[[package]] +name = "alloy-chains" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94c225801d42099570d0674701dddd4142f0ef715282aeb5985042e2ec962df7" +dependencies = [ + "num_enum", + "strum 0.26.2", +] + +[[package]] +name = "alloy-consensus" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "c-kzg", + "serde", +] + +[[package]] +name = "alloy-contract" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eefe64fd344cffa9cf9e3435ec4e93e6e9c3481bc37269af988bf497faf4a6a" +dependencies = [ + "alloy-dyn-abi", + "alloy-json-abi", + "alloy-network", + "alloy-network-primitives", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-eth", + "alloy-sol-types", + "alloy-transport", + "futures", + "futures-util", + "thiserror", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1109c57718022ac84c194f775977a534e1b3969b405e55693a61c42187cc0612" +dependencies = [ + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-type-parser", + "alloy-sol-types", + "const-hex", + "itoa", + "serde", + "serde_json", + "winnow 0.6.8", +] + +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", +] + +[[package]] +name = "alloy-eips" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "c-kzg", + "derive_more 1.0.0", + "once_cell", + "serde", + "sha2", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4cc0e59c803dd44d14fc0cfa9fea1f74cfa8fd9fb60ca303ced390c58c28d4e" +dependencies = [ + "alloy-primitives", + "alloy-sol-type-parser", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" +dependencies = [ + "alloy-primitives", + "alloy-sol-types", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "alloy-network" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-serde", + "alloy-signer", + "alloy-sol-types", + "async-trait", + "auto_impl", + "futures-utils-wasm", + "thiserror", +] + +[[package]] +name = "alloy-network-primitives" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" +dependencies = [ + "alloy-eips", + "alloy-primitives", + "alloy-serde", + "serde", +] + +[[package]] +name = "alloy-primitives" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a289ffd7448036f2f436b377f981c79ce0b2090877bad938d43387dc09931877" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 1.0.0", + "foldhash", + "hashbrown 0.15.0", + "hex-literal", + "indexmap 2.6.0", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand 0.8.5", + "ruint", + "rustc-hash 2.0.0", + "serde", + "sha3", + "tiny-keccak", +] + +[[package]] +name = "alloy-provider" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" +dependencies = [ + "alloy-chains", + "alloy-consensus", + "alloy-eips", + "alloy-json-rpc", + "alloy-network", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rpc-client", + "alloy-rpc-types-eth", + "alloy-transport", + "alloy-transport-http", + "async-stream", + "async-trait", + "auto_impl", + "dashmap", + "futures", + "futures-utils-wasm", + "lru", + "pin-project", + "reqwest 0.12.5", + "serde", + "serde_json", + "thiserror", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "alloy-rlp" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" +dependencies = [ + "alloy-rlp-derive", + "arrayvec", + "bytes", +] + +[[package]] +name = "alloy-rlp-derive" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "alloy-rpc-client" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "alloy-transport-http", + "futures", + "pin-project", + "reqwest 0.12.5", + "serde", + "serde_json", + "tokio", + "tokio-stream", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-rpc-types-eth" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-network-primitives", + "alloy-primitives", + "alloy-rlp", + "alloy-serde", + "alloy-sol-types", + "cfg-if", + "derive_more 1.0.0", + "hashbrown 0.14.5", + "itertools 0.13.0", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-serde" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" +dependencies = [ + "alloy-primitives", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-signer" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" +dependencies = [ + "alloy-primitives", + "async-trait", + "auto_impl", + "elliptic-curve", + "k256", + "thiserror", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0409e3ba5d1de409997a7db8b8e9d679d52088c1dee042a85033affd3cadeab4" +dependencies = [ + "alloy-sol-macro-expander", + "alloy-sol-macro-input", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.61", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18372ef450d59f74c7a64a738f546ba82c92f816597fed1802ef559304c81f1" +dependencies = [ + "alloy-sol-macro-input", + "const-hex", + "heck 0.5.0", + "indexmap 2.6.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.61", + "syn-solidity", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7bad89dd0d5f109e8feeaf787a9ed7a05a91a9a0efc6687d147a70ebca8eff7" +dependencies = [ + "const-hex", + "dunce", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.61", + "syn-solidity", +] + +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbd3548d5262867c2c4be6223fe4f2583e21ade0ca1c307fd23bc7f28fca479e" +dependencies = [ + "serde", + "winnow 0.6.8", +] + +[[package]] +name = "alloy-sol-types" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4aa666f1036341b46625e72bd36878bf45ad0185f1b88601223e1ec6ed4b72b1" +dependencies = [ + "alloy-json-abi", + "alloy-primitives", + "alloy-sol-macro", + "const-hex", + "serde", +] + +[[package]] +name = "alloy-transport" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" +dependencies = [ + "alloy-json-rpc", + "base64 0.22.1", + "futures-util", + "futures-utils-wasm", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower 0.5.1", + "tracing", + "url", +] + +[[package]] +name = "alloy-transport-http" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" +dependencies = [ + "alloy-json-rpc", + "alloy-transport", + "reqwest 0.12.5", + "serde_json", + "tower 0.5.1", + "tracing", + "url", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -191,16 +606,34 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" name = "ark-ec" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff 0.4.2", + "ark-poly", + "ark-serialize 0.4.2", + "ark-std 0.4.0", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits 0.2.19", + "zeroize", +] + +[[package]] +name = "ark-ff" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" dependencies = [ - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", + "ark-ff-asm 0.3.0", + "ark-ff-macros 0.3.0", + "ark-serialize 0.3.0", + "ark-std 0.3.0", "derivative", - "hashbrown 0.13.2", - "itertools 0.10.5", + "num-bigint 0.4.5", "num-traits 0.2.19", + "paste", + "rustc_version 0.3.3", "zeroize", ] @@ -210,20 +643,30 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", + "ark-ff-asm 0.4.2", + "ark-ff-macros 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "digest 0.10.7", "itertools 0.10.5", "num-bigint 0.4.5", "num-traits 0.2.19", "paste", - "rustc_version", + "rustc_version 0.4.0", "zeroize", ] +[[package]] +name = "ark-ff-asm" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -234,6 +677,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-ff-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" +dependencies = [ + "num-bigint 0.4.5", + "num-traits 0.2.19", + "quote", + "syn 1.0.109", +] + [[package]] name = "ark-ff-macros" version = "0.4.2" @@ -253,9 +708,9 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ff 0.4.2", + "ark-serialize 0.4.2", + "ark-std 0.4.0", "derivative", "hashbrown 0.13.2", ] @@ -267,8 +722,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c02e954eaeb4ddb29613fee20840c2bbc85ca4396d53e33837e11905363c5f2" dependencies = [ "ark-ec", - "ark-ff", - "ark-std", + "ark-ff 0.4.2", + "ark-std 0.4.0", ] [[package]] @@ -278,8 +733,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3975a01b0a6e3eae0f72ec7ca8598a6620fc72fa5981f6f5cca33b7cd788f633" dependencies = [ "ark-ec", - "ark-ff", - "ark-std", + "ark-ff 0.4.2", + "ark-std 0.4.0", +] + +[[package]] +name = "ark-serialize" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" +dependencies = [ + "ark-std 0.3.0", + "digest 0.9.0", ] [[package]] @@ -289,7 +754,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", - "ark-std", + "ark-std 0.4.0", "digest 0.10.7", "num-bigint 0.4.5", ] @@ -305,6 +770,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-std" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" +dependencies = [ + "num-traits 0.2.19", + "rand 0.8.5", +] + [[package]] name = "ark-std" version = "0.4.0" @@ -481,8 +956,8 @@ dependencies = [ "futures-lite 1.13.0", "log", "parking", - "polling 2.8.0", - "rustix 0.37.27", + "polling 2.5.2", + "rustix 0.37.13", "slab", "socket2 0.4.10", "waker-fn", @@ -657,7 +1132,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -698,7 +1173,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9a9bf8b79a749ee0b911b91b671cc2b6c670bdbc7e3dfd537576ddc94bb2a2" dependencies = [ - "http", + "http 0.2.12", "log", "url", ] @@ -737,12 +1212,12 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "bitflags 1.3.2", + "bitflags 1.2.1", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "itoa", "matchit", "memchr", @@ -754,9 +1229,9 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", ] @@ -770,8 +1245,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "mime", "rustversion", "tower-layer", @@ -889,7 +1364,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.61", ] @@ -911,7 +1386,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash", + "rustc-hash 1.1.0", "shlex", "syn 2.0.61", "which", @@ -934,9 +1409,9 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" -version = "1.3.2" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitflags" @@ -989,21 +1464,22 @@ version = "0.0.0" dependencies = [ "anyhow", "ark-ec", - "ark-ff", + "ark-ff 0.4.2", "ark-secp256k1", "ark-secp256r1", "assert_matches", "cached", "cairo-lang-casm", "cairo-lang-runner", + "cairo-lang-sierra", "cairo-lang-starknet-classes", "cairo-lang-utils", "cairo-native", "cairo-vm", "criterion", - "derive_more", + "derive_more 0.99.17", "glob", - "indexmap 2.2.6", + "indexmap 2.6.0", "itertools 0.12.1", "keccak", "log", @@ -1018,6 +1494,7 @@ dependencies = [ "rand 0.8.5", "regex", "rstest", + "semver 1.0.23", "serde", "serde_json", "sha2", @@ -1033,6 +1510,27 @@ dependencies = [ "toml", ] +[[package]] +name = "blockifier_regression_test" +version = "0.0.0" +dependencies = [ + "assert_matches", + "blockifier", + "cairo-lang-starknet-classes", + "cairo-lang-utils", + "cairo-vm", + "flate2", + "papyrus_execution", + "pretty_assertions", + "rstest", + "serde", + "serde_json", + "starknet-core", + "starknet-types-core", + "starknet_api", + "starknet_gateway", +] + [[package]] name = "blocking" version = "1.6.0" @@ -1047,6 +1545,18 @@ dependencies = [ "piper", ] +[[package]] +name = "blst" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874" +dependencies = [ + "cc", + "glob", + "threadpool", + "zeroize", +] + [[package]] name = "bs58" version = "0.5.1" @@ -1131,6 +1641,21 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "c-kzg" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" +dependencies = [ + "blst", + "cc", + "glob", + "hex", + "libc", + "once_cell", + "serde", +] + [[package]] name = "cached" version = "0.44.0" @@ -1169,9 +1694,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-lang-casm" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4425280959f189d8a5ebf1f5363c10663bc9f843a4819253e6be87d183b583e" +checksum = "60a4b4ca8473c25d1e760c83c2a49d953197556f82f6feb636004d3b6d6cc4a7" dependencies = [ "cairo-lang-utils", "indoc 2.0.5", @@ -1184,9 +1709,9 @@ dependencies = [ [[package]] name = "cairo-lang-compiler" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2698e2ca73db964e6d496a648fcbb2ace5559941b5179ab3310c9a0b6872b348" +checksum = "5852668d1c6966b34d6e4fe249732769ab9cb2012c201e3889d8119f206760a0" dependencies = [ "anyhow", "cairo-lang-defs", @@ -1201,26 +1726,27 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "indoc 2.0.5", - "salsa", - "semver", + "rayon", + "rust-analyzer-salsa", + "semver 1.0.23", "smol_str", "thiserror", ] [[package]] name = "cairo-lang-debug" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac7332f2b041ca28b24b0311a0b4a35f426bb52836a2d268a8374ea262e9e6b" +checksum = "b0644fab571f598547993936918c85f0e89b0bbc15140ca3ea723bff376be07d" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079a34b560a82b463cd12ae62022d70981e8ab56b6505f9499348ebeaf460de8" +checksum = "7f5f437d75ac25644880458effde562edcac45a888d27f2e497d30c6450fa97d" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -1229,15 +1755,15 @@ dependencies = [ "cairo-lang-syntax", "cairo-lang-utils", "itertools 0.12.1", - "salsa", + "rust-analyzer-salsa", "smol_str", ] [[package]] name = "cairo-lang-diagnostics" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c29625349297ad791942377763f5b04c779ea694f436488dc6ad194720b89487" +checksum = "6ec5b44d3eaf50e28e068d163e56b9effcea6afe3625c32dd96418d2d4ebc34c" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1247,9 +1773,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb26cd75126db6eaf94d5dffe0ce750d030ac879a88de5a621551969e9b59e3" +checksum = "a0cd844e568f51e39729e8ac18bd27ada2e2b6dc9138f8c81adad48456480681" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1257,24 +1783,24 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "651012f2956bea884c7a3ab9df21dc76112d7edd3f403b37ca5be62fc3f41b09" +checksum = "323a2385e000589f7591f8a46599b4a462db6e36e5935bad3bceddcc1a1608e1" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", "path-clean", - "salsa", - "semver", + "rust-analyzer-salsa", + "semver 1.0.23", "serde", "smol_str", ] [[package]] name = "cairo-lang-formatter" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d09ffb9498368cf4e95d0b28662596331aef1677e4f759ab5e609d27dfcb587" +checksum = "1cf9cf637e12d41260dc59f3d988c76a6347424913ac8b6b8449ff3e79b59750" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1285,7 +1811,7 @@ dependencies = [ "diffy", "ignore", "itertools 0.12.1", - "salsa", + "rust-analyzer-salsa", "serde", "smol_str", "thiserror", @@ -1293,9 +1819,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da4ffe6c197c35dec665029fcf695422f02c55b5118b4da1142e182b9fe77f87" +checksum = "5d71bc5b1f19a00eb662c2cac33259b16b9cdbf9c005047aca0d538c13936407" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1311,16 +1837,15 @@ dependencies = [ "log", "num-bigint 0.4.5", "num-traits 0.2.19", - "once_cell", - "salsa", + "rust-analyzer-salsa", "smol_str", ] [[package]] name = "cairo-lang-parser" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f262ad5f1110ff70c93deb81cce024cf160f4a4518762e7deb2047fe73846789" +checksum = "5d939d258e26ace0f3cb1e50338ae18981a7505e3c20eabd24a62d70ee862d6c" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1331,16 +1856,16 @@ dependencies = [ "itertools 0.12.1", "num-bigint 0.4.5", "num-traits 0.2.19", - "salsa", + "rust-analyzer-salsa", "smol_str", "unescaper", ] [[package]] name = "cairo-lang-plugins" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18024b44b5edbc1f378ba85c1a4ff04e880ea465a33251053aec507f08250668" +checksum = "b67a553a6d2d2b54264e77e3c8cb5bc866b40b32d5e2144a58b74c559c7e289f" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1351,15 +1876,15 @@ dependencies = [ "indent", "indoc 2.0.5", "itertools 0.12.1", - "salsa", + "rust-analyzer-salsa", "smol_str", ] [[package]] name = "cairo-lang-proc-macros" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124402d8fad2a033bb36910dd7d0651f3100845c63dce679c58797a8cb0448c2" +checksum = "c33b5f4502b7efde6ac07fd5468f6dae15d88760aeece3d57a7bc4c224ba693e" dependencies = [ "cairo-lang-debug", "quote", @@ -1368,9 +1893,9 @@ dependencies = [ [[package]] name = "cairo-lang-project" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f37dba9653eabf4dcb43a5e1436cd6bc093b5ad6f28ff42eaaef12549014213" +checksum = "b63d6a3cc86a79a29978acaaf6f94738c5487e265247fe06c7bf359645d8c200" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1382,11 +1907,11 @@ dependencies = [ [[package]] name = "cairo-lang-runner" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18df87ee986ca0e02e2ea63483875b791602809873c908bbf7b3d592e3833a3a" +checksum = "528a247ac59cb35b2f99d64605a81de815fa5fb0b0e7f7ece1d4e7fcf267d4ea" dependencies = [ - "ark-ff", + "ark-ff 0.4.2", "ark-secp256k1", "ark-secp256r1", "cairo-lang-casm", @@ -1413,9 +1938,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1612476b548e9ab8ae89ee38a73d9875339f62f2f59d9ce8a719bc1761c54c3" +checksum = "00c284031fd14796dad91483c3039d7929f8440e1e9e334017744b1d22df5aa8" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1432,17 +1957,16 @@ dependencies = [ "itertools 0.12.1", "num-bigint 0.4.5", "num-traits 0.2.19", - "once_cell", - "salsa", + "rust-analyzer-salsa", "smol_str", "toml", ] [[package]] name = "cairo-lang-sierra" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8209be8cf22263bf8a55df334a642b74fe563beecbbbefa55cda39fa4b131a61" +checksum = "891488c1a3184ce91679f5bdb63015a1d24769a48bd07e5d51a1779d0031dfbe" dependencies = [ "anyhow", "cairo-lang-utils", @@ -1455,9 +1979,8 @@ dependencies = [ "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", - "once_cell", "regex", - "salsa", + "rust-analyzer-salsa", "serde", "serde_json", "sha3", @@ -1468,9 +1991,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-ap-change" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c9d1350366c23e4a9f6e18ea95939f18df52df455f06c0e3d7889f80ce18a94" +checksum = "ea7752cd48c86b2cde8603b753a6df4da086dacd16a73d288854d5f040b51171" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1484,9 +2007,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-gas" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fe1ff15052b173537360b7dca5f9b2ccb10392b2a1c11af99add35d42632115" +checksum = "340892a09c9421414b2ac45b03c705f16e2bd737e4559dfd98ee1d20718dec9e" dependencies = [ "cairo-lang-eq-solver", "cairo-lang-sierra", @@ -1500,9 +2023,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-generator" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3802e7b6722fabc9cc0a61c86e7ad53138f6f41880aca80a60f889739fbf55" +checksum = "c5cc616e8df44c4d685fe3c5f81f35ebbda57225098b35cea8602457c45c9e96" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1516,8 +2039,7 @@ dependencies = [ "cairo-lang-utils", "itertools 0.12.1", "num-traits 0.2.19", - "once_cell", - "salsa", + "rust-analyzer-salsa", "serde", "serde_json", "smol_str", @@ -1525,9 +2047,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-to-casm" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355bde3b0a835bac2457af133a9042a7d039c934e678905b843bb6b420884428" +checksum = "1c22ff7e8113a46a907f82f191096c96935cc48247e3079971ddf536ccc2f4f8" dependencies = [ "assert_matches", "cairo-lang-casm", @@ -1546,9 +2068,9 @@ dependencies = [ [[package]] name = "cairo-lang-sierra-type-size" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddddaacc814e0ffda9f176c913fb2a9cd74fe6594dea789e8281eef10cac201" +checksum = "5bf41941776e7410a8853a8e2a116292fc24d219df1989a92ffe5ab0e98037eb" dependencies = [ "cairo-lang-sierra", "cairo-lang-utils", @@ -1556,9 +2078,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10be5fd5fe78db232b032e25e4be786f8061606be4ab26371c869c5ab267699c" +checksum = "b5508fa5ee8d24adf7d2c65505d0ac35efc892eac16d1449c6f7e314a0288cb8" dependencies = [ "anyhow", "cairo-lang-compiler", @@ -1577,7 +2099,6 @@ dependencies = [ "indent", "indoc 2.0.5", "itertools 0.12.1", - "once_cell", "serde", "serde_json", "smol_str", @@ -1587,9 +2108,9 @@ dependencies = [ [[package]] name = "cairo-lang-starknet-classes" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bf919d0919fce727c6d53ee5cb37459c9db35c258521284523c53f5f907c07" +checksum = "482b8f9d7f8cc7140f1260ee71f3308a66d15bd228a06281067ca3f8f4410db2" dependencies = [ "cairo-lang-casm", "cairo-lang-sierra", @@ -1600,7 +2121,6 @@ dependencies = [ "num-bigint 0.4.5", "num-integer", "num-traits 0.2.19", - "once_cell", "serde", "serde_json", "sha3", @@ -1611,25 +2131,25 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a376f88d815b63505be54a6afa93d75b67cfd65835922ec648cfcbb0a5e4b4" +checksum = "7db0776c3d06cea65d7afe7a3c7685f6867eb6d951cf505caf35abfd1746773b" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", "cairo-lang-utils", "num-bigint 0.4.5", "num-traits 0.2.19", - "salsa", + "rust-analyzer-salsa", "smol_str", "unescaper", ] [[package]] name = "cairo-lang-syntax-codegen" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01f276bc28f6302fc63032046a12b60d18498906e65f646acb963244eed97f7c" +checksum = "8ce0f7fa01c26cc731bc1d6350ac02fae91a68b5fdf60e684f991e861715adc4" dependencies = [ "genco", "xshell", @@ -1637,15 +2157,14 @@ dependencies = [ [[package]] name = "cairo-lang-test-plugin" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4cc569e35642d48ba2c75ba500397887a54fa5ead441e005b59968445851b99" +checksum = "74f1597b8229a3649183ff33b19f0aeca5d86505253ebbbce377b271d1732835" dependencies = [ "anyhow", "cairo-lang-compiler", "cairo-lang-debug", "cairo-lang-defs", - "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-lowering", "cairo-lang-semantic", @@ -1665,9 +2184,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e90b6236439e19077ec913351a17a33c7be199dcafdacd8389c4c5199400d6" +checksum = "630a070a69c387eee9c0eda65e4f2508d129d4fbe081091077e661020ab95637" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -1678,12 +2197,12 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.7.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a394e545f1500bea093d01be40895d3234faaa24d9585d08a509c514cabd88" +checksum = "73104609a7d865e4cd1de9cbf4e750683d076b6d0233bf81be511df274a26916" dependencies = [ "hashbrown 0.14.5", - "indexmap 2.2.6", + "indexmap 2.6.0", "itertools 0.12.1", "num-bigint 0.4.5", "num-traits 0.2.19", @@ -1695,13 +2214,14 @@ dependencies = [ [[package]] name = "cairo-native" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=354ef2b8088785e859a618418c62bfb8c995faff#354ef2b8088785e859a618418c62bfb8c995faff" +source = "git+https://github.com/lambdaclass/cairo_native?rev=2be717cba74c63628cb68b619ff2022c70d0cdd2#2be717cba74c63628cb68b619ff2022c70d0cdd2" dependencies = [ "anyhow", "aquamarine", "bumpalo", "cairo-lang-compiler", "cairo-lang-defs", + "cairo-lang-diagnostics", "cairo-lang-filesystem", "cairo-lang-runner", "cairo-lang-semantic", @@ -1731,6 +2251,8 @@ dependencies = [ "num-traits 0.2.19", "p256", "sec1", + "serde", + "serde_json", "sha2", "starknet-types-core", "stats_alloc", @@ -1743,7 +2265,7 @@ dependencies = [ [[package]] name = "cairo-native-runtime" version = "0.2.0" -source = "git+https://github.com/lambdaclass/cairo_native?rev=354ef2b8088785e859a618418c62bfb8c995faff#354ef2b8088785e859a618418c62bfb8c995faff" +source = "git+https://github.com/lambdaclass/cairo_native?rev=2be717cba74c63628cb68b619ff2022c70d0cdd2#2be717cba74c63628cb68b619ff2022c70d0cdd2" dependencies = [ "cairo-lang-sierra-gas", "lazy_static", @@ -1817,7 +2339,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", - "semver", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -2005,7 +2527,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] @@ -2082,10 +2604,10 @@ version = "0.0.0" dependencies = [ "clap", "criterion", - "derive_more", + "derive_more 0.99.17", "ethnum", "futures", - "indexmap 2.2.6", + "indexmap 2.6.0", "pretty_assertions", "rand 0.8.5", "rand_distr", @@ -2410,7 +2932,7 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "platforms", - "rustc_version", + "rustc_version 0.4.0", "subtle", "zeroize", ] @@ -2507,7 +3029,7 @@ dependencies = [ "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.10", + "parking_lot_core", ] [[package]] @@ -2637,10 +3159,31 @@ dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", ] +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.61", + "unicode-xid", +] + [[package]] name = "deunicode" version = "1.6.0" @@ -3124,7 +3667,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "syn 2.0.61", @@ -3186,8 +3729,8 @@ checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649" dependencies = [ "chrono", "ethers-core", - "reqwest", - "semver", + "reqwest 0.11.27", + "semver 1.0.23", "serde", "serde_json", "thiserror", @@ -3211,7 +3754,7 @@ dependencies = [ "futures-locks", "futures-util", "instant", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -3238,12 +3781,12 @@ dependencies = [ "futures-timer", "futures-util", "hashers", - "http", + "http 0.2.12", "instant", "jsonwebtoken", "once_cell", "pin-project", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "thiserror", @@ -3296,7 +3839,7 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver", + "semver 1.0.23", "serde", "serde_json", "solang-parser", @@ -3409,6 +3952,17 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +[[package]] +name = "fastrlp" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" +dependencies = [ + "arrayvec", + "auto_impl", + "bytes", +] + [[package]] name = "ff" version = "0.13.0" @@ -3483,6 +4037,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -3660,7 +4220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls", + "rustls 0.21.12", ] [[package]] @@ -3714,6 +4274,12 @@ dependencies = [ "slab", ] +[[package]] +name = "futures-utils-wasm" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" + [[package]] name = "fxhash" version = "0.2.1" @@ -3814,7 +4380,7 @@ dependencies = [ "futures-core", "futures-sink", "gloo-utils", - "http", + "http 0.2.12", "js-sys", "pin-project", "serde", @@ -3873,14 +4439,14 @@ dependencies = [ "flume", "futures", "gumdrop", - "http", + "http 0.2.12", "itertools 0.11.0", "lazy_static", "log", "num-format", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "simplelog", @@ -3934,8 +4500,8 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 2.2.6", + "http 0.2.12", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -3978,6 +4544,16 @@ dependencies = [ "serde", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "foldhash", + "serde", +] + [[package]] name = "hashers" version = "1.0.1" @@ -3997,15 +4573,6 @@ dependencies = [ "num-traits 0.2.19", ] -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.4.1" @@ -4029,6 +4596,15 @@ name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +dependencies = [ + "serde", +] + +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" [[package]] name = "hex_fmt" @@ -4073,7 +4649,7 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "rand 0.8.5", "resolv-conf", "smallvec", @@ -4131,6 +4707,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" @@ -4138,7 +4725,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", - "http", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +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.1", "pin-project-lite", ] @@ -4171,8 +4781,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", @@ -4184,6 +4794,25 @@ 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", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -4191,10 +4820,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "log", - "rustls", + "rustls 0.21.12", "rustls-native-certs", "tokio", "tokio-rustls", @@ -4207,10 +4836,46 @@ 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-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.7", + "tokio", + "tower 0.4.13", + "tower-service", + "tracing", ] [[package]] @@ -4335,8 +5000,8 @@ dependencies = [ "attohttpc", "bytes", "futures", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "log", "rand 0.8.5", "tokio", @@ -4442,12 +5107,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -4520,7 +5185,7 @@ dependencies = [ "socket2 0.5.7", "widestring", "windows-sys 0.48.0", - "winreg", + "winreg 0.50.0", ] [[package]] @@ -4642,7 +5307,7 @@ dependencies = [ "futures-channel", "futures-util", "gloo-net", - "http", + "http 0.2.12", "jsonrpsee-core", "pin-project", "rustls-native-certs", @@ -4653,7 +5318,7 @@ dependencies = [ "tokio-util", "tracing", "url", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -4668,11 +5333,11 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper", + "hyper 0.14.28", "jsonrpsee-types", - "parking_lot 0.12.2", + "parking_lot", "rand 0.8.5", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "soketto", @@ -4689,7 +5354,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.28", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -4697,7 +5362,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tracing", "url", ] @@ -4722,8 +5387,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" dependencies = [ "futures-util", - "http", - "hyper", + "http 0.2.12", + "hyper 0.14.28", "jsonrpsee-core", "jsonrpsee-types", "route-recognizer", @@ -4734,7 +5399,7 @@ dependencies = [ "tokio", "tokio-stream", "tokio-util", - "tower", + "tower 0.4.13", "tracing", ] @@ -4769,7 +5434,7 @@ version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" dependencies = [ - "http", + "http 0.2.12", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -4795,10 +5460,10 @@ dependencies = [ "memchr", "num-cmp", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "percent-encoding", "regex", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "time", @@ -4843,6 +5508,16 @@ dependencies = [ "cpufeatures", ] +[[package]] +name = "keccak-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" +dependencies = [ + "digest 0.10.7", + "sha3-asm", +] + [[package]] name = "kv-log-macro" version = "1.0.7" @@ -4852,6 +5527,15 @@ dependencies = [ "log", ] +[[package]] +name = "l1-provider" +version = "0.0.0" +dependencies = [ + "papyrus_base_layer", + "starknet_api", + "thiserror", +] + [[package]] name = "lalrpop" version = "0.20.2" @@ -4885,9 +5569,9 @@ dependencies = [ [[package]] name = "lambdaworks-crypto" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb5d4f22241504f7c7b8d2c3a7d7835d7c07117f10bff2a7d96a9ef6ef217c3" +checksum = "bbc2a4da0d9e52ccfe6306801a112e81a8fc0c76aa3e4449fefeda7fef72bb34" dependencies = [ "lambdaworks-math", "serde", @@ -4897,9 +5581,9 @@ dependencies = [ [[package]] name = "lambdaworks-math" -version = "0.7.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358e172628e713b80a530a59654154bfc45783a6ed70ea284839800cebdf8f97" +checksum = "d1bd2632acbd9957afc5aeec07ad39f078ae38656654043bf16e046fa2730e23" dependencies = [ "serde", "serde_json", @@ -4950,12 +5634,12 @@ checksum = "3f0bee397dc9a7003e7bd34fffc1dc2d4c4fdc96530a0c439a5f98c9402bc7bf" dependencies = [ "bitflags 2.5.0", "byteorder", - "derive_more", + "derive_more 0.99.17", "indexmap 1.9.3", "libc", "lifetimed-bytes", "mdbx-sys", - "parking_lot 0.12.2", + "parking_lot", "thiserror", ] @@ -5033,7 +5717,7 @@ dependencies = [ "multihash", "multistream-select", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "pin-project", "quick-protobuf", "rand 0.8.5", @@ -5057,7 +5741,7 @@ dependencies = [ "hickory-resolver", "libp2p-core", "libp2p-identity", - "parking_lot 0.12.2", + "parking_lot", "smallvec", "tracing", ] @@ -5260,11 +5944,11 @@ dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-tls", - "parking_lot 0.12.2", + "parking_lot", "quinn", "rand 0.8.5", "ring 0.16.20", - "rustls", + "rustls 0.21.12", "socket2 0.5.7", "thiserror", "tokio", @@ -5357,8 +6041,8 @@ dependencies = [ "libp2p-identity", "rcgen", "ring 0.16.20", - "rustls", - "rustls-webpki", + "rustls 0.21.12", + "rustls-webpki 0.101.7", "thiserror", "x509-parser", "yasna", @@ -5454,7 +6138,7 @@ dependencies = [ "lazy_static", "libc", "regex-lite", - "semver", + "semver 1.0.23", ] [[package]] @@ -5604,6 +6288,15 @@ dependencies = [ "libc", ] +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg 1.3.0", +] + [[package]] name = "memoffset" version = "0.9.1" @@ -5617,7 +6310,9 @@ dependencies = [ name = "mempool_test_utils" version = "0.0.0" dependencies = [ + "assert_matches", "blockifier", + "pretty_assertions", "serde_json", "starknet-types-core", "starknet_api", @@ -5651,7 +6346,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64 0.21.7", - "hyper", + "hyper 0.14.28", "indexmap 1.9.3", "ipnet", "metrics 0.21.1", @@ -5808,7 +6503,7 @@ dependencies = [ "assert-json-diff", "colored", "futures-core", - "hyper", + "hyper 0.14.28", "log", "rand 0.8.5", "regex", @@ -5914,7 +6609,7 @@ dependencies = [ "cached", "cairo-lang-starknet-classes", "cairo-vm", - "indexmap 2.2.6", + "indexmap 2.6.0", "log", "num-bigint 0.4.5", "papyrus_storage", @@ -5961,7 +6656,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags 1.3.2", + "bitflags 1.2.1", "byteorder", "libc", "netlink-packet-core", @@ -6015,13 +6710,26 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945" +dependencies = [ + "bitflags 1.2.1", + "cc", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + [[package]] name = "nix" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "cfg-if", "libc", ] @@ -6449,12 +7157,19 @@ dependencies = [ name = "papyrus_base_layer" version = "0.0.0" dependencies = [ + "alloy-contract", + "alloy-dyn-abi", + "alloy-json-rpc", + "alloy-primitives", + "alloy-provider", + "alloy-sol-types", + "alloy-transport", + "alloy-transport-http", "async-trait", "ethers", "ethers-core", "papyrus_config", "pretty_assertions", - "rustc-hex", "serde", "serde_json", "starknet-types-core", @@ -6467,27 +7182,13 @@ dependencies = [ "url", ] -[[package]] -name = "papyrus_block_builder" -version = "0.0.0" -dependencies = [ - "papyrus_storage", - "papyrus_test_utils", - "pretty_assertions", - "starknet_api", - "thiserror", - "tracing", -] - [[package]] name = "papyrus_common" version = "0.0.0" dependencies = [ "assert_matches", "cairo-lang-starknet-classes", - "hex", - "indexmap 2.2.6", - "itertools 0.12.1", + "indexmap 2.6.0", "lazy_static", "papyrus_test_utils", "pretty_assertions", @@ -6497,7 +7198,6 @@ dependencies = [ "sha3", "starknet-types-core", "starknet_api", - "thiserror", ] [[package]] @@ -6522,14 +7222,18 @@ name = "papyrus_consensus" version = "0.0.0" dependencies = [ "async-trait", + "clap", + "fs2", "futures", "lazy_static", "lru", "metrics 0.21.1", "mockall", + "nix 0.20.2", "papyrus_common", "papyrus_config", "papyrus_network", + "papyrus_network_types", "papyrus_protobuf", "papyrus_storage", "papyrus_test_utils", @@ -6542,6 +7246,24 @@ dependencies = [ "tracing", ] +[[package]] +name = "papyrus_consensus_orchestrator" +version = "0.0.0" +dependencies = [ + "async-trait", + "futures", + "mockall", + "papyrus_consensus", + "papyrus_network", + "papyrus_protobuf", + "papyrus_storage", + "papyrus_test_utils", + "starknet_api", + "test-case", + "tokio", + "tracing", +] + [[package]] name = "papyrus_execution" version = "0.0.0" @@ -6553,7 +7275,7 @@ dependencies = [ "cairo-lang-starknet-classes", "cairo-lang-utils", "cairo-vm", - "indexmap 2.2.6", + "indexmap 2.6.0", "itertools 0.12.1", "lazy_static", "papyrus_common", @@ -6582,7 +7304,7 @@ dependencies = [ "once_cell", "pretty_assertions", "rand 0.8.5", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "tokio", @@ -6593,8 +7315,8 @@ name = "papyrus_monitoring_gateway" version = "0.0.0" dependencies = [ "axum", - "http-body", - "hyper", + "http-body 0.4.6", + "hyper 0.14.28", "metrics 0.21.1", "metrics-exporter-prometheus", "metrics-process", @@ -6607,7 +7329,7 @@ dependencies = [ "starknet_client", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tracing", "validator", ] @@ -6618,10 +7340,11 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-stream", + "async-trait", "bytes", "deadqueue", "defaultmap", - "derive_more", + "derive_more 0.99.17", "futures", "lazy_static", "libp2p", @@ -6630,6 +7353,7 @@ dependencies = [ "mockall", "papyrus_common", "papyrus_config", + "papyrus_network_types", "pretty_assertions", "replace_with", "serde", @@ -6644,6 +7368,16 @@ dependencies = [ "void", ] +[[package]] +name = "papyrus_network_types" +version = "0.0.0" +dependencies = [ + "libp2p", + "papyrus_test_utils", + "rand_chacha 0.3.1", + "serde", +] + [[package]] name = "papyrus_node" version = "0.0.0" @@ -6664,6 +7398,7 @@ dependencies = [ "papyrus_common", "papyrus_config", "papyrus_consensus", + "papyrus_consensus_orchestrator", "papyrus_monitoring_gateway", "papyrus_network", "papyrus_p2p_sync", @@ -6672,7 +7407,7 @@ dependencies = [ "papyrus_sync", "papyrus_test_utils", "pretty_assertions", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "starknet_api", @@ -6695,7 +7430,7 @@ dependencies = [ "chrono", "enum-iterator", "futures", - "indexmap 2.2.6", + "indexmap 2.6.0", "lazy_static", "metrics 0.21.1", "papyrus_common", @@ -6735,13 +7470,15 @@ dependencies = [ name = "papyrus_protobuf" version = "0.0.0" dependencies = [ - "indexmap 2.2.6", + "futures", + "indexmap 2.6.0", "lazy_static", "papyrus_common", "papyrus_test_utils", "primitive-types", "prost", "prost-build", + "protoc-prebuilt", "rand 0.8.5", "rand_chacha 0.3.1", "starknet-types-core", @@ -6760,14 +7497,14 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-starknet-classes", "camelpaste", - "derive_more", + "derive_more 0.99.17", "enum-iterator", "ethers", "flate2", "futures-util", "hex", - "hyper", - "indexmap 2.2.6", + "hyper 0.14.28", + "indexmap 2.6.0", "insta", "itertools 0.12.1", "jsonrpsee", @@ -6787,7 +7524,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "regex", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "starknet-core", @@ -6797,7 +7534,7 @@ dependencies = [ "strum 0.25.0", "strum_macros 0.25.3", "tokio", - "tower", + "tower 0.4.13", "tracing", "validator", ] @@ -6814,7 +7551,7 @@ dependencies = [ "camelpaste", "clap", "human_bytes", - "indexmap 2.2.6", + "indexmap 2.6.0", "insta", "integer-encoding", "lazy_static", @@ -6864,7 +7601,7 @@ dependencies = [ "chrono", "futures", "futures-util", - "indexmap 2.2.6", + "indexmap 2.6.0", "itertools 0.12.1", "lru", "metrics 0.21.1", @@ -6876,7 +7613,7 @@ dependencies = [ "papyrus_storage", "papyrus_test_utils", "pretty_assertions", - "reqwest", + "reqwest 0.11.27", "serde", "simple_logger", "starknet-types-core", @@ -6895,14 +7632,14 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-starknet-classes", "cairo-lang-utils", - "indexmap 2.2.6", + "indexmap 2.6.0", "num-bigint 0.4.5", "pretty_assertions", "primitive-types", "prometheus-parse", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "starknet-types-core", @@ -6941,17 +7678,6 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.2" @@ -6959,21 +7685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -7080,6 +7792,17 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + [[package]] name = "petgraph" version = "0.6.5" @@ -7087,7 +7810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.6.0", ] [[package]] @@ -7097,7 +7820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -7263,18 +7986,16 @@ dependencies = [ [[package]] name = "polling" -version = "2.8.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ "autocfg 1.3.0", - "bitflags 1.3.2", "cfg-if", - "concurrent-queue", "libc", "log", - "pin-project-lite", - "windows-sys 0.48.0", + "wepoll-ffi", + "windows-sys 0.42.0", ] [[package]] @@ -7451,6 +8172,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "proc-macro2" version = "1.0.82" @@ -7491,7 +8234,7 @@ checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.2", + "parking_lot", "prometheus-client-derive-encode", ] @@ -7524,6 +8267,8 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ + "bit-set", + "bit-vec", "bitflags 2.5.0", "lazy_static", "num-traits 0.2.19", @@ -7531,6 +8276,8 @@ dependencies = [ "rand_chacha 0.3.1", "rand_xorshift 0.3.0", "regex-syntax 0.8.3", + "rusty-fork", + "tempfile", "unarray", ] @@ -7587,6 +8334,16 @@ dependencies = [ "prost", ] +[[package]] +name = "protoc-prebuilt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d85d4641fe3b8c6e853dfd09fe35379bc6b6e66bd692ac29ed4f7087de69ed5" +dependencies = [ + "ureq", + "zip", +] + [[package]] name = "psl-types" version = "2.0.11" @@ -7613,9 +8370,9 @@ dependencies = [ "hashbrown 0.14.5", "indoc 1.0.9", "libc", - "memoffset", + "memoffset 0.9.1", "num-bigint 0.4.5", - "parking_lot 0.12.2", + "parking_lot", "pyo3-build-config", "pyo3-ffi", "pyo3-macros", @@ -7744,8 +8501,8 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", - "rustls", + "rustc-hash 1.1.0", + "rustls 0.21.12", "thiserror", "tokio", "tracing", @@ -7760,8 +8517,8 @@ dependencies = [ "bytes", "rand 0.8.5", "ring 0.16.20", - "rustc-hash", - "rustls", + "rustc-hash 1.1.0", + "rustls 0.21.12", "slab", "thiserror", "tinyvec", @@ -7824,6 +8581,7 @@ dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.4", + "serde", ] [[package]] @@ -7957,7 +8715,7 @@ version = "10.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] @@ -8007,22 +8765,13 @@ dependencies = [ "rand_core 0.3.1", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", ] [[package]] @@ -8122,11 +8871,11 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "hyper 0.14.28", "hyper-rustls", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -8135,12 +8884,12 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", @@ -8151,8 +8900,47 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg", + "webpki-roots 0.25.4", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-tls 0.6.0", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls-pemfile 2.2.0", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.52.0", ] [[package]] @@ -8260,7 +9048,7 @@ dependencies = [ "futures", "futures-timer", "rstest_macros", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -8272,7 +9060,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", "unicode-ident", ] @@ -8293,6 +9081,65 @@ dependencies = [ "tokio", ] +[[package]] +name = "ruint" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286" +dependencies = [ + "alloy-rlp", + "ark-ff 0.3.0", + "ark-ff 0.4.2", + "bytes", + "fastrlp", + "num-bigint 0.4.5", + "num-traits 0.2.19", + "parity-scale-codec", + "primitive-types", + "proptest", + "rand 0.8.5", + "rlp", + "ruint-macro", + "serde", + "valuable", + "zeroize", +] + +[[package]] +name = "ruint-macro" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" + +[[package]] +name = "rust-analyzer-salsa" +version = "0.17.0-pre.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719825638c59fd26a55412a24561c7c5bcf54364c88b9a7a04ba08a6eafaba8d" +dependencies = [ + "indexmap 2.6.0", + "lock_api", + "oorandom", + "parking_lot", + "rust-analyzer-salsa-macros", + "rustc-hash 1.1.0", + "smallvec", + "tracing", + "triomphe", +] + +[[package]] +name = "rust-analyzer-salsa-macros" +version = "0.17.0-pre.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d96498e9684848c6676c399032ebc37c52da95ecbefa83d71ccc53b9f8a4a8e" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "rust_decimal" version = "1.35.0" @@ -8315,19 +9162,34 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustc-hex" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" +dependencies = [ + "semver 0.11.0", +] + [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver", + "semver 1.0.23", ] [[package]] @@ -8341,11 +9203,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.27" +version = "0.37.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" +checksum = "f79bef90eb6d984c72722595b5b1348ab39275a5e5123faca6863bf07d75a4e0" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "errno", "io-lifetimes", "libc", @@ -8374,10 +9236,25 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", "ring 0.17.8", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" +dependencies = [ + "log", + "once_cell", + "ring 0.17.8", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.3" @@ -8385,7 +9262,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.4", "schannel", "security-framework", ] @@ -8399,6 +9276,21 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -8409,12 +9301,35 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring 0.17.8", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "rw-stream-sink" version = "0.4.0" @@ -8427,39 +9342,10 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "salsa" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" -dependencies = [ - "crossbeam-utils", - "indexmap 1.9.3", - "lock_api", - "log", - "oorandom", - "parking_lot 0.11.2", - "rustc-hash", - "salsa-macros", - "smallvec", -] - -[[package]] -name = "salsa-macros" -version = "0.16.0" +name = "ryu" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" -dependencies = [ - "heck 0.3.3", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -8486,7 +9372,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.17", "parity-scale-codec", "scale-info-derive", ] @@ -8602,6 +9488,15 @@ dependencies = [ "libc", ] +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser", +] + [[package]] name = "semver" version = "1.0.23" @@ -8611,6 +9506,15 @@ dependencies = [ "serde", ] +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + [[package]] name = "send_wrapper" version = "0.4.0" @@ -8656,11 +9560,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -8790,6 +9695,16 @@ dependencies = [ "keccak", ] +[[package]] +name = "sha3-asm" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" +dependencies = [ + "cc", + "cfg-if", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -8940,7 +9855,7 @@ dependencies = [ "curve25519-dalek", "rand_core 0.6.4", "ring 0.17.8", - "rustc_version", + "rustc_version 0.4.0", "sha2", "subtle", ] @@ -8974,7 +9889,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", @@ -9031,6 +9946,12 @@ dependencies = [ "num-traits 0.1.43", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "starknet-core" version = "0.6.1" @@ -9049,26 +9970,6 @@ dependencies = [ "starknet-ff", ] -[[package]] -name = "starknet-crypto" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f2175b0b3fc24ff2ec6dc07f5a720498994effca7e78b11a6e1c1bd02cad52" -dependencies = [ - "crypto-bigint", - "hex", - "hmac", - "num-bigint 0.4.5", - "num-integer", - "num-traits 0.2.19", - "rfc6979", - "sha2", - "starknet-crypto-codegen 0.3.3", - "starknet-curve 0.3.0", - "starknet-ff", - "zeroize", -] - [[package]] name = "starknet-crypto" version = "0.6.2" @@ -9131,15 +10032,6 @@ dependencies = [ "syn 2.0.61", ] -[[package]] -name = "starknet-curve" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "252610baff59e4c4332ce3569f7469c5d3f9b415a2240d698fb238b2b4fc0942" -dependencies = [ - "starknet-ff", -] - [[package]] name = "starknet-curve" version = "0.4.2" @@ -9164,7 +10056,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abf1b44ec5b18d87c1ae5f54590ca9d0699ef4dd5b2ffa66fc97f24613ec585" dependencies = [ - "ark-ff", + "ark-ff 0.4.2", "bigdecimal", "crypto-bigint", "getrandom", @@ -9174,9 +10066,9 @@ dependencies = [ [[package]] name = "starknet-types-core" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6bacf0ba19bc721e518bc4bf389ff13daa8a7c5db5fd320600473b8aa9fcbd" +checksum = "fa1b9e01ccb217ab6d475c5cda05dbb22c30029f7bb52b192a010a00d77a3d74" dependencies = [ "lambdaworks-crypto", "lambdaworks-math", @@ -9194,16 +10086,18 @@ dependencies = [ "assert_matches", "bitvec", "cairo-lang-starknet-classes", - "derive_more", + "derive_more 0.99.17", "hex", - "indexmap 2.2.6", + "indexmap 2.6.0", "itertools 0.12.1", + "num-bigint 0.4.5", + "pretty_assertions", "primitive-types", "rstest", "serde", "serde_json", "sha3", - "starknet-crypto 0.5.2", + "starknet-crypto 0.7.1", "starknet-types-core", "strum 0.25.0", "strum_macros 0.25.3", @@ -9216,8 +10110,12 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-trait", + "futures", + "mempool_test_utils", "mockall", "papyrus_config", + "papyrus_storage", + "rstest", "serde", "starknet_api", "starknet_batcher_types", @@ -9225,6 +10123,7 @@ dependencies = [ "starknet_mempool_types", "thiserror", "tokio", + "tokio-stream", "tracing", "validator", ] @@ -9234,9 +10133,12 @@ name = "starknet_batcher_types" version = "0.0.0" dependencies = [ "async-trait", + "chrono", "mockall", "papyrus_proc_macros", "serde", + "starknet_api", + "starknet_consensus_manager_types", "starknet_mempool_infra", "thiserror", ] @@ -9249,8 +10151,8 @@ dependencies = [ "async-trait", "cairo-lang-starknet-classes", "enum-iterator", - "http", - "indexmap 2.2.6", + "http 0.2.12", + "indexmap 2.6.0", "mockall", "mockito 0.31.1", "os_info", @@ -9260,7 +10162,7 @@ dependencies = [ "pretty_assertions", "rand 0.8.5", "rand_chacha 0.3.1", - "reqwest", + "reqwest 0.11.27", "serde", "serde_json", "serde_repr", @@ -9301,7 +10203,6 @@ dependencies = [ "starknet_batcher_types", "starknet_consensus_manager_types", "starknet_mempool_infra", - "tokio", "validator", ] @@ -9310,6 +10211,7 @@ name = "starknet_consensus_manager_types" version = "0.0.0" dependencies = [ "async-trait", + "derive_more 0.99.17", "mockall", "papyrus_proc_macros", "serde", @@ -9327,8 +10229,7 @@ dependencies = [ "blockifier", "cairo-lang-sierra-to-casm", "cairo-lang-starknet-classes", - "enum-assoc", - "hyper", + "hyper 0.14.28", "mempool_test_utils", "mockall", "mockito 1.4.0", @@ -9336,12 +10237,13 @@ dependencies = [ "papyrus_config", "papyrus_rpc", "pretty_assertions", - "reqwest", + "reqwest 0.11.27", "rstest", "serde", "serde_json", "starknet-types-core", "starknet_api", + "starknet_gateway_types", "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", @@ -9353,19 +10255,54 @@ dependencies = [ "validator", ] +[[package]] +name = "starknet_gateway_types" +version = "0.0.0" +dependencies = [ + "async-trait", + "axum", + "enum-assoc", + "mockall", + "papyrus_rpc", + "serde", + "serde_json", + "starknet_api", + "starknet_mempool_infra", + "thiserror", + "tracing", +] + +[[package]] +name = "starknet_http_server" +version = "0.0.0" +dependencies = [ + "axum", + "papyrus_config", + "serde", + "serde_json", + "starknet_api", + "starknet_gateway", + "starknet_gateway_types", + "starknet_mempool_infra", + "tokio", + "tracing", + "validator", +] + [[package]] name = "starknet_mempool" version = "0.0.0" dependencies = [ "assert_matches", "async-trait", - "derive_more", + "derive_more 0.99.17", "itertools 0.12.1", "mempool_test_utils", "pretty_assertions", "rstest", "starknet-types-core", "starknet_api", + "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", "tokio", @@ -9378,11 +10315,12 @@ dependencies = [ "assert_matches", "async-trait", "bincode 1.3.3", - "hyper", + "hyper 0.14.28", "papyrus_config", "pretty_assertions", "rstest", "serde", + "starknet-types-core", "thiserror", "tokio", "tracing", @@ -9394,23 +10332,26 @@ dependencies = [ name = "starknet_mempool_integration_tests" version = "0.0.0" dependencies = [ + "assert_matches", "axum", "blockifier", "cairo-lang-starknet-classes", - "indexmap 2.2.6", - "itertools 0.12.1", + "indexmap 2.6.0", "mempool_test_utils", "papyrus_common", "papyrus_rpc", "papyrus_storage", "pretty_assertions", - "reqwest", + "reqwest 0.11.27", "rstest", "serde_json", "starknet-types-core", "starknet_api", + "starknet_batcher", "starknet_client", "starknet_gateway", + "starknet_gateway_types", + "starknet_http_server", "starknet_mempool_infra", "starknet_mempool_node", "starknet_mempool_types", @@ -9437,11 +10378,14 @@ dependencies = [ "rstest", "serde", "serde_json", + "starknet_api", "starknet_batcher", "starknet_batcher_types", "starknet_consensus_manager", "starknet_consensus_manager_types", "starknet_gateway", + "starknet_gateway_types", + "starknet_http_server", "starknet_mempool", "starknet_mempool_infra", "starknet_mempool_types", @@ -9451,12 +10395,36 @@ dependencies = [ "validator", ] +[[package]] +name = "starknet_mempool_p2p" +version = "0.0.0" +dependencies = [ + "async-trait", + "papyrus_network", + "starknet_mempool_infra", + "starknet_mempool_p2p_types", +] + +[[package]] +name = "starknet_mempool_p2p_types" +version = "0.0.0" +dependencies = [ + "async-trait", + "papyrus_network_types", + "papyrus_proc_macros", + "serde", + "starknet_api", + "starknet_mempool_infra", + "thiserror", +] + [[package]] name = "starknet_mempool_types" version = "0.0.0" dependencies = [ "async-trait", "mockall", + "papyrus_network_types", "papyrus_proc_macros", "serde", "starknet_api", @@ -9469,7 +10437,7 @@ name = "starknet_patricia" version = "0.0.0" dependencies = [ "async-recursion", - "derive_more", + "derive_more 0.99.17", "ethnum", "hex", "pretty_assertions", @@ -9500,6 +10468,7 @@ dependencies = [ "serde_json", "starknet-types-core", "starknet_api", + "tempfile", "thiserror", "validator", ] @@ -9544,7 +10513,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "phf_shared 0.10.0", "precomputed-hash", ] @@ -9618,8 +10587,8 @@ dependencies = [ "fs2", "hex", "once_cell", - "reqwest", - "semver", + "reqwest 0.11.27", + "semver 1.0.23", "serde", "serde_json", "sha2", @@ -9650,12 +10619,30 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn-solidity" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a850d65181df41b83c6be01a7d91f5e9377c43d48faa5af7d95816f437f5a3" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.61", +] + [[package]] name = "sync_wrapper" 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" + [[package]] name = "synstructure" version = "0.12.6" @@ -9689,7 +10676,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags 1.3.2", + "bitflags 1.2.1", "core-foundation", "system-configuration-sys", ] @@ -9845,7 +10832,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "reqwest", + "reqwest 0.11.27", "syn 2.0.61", "sysinfo", "users", @@ -9902,6 +10889,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + [[package]] name = "tikv-jemalloc-sys" version = "0.5.4+5.3.0-patched" @@ -10000,7 +10996,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", @@ -10046,7 +11042,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] @@ -10059,6 +11055,7 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", + "tokio-util", ] [[package]] @@ -10082,11 +11079,11 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.21.12", "tokio", "tokio-rustls", "tungstenite", - "webpki-roots", + "webpki-roots 0.25.4", ] [[package]] @@ -10130,7 +11127,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -10141,7 +11138,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "toml_datetime", "winnow 0.5.40", ] @@ -10152,7 +11149,7 @@ version = "0.22.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", @@ -10180,17 +11177,31 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -10298,6 +11309,16 @@ dependencies = [ "syn 2.0.61", ] +[[package]] +name = "triomphe" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +dependencies = [ + "serde", + "stable_deref_trait", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -10313,11 +11334,11 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.12", "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.21.12", "sha1", "thiserror", "url", @@ -10336,6 +11357,12 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "uint" version = "0.9.5" @@ -10452,6 +11479,21 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "2.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a" +dependencies = [ + "base64 0.22.1", + "log", + "once_cell", + "rustls 0.23.14", + "rustls-pki-types", + "url", + "webpki-roots 0.26.6", +] + [[package]] name = "url" version = "2.5.0" @@ -10461,6 +11503,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding", + "serde", ] [[package]] @@ -10576,6 +11619,15 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "waker-fn" version = "1.1.1" @@ -10689,6 +11741,24 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "webpki-roots" +version = "0.26.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "wepoll-ffi" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +dependencies = [ + "cc", +] + [[package]] name = "which" version = "4.4.2" @@ -10795,6 +11865,21 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -10844,6 +11929,12 @@ dependencies = [ "windows_x86_64_msvc 0.52.5", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -10856,6 +11947,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -10868,6 +11965,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -10886,6 +11989,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -10898,6 +12007,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -10910,6 +12025,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -10922,6 +12043,12 @@ version = "0.52.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -10962,6 +12089,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 = "workspace_tests" version = "0.0.0" @@ -10981,7 +12118,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version", + "rustc_version 0.4.0", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -11077,7 +12214,7 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.2", + "parking_lot", "pin-project", "rand 0.8.5", "static_assertions", @@ -11093,7 +12230,7 @@ dependencies = [ "instant", "log", "nohash-hasher", - "parking_lot 0.12.2", + "parking_lot", "pin-project", "rand 0.8.5", "static_assertions", From ac84f6ae57f36e42027078c52787383adf9820de Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 11:53:57 -0400 Subject: [PATCH 14/21] refactor: native syscall handler --- .../src/execution/native/syscall_handler.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/crates/blockifier/src/execution/native/syscall_handler.rs b/crates/blockifier/src/execution/native/syscall_handler.rs index 6ed2758251..0da19907f0 100644 --- a/crates/blockifier/src/execution/native/syscall_handler.rs +++ b/crates/blockifier/src/execution/native/syscall_handler.rs @@ -67,7 +67,8 @@ impl<'state> NativeSyscallHandler<'state> { } } - pub fn execute_inner_call( + #[allow(dead_code)] + fn execute_inner_call( &mut self, entry_point: CallEntryPoint, remaining_gas: &mut u128, @@ -75,23 +76,22 @@ impl<'state> NativeSyscallHandler<'state> { let call_info = entry_point .execute(self.state, self.resources, self.context) .map_err(|e| encode_str_as_felts(&e.to_string()))?; - let retdata = call_info.execution.retdata.0.clone(); + let retdata = call_info.execution.retdata.clone(); if call_info.execution.failed { // In VM it's wrapped into `SyscallExecutionError::SyscallError`. - return Err(retdata); + return Err(retdata.0.clone()); } self.update_remaining_gas(remaining_gas, &call_info); - let retdata = call_info.execution.retdata.clone(); - self.inner_calls.push(call_info); Ok(retdata) } - pub fn update_remaining_gas(&mut self, remaining_gas: &mut u128, call_info: &CallInfo) { + #[allow(dead_code)] + fn update_remaining_gas(&mut self, remaining_gas: &mut u128, call_info: &CallInfo) { // Create a new variable with converted type. let mut remaining_gas_u64 = u64::try_from(*remaining_gas).unwrap(); @@ -105,7 +105,8 @@ impl<'state> NativeSyscallHandler<'state> { // Handles gas related logic when executing a syscall. Required because Native calls the // syscalls directly unlike the VM where the `execute_syscall` method perform this operation // first. - pub fn substract_syscall_gas_cost( + #[allow(dead_code)] + fn substract_syscall_gas_cost( &mut self, remaining_gas: &mut u128, syscall_gas_cost: u64, From 72a9e235022d8fd1f7f4cd4766ed0d697fcaaa0f Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 13:31:42 -0400 Subject: [PATCH 15/21] chore: restore committer_ci.yml --- .github/workflows/committer_ci.yml | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index c3c65313ce..98bdf20029 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -8,14 +8,14 @@ on: tags: - v[0-9].** paths: - - ".github/workflows/committer_ci.yml" - - "Cargo.toml" - - "Cargo.lock" - - "crates/committer_cli/**" - - "crates/starknet_api/**" - - "crates/starknet_committer/**" - - "crates/starknet_patricia/**" - - "scripts/dependencies.sh" + - '.github/workflows/committer_ci.yml' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/committer_cli/**' + - 'crates/starknet_api/**' + - 'crates/starknet_committer/**' + - 'crates/starknet_patricia/**' + - 'scripts/dependencies.sh' pull_request: types: @@ -25,14 +25,14 @@ on: - auto_merge_enabled - edited paths: - - ".github/workflows/committer_ci.yml" - - "Cargo.toml" - - "Cargo.lock" - - "crates/committer_cli/**" - - "crates/starknet_api/**" - - "crates/starknet_committer/**" - - "crates/starknet_patricia/**" - - "scripts/dependencies.sh" + - '.github/workflows/committer_ci.yml' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/committer_cli/**' + - 'crates/starknet_api/**' + - 'crates/starknet_committer/**' + - 'crates/starknet_patricia/**' + - 'scripts/dependencies.sh' # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -56,7 +56,7 @@ jobs: uses: "google-github-actions/auth@v2" with: credentials_json: ${{ secrets.COMMITER_PRODUCTS_EXT_WRITER_JSON }} - - uses: "google-github-actions/setup-gcloud@v2" + - uses: 'google-github-actions/setup-gcloud@v2' - run: echo "BENCH_INPUT_FILES_PREFIX=$(cat ./crates/committer_cli/src/tests/flow_test_files_prefix)" >> $GITHUB_ENV - run: gcloud storage cp -r gs://committer-testing-artifacts/$BENCH_INPUT_FILES_PREFIX/* ./crates/committer_cli/test_inputs - run: cargo test -p committer_cli --release -- --include-ignored test_regression @@ -75,7 +75,7 @@ jobs: uses: "google-github-actions/auth@v2" with: credentials_json: ${{ secrets.COMMITER_PRODUCTS_EXT_WRITER_JSON }} - - uses: "google-github-actions/setup-gcloud@v2" + - uses: 'google-github-actions/setup-gcloud@v2' - run: echo "OLD_BENCH_INPUT_FILES_PREFIX=$(cat ./crates/committer_cli/src/tests/flow_test_files_prefix)" >> $GITHUB_ENV - run: gcloud storage cp -r gs://committer-testing-artifacts/$OLD_BENCH_INPUT_FILES_PREFIX/* ./crates/committer_cli/test_inputs From 4f8f59dfa1dc0a89471e765428d65df52cce835c Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 14:07:46 -0400 Subject: [PATCH 16/21] refactor: move update_remainng_gas out of SyscallHandler impl --- .../src/execution/native/syscall_handler.rs | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/crates/blockifier/src/execution/native/syscall_handler.rs b/crates/blockifier/src/execution/native/syscall_handler.rs index 0da19907f0..7f9ca94be6 100644 --- a/crates/blockifier/src/execution/native/syscall_handler.rs +++ b/crates/blockifier/src/execution/native/syscall_handler.rs @@ -83,25 +83,13 @@ impl<'state> NativeSyscallHandler<'state> { return Err(retdata.0.clone()); } - self.update_remaining_gas(remaining_gas, &call_info); + native_update_remaining_gas(remaining_gas, &call_info); self.inner_calls.push(call_info); Ok(retdata) } - #[allow(dead_code)] - fn update_remaining_gas(&mut self, remaining_gas: &mut u128, call_info: &CallInfo) { - // Create a new variable with converted type. - let mut remaining_gas_u64 = u64::try_from(*remaining_gas).unwrap(); - - // Pass the reference to the function. - update_remaining_gas(&mut remaining_gas_u64, call_info); - - // Change the remaining gas value. - *remaining_gas = u128::from(remaining_gas_u64); - } - // Handles gas related logic when executing a syscall. Required because Native calls the // syscalls directly unlike the VM where the `execute_syscall` method perform this operation // first. @@ -322,3 +310,18 @@ impl<'state> StarknetSyscallHandler for &mut NativeSyscallHandler<'state> { todo!("Implement sha256_process_block syscall."); } } + +/// Wrapper function around [update_remaining_gas] which takes a u128 as an input, converts it to +/// u64 and uses [update_remaining_gas] to withdraw the right amount. Finally, updates the value +/// to which `remaining_gas` points to. +#[allow(dead_code)] +fn native_update_remaining_gas(remaining_gas: &mut u128, call_info: &CallInfo) { + // Create a new variable with converted type. + let mut remaining_gas_u64 = u64::try_from(*remaining_gas).unwrap(); + + // Pass the reference to the function. + update_remaining_gas(&mut remaining_gas_u64, call_info); + + // Change the remaining gas value. + *remaining_gas = u128::from(remaining_gas_u64); +} From 29c2b37fabd569c520f38d40cd23b3a4f11c5f22 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 14:15:25 -0400 Subject: [PATCH 17/21] fix: restore concurrency in main workflow --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a87db9c686..3ffc539917 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,11 @@ on: # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: +<<<<<<< HEAD group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }} +======= + group: ${{ github.workflow }}-${{ github.ref }} +>>>>>>> df3f7106c (fix: restore concurrency in main workflow) cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: From 045a3205d242ea14a3418e66ce685e6f7ac69dbb Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 14:26:34 -0400 Subject: [PATCH 18/21] chore: restore papyrus_docker-publish.yml --- .github/workflows/papyrus_docker-publish.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/papyrus_docker-publish.yml b/.github/workflows/papyrus_docker-publish.yml index 9b2110997c..294bd71fb7 100644 --- a/.github/workflows/papyrus_docker-publish.yml +++ b/.github/workflows/papyrus_docker-publish.yml @@ -6,15 +6,15 @@ on: branches: [main] tags: ["v*.*.*"] paths: - - ".github/workflows/papyrus_docker-publish.yml" - - "crates/papyrus**/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_docker-publish.yml' + - 'crates/papyrus**/**' + - 'scripts/dependencies.sh' pull_request: paths: - - ".github/workflows/papyrus_docker-publish.yml" - - "crates/papyrus**/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_docker-publish.yml' + - 'crates/papyrus**/**' + - 'scripts/dependencies.sh' # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -71,7 +71,6 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@v3.2.0 with: - file: dynamic.Dockerfile context: . push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} From a3807a8c4f2815600e864ae1637c7813d812c5d5 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Sun, 6 Oct 2024 15:50:25 -0400 Subject: [PATCH 19/21] chore: restored several workflow files List of files restored: .github/workflows/blockifier_ci.yml .github/workflows/blockifier_compiled_cairo.yml .github/workflows/clean_stale_prs.yml .github/workflows/lock_closed_prs.yml .github/workflows/main.yml .github/workflows/merge_paths_ci.yml .github/workflows/papyrus/helm-install.yml .github/workflows/papyrus_benchmark.yaml .github/workflows/papyrus_ci.yml .github/workflows/verify-deps.yml --- .github/workflows/blockifier_ci.yml | 2 +- .../workflows/blockifier_compiled_cairo.yml | 24 ++++----- .github/workflows/clean_stale_prs.yml | 2 +- .github/workflows/lock_closed_prs.yml | 46 ++++++++-------- .github/workflows/merge_paths_ci.yml | 2 +- .github/workflows/papyrus/helm-install.yml | 2 +- .github/workflows/papyrus_benchmark.yaml | 2 +- .github/workflows/papyrus_ci.yml | 52 +++++++++---------- .github/workflows/verify-deps.yml | 4 +- 9 files changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/blockifier_ci.yml b/.github/workflows/blockifier_ci.yml index aac05489d9..335a6cedbb 100644 --- a/.github/workflows/blockifier_ci.yml +++ b/.github/workflows/blockifier_ci.yml @@ -41,7 +41,7 @@ concurrency: jobs: featureless-build: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap diff --git a/.github/workflows/blockifier_compiled_cairo.yml b/.github/workflows/blockifier_compiled_cairo.yml index d7362ab489..5703f3e3e1 100644 --- a/.github/workflows/blockifier_compiled_cairo.yml +++ b/.github/workflows/blockifier_compiled_cairo.yml @@ -7,12 +7,12 @@ on: - reopened - synchronize paths: - - ".github/workflows/blockifier_compiled_cairo.yml" - - "crates/blockifier/feature_contracts/**" - - "crates/blockifier/src/test_utils/cairo_compile.rs" - - "crates/blockifier/tests/feature_contracts_compatibility_test.rs" - - "crates/blockifier/tests/requirements.txt" - - "scripts/dependencies.sh" + - '.github/workflows/blockifier_compiled_cairo.yml' + - 'crates/blockifier/feature_contracts/**' + - 'crates/blockifier/src/test_utils/cairo_compile.rs' + - 'crates/blockifier/tests/feature_contracts_compatibility_test.rs' + - 'crates/blockifier/tests/requirements.txt' + - 'scripts/dependencies.sh' # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: @@ -21,7 +21,7 @@ concurrency: jobs: verify_cairo_file_dependencies: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-20-04-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -30,7 +30,7 @@ jobs: - uses: actions/setup-python@v5 id: setup-pypy with: - python-version: "pypy3.9" + python-version: 'pypy3.9' - run: ln -s '${{ steps.setup-pypy.outputs.python-path }}' /usr/local/bin/pypy3.9 - env: LD_LIBRARY_PATH: ${{ env.Python3_ROOT_DIR }}/bin @@ -40,16 +40,16 @@ jobs: - name: checkout sequencer into `sequencer` directory. uses: actions/checkout@v4 with: - repository: "starkware-libs/sequencer" - path: "sequencer" + repository: 'starkware-libs/sequencer' + path: 'sequencer' - name: checkout cairo1 repo in order to compile cairo1 contracts. uses: actions/checkout@v4 with: - repository: "starkware-libs/cairo" + repository: 'starkware-libs/cairo' fetch-depth: 0 fetch-tags: true - path: "cairo" + path: 'cairo' - name: install toolchain for legacy contract compilation (old compiler tag) uses: actions-rs/toolchain@master diff --git a/.github/workflows/clean_stale_prs.yml b/.github/workflows/clean_stale_prs.yml index a30494b701..1ccbe73ac8 100644 --- a/.github/workflows/clean_stale_prs.yml +++ b/.github/workflows/clean_stale_prs.yml @@ -9,7 +9,7 @@ on: jobs: stale: name: ๐Ÿงน Clean up stale issues and PRs - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small steps: - name: ๐Ÿš€ Run stale uses: actions/stale@v3 diff --git a/.github/workflows/lock_closed_prs.yml b/.github/workflows/lock_closed_prs.yml index e49213b874..91b0175ffd 100644 --- a/.github/workflows/lock_closed_prs.yml +++ b/.github/workflows/lock_closed_prs.yml @@ -7,26 +7,26 @@ on: workflow_dispatch: jobs: - # lock: - name: ๐Ÿ”’ Lock closed issues and PRs - runs-on: ubuntu-22.04 - steps: - - uses: dessant/lock-threads@v2.0.3 - with: - github-token: ${{ github.token }} - issue-lock-inactive-days: "30" - issue-lock-reason: "" - issue-comment: > - Issue closed and locked due to lack of activity. - - If you encounter this same issue, please open a new issue and refer - to this closed one. - pr-lock-inactive-days: "1" - pr-lock-reason: "" - pr-comment: > - Pull Request closed and locked due to lack of activity. - - If you'd like to build on this closed PR, you can clone it using - this method: https://stackoverflow.com/a/14969986 - - Then open a new PR, referencing this closed PR in your message. + lock: + name: ๐Ÿ”’ Lock closed issues and PRs + runs-on: starkware-ubuntu-latest-small + steps: + - uses: dessant/lock-threads@v2.0.3 + with: + github-token: ${{ github.token }} + issue-lock-inactive-days: "30" + issue-lock-reason: "" + issue-comment: > + Issue closed and locked due to lack of activity. + + If you encounter this same issue, please open a new issue and refer + to this closed one. + pr-lock-inactive-days: "1" + pr-lock-reason: "" + pr-comment: > + Pull Request closed and locked due to lack of activity. + + If you'd like to build on this closed PR, you can clone it using + this method: https://stackoverflow.com/a/14969986 + + Then open a new PR, referencing this closed PR in your message. diff --git a/.github/workflows/merge_paths_ci.yml b/.github/workflows/merge_paths_ci.yml index 3b222ef1fa..200aa1b573 100644 --- a/.github/workflows/merge_paths_ci.yml +++ b/.github/workflows/merge_paths_ci.yml @@ -23,7 +23,7 @@ concurrency: jobs: merge-paths-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 diff --git a/.github/workflows/papyrus/helm-install.yml b/.github/workflows/papyrus/helm-install.yml index 280bb54b53..886f307f09 100644 --- a/.github/workflows/papyrus/helm-install.yml +++ b/.github/workflows/papyrus/helm-install.yml @@ -14,7 +14,7 @@ on: jobs: deploy-teardown: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small permissions: contents: "read" id-token: "write" diff --git a/.github/workflows/papyrus_benchmark.yaml b/.github/workflows/papyrus_benchmark.yaml index 6a1a4edede..b7912e4957 100644 --- a/.github/workflows/papyrus_benchmark.yaml +++ b/.github/workflows/papyrus_benchmark.yaml @@ -8,7 +8,7 @@ on: jobs: storage-benchmark: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest permissions: contents: "write" id-token: "write" diff --git a/.github/workflows/papyrus_ci.yml b/.github/workflows/papyrus_ci.yml index cbb75559c7..b93df49923 100644 --- a/.github/workflows/papyrus_ci.yml +++ b/.github/workflows/papyrus_ci.yml @@ -4,15 +4,15 @@ on: push: branches: [main] paths: - - ".github/workflows/papyrus_ci.yml" - - "Dockerfile" - - "papyrus_utilities.Dockerfile" - - "Cargo.toml" - - "Cargo.lock" - - "crates/papyrus**/**" - - "crates/sequencing/**" - - "crates/starknet_client/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_ci.yml' + - 'Dockerfile' + - 'papyrus_utilities.Dockerfile' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/papyrus**/**' + - 'crates/sequencing/**' + - 'crates/starknet_client/**' + - 'scripts/dependencies.sh' pull_request: types: @@ -22,15 +22,15 @@ on: - auto_merge_enabled - edited # for when the PR title is edited paths: - - ".github/workflows/papyrus_ci.yml" - - "Dockerfile" - - "papyrus_utilities.Dockerfile" - - "Cargo.toml" - - "Cargo.lock" - - "crates/papyrus**/**" - - "crates/sequencing/**" - - "crates/starknet_client/**" - - "scripts/dependencies.sh" + - '.github/workflows/papyrus_ci.yml' + - 'Dockerfile' + - 'papyrus_utilities.Dockerfile' + - 'Cargo.toml' + - 'Cargo.lock' + - 'crates/papyrus**/**' + - 'crates/sequencing/**' + - 'crates/starknet_client/**' + - 'scripts/dependencies.sh' merge_group: types: [checks_requested] @@ -42,7 +42,7 @@ concurrency: jobs: executable-run: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -57,7 +57,7 @@ jobs: & sleep 30 ; kill $! executable-run-no-rpc: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -72,7 +72,7 @@ jobs: & sleep 30 ; kill $! p2p-sync-e2e-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -84,7 +84,7 @@ jobs: run: scripts/papyrus/p2p_sync_e2e_test/main.sh ${{ secrets.CI_BASE_LAYER_NODE_URL }} integration-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -97,7 +97,7 @@ jobs: cargo run -r -p papyrus_node --bin central_source_integration_test --features="futures-util tokio-stream" test-no-rpc: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - uses: ./.github/actions/bootstrap @@ -107,7 +107,7 @@ jobs: SEED: 0 check-starknet_api-dependency: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-small if: github.base_ref == 'main' # this step is only run if the pr is to the main branch steps: - uses: actions/checkout@v4 @@ -115,7 +115,7 @@ jobs: - run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main build-papyrus-utilities-image: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 - name: Set up Docker Buildx @@ -131,7 +131,7 @@ jobs: cache-to: type=gha,mode=max,scope=buildkit-ci random-table-test: - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium steps: - uses: actions/checkout@v4 # run this job only if the path 'crates/papyrus_storage/src/db/**' is changed, because it takes around 2 minutes. diff --git a/.github/workflows/verify-deps.yml b/.github/workflows/verify-deps.yml index a918e4ce3e..8582cb1b6b 100644 --- a/.github/workflows/verify-deps.yml +++ b/.github/workflows/verify-deps.yml @@ -2,12 +2,12 @@ name: Nightly Latest Dependencies Check on: schedule: - - cron: "0 0 * * *" # Runs at 00:00 UTC every day + - cron: '0 0 * * *' # Runs at 00:00 UTC every day jobs: latest_deps: name: Latest Dependencies - runs-on: ubuntu-22.04 + runs-on: starkware-ubuntu-latest-medium continue-on-error: true steps: - uses: actions/checkout@v4 From 04011feb82643bf72379e1a8d60ea42dfd99ea5f Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 7 Oct 2024 07:18:41 -0400 Subject: [PATCH 20/21] refactor: unwrap -> expect in native gas withdraw --- crates/blockifier/src/execution/native/syscall_handler.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/blockifier/src/execution/native/syscall_handler.rs b/crates/blockifier/src/execution/native/syscall_handler.rs index 7f9ca94be6..806abbc7b1 100644 --- a/crates/blockifier/src/execution/native/syscall_handler.rs +++ b/crates/blockifier/src/execution/native/syscall_handler.rs @@ -317,7 +317,8 @@ impl<'state> StarknetSyscallHandler for &mut NativeSyscallHandler<'state> { #[allow(dead_code)] fn native_update_remaining_gas(remaining_gas: &mut u128, call_info: &CallInfo) { // Create a new variable with converted type. - let mut remaining_gas_u64 = u64::try_from(*remaining_gas).unwrap(); + let mut remaining_gas_u64 = + u64::try_from(*remaining_gas).expect("Failed to convert gas to u64."); // Pass the reference to the function. update_remaining_gas(&mut remaining_gas_u64, call_info); From 3b10658eef81d415516253a1e2f1b6631c3a0708 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 7 Oct 2024 12:23:24 -0400 Subject: [PATCH 21/21] chore: restore rebase unintended changes --- .github/workflows/committer_ci.yml | 5 - .github/workflows/main.yml | 4 - .github/workflows/papyrus_nightly-tests.yml | 6 +- Cargo.lock | 1839 ++- .../cairo1/compiled/account_faulty.casm.json | 2 +- .../account_with_dummy_validate.casm.json | 2 +- .../account_with_long_validate.casm.json | 2 +- .../cairo1/compiled/empty_contract.casm.json | 2 +- .../cairo1/compiled/test_contract.casm.json | 13410 ++++++++++------ .../blockifier/src/execution/entry_point.rs | 4 +- 10 files changed, 9568 insertions(+), 5708 deletions(-) diff --git a/.github/workflows/committer_ci.yml b/.github/workflows/committer_ci.yml index 98bdf20029..c4cf79d2fe 100644 --- a/.github/workflows/committer_ci.yml +++ b/.github/workflows/committer_ci.yml @@ -39,11 +39,6 @@ concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }} cancel-in-progress: ${{ github.event_name == 'pull_request' }} -# On PR events, cancel existing CI runs on this same PR for this workflow. -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_request' }} - jobs: run-regression-tests: runs-on: starkware-ubuntu-latest-medium diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ffc539917..a87db9c686 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,11 +18,7 @@ on: # On PR events, cancel existing CI runs on this same PR for this workflow. concurrency: -<<<<<<< HEAD group: ${{ github.workflow }}-${{ github.ref }}-${{ github.job }} -======= - group: ${{ github.workflow }}-${{ github.ref }} ->>>>>>> df3f7106c (fix: restore concurrency in main workflow) cancel-in-progress: ${{ github.event_name == 'pull_request' }} jobs: diff --git a/.github/workflows/papyrus_nightly-tests.yml b/.github/workflows/papyrus_nightly-tests.yml index 8f9d9ef0b0..0592f28e3e 100644 --- a/.github/workflows/papyrus_nightly-tests.yml +++ b/.github/workflows/papyrus_nightly-tests.yml @@ -2,9 +2,9 @@ name: Papyrus-Nightly-Tests # We run gateway_integration_test at different times, to avoid a nonce race between parallel runs. on: schedule: - - cron: '30 22 * * *' # Uses ubuntu runner. - - cron: '30 0 * * *' # Uses macos runner. - workflow_dispatch: # Uses ubuntu runner. + - cron: '30 22 * * *' # Uses ubuntu runner. + - cron: '30 0 * * *' # Uses macos runner. + workflow_dispatch: # Uses ubuntu runner. jobs: GW-integration-test-ubuntu: diff --git a/Cargo.lock b/Cargo.lock index 3d74baaf59..a1eea94bce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,18 +14,18 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.21.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" @@ -98,7 +98,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94c225801d42099570d0674701dddd4142f0ef715282aeb5985042e2ec962df7" dependencies = [ "num_enum", - "strum 0.26.2", + "strum 0.26.3", ] [[package]] @@ -149,7 +149,7 @@ dependencies = [ "itoa", "serde", "serde_json", - "winnow 0.6.8", + "winnow 0.6.20", ] [[package]] @@ -304,7 +304,7 @@ dependencies = [ "futures-utils-wasm", "lru", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.8", "serde", "serde_json", "thiserror", @@ -332,7 +332,7 @@ checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -346,7 +346,7 @@ dependencies = [ "alloy-transport-http", "futures", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.8", "serde", "serde_json", "tokio", @@ -413,7 +413,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -429,7 +429,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "syn-solidity", "tiny-keccak", ] @@ -445,7 +445,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "syn-solidity", ] @@ -456,7 +456,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd3548d5262867c2c4be6223fe4f2583e21ade0ca1c307fd23bc7f28fca479e" dependencies = [ "serde", - "winnow 0.6.8", + "winnow 0.6.20", ] [[package]] @@ -499,7 +499,7 @@ checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" dependencies = [ "alloy-json-rpc", "alloy-transport", - "reqwest 0.12.5", + "reqwest 0.12.8", "serde_json", "tower 0.5.1", "tracing", @@ -529,9 +529,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" +checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" dependencies = [ "anstyle", "anstyle-parse", @@ -544,33 +544,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anstyle-parse" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" +checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" dependencies = [ "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.3" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" +checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" dependencies = [ "anstyle", "windows-sys 0.52.0", @@ -578,9 +578,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aquamarine" @@ -593,7 +593,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -630,7 +630,7 @@ dependencies = [ "ark-serialize 0.3.0", "ark-std 0.3.0", "derivative", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "paste", "rustc_version 0.3.3", @@ -650,10 +650,10 @@ dependencies = [ "derivative", "digest 0.10.7", "itertools 0.10.5", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "paste", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -683,7 +683,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "quote", "syn 1.0.109", @@ -695,7 +695,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "proc-macro2", "quote", @@ -756,7 +756,7 @@ dependencies = [ "ark-serialize-derive", "ark-std 0.4.0", "digest 0.10.7", - "num-bigint 0.4.5", + "num-bigint 0.4.6", ] [[package]] @@ -792,15 +792,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii-canvas" @@ -813,9 +813,9 @@ dependencies = [ [[package]] name = "asn1-rs" -version = "0.5.2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" +checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" dependencies = [ "asn1-rs-derive", "asn1-rs-impl", @@ -829,25 +829,25 @@ dependencies = [ [[package]] name = "asn1-rs-derive" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" +checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.79", "synstructure", ] [[package]] name = "asn1-rs-impl" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" +checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.79", ] [[package]] @@ -879,22 +879,21 @@ dependencies = [ [[package]] name = "async-channel" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite", ] [[package]] name = "async-compression" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "flate2", "futures-core", @@ -905,13 +904,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.11.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite 2.3.0", "slab", ] @@ -923,7 +922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ "async-lock 2.8.0", - "autocfg 1.3.0", + "autocfg 1.4.0", "blocking", "futures-lite 1.13.0", ] @@ -934,10 +933,10 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" dependencies = [ - "async-channel 2.2.1", + "async-channel 2.3.1", "async-executor", - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.4", + "async-lock 3.4.0", "blocking", "futures-lite 2.3.0", "once_cell", @@ -950,7 +949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock 2.8.0", - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if", "concurrent-queue", "futures-lite 1.13.0", @@ -965,21 +964,21 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.2" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ - "async-lock 3.3.0", + "async-lock 3.4.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.3.0", "parking", - "polling 3.7.0", - "rustix 0.38.34", + "polling 3.7.3", + "rustix 0.38.37", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -993,12 +992,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite", ] @@ -1026,7 +1025,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.37", "windows-sys 0.48.0", ] @@ -1038,43 +1037,43 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "async-signal" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe66191c335039c7bb78f99dc7520b0cbb166b3a1cb33a03f53d8a1c6f2afda" +checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3" dependencies = [ - "async-io 2.3.2", - "async-lock 3.3.0", + "async-io 2.3.4", + "async-lock 3.4.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.37", "signal-hook-registry", "slab", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "async-std" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" +checksum = "c634475f29802fde2b8f0b505b1bd00dfe4df7d4a000f0b36f7671197d5c3615" dependencies = [ "async-channel 1.9.0", "async-global-executor", - "async-io 1.13.0", - "async-lock 2.8.0", + "async-io 2.3.4", + "async-lock 3.4.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite 1.13.0", - "gloo-timers", + "futures-lite 2.3.0", + "gloo-timers 0.3.0", "kv-log-macro", "log", "memchr", @@ -1087,9 +1086,9 @@ dependencies = [ [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -1098,13 +1097,13 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -1115,13 +1114,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -1132,7 +1131,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1186,7 +1185,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -1195,14 +1194,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" @@ -1217,7 +1216,7 @@ dependencies = [ "futures-util", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "itoa", "matchit", "memchr", @@ -1255,17 +1254,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.71" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -1325,7 +1324,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "serde", @@ -1355,7 +1354,7 @@ version = "0.66.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "lazy_static", @@ -1366,7 +1365,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -1375,7 +1374,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools 0.12.1", @@ -1388,10 +1387,28 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.61", + "syn 2.0.79", "which", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "proc-macro2", + "quote", + "regex", + "rustc-hash 1.1.0", + "shlex", + "syn 2.0.79", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -1415,9 +1432,9 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitvec" @@ -1477,13 +1494,13 @@ dependencies = [ "cairo-native", "cairo-vm", "criterion", - "derive_more 0.99.17", + "derive_more 0.99.18", "glob", "indexmap 2.6.0", "itertools 0.12.1", "keccak", "log", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-rational 0.4.2", "num-traits 0.2.19", @@ -1533,12 +1550,11 @@ dependencies = [ [[package]] name = "blocking" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "495f7104e962b7356f0aeb34247aca1fe7d2e783b346582db7f2904cb5717e88" +checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" dependencies = [ - "async-channel 2.2.1", - "async-lock 3.3.0", + "async-channel 2.3.1", "async-task", "futures-io", "futures-lite 2.3.0", @@ -1569,9 +1585,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -1613,9 +1629,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -1694,13 +1710,13 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cairo-lang-casm" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a4b4ca8473c25d1e760c83c2a49d953197556f82f6feb636004d3b6d6cc4a7" +checksum = "fd4d6659539ace9649c8e8a7434e51b0c50a7a700111d0a2b967dde220ddff49" dependencies = [ "cairo-lang-utils", "indoc 2.0.5", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "parity-scale-codec", "schemars", @@ -1735,18 +1751,18 @@ dependencies = [ [[package]] name = "cairo-lang-debug" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0644fab571f598547993936918c85f0e89b0bbc15140ca3ea723bff376be07d" +checksum = "50c804649297ca417206435ee3e8041d2100cc31ebf4a95bc4b92ed02dc63469" dependencies = [ "cairo-lang-utils", ] [[package]] name = "cairo-lang-defs" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f5f437d75ac25644880458effde562edcac45a888d27f2e497d30c6450fa97d" +checksum = "e8fbda467ac36f73bb1879e1f741898fc719d6f9239a01cc422e6a023281319b" dependencies = [ "cairo-lang-debug", "cairo-lang-diagnostics", @@ -1761,9 +1777,9 @@ dependencies = [ [[package]] name = "cairo-lang-diagnostics" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec5b44d3eaf50e28e068d163e56b9effcea6afe3625c32dd96418d2d4ebc34c" +checksum = "c843ef4715e3d21de5388d02206db2506e2d2ec0e80e2629e0ae9900a08b8674" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", @@ -1773,9 +1789,9 @@ dependencies = [ [[package]] name = "cairo-lang-eq-solver" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0cd844e568f51e39729e8ac18bd27ada2e2b6dc9138f8c81adad48456480681" +checksum = "33a416c5871960fb4823160ebef2abc51e0c1b86fef1e97a1ebb2e5f3c3795d3" dependencies = [ "cairo-lang-utils", "good_lp", @@ -1783,9 +1799,9 @@ dependencies = [ [[package]] name = "cairo-lang-filesystem" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "323a2385e000589f7591f8a46599b4a462db6e36e5935bad3bceddcc1a1608e1" +checksum = "47189e0cb84b21defd201af4cf24a94c6b0d09f48706cf659c9ffa0def8a7a43" dependencies = [ "cairo-lang-debug", "cairo-lang-utils", @@ -1798,9 +1814,9 @@ dependencies = [ [[package]] name = "cairo-lang-formatter" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf9cf637e12d41260dc59f3d988c76a6347424913ac8b6b8449ff3e79b59750" +checksum = "6409ff1f4a93ce7c0968d9d857d2a8c03657617a827159d33f978110b718b31d" dependencies = [ "anyhow", "cairo-lang-diagnostics", @@ -1819,9 +1835,9 @@ dependencies = [ [[package]] name = "cairo-lang-lowering" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d71bc5b1f19a00eb662c2cac33259b16b9cdbf9c005047aca0d538c13936407" +checksum = "1e224e006c82ef21bd9e243390992de2be25ae6fbbdaa8544067b3f0c31977f1" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1835,7 +1851,7 @@ dependencies = [ "id-arena", "itertools 0.12.1", "log", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "rust-analyzer-salsa", "smol_str", @@ -1843,9 +1859,9 @@ dependencies = [ [[package]] name = "cairo-lang-parser" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d939d258e26ace0f3cb1e50338ae18981a7505e3c20eabd24a62d70ee862d6c" +checksum = "afb260ba349c2b699639e56f9b64deb969ff01179a0253087e2c8ceec7e32157" dependencies = [ "cairo-lang-diagnostics", "cairo-lang-filesystem", @@ -1854,7 +1870,7 @@ dependencies = [ "cairo-lang-utils", "colored", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "rust-analyzer-salsa", "smol_str", @@ -1863,9 +1879,9 @@ dependencies = [ [[package]] name = "cairo-lang-plugins" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67a553a6d2d2b54264e77e3c8cb5bc866b40b32d5e2144a58b74c559c7e289f" +checksum = "05a2e500dc8ddea4d25a866d8a839158b0e4c41a6c023f21911e2da252bd91b3" dependencies = [ "cairo-lang-defs", "cairo-lang-diagnostics", @@ -1882,20 +1898,20 @@ dependencies = [ [[package]] name = "cairo-lang-proc-macros" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33b5f4502b7efde6ac07fd5468f6dae15d88760aeece3d57a7bc4c224ba693e" +checksum = "d72f17373740f242d6995e896b9195c2cedff7e8b14e496afdd16b405039d1fb" dependencies = [ "cairo-lang-debug", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "cairo-lang-project" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63d6a3cc86a79a29978acaaf6f94738c5487e265247fe06c7bf359645d8c200" +checksum = "13294f08d2013fcd6e815e7235935680963dec3390e5baf454f33da866fc44b6" dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", @@ -1926,7 +1942,7 @@ dependencies = [ "cairo-vm", "itertools 0.12.1", "keccak", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "rand 0.8.5", @@ -1938,9 +1954,9 @@ dependencies = [ [[package]] name = "cairo-lang-semantic" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00c284031fd14796dad91483c3039d7929f8440e1e9e334017744b1d22df5aa8" +checksum = "6936215bca75c23e71873998420a3d46c322507a09917ce676c8d39f8c1bd6fe" dependencies = [ "cairo-lang-debug", "cairo-lang-defs", @@ -1955,7 +1971,7 @@ dependencies = [ "id-arena", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "rust-analyzer-salsa", "smol_str", @@ -1976,7 +1992,7 @@ dependencies = [ "itertools 0.12.1", "lalrpop", "lalrpop-util", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "regex", @@ -2000,7 +2016,7 @@ dependencies = [ "cairo-lang-sierra-type-size", "cairo-lang-utils", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "thiserror", ] @@ -2016,7 +2032,7 @@ dependencies = [ "cairo-lang-sierra-type-size", "cairo-lang-utils", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "thiserror", ] @@ -2060,7 +2076,7 @@ dependencies = [ "cairo-lang-utils", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "starknet-types-core", "thiserror", @@ -2118,7 +2134,7 @@ dependencies = [ "cairo-lang-utils", "convert_case 0.6.0", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "serde", @@ -2131,14 +2147,14 @@ dependencies = [ [[package]] name = "cairo-lang-syntax" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db0776c3d06cea65d7afe7a3c7685f6867eb6d951cf505caf35abfd1746773b" +checksum = "cebe67c0d68f9acf8709d170c1308ca57a778d22f70da38a57f74ae250eee28a" dependencies = [ "cairo-lang-debug", "cairo-lang-filesystem", "cairo-lang-utils", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "rust-analyzer-salsa", "smol_str", @@ -2147,9 +2163,9 @@ dependencies = [ [[package]] name = "cairo-lang-syntax-codegen" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce0f7fa01c26cc731bc1d6350ac02fae91a68b5fdf60e684f991e861715adc4" +checksum = "31cef5b4347626e61bad8f070495cd35d637a5cb6744c34d20dd382c7431aff8" dependencies = [ "genco", "xshell", @@ -2176,7 +2192,7 @@ dependencies = [ "cairo-lang-utils", "indoc 2.0.5", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "serde", "starknet-types-core", @@ -2184,9 +2200,9 @@ dependencies = [ [[package]] name = "cairo-lang-test-utils" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630a070a69c387eee9c0eda65e4f2508d129d4fbe081091077e661020ab95637" +checksum = "060c61ac4a3ae0428771244ff8db903105f127392b7d725d919fe3fb1ec4132f" dependencies = [ "cairo-lang-formatter", "cairo-lang-utils", @@ -2197,14 +2213,14 @@ dependencies = [ [[package]] name = "cairo-lang-utils" -version = "2.8.2" +version = "2.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73104609a7d865e4cd1de9cbf4e750683d076b6d0233bf81be511df274a26916" +checksum = "8bfc6372538143afad658c853a35bdc9f5210c5cb54e0c8f04ab78e268139466" dependencies = [ "hashbrown 0.14.5", "indexmap 2.6.0", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "parity-scale-codec", "schemars", @@ -2247,7 +2263,7 @@ dependencies = [ "llvm-sys", "melior", "mlir-sys", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "p256", "sec1", @@ -2271,8 +2287,8 @@ dependencies = [ "lazy_static", "libc", "rand 0.8.5", - "starknet-crypto 0.7.1", - "starknet-curve 0.5.0", + "starknet-crypto 0.7.2", + "starknet-curve 0.5.1", "starknet-types-core", ] @@ -2291,7 +2307,7 @@ dependencies = [ "keccak", "lazy_static", "nom", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-prime", "num-traits 0.2.19", @@ -2315,9 +2331,9 @@ checksum = "02d88a780e6aa14b75d7be99f374d8b5c315aaf9c12ada1e2b1cb281468584c9" [[package]] name = "camino" -version = "1.1.6" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -2363,9 +2379,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.1.15" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -2389,9 +2405,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" @@ -2429,7 +2445,7 @@ dependencies = [ "num-traits 0.2.19", "serde", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2472,9 +2488,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4" dependencies = [ "glob", "libc", @@ -2483,9 +2499,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" dependencies = [ "clap_builder", "clap_derive", @@ -2493,9 +2509,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" dependencies = [ "anstream", "anstyle", @@ -2505,21 +2521,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" [[package]] name = "cloudabi" @@ -2584,9 +2600,9 @@ dependencies = [ [[package]] name = "colorchoice" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" +checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" [[package]] name = "colored" @@ -2604,7 +2620,7 @@ version = "0.0.0" dependencies = [ "clap", "criterion", - "derive_more 0.99.17", + "derive_more 0.99.18", "ethnum", "futures", "indexmap 2.6.0", @@ -2673,9 +2689,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca" [[package]] name = "const-hex" -version = "1.11.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba00838774b4ab0233e355d26710fbfc8327a05c017f6dc4873f876d1f79f78" +checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586" dependencies = [ "cfg-if", "cpufeatures", @@ -2692,18 +2708,18 @@ checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const_format" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" +checksum = "50c655d81ff1114fb0dcdea9225ea9f0cc712a6f8d189378e82bdf62a473a64b" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.32" +version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" +checksum = "eff1a44b93f47b1bac19a27932f5c591e43d1ba357ee4f61526c8a25603f0eb1" dependencies = [ "proc-macro2", "quote", @@ -2771,9 +2787,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "core2" @@ -2786,18 +2802,18 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if", ] @@ -2868,9 +2884,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -2912,27 +2928,26 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] name = "curve25519-dalek" -version = "4.1.2" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", "cpufeatures", "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "platforms", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -2945,7 +2960,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -2960,12 +2975,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.8", - "darling_macro 0.20.8", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -2984,16 +2999,16 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", - "syn 2.0.61", + "strsim 0.11.1", + "syn 2.0.79", ] [[package]] @@ -3009,20 +3024,20 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.8" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.8", + "darling_core 0.20.10", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -3087,14 +3102,14 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.2.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" +checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" dependencies = [ "asn1-rs", "displaydoc", "nom", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "rusticata-macros", ] @@ -3121,46 +3136,46 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ - "darling 0.20.8", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", - "syn 1.0.109", + "rustc_version 0.4.1", + "syn 2.0.79", ] [[package]] @@ -3180,7 +3195,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "unicode-xid", ] @@ -3270,13 +3285,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -3299,9 +3314,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" @@ -3357,14 +3372,14 @@ dependencies = [ "enum-ordinalize", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "either" -version = "1.11.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "elliptic-curve" @@ -3436,14 +3451,14 @@ checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" [[package]] name = "enum-as-inner" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -3474,7 +3489,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -3494,23 +3509,23 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "env_filter" -version = "0.1.0" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab" dependencies = [ "log", ] [[package]] name = "env_logger" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" dependencies = [ "anstream", "anstyle", @@ -3670,7 +3685,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.61", + "syn 2.0.79", "toml", "walkdir", ] @@ -3688,7 +3703,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -3713,8 +3728,8 @@ dependencies = [ "rlp", "serde", "serde_json", - "strum 0.26.2", - "syn 2.0.61", + "strum 0.26.3", + "syn 2.0.79", "tempfile", "thiserror", "tiny-keccak", @@ -3849,7 +3864,7 @@ dependencies = [ "tokio", "tracing", "walkdir", - "yansi", + "yansi 0.5.1", ] [[package]] @@ -3877,43 +3892,22 @@ dependencies = [ [[package]] name = "event-listener" -version = "4.0.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", "pin-project-lite", ] -[[package]] -name = "event-listener" -version = "5.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite", ] @@ -3948,9 +3942,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -3975,20 +3969,20 @@ dependencies = [ [[package]] name = "fiat-crypto" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38793c55593b33412e3ae40c2c9781ffaa6f438f6f8c10f24e71846fbd7ae01e" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -4011,9 +4005,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -4107,9 +4101,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -4122,9 +4116,9 @@ dependencies = [ [[package]] name = "futures-bounded" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e2774cc104e198ef3d3e1ff4ab40f86fa3245d6cb6a3a46174f21463cee173" +checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e" dependencies = [ "futures-timer", "futures-util", @@ -4132,9 +4126,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -4142,15 +4136,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -4160,9 +4154,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -4185,7 +4179,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -4204,36 +4198,37 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "futures-rustls" -version = "0.24.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" +checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb" dependencies = [ "futures-io", - "rustls 0.21.12", + "rustls 0.23.14", + "rustls-pki-types", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-ticker" @@ -4252,15 +4247,15 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" dependencies = [ - "gloo-timers", + "gloo-timers 0.2.6", "send_wrapper 0.4.0", ] [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -4291,9 +4286,9 @@ dependencies = [ [[package]] name = "genco" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98d7af598790738fee616426e669360fa361273b1b9c9b7f30c92fa627605cad" +checksum = "afac3cbb14db69ac9fef9cdb60d8a87e39a7a527f85a81a923436efa40ad42c6" dependencies = [ "genco-macros", "relative-path", @@ -4302,13 +4297,13 @@ dependencies = [ [[package]] name = "genco-macros" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4cf186fea4af17825116f72932fe52cce9a13bae39ff63b4dc0cfdb3fb4bde1" +checksum = "553630feadf7b76442b0849fd25fdf89b860d933623aec9693fed19af0400c78" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -4347,9 +4342,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -4359,15 +4354,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -4403,6 +4398,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "gloo-utils" version = "0.2.0" @@ -4508,6 +4515,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.6.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -4550,6 +4576,8 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" dependencies = [ + "allocator-api2", + "equivalent", "foldhash", "serde", ] @@ -4591,6 +4619,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -4754,9 +4788,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -4772,15 +4806,15 @@ checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4803,9 +4837,11 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", + "httpdate", "itoa", "pin-project-lite", "smallvec", @@ -4821,7 +4857,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.30", "log", "rustls 0.21.12", "rustls-native-certs", @@ -4836,7 +4872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.28", + "hyper 0.14.30", "native-tls", "tokio", "tokio-native-tls", @@ -4860,9 +4896,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -4873,16 +4909,15 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower 0.4.13", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4970,7 +5005,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e" dependencies = [ - "async-io 2.3.2", + "async-io 2.3.4", "core-foundation", "fnv", "futures", @@ -5001,7 +5036,7 @@ dependencies = [ "bytes", "futures", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.30", "log", "rand 0.8.5", "tokio", @@ -5011,15 +5046,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" +checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.6", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -5100,7 +5135,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "hashbrown 0.12.3", "serde", ] @@ -5139,9 +5174,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.38.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" dependencies = [ "console", "lazy_static", @@ -5152,9 +5187,9 @@ dependencies = [ [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if", ] @@ -5171,7 +5206,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", "windows-sys 0.48.0", ] @@ -5185,31 +5220,31 @@ dependencies = [ "socket2 0.5.7", "widestring", "windows-sys 0.48.0", - "winreg 0.50.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] [[package]] name = "is_terminal_polyfill" -version = "1.70.0" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "iso8601" @@ -5264,27 +5299,27 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "jsonrpsee" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc" +checksum = "138572befc78a9793240645926f30161f8b4143d2be18d09e44ed9814bd7ee2c" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -5300,9 +5335,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935" +checksum = "5c671353e4adf926799107bd7f5724a06b6bc0a333db442a0843c58640bdd0c1" dependencies = [ "futures-channel", "futures-util", @@ -5323,9 +5358,9 @@ dependencies = [ [[package]] name = "jsonrpsee-core" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b" +checksum = "f24ea59b037b6b9b0e2ebe2c30a3e782b56bd7c76dcc5d6d70ba55d442af56e3" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -5333,7 +5368,7 @@ dependencies = [ "beef", "futures-timer", "futures-util", - "hyper 0.14.28", + "hyper 0.14.30", "jsonrpsee-types", "parking_lot", "rand 0.8.5", @@ -5349,12 +5384,12 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20" +checksum = "57c7b9f95208927653e7965a98525e7fc641781cab89f0e27c43fa2974405683" dependencies = [ "async-trait", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", @@ -5369,9 +5404,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515" +checksum = "dcc0eba68ba205452bcb4c7b80a79ddcb3bf36c261a841b239433142db632d24" dependencies = [ "heck 0.4.1", "proc-macro-crate 1.3.1", @@ -5382,13 +5417,13 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c" +checksum = "a482bc4e25eebd0adb61a3468c722763c381225bd3ec46e926f709df8a8eb548" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.28", + "hyper 0.14.30", "jsonrpsee-core", "jsonrpsee-types", "route-recognizer", @@ -5405,9 +5440,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9" +checksum = "3264e339143fe37ed081953842ee67bfafa99e3b91559bdded6e4abd8fc8535e" dependencies = [ "anyhow", "beef", @@ -5419,9 +5454,9 @@ dependencies = [ [[package]] name = "jsonrpsee-wasm-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c7cbb3447cf14fd4d2f407c3cc96e6c9634d5440aa1fbed868a31f3c02b27f0" +checksum = "9437dd0e8728897d0aa5a0075b8710266300e55ced07101ca0930fac4a611384" dependencies = [ "jsonrpsee-client-transport", "jsonrpsee-core", @@ -5430,9 +5465,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.20.3" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0" +checksum = "6d06eeabbb55f0af8405288390a358ebcceb6e79e1390741e6f152309c4d6076" dependencies = [ "http 0.2.12", "jsonrpsee-client-transport", @@ -5468,7 +5503,7 @@ dependencies = [ "serde_json", "time", "url", - "uuid 1.8.0", + "uuid 1.10.0", ] [[package]] @@ -5487,9 +5522,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -5550,7 +5585,7 @@ dependencies = [ "petgraph", "pico-args", "regex", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", "string_cache", "term", "tiny-keccak", @@ -5564,7 +5599,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" dependencies = [ - "regex-automata 0.4.6", + "regex-automata 0.4.8", ] [[package]] @@ -5606,18 +5641,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -5632,9 +5667,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f0bee397dc9a7003e7bd34fffc1dc2d4c4fdc96530a0c439a5f98c9402bc7bf" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "byteorder", - "derive_more 0.99.17", + "derive_more 0.99.18", "indexmap 1.9.3", "libc", "lifetimed-bytes", @@ -5703,15 +5738,14 @@ dependencies = [ [[package]] name = "libp2p-core" -version = "0.41.2" +version = "0.41.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8130a8269e65a2554d55131c770bdf4bcd94d2b8d4efb24ca23699be65066c05" +checksum = "a5a8920cbd8540059a01950c1e5c96ea8d89eb50c51cd366fc18bdf540a6e48f" dependencies = [ "either", "fnv", "futures", "futures-timer", - "instant", "libp2p-identity", "multiaddr", "multihash", @@ -5728,6 +5762,7 @@ dependencies = [ "tracing", "unsigned-varint 0.8.0", "void", + "web-time", ] [[package]] @@ -5803,9 +5838,9 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" +checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" dependencies = [ "bs58", "ed25519-dalek", @@ -5933,9 +5968,9 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0375cdfee57b47b313ef1f0fdb625b78aed770d33a40cf1c294a371ff5e6666" +checksum = "c67296ad4e092e23f92aea3d2bdb6f24eab79c0929ed816dfb460ea2f4567d2b" dependencies = [ "bytes", "futures", @@ -5947,8 +5982,8 @@ dependencies = [ "parking_lot", "quinn", "rand 0.8.5", - "ring 0.16.20", - "rustls 0.21.12", + "ring 0.17.8", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -5989,7 +6024,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -6031,17 +6066,17 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ce7e3c2e7569d685d08ec795157981722ff96e9e9f9eae75df3c29d02b07a5" +checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" dependencies = [ "futures", "futures-rustls", "libp2p-core", "libp2p-identity", "rcgen", - "ring 0.16.20", - "rustls 0.21.12", + "ring 0.17.8", + "rustls 0.23.14", "rustls-webpki 0.101.7", "thiserror", "x509-parser", @@ -6066,9 +6101,9 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.45.1" +version = "0.45.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "200cbe50349a44760927d50b431d77bed79b9c0a3959de1af8d24a63434b71e5" +checksum = "ddd5265f6b80f94d48a3963541aad183cc598a645755d2f1805a373e41e0716b" dependencies = [ "either", "futures", @@ -6076,16 +6111,16 @@ dependencies = [ "thiserror", "tracing", "yamux 0.12.1", - "yamux 0.13.2", + "yamux 0.13.3", ] [[package]] name = "libproc" -version = "0.14.8" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9ea4b75e1a81675429dafe43441df1caea70081e82246a8cccf514884a88bb" +checksum = "e78a09b56be5adbcad5aa1197371688dc6bb249a26da3bca2011ee2fb987ebfb" dependencies = [ - "bindgen 0.69.4", + "bindgen 0.70.1", "errno", "libc", ] @@ -6096,8 +6131,9 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", + "redox_syscall", ] [[package]] @@ -6123,15 +6159,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "llvm-sys" -version = "181.1.1" +version = "181.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d255b36907416971229095a8465c0b69f5f1c6fb8421b6dcdbb64eb47e1be90" +checksum = "d320f9d2723c97d4b78f9190a61ed25cc7cfbe456668c08e6e7dd8e50ceb8500" dependencies = [ "anyhow", "cc", @@ -6147,26 +6183,26 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" dependencies = [ "value-bag", ] [[package]] name = "lru" -version = "0.12.3" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] @@ -6268,16 +6304,16 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.61", + "syn 2.0.79", "tblgen-alt", "unindent 0.2.3", ] [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -6294,7 +6330,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -6303,7 +6339,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -6346,7 +6382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d4fa7ce7c4862db464a37b0b31d89bca874562f034bd7993895572783d02950" dependencies = [ "base64 0.21.7", - "hyper 0.14.28", + "hyper 0.14.30", "indexmap 1.9.3", "ipnet", "metrics 0.21.1", @@ -6365,7 +6401,7 @@ checksum = "38b4faf00617defe497754acde3024865bc143d44a86799b24e191ecff91354f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -6422,22 +6458,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -6473,7 +6510,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -6496,14 +6533,19 @@ dependencies = [ [[package]] name = "mockito" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e" +checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d" dependencies = [ "assert-json-diff", + "bytes", "colored", - "futures-core", - "hyper 0.14.28", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "log", "rand 0.8.5", "regex", @@ -6515,9 +6557,9 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" +checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961" dependencies = [ "arrayref", "byteorder", @@ -6528,7 +6570,7 @@ dependencies = [ "percent-encoding", "serde", "static_assertions", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", "url", ] @@ -6585,11 +6627,10 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -6611,7 +6652,7 @@ dependencies = [ "cairo-vm", "indexmap 2.6.0", "log", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "papyrus_storage", "pretty_assertions", "pyo3", @@ -6736,11 +6777,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "cfg_aliases", "libc", @@ -6801,7 +6842,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-complex 0.4.6", "num-integer", "num-iter", @@ -6815,16 +6856,16 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits 0.2.19", ] [[package]] name = "num-bigint" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" dependencies = [ "num-integer", "num-traits 0.2.19", @@ -6844,7 +6885,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-traits 0.2.19", ] @@ -6888,7 +6929,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits 0.2.19", ] @@ -6899,7 +6940,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", ] @@ -6913,7 +6954,7 @@ dependencies = [ "bitvec", "either", "lru", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-modular", "num-traits 0.2.19", @@ -6926,7 +6967,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-bigint 0.2.6", "num-integer", "num-traits 0.2.19", @@ -6938,7 +6979,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "serde", @@ -6959,7 +7000,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "libm", ] @@ -6969,29 +7010,29 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] [[package]] name = "num_enum" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -7005,33 +7046,33 @@ dependencies = [ [[package]] name = "object" -version = "0.32.2" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] [[package]] name = "oid-registry" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" +checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" dependencies = [ "asn1-rs", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" -version = "11.1.3" +version = "11.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9" [[package]] name = "opaque-debug" @@ -7066,11 +7107,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -7087,7 +7128,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -7098,9 +7139,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.102" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -7316,7 +7357,7 @@ version = "0.0.0" dependencies = [ "axum", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "metrics 0.21.1", "metrics-exporter-prometheus", "metrics-process", @@ -7344,7 +7385,7 @@ dependencies = [ "bytes", "deadqueue", "defaultmap", - "derive_more 0.99.17", + "derive_more 0.99.18", "futures", "lazy_static", "libp2p", @@ -7462,7 +7503,7 @@ dependencies = [ "papyrus_test_utils", "prometheus-parse", "quote", - "syn 2.0.61", + "syn 2.0.79", "tracing", ] @@ -7497,13 +7538,13 @@ dependencies = [ "cairo-lang-casm", "cairo-lang-starknet-classes", "camelpaste", - "derive_more 0.99.17", + "derive_more 0.99.18", "enum-iterator", "ethers", "flate2", "futures-util", "hex", - "hyper 0.14.28", + "hyper 0.14.30", "indexmap 2.6.0", "insta", "itertools 0.12.1", @@ -7559,7 +7600,7 @@ dependencies = [ "memmap2", "metrics 0.21.1", "metrics-exporter-prometheus", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "page_size", "papyrus_common", @@ -7633,7 +7674,7 @@ dependencies = [ "cairo-lang-starknet-classes", "cairo-lang-utils", "indexmap 2.6.0", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "pretty_assertions", "primitive-types", "prometheus-parse", @@ -7666,7 +7707,7 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -7674,15 +7715,15 @@ dependencies = [ [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -7696,9 +7737,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -7820,7 +7861,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -7853,7 +7894,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -7882,22 +7923,22 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -7925,12 +7966,12 @@ dependencies = [ [[package]] name = "piper" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] @@ -7946,21 +7987,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "platforms" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plotters" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits 0.2.19", "plotters-backend", @@ -7971,15 +8006,15 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] @@ -7990,7 +8025,7 @@ version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if", "libc", "log", @@ -8000,17 +8035,17 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.0" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645493cf344456ef24219d02a768cf1fb92ddf8c92161679ae3d91b91a637be3" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi", + "hermit-abi 0.4.0", "pin-project-lite", - "rustix 0.38.34", + "rustix 0.38.37", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8038,9 +8073,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -8050,9 +8085,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "precomputed-hash" @@ -8062,9 +8100,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "predicates" -version = "3.1.0" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" dependencies = [ "anstyle", "predicates-core", @@ -8072,15 +8110,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" [[package]] name = "predicates-tree" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" dependencies = [ "predicates-core", "termtree", @@ -8088,22 +8126,22 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" dependencies = [ "diff", - "yansi", + "yansi 1.0.1", ] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -8141,11 +8179,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit 0.22.22", ] [[package]] @@ -8191,14 +8229,14 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -8209,11 +8247,11 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "hex", "lazy_static", "procfs-core", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -8222,15 +8260,15 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "hex", ] [[package]] name = "prometheus-client" -version = "0.22.2" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" +checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" dependencies = [ "dtoa", "itoa", @@ -8246,7 +8284,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -8263,19 +8301,19 @@ dependencies = [ [[package]] name = "proptest" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.5.0", + "bitflags 2.6.0", "lazy_static", "num-traits 0.2.19", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift 0.3.0", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", "rusty-fork", "tempfile", "unarray", @@ -8293,9 +8331,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" dependencies = [ "bytes", "heck 0.5.0", @@ -8308,7 +8346,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.61", + "syn 2.0.79", "tempfile", ] @@ -8322,14 +8360,14 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "prost-types" -version = "0.12.4" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" dependencies = [ "prost", ] @@ -8371,7 +8409,7 @@ dependencies = [ "indoc 1.0.9", "libc", "memoffset 0.9.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "parking_lot", "pyo3-build-config", "pyo3-ffi", @@ -8492,17 +8530,18 @@ dependencies = [ [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "futures-io", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 1.1.0", - "rustls 0.21.12", + "rustc-hash 2.0.0", + "rustls 0.23.14", + "socket2 0.5.7", "thiserror", "tokio", "tracing", @@ -8510,15 +8549,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", - "ring 0.16.20", - "rustc-hash 1.1.0", - "rustls 0.21.12", + "ring 0.17.8", + "rustc-hash 2.0.0", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -8527,22 +8566,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ - "bytes", "libc", + "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -8767,27 +8806,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.2.1", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -8796,14 +8826,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.6", - "regex-syntax 0.8.3", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -8817,13 +8847,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.3", + "regex-syntax 0.8.5", ] [[package]] @@ -8840,9 +8870,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -8870,10 +8900,10 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.28", + "hyper 0.14.30", "hyper-rustls", "hyper-tls 0.5.0", "ipnet", @@ -8901,14 +8931,14 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -8940,7 +8970,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "winreg 0.52.0", + "windows-registry", ] [[package]] @@ -9004,9 +9034,9 @@ dependencies = [ [[package]] name = "rlimit" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" +checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a" dependencies = [ "libc", ] @@ -9048,7 +9078,7 @@ dependencies = [ "futures", "futures-timer", "rstest_macros", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -9060,7 +9090,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "syn 1.0.109", "unicode-ident", ] @@ -9092,7 +9122,7 @@ dependencies = [ "ark-ff 0.4.2", "bytes", "fastrlp", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "parity-scale-codec", "primitive-types", @@ -9137,14 +9167,14 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "rust_decimal" -version = "1.35.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a" +checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "num-traits 0.2.19", @@ -9185,9 +9215,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -9217,14 +9247,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys 0.4.14", "windows-sys 0.52.0", ] @@ -9314,9 +9344,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092474d1a01ea8278f69e6a358998405fae5b8b963ddaeb2b0b04a128bf1dfb0" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rusty-fork" @@ -9372,7 +9402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more 0.99.17", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -9383,7 +9413,7 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate 3.2.0", "proc-macro2", "quote", "syn 1.0.109", @@ -9391,18 +9421,18 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "schemars" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e7ed6919cb46507fb01ff1654309219f62b4d603822501b0b80d42f6f21ef" +checksum = "09c024468a378b7e36765cd36702b7a90cc3cba11654f6685c8f233408e89e92" dependencies = [ "dyn-clone", "indexmap 1.9.3", @@ -9413,14 +9443,14 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185f2b7aa7e02d418e453790dde16890256bbd2bcd04b7dc5348811052b53f49" +checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e" dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -9467,11 +9497,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -9480,9 +9510,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -9529,33 +9559,33 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.201" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.201" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "serde_derive_internals" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" +checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -9599,14 +9629,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -9644,10 +9674,10 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.8", + "darling 0.20.10", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -9741,9 +9771,9 @@ dependencies = [ [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" [[package]] name = "simple_asn1" @@ -9751,7 +9781,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-traits 0.2.19", "thiserror", "time", @@ -9798,7 +9828,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -9836,9 +9866,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49" +checksum = "dd538fb6910ac1099850255cf94a94df6551fbdd602454387d0adb2d1ca6dead" dependencies = [ "serde", ] @@ -9855,7 +9885,7 @@ dependencies = [ "curve25519-dalek", "rand_core 0.6.4", "ring 0.17.8", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "sha2", "subtle", ] @@ -9979,12 +10009,12 @@ dependencies = [ "crypto-bigint", "hex", "hmac", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "rfc6979", "sha2", - "starknet-crypto-codegen 0.3.3", + "starknet-crypto-codegen", "starknet-curve 0.4.2", "starknet-ff", "zeroize", @@ -9992,20 +10022,19 @@ dependencies = [ [[package]] name = "starknet-crypto" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff2a821ad8d98c6c3e4d0e5097f3fe6e2ed120ada9d32be87cd1330c7923a2f0" +checksum = "60a5064173a8e8d2675e67744fd07f310de44573924b6b7af225a6bdd8102913" dependencies = [ "crypto-bigint", "hex", "hmac", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "rfc6979", "sha2", - "starknet-crypto-codegen 0.4.0", - "starknet-curve 0.5.0", + "starknet-curve 0.5.1", "starknet-types-core", "zeroize", ] @@ -10018,18 +10047,7 @@ checksum = "bbc159a1934c7be9761c237333a57febe060ace2bc9e3b337a59a37af206d19f" dependencies = [ "starknet-curve 0.4.2", "starknet-ff", - "syn 2.0.61", -] - -[[package]] -name = "starknet-crypto-codegen" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e179dedc3fa6da064e56811d3e05d446aa2f7459e4eb0e3e49378a337235437" -dependencies = [ - "starknet-curve 0.5.0", - "starknet-types-core", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -10043,9 +10061,9 @@ dependencies = [ [[package]] name = "starknet-curve" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56935b306dcf0b8f14bb2a1257164b8478bb8be4801dfae0923f5b266d1b457c" +checksum = "bcde6bd74269b8161948190ace6cf069ef20ac6e79cd2ba09b320efa7500b6de" dependencies = [ "starknet-types-core", ] @@ -10073,7 +10091,7 @@ dependencies = [ "lambdaworks-crypto", "lambdaworks-math", "lazy_static", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "num-integer", "num-traits 0.2.19", "serde", @@ -10086,18 +10104,18 @@ dependencies = [ "assert_matches", "bitvec", "cairo-lang-starknet-classes", - "derive_more 0.99.17", + "derive_more 0.99.18", "hex", "indexmap 2.6.0", "itertools 0.12.1", - "num-bigint 0.4.5", + "num-bigint 0.4.6", "pretty_assertions", "primitive-types", "rstest", "serde", "serde_json", "sha3", - "starknet-crypto 0.7.1", + "starknet-crypto 0.7.2", "starknet-types-core", "strum 0.25.0", "strum_macros 0.25.3", @@ -10110,13 +10128,17 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-trait", + "blockifier", + "chrono", "futures", + "indexmap 2.6.0", "mempool_test_utils", "mockall", "papyrus_config", "papyrus_storage", "rstest", "serde", + "starknet-types-core", "starknet_api", "starknet_batcher_types", "starknet_mempool_infra", @@ -10133,6 +10155,7 @@ name = "starknet_batcher_types" version = "0.0.0" dependencies = [ "async-trait", + "blockifier", "chrono", "mockall", "papyrus_proc_macros", @@ -10211,7 +10234,7 @@ name = "starknet_consensus_manager_types" version = "0.0.0" dependencies = [ "async-trait", - "derive_more 0.99.17", + "derive_more 0.99.18", "mockall", "papyrus_proc_macros", "serde", @@ -10229,11 +10252,11 @@ dependencies = [ "blockifier", "cairo-lang-sierra-to-casm", "cairo-lang-starknet-classes", - "hyper 0.14.28", + "hyper 0.14.30", "mempool_test_utils", "mockall", - "mockito 1.4.0", - "num-bigint 0.4.5", + "mockito 1.5.0", + "num-bigint 0.4.6", "papyrus_config", "papyrus_rpc", "pretty_assertions", @@ -10295,7 +10318,7 @@ version = "0.0.0" dependencies = [ "assert_matches", "async-trait", - "derive_more 0.99.17", + "derive_more 0.99.18", "itertools 0.12.1", "mempool_test_utils", "pretty_assertions", @@ -10315,7 +10338,7 @@ dependencies = [ "assert_matches", "async-trait", "bincode 1.3.3", - "hyper 0.14.28", + "hyper 0.14.30", "papyrus_config", "pretty_assertions", "rstest", @@ -10437,7 +10460,7 @@ name = "starknet_patricia" version = "0.0.0" dependencies = [ "async-recursion", - "derive_more 0.99.17", + "derive_more 0.99.18", "ethnum", "hex", "pretty_assertions", @@ -10538,11 +10561,11 @@ checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ - "strum_macros 0.26.2", + "strum_macros 0.26.4", ] [[package]] @@ -10555,27 +10578,27 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "svm-rs" @@ -10610,9 +10633,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.61" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -10628,7 +10651,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -10642,17 +10665,19 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "synstructure" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", - "unicode-xid", + "syn 2.0.79", ] [[package]] @@ -10699,9 +10724,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -10710,9 +10735,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tblgen-alt" @@ -10728,14 +10753,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.10.1" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", - "rustix 0.38.34", - "windows-sys 0.52.0", + "fastrand 2.1.1", + "once_cell", + "rustix 0.38.37", + "windows-sys 0.59.0", ] [[package]] @@ -10782,7 +10808,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -10793,7 +10819,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "test-case-core", ] @@ -10816,7 +10842,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -10833,7 +10859,7 @@ dependencies = [ "quote", "regex", "reqwest 0.11.27", - "syn 2.0.61", + "syn 2.0.79", "sysinfo", "users", "which", @@ -10841,22 +10867,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -10972,9 +10998,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -10987,32 +11013,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -11048,9 +11073,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -11088,9 +11113,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -11102,21 +11127,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.12" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.12", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -11134,26 +11159,15 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.6.0", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.8", + "winnow 0.6.20", ] [[package]] @@ -11223,7 +11237,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -11306,14 +11320,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" dependencies = [ "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" dependencies = [ "serde", "stable_deref_trait", @@ -11383,45 +11397,45 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unescaper" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0adf6ad32eb5b3cadff915f7b770faaac8f7ff0476633aa29eb0d9584d889d34" +checksum = "c878a167baa8afd137494101a688ef8c67125089ff2249284bd2b5f9bfedb815" dependencies = [ "thiserror", ] [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unicode_categories" @@ -11496,9 +11510,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -11530,9 +11544,9 @@ checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -11546,9 +11560,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "validator" @@ -11609,9 +11623,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "void" @@ -11630,9 +11644,9 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" +checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" [[package]] name = "walkdir" @@ -11661,34 +11675,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -11698,9 +11713,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -11708,28 +11723,38 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -11768,7 +11793,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.34", + "rustix 0.38.37", ] [[package]] @@ -11795,11 +11820,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -11825,7 +11850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ "windows-core 0.54.0", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -11843,7 +11868,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -11852,17 +11877,47 @@ version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" dependencies = [ - "windows-result", - "windows-targets 0.52.5", + "windows-result 0.1.2", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" dependencies = [ - "windows-targets 0.52.5", + "windows-result 0.2.0", + "windows-targets 0.52.6", ] [[package]] @@ -11895,7 +11950,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -11915,18 +11979,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -11943,9 +12007,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -11961,9 +12025,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -11979,15 +12043,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -12003,9 +12067,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -12021,9 +12085,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -12039,9 +12103,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -12057,9 +12121,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -12072,9 +12136,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -12089,16 +12153,6 @@ 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 = "workspace_tests" version = "0.0.0" @@ -12118,7 +12172,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -12149,9 +12203,9 @@ dependencies = [ [[package]] name = "x509-parser" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" +checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" dependencies = [ "asn1-rs", "data-encoding", @@ -12171,15 +12225,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys 0.4.13", - "rustix 0.38.34", + "linux-raw-sys 0.4.14", + "rustix 0.38.37", ] [[package]] name = "xml-rs" -version = "0.8.20" +version = "0.8.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" +checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26" [[package]] name = "xmltree" @@ -12222,18 +12276,18 @@ dependencies = [ [[package]] name = "yamux" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f97202f6b125031b95d83e01dc57292b529384f80bfae4677e4bbc10178cf72" +checksum = "a31b5e376a8b012bee9c423acdbb835fc34d45001cfa3106236a624e4b738028" dependencies = [ "futures", - "instant", "log", "nohash-hasher", "parking_lot", "pin-project", "rand 0.8.5", "static_assertions", + "web-time", ] [[package]] @@ -12242,6 +12296,12 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "yasna" version = "0.5.2" @@ -12253,29 +12313,30 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ + "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -12288,7 +12349,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.61", + "syn 2.0.79", ] [[package]] @@ -12326,7 +12387,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ - "zstd-safe 7.2.0", + "zstd-safe 7.2.1", ] [[package]] @@ -12341,18 +12402,18 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "7.2.0" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.13+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" dependencies = [ "cc", "pkg-config", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json index fd4cce75fa..5d1bb9be09 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_faulty.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.1", + "compiler_version": "2.8.2", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json index 7f9921889a..7b6b3673ca 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_dummy_validate.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.1", + "compiler_version": "2.8.2", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json index 831289775f..27ba33d097 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/account_with_long_validate.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.1", + "compiler_version": "2.8.2", "bytecode": [ "0xa0680017fff8000", "0x7", diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json index 30015279dc..10caa8a487 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/empty_contract.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.1", + "compiler_version": "2.8.2", "bytecode": [], "bytecode_segment_lengths": 0, "hints": [], diff --git a/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json b/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json index 6928947940..e83fe5605a 100644 --- a/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json +++ b/crates/blockifier/feature_contracts/cairo1/compiled/test_contract.casm.json @@ -1,6 +1,6 @@ { "prime": "0x800000000000011000000000000000000000000000000000000000000000001", - "compiler_version": "2.7.1", + "compiler_version": "2.8.2", "bytecode": [ "0xa0680017fff8000", "0x7", @@ -100,9 +100,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4529", + "0x4a6e", "0x482480017fff8000", - "0x4528", + "0x4a6d", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -275,9 +275,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x447a", + "0x49bf", "0x482480017fff8000", - "0x4479", + "0x49be", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -536,7 +536,7 @@ "0x48127ffa7fff8000", "0x480080007ff88000", "0x1104800180018000", - "0x1643", + "0x1810", "0x20680017fff7ffa", "0xb", "0x48127ff87fff8000", @@ -588,9 +588,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4341", + "0x4886", "0x482480017fff8000", - "0x4340", + "0x4885", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -715,6 +715,467 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", + "0x2", + "0xa0680017fff8000", + "0x7", + "0x482680017ffa8000", + "0x100000000000000000000000000000000", + "0x400280007ff97fff", + "0x10780017fff7fff", + "0x10c", + "0x4825800180007ffa", + "0x0", + "0x400280007ff97fff", + "0x482680017ff98000", + "0x1", + "0x48297ffc80007ffd", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0xa", + "0x482680017ffc8000", + "0x1", + "0x480a7ffd7fff8000", + "0x480680017fff8000", + "0x0", + "0x480280007ffc8000", + "0x10780017fff7fff", + "0x8", + "0x480a7ffc7fff8000", + "0x480a7ffd7fff8000", + "0x480680017fff8000", + "0x1", + "0x480680017fff8000", + "0x0", + "0x20680017fff7ffe", + "0xe1", + "0x40137fff7fff8001", + "0xa0680017fff8004", + "0xe", + "0x4825800180048001", + "0x800000000000000000000000000000000000000000000000000000000000000", + "0x484480017ffe8000", + "0x110000000000000000", + "0x48307ffe7fff8002", + "0x480080007ff67ffc", + "0x480080017ff57ffc", + "0x402480017ffb7ffd", + "0xffffffffffffffeeffffffffffffffff", + "0x400080027ff47ffd", + "0x10780017fff7fff", + "0xce", + "0x484480017fff8001", + "0x8000000000000000000000000000000", + "0x48317fff80008001", + "0x480080007ff77ffd", + "0x480080017ff67ffd", + "0x402480017ffc7ffe", + "0xf8000000000000000000000000000000", + "0x400080027ff57ffe", + "0x482480017ff58000", + "0x3", + "0x48307ff680007ff7", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0xa", + "0x482480017ff58000", + "0x1", + "0x48127ff57fff8000", + "0x480680017fff8000", + "0x0", + "0x480080007ff28000", + "0x10780017fff7fff", + "0x8", + "0x48127ff57fff8000", + "0x48127ff57fff8000", + "0x480680017fff8000", + "0x1", + "0x480680017fff8000", + "0x0", + "0x20680017fff7ffe", + "0xa1", + "0x40137fff7fff8000", + "0x48307ffc80007ffd", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0xa", + "0x482480017ffb8000", + "0x1", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x0", + "0x48127ff87fff8000", + "0x10780017fff7fff", + "0x8", + "0x48127ffb7fff8000", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x480680017fff8000", + "0x0", + "0x20680017fff7ffe", + "0x20", + "0x40780017fff7fff", + "0x1", + "0x48127ff47fff8000", + "0x48127fe77fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ffb7fff8000", + "0x48127ffa7fff8000", + "0x480080007ff88000", + "0x1104800180018000", + "0x16ed", + "0x20680017fff7ffa", + "0xb", + "0x48127ff87fff8000", + "0x48127ff87fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x10780017fff7fff", + "0x14", + "0x48127ff87fff8000", + "0x48127ff87fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x48127ff57fff8000", + "0x48127fe87fff8000", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x480680017fff8000", + "0x1", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x20680017fff7ffd", + "0x53", + "0x48307ffb80007ffc", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0x10", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x496e70757420746f6f206c6f6e6720666f7220617267756d656e7473", + "0x400080007ffe7fff", + "0x48127ff67fff8000", + "0x48127ff67fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x1104800180018000", + "0x4763", + "0x482480017fff8000", + "0x4762", + "0x480080007fff8000", + "0xa0680017fff8000", + "0x9", + "0x4824800180007ff4", + "0x602c", + "0x482480017fff8000", + "0x100000000000000000000000000000000", + "0x400080007ff17fff", + "0x10780017fff7fff", + "0x23", + "0x4824800180007ff4", + "0x602c", + "0x400080007ff27fff", + "0x482480017ff28000", + "0x1", + "0x48127ffe7fff8000", + "0x480a7ffb7fff8000", + "0x480a80017fff8000", + "0x480a80007fff8000", + "0x48127ff27fff8000", + "0x48127ff27fff8000", + "0x1104800180018000", + "0x16fc", + "0x20680017fff7ffd", + "0xc", + "0x40780017fff7fff", + "0x1", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x480680017fff8000", + "0x0", + "0x48127ffb7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7574206f6620676173", + "0x400080007ffe7fff", + "0x482480017fef8000", + "0x1", + "0x48127fef7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4661696c656420746f20646573657269616c697a6520706172616d202333", + "0x400080007ffe7fff", + "0x48127ff77fff8000", + "0x48127ff77fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4661696c656420746f20646573657269616c697a6520706172616d202332", + "0x400080007ffe7fff", + "0x48127ff87fff8000", + "0x48127feb7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x482480017ff48000", + "0x3", + "0x10780017fff7fff", + "0x5", + "0x40780017fff7fff", + "0x6", + "0x48127ff47fff8000", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4661696c656420746f20646573657269616c697a6520706172616d202331", + "0x400080007ffe7fff", + "0x48127ffd7fff8000", + "0x48127fef7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7574206f6620676173", + "0x400080007ffe7fff", + "0x482680017ff98000", + "0x1", + "0x480a7ffa7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0xa0680017fff8000", + "0x7", + "0x482680017ffa8000", + "0x100000000000000000000000000000000", + "0x400280007ff97fff", + "0x10780017fff7fff", + "0x97", + "0x4825800180007ffa", + "0x0", + "0x400280007ff97fff", + "0x482680017ff98000", + "0x1", + "0x48297ffc80007ffd", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0xa", + "0x482680017ffc8000", + "0x1", + "0x480a7ffd7fff8000", + "0x480680017fff8000", + "0x0", + "0x480280007ffc8000", + "0x10780017fff7fff", + "0x8", + "0x480a7ffc7fff8000", + "0x480a7ffd7fff8000", + "0x480680017fff8000", + "0x1", + "0x480680017fff8000", + "0x0", + "0x20680017fff7ffe", + "0x6c", + "0xa0680017fff8004", + "0xe", + "0x4824800180047ffe", + "0x800000000000000000000000000000000000000000000000000000000000000", + "0x484480017ffe8000", + "0x110000000000000000", + "0x48307ffe7fff8002", + "0x480080007ff67ffc", + "0x480080017ff57ffc", + "0x402480017ffb7ffd", + "0xffffffffffffffeeffffffffffffffff", + "0x400080027ff47ffd", + "0x10780017fff7fff", + "0x5a", + "0x484480017fff8001", + "0x8000000000000000000000000000000", + "0x48307fff80007ffd", + "0x480080007ff77ffd", + "0x480080017ff67ffd", + "0x402480017ffc7ffe", + "0xf8000000000000000000000000000000", + "0x400080027ff57ffe", + "0x482480017ff58000", + "0x3", + "0x48307ff680007ff7", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0x10", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x496e70757420746f6f206c6f6e6720666f7220617267756d656e7473", + "0x400080007ffe7fff", + "0x48127ffc7fff8000", + "0x48127fef7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x1104800180018000", + "0x4699", + "0x482480017fff8000", + "0x4698", + "0x480080007fff8000", + "0xa0680017fff8000", + "0x9", + "0x4824800180007fed", + "0x9e66", + "0x482480017fff8000", + "0x100000000000000000000000000000000", + "0x400080007ff77fff", + "0x10780017fff7fff", + "0x20", + "0x4824800180007fed", + "0x9e66", + "0x400080007ff87fff", + "0x482480017ff88000", + "0x1", + "0x48127ffe7fff8000", + "0x480a7ffb7fff8000", + "0x48127fef7fff8000", + "0x1104800180018000", + "0x16c3", + "0x20680017fff7ffd", + "0xc", + "0x40780017fff7fff", + "0x1", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x48127ff97fff8000", + "0x480680017fff8000", + "0x0", + "0x48127ffb7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7574206f6620676173", + "0x400080007ffe7fff", + "0x482480017ff58000", + "0x1", + "0x48127fe87fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x482480017ff48000", + "0x3", + "0x10780017fff7fff", + "0x5", + "0x40780017fff7fff", + "0x6", + "0x48127ff47fff8000", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4661696c656420746f20646573657269616c697a6520706172616d202331", + "0x400080007ffe7fff", + "0x48127ffd7fff8000", + "0x48127fef7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7574206f6620676173", + "0x400080007ffe7fff", + "0x482680017ff98000", + "0x1", + "0x480a7ffa7fff8000", + "0x480a7ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", "0x3", "0xa0680017fff8000", "0x7", @@ -922,9 +1383,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x41f3", + "0x456b", "0x482480017fff8000", - "0x41f2", + "0x456a", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -950,7 +1411,7 @@ "0x480a80017fff8000", "0x480a80027fff8000", "0x1104800180018000", - "0x1501", + "0x160d", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -1128,9 +1589,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x4125", + "0x449d", "0x482480017fff8000", - "0x4124", + "0x449c", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1245,7 +1706,7 @@ "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x1444", + "0x1550", "0x20680017fff7ffc", "0xf2", "0x48127ff97fff8000", @@ -1256,7 +1717,7 @@ "0x40137ffa7fff8001", "0x40137ffb7fff8002", "0x1104800180018000", - "0x1506", + "0x1612", "0x20680017fff7feb", "0xdf", "0x20680017fff7fee", @@ -1344,9 +1805,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x404d", + "0x43c5", "0x482480017fff8000", - "0x404c", + "0x43c4", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1388,7 +1849,7 @@ "0x48127fdb7fff8000", "0x48127fdf7fff8000", "0x1104800180018000", - "0x1937", + "0x1a43", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -1682,9 +2143,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3efb", + "0x4273", "0x482480017fff8000", - "0x3efa", + "0x4272", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1969,9 +2430,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3ddc", + "0x4154", "0x482480017fff8000", - "0x3ddb", + "0x4153", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -1993,7 +2454,7 @@ "0x48127fee7fff8000", "0x48127ff27fff8000", "0x1104800180018000", - "0x184a", + "0x1956", "0x482480017fc88000", "0x1", "0x48127ffa7fff8000", @@ -2186,9 +2647,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3d03", + "0x407b", "0x482480017fff8000", - "0x3d02", + "0x407a", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2402,9 +2863,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3c2b", + "0x3fa3", "0x482480017fff8000", - "0x3c2a", + "0x3fa2", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2541,9 +3002,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3ba0", + "0x3f18", "0x482480017fff8000", - "0x3b9f", + "0x3f17", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2575,7 +3036,7 @@ "0x48127ff77fff8000", "0x480080007ffc8000", "0x1104800180018000", - "0x164c", + "0x1758", "0x40780017fff7fff", "0x1", "0x48127ffa7fff8000", @@ -2814,9 +3275,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3a8f", + "0x3e07", "0x482480017fff8000", - "0x3a8e", + "0x3e06", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -2992,9 +3453,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x39dd", + "0x3d55", "0x482480017fff8000", - "0x39dc", + "0x3d54", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3013,7 +3474,7 @@ "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x1554", + "0x1660", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3096,9 +3557,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3975", + "0x3ced", "0x482480017fff8000", - "0x3974", + "0x3cec", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3117,7 +3578,7 @@ "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x15c0", + "0x16cc", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3201,15 +3662,15 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x390c", + "0x3c84", "0x482480017fff8000", - "0x390b", + "0x3c83", "0x480080007fff8000", "0x480080017fff8000", "0x484480017fff8000", "0x8", "0x482480017fff8000", - "0x4142e", + "0x40312", "0xa0680017fff8000", "0x8", "0x48307ffe80007ff5", @@ -3226,7 +3687,7 @@ "0x480a7ff97fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x15a6", + "0x16b2", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -3313,28 +3774,28 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x389c", + "0x3c14", "0x482480017fff8000", - "0x389b", + "0x3c13", "0x480080007fff8000", "0xa0680017fff8000", "0x9", "0x4824800180007ff8", - "0x382d4", + "0x371b8", "0x482480017fff8000", "0x100000000000000000000000000000000", "0x400080007ff77fff", "0x10780017fff7fff", "0x1f", "0x4824800180007ff8", - "0x382d4", + "0x371b8", "0x400080007ff87fff", "0x482480017ff88000", "0x1", "0x48127ffe7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x169a", + "0x17a6", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -3459,9 +3920,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x380a", + "0x3b82", "0x482480017fff8000", - "0x3809", + "0x3b81", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3661,9 +4122,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3740", + "0x3ab8", "0x482480017fff8000", - "0x373f", + "0x3ab7", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3684,7 +4145,7 @@ "0x48127ff47fff8000", "0x48127ff47fff8000", "0x1104800180018000", - "0x16c5", + "0x17d1", "0x20680017fff7ffd", "0xe", "0x40780017fff7fff", @@ -3783,9 +4244,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x36c6", + "0x3a3e", "0x482480017fff8000", - "0x36c5", + "0x3a3d", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3897,9 +4358,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3654", + "0x39cc", "0x482480017fff8000", - "0x3653", + "0x39cb", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -3918,7 +4379,7 @@ "0x48127ffe7fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x172a", + "0x1836", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -4036,9 +4497,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x35c9", + "0x3941", "0x482480017fff8000", - "0x35c8", + "0x3940", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4057,7 +4518,7 @@ "0x48127ffe7fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x16cf", + "0x17db", "0x20680017fff7ffd", "0xc", "0x40780017fff7fff", @@ -4241,9 +4702,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x34fc", + "0x3874", "0x482480017fff8000", - "0x34fb", + "0x3873", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -4485,9 +4946,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3408", + "0x3780", "0x482480017fff8000", - "0x3407", + "0x377f", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -4513,7 +4974,7 @@ "0x48127feb7fff8000", "0x48127fef7fff8000", "0x1104800180018000", - "0x1533", + "0x163f", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -4628,7 +5089,7 @@ "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x1583", + "0x168f", "0x20680017fff7ffc", "0x63", "0x48307ffa80007ffb", @@ -4653,9 +5114,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3360", + "0x36d8", "0x482480017fff8000", - "0x335f", + "0x36d7", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -4686,7 +5147,7 @@ "0x48127feb7fff8000", "0x48127feb7fff8000", "0x1104800180018000", - "0x160d", + "0x1719", "0x20680017fff7ffd", "0xe", "0x40780017fff7fff", @@ -4821,7 +5282,7 @@ "0x48127ff67fff8000", "0x48127ff67fff8000", "0x1104800180018000", - "0x14c2", + "0x15ce", "0x20680017fff7ffc", "0x60", "0x48307ffa80007ffb", @@ -4844,9 +5305,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x32a1", + "0x3619", "0x482480017fff8000", - "0x32a0", + "0x3618", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5001,9 +5462,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3204", + "0x357c", "0x482480017fff8000", - "0x3203", + "0x357b", "0x480080007fff8000", "0x480080027fff8000", "0x482480017fff8000", @@ -5024,7 +5485,7 @@ "0x48127ffd7fff8000", "0x480a7ffb7fff8000", "0x1104800180018000", - "0x15dd", + "0x16e9", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5133,9 +5594,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3180", + "0x34f8", "0x482480017fff8000", - "0x317f", + "0x34f7", "0x480080007fff8000", "0x480080007fff8000", "0x484480017fff8000", @@ -5159,7 +5620,7 @@ "0x480a7ffb7fff8000", "0x48127ff17fff8000", "0x1104800180018000", - "0x1678", + "0x1784", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5282,9 +5743,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x30eb", + "0x3463", "0x482480017fff8000", - "0x30ea", + "0x3462", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5420,9 +5881,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x3061", + "0x33d9", "0x482480017fff8000", - "0x3060", + "0x33d8", "0x480080007fff8000", "0x480080047fff8000", "0x484480017fff8000", @@ -5450,7 +5911,7 @@ "0x480a7ff77fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0x1683", + "0x178f", "0x20680017fff7ffd", "0xf", "0x40780017fff7fff", @@ -5546,9 +6007,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x2fe3", + "0x335b", "0x482480017fff8000", - "0x2fe2", + "0x335a", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5564,14 +6025,14 @@ "0x400080007ff87fff", "0x480a7ff97fff8000", "0x1104800180018000", - "0x17e3", + "0x18ef", "0x482480017fe88000", "0x1", "0x20680017fff7ffc", "0x17", "0x48127ffb7fff8000", "0x1104800180018000", - "0x17dc", + "0x18e8", "0x20680017fff7ffd", "0xd", "0x40780017fff7fff", @@ -5710,9 +6171,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x2f3f", + "0x32b7", "0x482480017fff8000", - "0x2f3e", + "0x32b6", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -5916,9 +6377,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x2e71", + "0x31e9", "0x482480017fff8000", - "0x2e70", + "0x31e8", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6121,9 +6582,9 @@ "0x1", "0x208b7fff7fff7ffe", "0x1104800180018000", - "0x2da4", + "0x311c", "0x482480017fff8000", - "0x2da3", + "0x311b", "0x480080007fff8000", "0xa0680017fff8000", "0x9", @@ -6326,6 +6787,274 @@ "0x482480017ff78000", "0x1", "0x208b7fff7fff7ffe", + "0x480680017fff8000", + "0x43616c6c436f6e7472616374", + "0x400280007ff97fff", + "0x400380017ff97ff8", + "0x400380027ff97ffa", + "0x400380037ff97ffb", + "0x400380047ff97ffc", + "0x400380057ff97ffd", + "0x480280077ff98000", + "0x20680017fff7fff", + "0x1c", + "0x40780017fff7fff", + "0xc", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x46a6158a16a947e5916b2a2ca68501a45e93d7110e81aa2d6438b1c57c879a3", + "0x400080007ffe7fff", + "0x480680017fff8000", + "0x0", + "0x400080017ffd7fff", + "0x480680017fff8000", + "0x457870656374656420726576657274", + "0x400080027ffc7fff", + "0x480680017fff8000", + "0xf", + "0x400080037ffb7fff", + "0x480a7ff77fff8000", + "0x480280067ff98000", + "0x482680017ff98000", + "0xa", + "0x480680017fff8000", + "0x1", + "0x48127ff77fff8000", + "0x482480017ff68000", + "0x4", + "0x208b7fff7fff7ffe", + "0x480280087ff98000", + "0x480280097ff98000", + "0x480280067ff98000", + "0x482680017ff98000", + "0xa", + "0x48307ffc80007ffd", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0x51", + "0x4824800180007ffc", + "0x1", + "0x480080007fff8000", + "0x4824800180007fff", + "0x454e545259504f494e545f4641494c4544", + "0x20680017fff7fff", + "0x3a", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x1275130f95dda36bcbb6e9d28796c1d7e10b6e9fd5ed083e0ede4b12f613528", + "0x480680017fff8000", + "0x53746f7261676552656164", + "0x400080007ff87fff", + "0x400080017ff87ff7", + "0x400080027ff87ffd", + "0x400080037ff87ffe", + "0x480080057ff88000", + "0x20680017fff7fff", + "0x22", + "0x480080067ff78000", + "0x480080047ff68000", + "0x482480017ff58000", + "0x7", + "0x20680017fff7ffd", + "0xe", + "0x40780017fff7fff", + "0x2", + "0x480a7ff77fff8000", + "0x48127ffb7fff8000", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x76616c7565732073686f756c64206e6f74206368616e67652e", + "0x400080007ffe7fff", + "0x480a7ff77fff8000", + "0x48127ffb7fff8000", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x5", + "0x480a7ff77fff8000", + "0x480080047ff18000", + "0x482480017ff08000", + "0x8", + "0x480680017fff8000", + "0x1", + "0x480080067fee8000", + "0x480080077fed8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x7", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x556e6578706563746564206572726f72", + "0x400080007ffe7fff", + "0x480a7ff77fff8000", + "0x48127ff07fff8000", + "0x48127ff07fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xa", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7074696f6e3a3a756e77726170206661696c65642e", + "0x400080007ffe7fff", + "0x480a7ff77fff8000", + "0x48127ff07fff8000", + "0x48127ff07fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x0", + "0x400080007ffe7fff", + "0x48127ffe7fff8000", + "0x482480017ffd8000", + "0x1", + "0x480680017fff8000", + "0x456d69744576656e74", + "0x400280007ffc7fff", + "0x400380017ffc7ffb", + "0x400280027ffc7ffd", + "0x400280037ffc7ffe", + "0x400280047ffc7ffd", + "0x400280057ffc7ffe", + "0x480280077ffc8000", + "0x20680017fff7fff", + "0x62", + "0x480280067ffc8000", + "0x480680017fff8000", + "0x5265706c616365436c617373", + "0x400280087ffc7fff", + "0x400280097ffc7ffe", + "0x4003800a7ffc7ffd", + "0x4802800c7ffc8000", + "0x20680017fff7fff", + "0x4e", + "0x4802800b7ffc8000", + "0x480680017fff8000", + "0x11", + "0x480680017fff8000", + "0x53656e644d657373616765546f4c31", + "0x4002800d7ffc7fff", + "0x4002800e7ffc7ffd", + "0x4002800f7ffc7ffe", + "0x400280107ffc7ff6", + "0x400280117ffc7ff7", + "0x480280137ffc8000", + "0x20680017fff7fff", + "0x36", + "0x480280127ffc8000", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x1275130f95dda36bcbb6e9d28796c1d7e10b6e9fd5ed083e0ede4b12f613528", + "0x480680017fff8000", + "0x11", + "0x480680017fff8000", + "0x53746f726167655772697465", + "0x400280147ffc7fff", + "0x400280157ffc7ffb", + "0x400280167ffc7ffc", + "0x400280177ffc7ffd", + "0x400280187ffc7ffe", + "0x4802801a7ffc8000", + "0x20680017fff7fff", + "0x1a", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x46a6158a16a947e5916b2a2ca68501a45e93d7110e81aa2d6438b1c57c879a3", + "0x400080007ffe7fff", + "0x480680017fff8000", + "0x0", + "0x400080017ffd7fff", + "0x480680017fff8000", + "0x746573745f7265766572745f68656c706572", + "0x400080027ffc7fff", + "0x480680017fff8000", + "0x12", + "0x400080037ffb7fff", + "0x480a7ffa7fff8000", + "0x480280197ffc8000", + "0x482680017ffc8000", + "0x1b", + "0x480680017fff8000", + "0x1", + "0x48127ff77fff8000", + "0x482480017ff68000", + "0x4", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x5", + "0x480a7ffa7fff8000", + "0x480280197ffc8000", + "0x482680017ffc8000", + "0x1d", + "0x480680017fff8000", + "0x1", + "0x4802801b7ffc8000", + "0x4802801c7ffc8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xb", + "0x480a7ffa7fff8000", + "0x480280127ffc8000", + "0x482680017ffc8000", + "0x16", + "0x480680017fff8000", + "0x1", + "0x480280147ffc8000", + "0x480280157ffc8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xf", + "0x480a7ffa7fff8000", + "0x4802800b7ffc8000", + "0x482680017ffc8000", + "0xf", + "0x480680017fff8000", + "0x1", + "0x4802800d7ffc8000", + "0x4802800e7ffc8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x12", + "0x480a7ffa7fff8000", + "0x480280067ffc8000", + "0x482680017ffc8000", + "0xa", + "0x480680017fff8000", + "0x1", + "0x480280087ffc8000", + "0x480280097ffc8000", + "0x208b7fff7fff7ffe", "0xa0680017fff8000", "0x7", "0x482680017ff68000", @@ -8702,9 +9431,9 @@ "0x20680017fff7ffd", "0x37", "0x1104800180018000", - "0x2373", + "0x25df", "0x482480017fff8000", - "0x2372", + "0x25de", "0x48127ff97fff8000", "0x480a7ffc7fff8000", "0x480a7ffd7fff8000", @@ -9146,15 +9875,15 @@ "0x20680017fff7ffc", "0x12", "0x40780017fff7fff", - "0x327", + "0x30c", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x53686f756c64206265206e6f6e65", "0x400080007ffe7fff", "0x480a7ffb7fff8000", - "0x48127cd47fff8000", - "0x48127cd47fff8000", + "0x48127cef7fff8000", + "0x48127cef7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9181,15 +9910,15 @@ "0x20680017fff7fff", "0x13", "0x40780017fff7fff", - "0x321", + "0x306", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x53686f756c64206661696c", "0x400080007ffe7fff", "0x480a7ffb7fff8000", - "0x480080067cd58000", - "0x482480017cd48000", + "0x480080067cf08000", + "0x482480017cef8000", "0xa", "0x480680017fff8000", "0x1", @@ -9271,7 +10000,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x301", + "0x2e6", "0x10780017fff7fff", "0xa", "0x4824800180007ffa", @@ -9281,7 +10010,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x300", + "0x2e5", "0x10780017fff7fff", "0x14", "0x4824800180007ffc", @@ -9291,7 +10020,7 @@ "0x10780017fff7fff", "0x6", "0x40780017fff7fff", - "0x2ff", + "0x2e4", "0x10780017fff7fff", "0xa", "0x4824800180007ffc", @@ -9301,15 +10030,15 @@ "0x10780017fff7fff", "0x12", "0x40780017fff7fff", - "0x2fe", + "0x2e3", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x556e657870656374656420636f6f7264696e61746573", "0x400080007ffe7fff", - "0x48127ce97fff8000", - "0x48127cf77fff8000", - "0x48127cf77fff8000", + "0x48127d047fff8000", + "0x48127d127fff8000", + "0x48127d127fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9404,15 +10133,15 @@ "0x48127ffa7fff8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2ea", + "0x2cf", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127d0d7fff8000", - "0x48127d117fff8000", - "0x48127d117fff8000", + "0x48127d287fff8000", + "0x48127d2c7fff8000", + "0x48127d2c7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9420,37 +10149,37 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2f0", - "0x48127d0d7fff8000", - "0x480080067cf88000", - "0x482480017cf78000", + "0x2d5", + "0x48127d287fff8000", + "0x480080067d138000", + "0x482480017d128000", "0xa", "0x480680017fff8000", "0x1", - "0x480080087cf58000", - "0x480080097cf48000", + "0x480080087d108000", + "0x480080097d0f8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x30a", - "0x48127ce97fff8000", - "0x480080037cf28000", - "0x482480017cf18000", + "0x2ef", + "0x48127d047fff8000", + "0x480080037d0d8000", + "0x482480017d0c8000", "0x7", "0x480680017fff8000", "0x1", - "0x480080057cef8000", - "0x480080067cee8000", + "0x480080057d0a8000", + "0x480080067d098000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x30a", + "0x2ef", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127ce97fff8000", - "0x48127cf17fff8000", - "0x48127cf17fff8000", + "0x48127d047fff8000", + "0x48127d0c7fff8000", + "0x48127d0c7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9458,26 +10187,26 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x310", - "0x48127ce97fff8000", - "0x480080067ce08000", - "0x482480017cdf8000", + "0x2f5", + "0x48127d047fff8000", + "0x480080067cfb8000", + "0x482480017cfa8000", "0xa", "0x480680017fff8000", "0x1", - "0x480080087cdd8000", - "0x480080097cdc8000", + "0x480080087cf88000", + "0x480080097cf78000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x314", + "0x2f9", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x57726f6e67206572726f72206d7367", "0x400080007ffe7fff", - "0x48127ce97fff8000", - "0x48127cdf7fff8000", - "0x48127cdf7fff8000", + "0x48127d047fff8000", + "0x48127cfa7fff8000", + "0x48127cfa7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9485,7 +10214,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x319", + "0x2fe", "0x40780017fff7fff", "0x1", "0x480680017fff8000", @@ -9493,8 +10222,8 @@ "0x400080007ffe7fff", "0x482680017ffb8000", "0x1", - "0x48127cdf7fff8000", - "0x48127cdf7fff8000", + "0x48127cfa7fff8000", + "0x48127cfa7fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -9502,7 +10231,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x32d", + "0x312", "0x480a7ffb7fff8000", "0x480280067ffd8000", "0x482680017ffd8000", @@ -11304,9 +12033,9 @@ "0x20680017fff7fff", "0x14d", "0x1104800180018000", - "0x1952", + "0x1bbe", "0x482480017fff8000", - "0x1951", + "0x1bbd", "0x480680017fff8000", "0x2", "0x482480017ffe8000", @@ -11388,7 +12117,7 @@ "0x480680017fff8000", "0x0", "0x1104800180018000", - "0xa11", + "0xbd4", "0x402580017fd38005", "0x1", "0x20680017fff7fff", @@ -11407,7 +12136,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xa1d", + "0xbe0", "0x20680017fff7ffb", "0x70", "0x48127ffa7fff8000", @@ -11420,7 +12149,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xa10", + "0xbd3", "0x20680017fff7ffb", "0x59", "0x48127ffa7fff8000", @@ -11433,7 +12162,7 @@ "0x480680017fff8000", "0x1f", "0x1104800180018000", - "0xa03", + "0xbc6", "0x20680017fff7ffb", "0x42", "0x48127ffa7fff8000", @@ -11446,7 +12175,7 @@ "0x480680017fff8000", "0x2", "0x1104800180018000", - "0x9f6", + "0xbb9", "0x20680017fff7ffb", "0x2b", "0x40780017fff7fff", @@ -11468,7 +12197,7 @@ "0x482480017ff88000", "0x2", "0x1104800180018000", - "0xe50", + "0x1013", "0x20680017fff7ffd", "0x9", "0x400180007fff8003", @@ -11925,7 +12654,7 @@ "0x480a7ff97fff8000", "0x480a7ffa7fff8000", "0x1104800180018000", - "0xcc9", + "0xe8c", "0x20680017fff7ffc", "0x11", "0x400280007ffc7ffd", @@ -12295,7 +13024,7 @@ "0x480080007ffc8000", "0x480080017ffb8000", "0x1104800180018000", - "0xc07", + "0xdca", "0x20680017fff7ffd", "0xb", "0x48127ffc7fff8000", @@ -12544,7 +13273,7 @@ "0x48127ffa7fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0xbab", + "0xd6e", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x1", @@ -12750,7 +13479,7 @@ "0x48127ff27fff8000", "0x48307ffc80007ffd", "0x1104800180018000", - "0xb30", + "0xcf3", "0x484480017f9b8000", "0x20", "0xa0680017fff8000", @@ -13079,7 +13808,7 @@ "0x480a7ffb7fff8000", "0x480a7ffc7fff8000", "0x1104800180018000", - "0xad6", + "0xc99", "0x20680017fff7ffd", "0x3e", "0x20680017fff7ffe", @@ -13090,7 +13819,7 @@ "0x48127ff97fff8000", "0x48127ffb7fff8000", "0x1104800180018000", - "0xd8d", + "0x1112", "0x20680017fff7ffd", "0x1b", "0x48317fff80007ffd", @@ -13188,7 +13917,7 @@ "0x20680017fff7fff", "0x4", "0x10780017fff7fff", - "0x2fd", + "0x4c0", "0x480680017fff8000", "0xffffffff00000000ffffffffffffffff", "0x48317fff80017ffa", @@ -13209,10 +13938,10 @@ "0x10780017fff7fff", "0x7", "0x40780017fff7fff", - "0x2d3", - "0x48127d2b7fff8000", + "0x2b8", + "0x48127d467fff8000", "0x10780017fff7fff", - "0x2e8", + "0x4ab", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x48317fff80017ff9", @@ -13225,11 +13954,11 @@ "0x9", "0x400080007ffb7fff", "0x40780017fff7fff", - "0x2d0", - "0x482480017d2b8000", + "0x2b5", + "0x482480017d468000", "0x1", "0x10780017fff7fff", - "0x2d7", + "0x49a", "0x482480017ffa8000", "0x1", "0x10780017fff7fff", @@ -13322,7 +14051,7 @@ "0x1", "0x48307ffe80007fff", "0x20680017fff7fff", - "0x272", + "0x435", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x480680017fff8000", @@ -13428,7 +14157,7 @@ "0x40317ff97ffb7ffc", "0x40307ffa7ffc7ff1", "0x10780017fff7fff", - "0x1bb", + "0x37e", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480080097fcb8001", @@ -13675,218 +14404,101 @@ "0x480a7ff87fff8000", "0x48127f597fff8000", "0x48127f597fff8000", - "0x480680017fff8000", - "0xbce6faada7179e84f3b9cac2fc632551", - "0x480680017fff8000", - "0xffffffff00000000ffffffffffffffff", "0x1104800180018000", - "0xc06", - "0x48127ffd7fff8000", - "0x480a7ff97fff8000", - "0x480a7ffa7fff8000", - "0x48127e5d7fff8000", - "0x48127e5d7fff8000", + "0xf8f", "0x480680017fff8000", "0xbce6faada7179e84f3b9cac2fc632551", "0x480680017fff8000", "0xffffffff00000000ffffffffffffffff", - "0x1104800180018000", - "0xbfb", - "0x480680017fff8000", - "0x77037d812deb33a0f4a13945d898c296", - "0x480680017fff8000", - "0x6b17d1f2e12c4247f8bce6e563a440f2", - "0x480680017fff8000", - "0x2bce33576b315ececbb6406837bf51f5", - "0x480680017fff8000", - "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e16", - "0x480680017fff8000", - "0x5365637032353672314e6577", - "0x400280007ff67fff", - "0x400380017ff67ff5", - "0x400280027ff67ffb", - "0x400280037ff67ffc", - "0x400280047ff67ffd", - "0x400280057ff67ffe", - "0x480280077ff68000", - "0x20680017fff7fff", - "0x92", - "0x480280087ff68000", - "0x480280097ff68000", - "0x480280067ff68000", - "0x482680017ff68000", - "0xa", - "0x20680017fff7ffc", - "0x7d", - "0x480680017fff8000", - "0x5365637032353672314d756c", - "0x400080007ffe7fff", - "0x400080017ffe7ffd", - "0x400080027ffe7ffc", - "0x400080037ffe7ef7", - "0x400080047ffe7ef8", - "0x480080067ffe8000", - "0x20680017fff7fff", - "0x68", - "0x480080057ffd8000", - "0x480080077ffc8000", - "0x480680017fff8000", - "0x5365637032353672314d756c", - "0x400080087ffa7fff", - "0x400080097ffa7ffd", - "0x4001800a7ffa7ffd", - "0x4000800b7ffa7fef", - "0x4000800c7ffa7ff0", - "0x4800800e7ffa8000", - "0x20680017fff7fff", - "0x51", - "0x4800800d7ff98000", - "0x4800800f7ff88000", - "0x480680017fff8000", - "0x536563703235367231416464", - "0x400080107ff67fff", - "0x400080117ff67ffd", - "0x400080127ff67ffa", - "0x400080137ff67ffe", - "0x480080157ff68000", - "0x20680017fff7fff", - "0x3b", - "0x480080147ff58000", - "0x480080167ff48000", - "0x480680017fff8000", - "0x5365637032353672314765745879", - "0x400080177ff27fff", - "0x400080187ff27ffd", - "0x400080197ff27ffe", - "0x4800801b7ff28000", - "0x20680017fff7fff", - "0x26", - "0x4800801c7ff18000", - "0x4800801d7ff08000", - "0x4800801a7fef8000", - "0x482480017fee8000", - "0x20", - "0x48287ff980007ffc", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", - "0x8", + "0x480080007ff98000", + "0x480080017ff88000", + "0x480080027ff78000", + "0x480080037ff68000", + "0x480080047ff58000", + "0x480080057ff48000", + "0x48307fff80007ff9", "0x40780017fff7fff", + "0xc", + "0x20680017fff7ff3", + "0x8", + "0x40307ff17ff47feb", + "0x402480017ff57ff4", "0x1", - "0x480680017fff8000", - "0x0", - "0x10780017fff7fff", - "0xd", - "0x48287ffa80007ffc", - "0x20680017fff7fff", - "0x4", + "0x400080067fe67ff5", "0x10780017fff7fff", + "0x3", + "0x400080067fe67ff3", + "0x48307ff17ff68000", + "0x48307fe680007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x40507fff7fff7fff", + "0x48307ff47fff8000", + "0x48307ff47fff8000", + "0x48307ff57fff8000", + "0x48307fec7fff8000", + "0x48307fe180007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080077fdd7fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x400080087fdc7fff", + "0x48307fef7ffe8000", + "0x48307ff07fff8000", + "0x48307ff07fff8000", + "0x48307ff17fff8000", + "0x48307fdb80007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080097fd67fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x4000800a7fd57fff", + "0xa0680017fff7fdf", + "0xc", + "0xa0680017fff8001", "0x6", - "0x480680017fff8000", - "0x0", + "0x48127fd97fff7ffe", + "0x40127fdb7fff7ffe", "0x10780017fff7fff", - "0x4", - "0x480680017fff8000", - "0x1", - "0x48127fde7fff8000", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", + "0x10", + "0x48127fdc7fff7ffe", + "0x40127fd87fff7ffe", + "0x10780017fff7fff", + "0xc", + "0x480680017fff7fda", "0x0", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x7", - "0x48127fde7fff8000", - "0x4800801a7fe98000", - "0x482480017fe88000", - "0x1e", - "0x480680017fff8000", - "0x1", - "0x4800801c7fe68000", - "0x4800801d7fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xb", - "0x48127fde7fff8000", - "0x480080147fe98000", - "0x482480017fe88000", - "0x18", - "0x480680017fff8000", - "0x1", - "0x480080167fe68000", - "0x480080177fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xf", - "0x48127fde7fff8000", - "0x4800800d7fe98000", - "0x482480017fe88000", - "0x11", - "0x480680017fff8000", - "0x1", - "0x4800800f7fe68000", - "0x480080107fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x13", - "0x48127fde7fff8000", - "0x480080057fe98000", - "0x482480017fe88000", - "0x9", - "0x480680017fff8000", - "0x1", - "0x480080077fe68000", - "0x480080087fe58000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0xf", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7074696f6e3a3a756e77726170206661696c65642e", - "0x400080007ffe7fff", - "0x48127fed7fff8000", - "0x48127fed7fff8000", - "0x48127ffc7fff8000", - "0x482480017ffb8000", - "0x1", + "0xa0680017fff8000", + "0x6", + "0x40127fd77fff7ffd", + "0x40127fdc7fff7ffe", "0x10780017fff7fff", - "0x9", - "0x40780017fff7fff", - "0x15", - "0x480280067ff68000", - "0x482680017ff68000", - "0xa", - "0x480280087ff68000", - "0x480280097ff68000", - "0x48127fde7fff8000", - "0x48127ffb7fff8000", - "0x48127ffb7fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x48127ffa7fff8000", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x28f", + "0x4", + "0x40127fdc7fff7ffd", + "0x40127fd77fff7ffe", + "0x482480017ffd8000", + "0xffffffffffffffff0000000000000000", + "0x4000800b7fd17fff", + "0x48507ffd7ffc8000", + "0x48307fe97ff98000", + "0x48307fe67fff8000", + "0x40307ffd7fff7fd2", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480080077d5c8001", - "0x480080087d5b7ffe", - "0x400080097d5a7ffe", + "0x4800800c7fcd8001", + "0x4800800d7fcc7ffe", + "0x4000800e7fcb7ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d5f", - "0x48507d637ffc8000", - "0x48507d627ffc8000", + "0x40307ffc7fff7fd3", + "0x48507fcf7ffc8000", + "0x48507fce7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x4800800a7d568001", - "0x4800800b7d557fff", - "0x4000800c7d547ffd", + "0x4800800f7fc78001", + "0x480080107fc67fff", + "0x400080117fc57ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -13895,28 +14507,28 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x4800800d7d507fff", - "0x4800800e7d4f7ffd", - "0x4000800f7d4e7d52", + "0x480080127fc17fff", + "0x480080137fc07ffd", + "0x400080147fbf7fd7", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", - "0x40307d527ffe7fff", - "0x40307ffc7ff77d5c", + "0x40307fd77ffe7fff", + "0x40307ffc7ff77fd8", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480080107d4d8001", - "0x480080117d4c7ffe", - "0x400080127d4b7ffe", + "0x480080157fbe8001", + "0x480080167fbd7ffe", + "0x400080177fbc7ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d50", - "0x48507d527ffc8000", - "0x48507d517ffc8000", + "0x40307ffc7fff7fc3", + "0x48507fc17ffc8000", + "0x48507fc07ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x480080137d478001", - "0x480080147d467fff", - "0x400080157d457ffd", + "0x480080187fb88001", + "0x480080197fb77fff", + "0x4000801a7fb67ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -13925,81 +14537,649 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x480080167d417fff", - "0x480080177d407ffd", - "0x400180187d3f7ffb", + "0x4800801b7fb27fff", + "0x4800801c7fb17ffd", + "0x4000801d7fb07fc6", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", - "0x40287ffb7ffe7fff", - "0x40307ffc7ff77d4c", - "0x40780017fff7fff", - "0x1", - "0x480680017fff8000", - "0x4f7074696f6e3a3a756e77726170206661696c65642e", - "0x400080007ffe7fff", - "0x482480017d3d8000", - "0x19", - "0x480a7ff57fff8000", - "0x480a7ff67fff8000", - "0x480680017fff8000", - "0x1", - "0x48127ffa7fff8000", - "0x482480017ff98000", - "0x1", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x2bf", - "0x48127d3d7fff8000", - "0x10780017fff7fff", - "0x5", - "0x40780017fff7fff", - "0x2d8", - "0x480a7ff47fff8000", - "0x480a7ff57fff8000", - "0x480a7ff67fff8000", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x480680017fff8000", - "0x0", - "0x208b7fff7fff7ffe", - "0x48297ffa80007ff6", - "0x20680017fff7fff", - "0x19", - "0x48297ffb80007ff7", - "0x20680017fff7fff", - "0x12", - "0x48297ffc80007ff8", - "0x20680017fff7fff", - "0xb", - "0x48297ffd80007ff9", - "0x20680017fff7fff", - "0x5", - "0x480680017fff8000", - "0x1", - "0x208b7fff7fff7ffe", - "0x480680017fff8000", - "0x0", - "0x208b7fff7fff7ffe", - "0x40780017fff7fff", - "0x1", - "0x10780017fff7fff", - "0x8", - "0x40780017fff7fff", - "0x2", - "0x10780017fff7fff", - "0x4", - "0x40780017fff7fff", - "0x3", - "0x480680017fff8000", - "0x0", - "0x208b7fff7fff7ffe", - "0x4825800180007ffd", - "0x0", - "0x20680017fff7fff", - "0x4", - "0x10780017fff7fff", + "0x40307fc67ffe7fff", + "0x40307ffc7ff77fc7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800801e7faf8001", + "0x4800801f7fae7ffe", + "0x400080207fad7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fb4", + "0x48507fb17ffc8000", + "0x48507fb07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080217fa98001", + "0x480080227fa87fff", + "0x400080237fa77ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080247fa37fff", + "0x480080257fa27ffd", + "0x400080267fa17fb3", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fb37ffe7fff", + "0x40307ffc7ff77fb4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080277fa08001", + "0x480080287f9f7ffe", + "0x400080297f9e7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fa4", + "0x48507fa37ffc8000", + "0x48507fa27ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800802a7f9a8001", + "0x4800802b7f997fff", + "0x4000802c7f987ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800802d7f947fff", + "0x4800802e7f937ffd", + "0x4000802f7f927fa6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fa67ffe7fff", + "0x40307ffc7ff77fa7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080307f918001", + "0x480080317f907ffe", + "0x400080327f8f7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7f95", + "0x48507f937ffc8000", + "0x48507f927ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080337f8b8001", + "0x480080347f8a7fff", + "0x400080357f897ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080367f857fff", + "0x480080377f847ffd", + "0x400080387f837f93", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307f937ffe7fff", + "0x40307ffc7ff77f94", + "0x482480017f838000", + "0x39", + "0x480a7ff97fff8000", + "0x480a7ffa7fff8000", + "0x48127e6b7fff8000", + "0x48127e6b7fff8000", + "0x1104800180018000", + "0xea3", + "0x480680017fff8000", + "0xbce6faada7179e84f3b9cac2fc632551", + "0x480680017fff8000", + "0xffffffff00000000ffffffffffffffff", + "0x480080007ff98000", + "0x480080017ff88000", + "0x480080027ff78000", + "0x480080037ff68000", + "0x480080047ff58000", + "0x480080057ff48000", + "0x48307fff80007ff9", + "0x40780017fff7fff", + "0xc", + "0x20680017fff7ff3", + "0x8", + "0x40307ff17ff47feb", + "0x402480017ff57ff4", + "0x1", + "0x400080067fe67ff5", + "0x10780017fff7fff", + "0x3", + "0x400080067fe67ff3", + "0x48307ff17ff68000", + "0x48307fe680007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x40507fff7fff7fff", + "0x48307ff47fff8000", + "0x48307ff47fff8000", + "0x48307ff57fff8000", + "0x48307fec7fff8000", + "0x48307fe180007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080077fdd7fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x400080087fdc7fff", + "0x48307fef7ffe8000", + "0x48307ff07fff8000", + "0x48307ff07fff8000", + "0x48307ff17fff8000", + "0x48307fdb80007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080097fd67fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x4000800a7fd57fff", + "0xa0680017fff7fdf", + "0xc", + "0xa0680017fff8001", + "0x6", + "0x48127fd97fff7ffe", + "0x40127fdb7fff7ffe", + "0x10780017fff7fff", + "0x10", + "0x48127fdc7fff7ffe", + "0x40127fd87fff7ffe", + "0x10780017fff7fff", + "0xc", + "0x480680017fff7fda", + "0x0", + "0xa0680017fff8000", + "0x6", + "0x40127fd77fff7ffd", + "0x40127fdc7fff7ffe", + "0x10780017fff7fff", + "0x4", + "0x40127fdc7fff7ffd", + "0x40127fd77fff7ffe", + "0x482480017ffd8000", + "0xffffffffffffffff0000000000000000", + "0x4000800b7fd17fff", + "0x48507ffd7ffc8000", + "0x48307fe97ff98000", + "0x48307fe67fff8000", + "0x40307ffd7fff7fd2", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800800c7fcd8001", + "0x4800800d7fcc7ffe", + "0x4000800e7fcb7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fd3", + "0x48507fcf7ffc8000", + "0x48507fce7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800800f7fc78001", + "0x480080107fc67fff", + "0x400080117fc57ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080127fc17fff", + "0x480080137fc07ffd", + "0x400080147fbf7fd7", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fd77ffe7fff", + "0x40307ffc7ff77fd8", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080157fbe8001", + "0x480080167fbd7ffe", + "0x400080177fbc7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fc3", + "0x48507fc17ffc8000", + "0x48507fc07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080187fb88001", + "0x480080197fb77fff", + "0x4000801a7fb67ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800801b7fb27fff", + "0x4800801c7fb17ffd", + "0x4000801d7fb07fc6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fc67ffe7fff", + "0x40307ffc7ff77fc7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800801e7faf8001", + "0x4800801f7fae7ffe", + "0x400080207fad7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fb4", + "0x48507fb17ffc8000", + "0x48507fb07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080217fa98001", + "0x480080227fa87fff", + "0x400080237fa77ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080247fa37fff", + "0x480080257fa27ffd", + "0x400080267fa17fb3", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fb37ffe7fff", + "0x40307ffc7ff77fb4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080277fa08001", + "0x480080287f9f7ffe", + "0x400080297f9e7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fa4", + "0x48507fa37ffc8000", + "0x48507fa27ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800802a7f9a8001", + "0x4800802b7f997fff", + "0x4000802c7f987ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800802d7f947fff", + "0x4800802e7f937ffd", + "0x4000802f7f927fa6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fa67ffe7fff", + "0x40307ffc7ff77fa7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080307f918001", + "0x480080317f907ffe", + "0x400080327f8f7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7f95", + "0x48507f937ffc8000", + "0x48507f927ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080337f8b8001", + "0x480080347f8a7fff", + "0x400080357f897ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080367f857fff", + "0x480080377f847ffd", + "0x400080387f837f93", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307f937ffe7fff", + "0x40307ffc7ff77f94", + "0x480680017fff8000", + "0x77037d812deb33a0f4a13945d898c296", + "0x480680017fff8000", + "0x6b17d1f2e12c4247f8bce6e563a440f2", + "0x480680017fff8000", + "0x2bce33576b315ececbb6406837bf51f5", + "0x480680017fff8000", + "0x4fe342e2fe1a7f9b8ee7eb4a7c0f9e16", + "0x482480017f7f8000", + "0x39", + "0x480680017fff8000", + "0x5365637032353672314e6577", + "0x400280007ff67fff", + "0x400380017ff67ff5", + "0x400280027ff67ffa", + "0x400280037ff67ffb", + "0x400280047ff67ffc", + "0x400280057ff67ffd", + "0x480280077ff68000", + "0x20680017fff7fff", + "0x92", + "0x480280087ff68000", + "0x480280097ff68000", + "0x480280067ff68000", + "0x482680017ff68000", + "0xa", + "0x20680017fff7ffc", + "0x7d", + "0x480680017fff8000", + "0x5365637032353672314d756c", + "0x400080007ffe7fff", + "0x400080017ffe7ffd", + "0x400080027ffe7ffc", + "0x400080037ffe7e94", + "0x400080047ffe7e95", + "0x480080067ffe8000", + "0x20680017fff7fff", + "0x68", + "0x480080057ffd8000", + "0x480080077ffc8000", + "0x480680017fff8000", + "0x5365637032353672314d756c", + "0x400080087ffa7fff", + "0x400080097ffa7ffd", + "0x4001800a7ffa7ffd", + "0x4000800b7ffa7f7e", + "0x4000800c7ffa7f7f", + "0x4800800e7ffa8000", + "0x20680017fff7fff", + "0x51", + "0x4800800d7ff98000", + "0x4800800f7ff88000", + "0x480680017fff8000", + "0x536563703235367231416464", + "0x400080107ff67fff", + "0x400080117ff67ffd", + "0x400080127ff67ffa", + "0x400080137ff67ffe", + "0x480080157ff68000", + "0x20680017fff7fff", + "0x3b", + "0x480080147ff58000", + "0x480080167ff48000", + "0x480680017fff8000", + "0x5365637032353672314765745879", + "0x400080177ff27fff", + "0x400080187ff27ffd", + "0x400080197ff27ffe", + "0x4800801b7ff28000", + "0x20680017fff7fff", + "0x26", + "0x4800801c7ff18000", + "0x4800801d7ff08000", + "0x4800801a7fef8000", + "0x482480017fee8000", + "0x20", + "0x48287ff980007ffc", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0x8", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x0", + "0x10780017fff7fff", + "0xd", + "0x48287ffa80007ffc", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", + "0x6", + "0x480680017fff8000", + "0x0", + "0x10780017fff7fff", + "0x4", + "0x480680017fff8000", + "0x1", + "0x48127fe47fff8000", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x7", + "0x48127fe47fff8000", + "0x4800801a7fe98000", + "0x482480017fe88000", + "0x1e", + "0x480680017fff8000", + "0x1", + "0x4800801c7fe68000", + "0x4800801d7fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xb", + "0x48127fe47fff8000", + "0x480080147fe98000", + "0x482480017fe88000", + "0x18", + "0x480680017fff8000", + "0x1", + "0x480080167fe68000", + "0x480080177fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xf", + "0x48127fe47fff8000", + "0x4800800d7fe98000", + "0x482480017fe88000", + "0x11", + "0x480680017fff8000", + "0x1", + "0x4800800f7fe68000", + "0x480080107fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x13", + "0x48127fe47fff8000", + "0x480080057fe98000", + "0x482480017fe88000", + "0x9", + "0x480680017fff8000", + "0x1", + "0x480080077fe68000", + "0x480080087fe58000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0xf", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7074696f6e3a3a756e77726170206661696c65642e", + "0x400080007ffe7fff", + "0x48127fed7fff8000", + "0x48127fed7fff8000", + "0x48127ffc7fff8000", + "0x482480017ffb8000", + "0x1", + "0x10780017fff7fff", + "0x9", + "0x40780017fff7fff", + "0x15", + "0x480280067ff68000", + "0x482680017ff68000", + "0xa", + "0x480280087ff68000", + "0x480280097ff68000", + "0x48127fe47fff8000", + "0x48127ffb7fff8000", + "0x48127ffb7fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x48127ffa7fff8000", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x274", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080077d778001", + "0x480080087d767ffe", + "0x400080097d757ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7d7a", + "0x48507d7e7ffc8000", + "0x48507d7d7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800800a7d718001", + "0x4800800b7d707fff", + "0x4000800c7d6f7ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800800d7d6b7fff", + "0x4800800e7d6a7ffd", + "0x4000800f7d697d6d", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307d6d7ffe7fff", + "0x40307ffc7ff77d77", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080107d688001", + "0x480080117d677ffe", + "0x400080127d667ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7d6b", + "0x48507d6d7ffc8000", + "0x48507d6c7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080137d628001", + "0x480080147d617fff", + "0x400080157d607ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080167d5c7fff", + "0x480080177d5b7ffd", + "0x400180187d5a7ffb", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40287ffb7ffe7fff", + "0x40307ffc7ff77d67", + "0x40780017fff7fff", + "0x1", + "0x480680017fff8000", + "0x4f7074696f6e3a3a756e77726170206661696c65642e", + "0x400080007ffe7fff", + "0x482480017d588000", + "0x19", + "0x480a7ff57fff8000", + "0x480a7ff67fff8000", + "0x480680017fff8000", + "0x1", + "0x48127ffa7fff8000", + "0x482480017ff98000", + "0x1", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x2a4", + "0x48127d587fff8000", + "0x10780017fff7fff", + "0x5", + "0x40780017fff7fff", + "0x2bd", + "0x480a7ff47fff8000", + "0x480a7ff57fff8000", + "0x480a7ff67fff8000", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x480680017fff8000", + "0x0", + "0x208b7fff7fff7ffe", + "0x48297ffa80007ff6", + "0x20680017fff7fff", + "0x19", + "0x48297ffb80007ff7", + "0x20680017fff7fff", + "0x12", + "0x48297ffc80007ff8", + "0x20680017fff7fff", + "0xb", + "0x48297ffd80007ff9", + "0x20680017fff7fff", + "0x5", + "0x480680017fff8000", + "0x1", + "0x208b7fff7fff7ffe", + "0x480680017fff8000", + "0x0", + "0x208b7fff7fff7ffe", + "0x40780017fff7fff", + "0x1", + "0x10780017fff7fff", + "0x8", + "0x40780017fff7fff", + "0x2", + "0x10780017fff7fff", + "0x4", + "0x40780017fff7fff", + "0x3", + "0x480680017fff8000", + "0x0", + "0x208b7fff7fff7ffe", + "0x4825800180007ffd", + "0x0", + "0x20680017fff7fff", + "0x4", + "0x10780017fff7fff", "0x462", "0xa0680017fff8000", "0x8", @@ -14115,7 +15295,7 @@ "0x1", "0x48127ffe7fff8000", "0x1104800180018000", - "0xc7b", + "0xd24", "0x20680017fff7ffd", "0xb7", "0x20680017fff7fff", @@ -14190,7 +15370,7 @@ "0x7", "0x48127ffe7fff8000", "0x1104800180018000", - "0xc30", + "0xcd9", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -14225,7 +15405,7 @@ "0x6", "0x48127ff67fff8000", "0x1104800180018000", - "0xc0d", + "0xcb6", "0x20680017fff7ffd", "0x34", "0x48127ffc7fff8000", @@ -14367,7 +15547,7 @@ "0x48127ffd7fff8000", "0x48127fef7fff8000", "0x1104800180018000", - "0xb7f", + "0xc28", "0x20680017fff7ffd", "0xdd", "0x20680017fff7fff", @@ -14417,7 +15597,7 @@ "0x5", "0x48127ffe7fff8000", "0x1104800180018000", - "0xb4d", + "0xbf6", "0x20680017fff7ffd", "0x96", "0x480680017fff8000", @@ -14459,7 +15639,7 @@ "0x3", "0x48127ffe7fff8000", "0x1104800180018000", - "0xb23", + "0xbcc", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -14494,7 +15674,7 @@ "0x2", "0x48127ff67fff8000", "0x1104800180018000", - "0xb00", + "0xba9", "0x20680017fff7ffd", "0x34", "0x48127ffc7fff8000", @@ -14679,7 +15859,7 @@ "0x3", "0x48127ffe7fff8000", "0x1104800180018000", - "0xa47", + "0xaf0", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -14714,7 +15894,7 @@ "0x2", "0x48127ff87fff8000", "0x1104800180018000", - "0xa24", + "0xacd", "0x20680017fff7ffd", "0x3a", "0x48127ffc7fff8000", @@ -14849,7 +16029,7 @@ "0x2", "0x48127ffe7fff8000", "0x1104800180018000", - "0x99d", + "0xa46", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -14884,7 +16064,7 @@ "0x1", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x97a", + "0xa23", "0x20680017fff7ffd", "0x3c", "0x48127ffc7fff8000", @@ -14996,7 +16176,7 @@ "0x2", "0x48127ffe7fff8000", "0x1104800180018000", - "0x90a", + "0x9b3", "0x20680017fff7ffd", "0x7", "0x48127ffc7fff8000", @@ -15031,7 +16211,7 @@ "0x1", "0x480a7ffd7fff8000", "0x1104800180018000", - "0x8e7", + "0x990", "0x20680017fff7ffd", "0x2d", "0x48127ffc7fff8000", @@ -15861,14 +17041,14 @@ "0x400380047ff67ffd", "0x480280067ff68000", "0x20680017fff7fff", - "0x2af", + "0x471", "0x480280077ff68000", "0x480280087ff68000", "0x480280057ff68000", "0x482680017ff68000", "0x9", "0x20680017fff7ffc", - "0x29c", + "0x45e", "0x480680017fff8000", "0x29bfcdb2dce28d959f2815b16f81798", "0x480680017fff8000", @@ -15887,14 +17067,14 @@ "0x400080057ffa7ffe", "0x480080077ffa8000", "0x20680017fff7fff", - "0x27a", + "0x43c", "0x480080087ff98000", "0x480080097ff88000", "0x480080067ff78000", "0x482480017ff68000", "0xa", "0x20680017fff7ffc", - "0x265", + "0x427", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", @@ -16000,7 +17180,7 @@ "0x40317ff97ffb7ffa", "0x40307ffa7ffc7ff1", "0x10780017fff7fff", - "0x1ae", + "0x370", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280097ff48001", @@ -16247,40 +17427,264 @@ "0x480a7ff87fff8000", "0x48127f597fff8000", "0x48127f597fff8000", + "0x1104800180018000", + "0x3c0", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x1104800180018000", - "0x1fa", + "0x480080007ff98000", + "0x480080017ff88000", + "0x480080027ff78000", + "0x480080037ff68000", + "0x480080047ff58000", + "0x480080057ff48000", + "0x48307fff80007ff9", + "0x40780017fff7fff", + "0xc", + "0x20680017fff7ff3", + "0x8", + "0x40307ff17ff47feb", + "0x402480017ff57ff4", + "0x1", + "0x400080067fe67ff5", + "0x10780017fff7fff", + "0x3", + "0x400080067fe67ff3", + "0x48307ff17ff68000", + "0x48307fe680007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x40507fff7fff7fff", + "0x48307ff47fff8000", + "0x48307ff47fff8000", + "0x48307ff57fff8000", + "0x48307fec7fff8000", + "0x48307fe180007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080077fdd7fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x400080087fdc7fff", + "0x48307fef7ffe8000", + "0x48307ff07fff8000", + "0x48307ff07fff8000", + "0x48307ff17fff8000", + "0x48307fdb80007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080097fd67fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x4000800a7fd57fff", + "0xa0680017fff7fdf", + "0xc", + "0xa0680017fff8001", + "0x6", + "0x48127fd97fff7ffe", + "0x40127fdb7fff7ffe", + "0x10780017fff7fff", + "0x10", + "0x48127fdc7fff7ffe", + "0x40127fd87fff7ffe", + "0x10780017fff7fff", + "0xc", + "0x480680017fff7fda", + "0x0", + "0xa0680017fff8000", + "0x6", + "0x40127fd77fff7ffd", + "0x40127fdc7fff7ffe", + "0x10780017fff7fff", + "0x4", + "0x40127fdc7fff7ffd", + "0x40127fd77fff7ffe", + "0x482480017ffd8000", + "0xffffffffffffffff0000000000000000", + "0x4000800b7fd17fff", + "0x48507ffd7ffc8000", + "0x48307fe97ff98000", + "0x48307fe67fff8000", + "0x40307ffd7fff7fd2", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800800c7fcd8001", + "0x4800800d7fcc7ffe", + "0x4000800e7fcb7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fd3", + "0x48507fcf7ffc8000", + "0x48507fce7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800800f7fc78001", + "0x480080107fc67fff", + "0x400080117fc57ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080127fc17fff", + "0x480080137fc07ffd", + "0x400080147fbf7fd7", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fd77ffe7fff", + "0x40307ffc7ff77fd8", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080157fbe8001", + "0x480080167fbd7ffe", + "0x400080177fbc7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fc3", + "0x48507fc17ffc8000", + "0x48507fc07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080187fb88001", + "0x480080197fb77fff", + "0x4000801a7fb67ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800801b7fb27fff", + "0x4800801c7fb17ffd", + "0x4000801d7fb07fc6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fc67ffe7fff", + "0x40307ffc7ff77fc7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800801e7faf8001", + "0x4800801f7fae7ffe", + "0x400080207fad7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fb4", + "0x48507fb17ffc8000", + "0x48507fb07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080217fa98001", + "0x480080227fa87fff", + "0x400080237fa77ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080247fa37fff", + "0x480080257fa27ffd", + "0x400080267fa17fb3", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fb37ffe7fff", + "0x40307ffc7ff77fb4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080277fa08001", + "0x480080287f9f7ffe", + "0x400080297f9e7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fa4", + "0x48507fa37ffc8000", + "0x48507fa27ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800802a7f9a8001", + "0x4800802b7f997fff", + "0x4000802c7f987ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800802d7f947fff", + "0x4800802e7f937ffd", + "0x4000802f7f927fa6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fa67ffe7fff", + "0x40307ffc7ff77fa7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080307f918001", + "0x480080317f907ffe", + "0x400080327f8f7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7f95", + "0x48507f937ffc8000", + "0x48507f927ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080337f8b8001", + "0x480080347f8a7fff", + "0x400080357f897ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080367f857fff", + "0x480080377f847ffd", + "0x400080387f837f93", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307f937ffe7fff", + "0x40307ffc7ff77f94", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x48307ffe80017fff", + "0x48307f8e80017fff", "0xa0680017fff7fff", "0x7", "0x482480017fff8000", "0x100000000000000000000000000000000", - "0x400080007ff97fff", + "0x400080397f7f7fff", "0x10780017fff7fff", "0xc", - "0x400080007ffa7fff", + "0x400080397f807fff", "0x40780017fff7fff", "0x1", - "0x482480017ff98000", - "0x1", + "0x482480017f7f8000", + "0x3a", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482480017ff98000", - "0x1", + "0x482480017f7f8000", + "0x3a", "0x48127ffe7fff8000", "0x480680017fff8000", "0x1", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", - "0x48307ff680017fff", + "0x48307f8680017fff", "0xa0680017fff7fff", "0x7", "0x482480017fff8000", @@ -16325,104 +17729,330 @@ "0x480680017fff8000", "0x1", "0x20680017fff7fff", - "0x59", + "0x13b", "0x48127ffc7fff8000", "0x480a7ffb7fff8000", "0x480a7ffc7fff8000", - "0x48127e4a7fff8000", - "0x48127e4a7fff8000", + "0x48127e587fff8000", + "0x48127e587fff8000", + "0x1104800180018000", + "0x28c", "0x480680017fff8000", "0xbaaedce6af48a03bbfd25e8cd0364141", "0x480680017fff8000", "0xfffffffffffffffffffffffffffffffe", - "0x1104800180018000", - "0x1a6", - "0x48127f017fff8000", - "0x48127f017fff8000", + "0x480080007ff98000", + "0x480080017ff88000", + "0x480080027ff78000", + "0x480080037ff68000", + "0x480080047ff58000", + "0x480080057ff48000", + "0x48307fff80007ff9", + "0x40780017fff7fff", + "0xc", + "0x20680017fff7ff3", + "0x8", + "0x40307ff17ff47feb", + "0x402480017ff57ff4", + "0x1", + "0x400080067fe67ff5", + "0x10780017fff7fff", + "0x3", + "0x400080067fe67ff3", + "0x48307ff17ff68000", + "0x48307fe680007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x40507fff7fff7fff", + "0x48307ff47fff8000", + "0x48307ff47fff8000", + "0x48307ff57fff8000", + "0x48307fec7fff8000", + "0x48307fe180007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080077fdd7fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x400080087fdc7fff", + "0x48307fef7ffe8000", + "0x48307ff07fff8000", + "0x48307ff07fff8000", + "0x48307ff17fff8000", + "0x48307fdb80007fff", + "0x4844800180007fff", + "0x100000000000000000000000000000000", + "0x400080097fd67fff", + "0x482480017fff8000", + "0xfffffffffffffffffffffffffffffffc", + "0x4000800a7fd57fff", + "0xa0680017fff7fdf", + "0xc", + "0xa0680017fff8001", + "0x6", + "0x48127fd97fff7ffe", + "0x40127fdb7fff7ffe", + "0x10780017fff7fff", + "0x10", + "0x48127fdc7fff7ffe", + "0x40127fd87fff7ffe", + "0x10780017fff7fff", + "0xc", + "0x480680017fff7fda", + "0x0", + "0xa0680017fff8000", + "0x6", + "0x40127fd77fff7ffd", + "0x40127fdc7fff7ffe", + "0x10780017fff7fff", + "0x4", + "0x40127fdc7fff7ffd", + "0x40127fd77fff7ffe", + "0x482480017ffd8000", + "0xffffffffffffffff0000000000000000", + "0x4000800b7fd17fff", + "0x48507ffd7ffc8000", + "0x48307fe97ff98000", + "0x48307fe67fff8000", + "0x40307ffd7fff7fd2", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800800c7fcd8001", + "0x4800800d7fcc7ffe", + "0x4000800e7fcb7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fd3", + "0x48507fcf7ffc8000", + "0x48507fce7ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800800f7fc78001", + "0x480080107fc67fff", + "0x400080117fc57ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080127fc17fff", + "0x480080137fc07ffd", + "0x400080147fbf7fd7", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fd77ffe7fff", + "0x40307ffc7ff77fd8", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080157fbe8001", + "0x480080167fbd7ffe", + "0x400080177fbc7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fc3", + "0x48507fc17ffc8000", + "0x48507fc07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080187fb88001", + "0x480080197fb77fff", + "0x4000801a7fb67ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800801b7fb27fff", + "0x4800801c7fb17ffd", + "0x4000801d7fb07fc6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fc67ffe7fff", + "0x40307ffc7ff77fc7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x4800801e7faf8001", + "0x4800801f7fae7ffe", + "0x400080207fad7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fb4", + "0x48507fb17ffc8000", + "0x48507fb07ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080217fa98001", + "0x480080227fa87fff", + "0x400080237fa77ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080247fa37fff", + "0x480080257fa27ffd", + "0x400080267fa17fb3", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fb37ffe7fff", + "0x40307ffc7ff77fb4", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080277fa08001", + "0x480080287f9f7ffe", + "0x400080297f9e7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7fa4", + "0x48507fa37ffc8000", + "0x48507fa27ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x4800802a7f9a8001", + "0x4800802b7f997fff", + "0x4000802c7f987ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x4800802d7f947fff", + "0x4800802e7f937ffd", + "0x4000802f7f927fa6", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307fa67ffe7fff", + "0x40307ffc7ff77fa7", + "0x4824800180008002", + "0xffffffffffffffff0000000000000000", + "0x480080307f918001", + "0x480080317f907ffe", + "0x400080327f8f7ffe", + "0x484480017ffe8000", + "0x10000000000000000", + "0x40307ffc7fff7f95", + "0x48507f937ffc8000", + "0x48507f927ffc8000", + "0x4824800180018002", + "0xffffffffffffffff0000000000000000", + "0x480080337f8b8001", + "0x480080347f8a7fff", + "0x400080357f897ffd", + "0x484480017ffd8000", + "0x10000000000000000", + "0x40307ffd7fff7ffb", + "0x484480017ffd8000", + "0x10000000000000000", + "0x48307fff7ff98003", + "0x482480017fff8000", + "0xfffffffffffffffe0000000000000000", + "0x480080367f857fff", + "0x480080377f847ffd", + "0x400080387f837f93", + "0x404480017ffc7ffe", + "0x100000000000000000000000000000000", + "0x40307f937ffe7fff", + "0x40307ffc7ff77f94", + "0x48127f0f7fff8000", + "0x48127f0f7fff8000", + "0x482480017f818000", + "0x39", "0x480680017fff8000", "0x536563703235366b314d756c", - "0x400080007d497fff", - "0x400080017d497d48", - "0x400080027d497d47", - "0x400080037d497ffd", - "0x400080047d497ffe", - "0x480080067d498000", + "0x400080007d647fff", + "0x400080017d647d63", + "0x400080027d647d62", + "0x400080037d647ffc", + "0x400080047d647ffd", + "0x480080067d648000", "0x20680017fff7fff", "0x37", - "0x480080057d488000", - "0x480080077d478000", + "0x480080057d638000", + "0x480080077d628000", "0x480680017fff8000", "0x536563703235366b314d756c", - "0x400080087d457fff", - "0x400080097d457ffd", - "0x4000800a7d457d39", - "0x4000800b7d457ff7", - "0x4000800c7d457ff8", - "0x4800800e7d458000", + "0x400080087d607fff", + "0x400080097d607ffd", + "0x4000800a7d607d54", + "0x4000800b7d607f86", + "0x4000800c7d607f87", + "0x4800800e7d608000", "0x20680017fff7fff", "0x20", - "0x4800800d7d448000", - "0x4800800f7d438000", + "0x4800800d7d5f8000", + "0x4800800f7d5e8000", "0x480680017fff8000", "0x536563703235366b31416464", - "0x400080107d417fff", - "0x400080117d417ffd", - "0x400080127d417ffa", - "0x400080137d417ffe", - "0x480080157d418000", + "0x400080107d5c7fff", + "0x400080117d5c7ffd", + "0x400080127d5c7ffa", + "0x400080137d5c7ffe", + "0x480080157d5c8000", "0x20680017fff7fff", "0xc", - "0x48127ff17fff8000", - "0x480080147d3f8000", - "0x482480017d3e8000", + "0x48127ff57fff8000", + "0x480080147d5a8000", + "0x482480017d598000", "0x17", "0x480680017fff8000", "0x0", "0x480680017fff8000", "0x0", - "0x480080167d3b8000", + "0x480080167d568000", "0x208b7fff7fff7ffe", - "0x48127ff17fff8000", - "0x480080147d3f8000", - "0x482480017d3e8000", + "0x48127ff57fff8000", + "0x480080147d5a8000", + "0x482480017d598000", "0x18", "0x480680017fff8000", "0x1", - "0x480080167d3c8000", - "0x480080177d3b8000", + "0x480080167d578000", + "0x480080177d568000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x4", - "0x48127ff17fff8000", - "0x4800800d7d3f8000", - "0x482480017d3e8000", + "0x48127ff57fff8000", + "0x4800800d7d5a8000", + "0x482480017d598000", "0x11", "0x480680017fff8000", "0x1", - "0x4800800f7d3c8000", - "0x480080107d3b8000", + "0x4800800f7d578000", + "0x480080107d568000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", "0x8", - "0x48127ff17fff8000", - "0x480080057d3f8000", - "0x482480017d3e8000", + "0x48127ff57fff8000", + "0x480080057d5a8000", + "0x482480017d598000", "0x9", "0x480680017fff8000", "0x1", - "0x480080077d3c8000", - "0x480080087d3b8000", + "0x480080077d578000", + "0x480080087d568000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x106", + "0xf9", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x753235365f737562204f766572666c6f77", "0x400080007ffe7fff", - "0x48127ef47fff8000", - "0x48127d3e7fff8000", - "0x48127d3e7fff8000", + "0x48127f017fff8000", + "0x48127d597fff8000", + "0x48127d597fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -16430,7 +18060,7 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x28f", + "0x274", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280077ff48001", @@ -16438,9 +18068,9 @@ "0x400280097ff47ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d5f", - "0x48507d637ffc8000", - "0x48507d627ffc8000", + "0x40307ffc7fff7d7a", + "0x48507d7e7ffc8000", + "0x48507d7d7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x4802800a7ff48001", @@ -16456,11 +18086,11 @@ "0xfffffffffffffffe0000000000000000", "0x4802800d7ff47fff", "0x4802800e7ff47ffd", - "0x4002800f7ff47d52", + "0x4002800f7ff47d6d", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", - "0x40307d527ffe7fff", - "0x40307ffc7ff77d5c", + "0x40307d6d7ffe7fff", + "0x40307ffc7ff77d77", "0x4824800180008002", "0xffffffffffffffff0000000000000000", "0x480280107ff48001", @@ -16468,9 +18098,9 @@ "0x400280127ff47ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40307ffc7fff7d50", - "0x48507d527ffc8000", - "0x48507d517ffc8000", + "0x40307ffc7fff7d6b", + "0x48507d6d7ffc8000", + "0x48507d6c7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480280137ff48001", @@ -16490,7 +18120,7 @@ "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40287ff97ffe7fff", - "0x40307ffc7ff77d4c", + "0x40307ffc7ff77d67", "0x40780017fff7fff", "0x1", "0x480680017fff8000", @@ -16498,8 +18128,8 @@ "0x400080007ffe7fff", "0x482680017ff48000", "0x19", - "0x48127d3e7fff8000", - "0x48127d3e7fff8000", + "0x48127d597fff8000", + "0x48127d597fff8000", "0x480680017fff8000", "0x1", "0x48127ffa7fff8000", @@ -16507,26 +18137,26 @@ "0x1", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2b9", + "0x29e", "0x40780017fff7fff", "0x1", "0x480680017fff8000", "0x4f7074696f6e3a3a756e77726170206661696c65642e", "0x400080007ffe7fff", - "0x48127d437fff8000", - "0x48127d437fff8000", + "0x48127d5e7fff8000", + "0x48127d5e7fff8000", "0x48127ffc7fff8000", "0x482480017ffb8000", "0x1", "0x10780017fff7fff", "0x9", "0x40780017fff7fff", - "0x2bf", - "0x480080067d3a8000", - "0x482480017d398000", + "0x2a4", + "0x480080067d558000", + "0x482480017d548000", "0xa", - "0x480080087d388000", - "0x480080097d378000", + "0x480080087d538000", + "0x480080097d528000", "0x480a7ff47fff8000", "0x48127ffb7fff8000", "0x48127ffb7fff8000", @@ -16536,10 +18166,10 @@ "0x48127ffa7fff8000", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2c9", + "0x2ae", "0x480a7ff47fff8000", - "0x48127d347fff8000", - "0x48127d347fff8000", + "0x48127d4f7fff8000", + "0x48127d4f7fff8000", "0x480680017fff8000", "0x0", "0x480680017fff8000", @@ -16548,7 +18178,7 @@ "0x0", "0x208b7fff7fff7ffe", "0x40780017fff7fff", - "0x2cd", + "0x2b2", "0x480a7ff47fff8000", "0x480280057ff68000", "0x482680017ff68000", @@ -16589,7 +18219,7 @@ "0x402780017ffc8001", "0x9", "0x1104800180018000", - "0x354", + "0x23b", "0x40137ffa7fff8000", "0x20680017fff7ffb", "0x8e", @@ -16602,7 +18232,7 @@ "0x480680017fff8000", "0x0", "0x1104800180018000", - "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffef61", + "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffebdc", "0x20680017fff7ffd", "0x7b", "0x480680017fff8000", @@ -16761,19 +18391,19 @@ "0x2", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480280007ff78001", - "0x480280017ff77ffe", - "0x400280027ff77ffe", + "0x480280007ff98001", + "0x480280017ff97ffe", + "0x400280027ff97ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ff8", - "0x48487ffa7ffc8000", - "0x48487ffa7ffc8000", + "0x40317ffc7fff7ffa", + "0x48487ffc7ffc8000", + "0x48487ffc7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x480280037ff78001", - "0x480280047ff77fff", - "0x400280057ff77ffd", + "0x480280037ff98001", + "0x480280047ff97fff", + "0x400280057ff97ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -16782,9 +18412,9 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x480280067ff77fff", - "0x480280077ff77ffd", - "0x400280087ff77ff0", + "0x480280067ff97fff", + "0x480280077ff97ffd", + "0x400280087ff97ff0", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", @@ -16793,19 +18423,19 @@ "0x2", "0x4824800180008002", "0xffffffffffffffff0000000000000000", - "0x480280097ff78001", - "0x4802800a7ff77ffe", - "0x4002800b7ff77ffe", + "0x480280097ff98001", + "0x4802800a7ff97ffe", + "0x4002800b7ff97ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ff8", - "0x48487ffb7ffc8000", - "0x48487ffb7ffc8000", + "0x40317ffc7fff7ffa", + "0x48487ffd7ffc8000", + "0x48487ffd7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", - "0x4802800c7ff78001", - "0x4802800d7ff77fff", - "0x4002800e7ff77ffd", + "0x4802800c7ff98001", + "0x4802800d7ff97fff", + "0x4002800e7ff97ffd", "0x484480017ffd8000", "0x10000000000000000", "0x40307ffd7fff7ffb", @@ -16814,9 +18444,9 @@ "0x48307fff7ff98003", "0x482480017fff8000", "0xfffffffffffffffe0000000000000000", - "0x4802800f7ff77fff", - "0x480280107ff77ffd", - "0x400280117ff77ff0", + "0x4802800f7ff97fff", + "0x480280107ff97ffd", + "0x400280117ff97ff0", "0x404480017ffc7ffe", "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", @@ -16826,20 +18456,20 @@ "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400280127ff77fff", + "0x400280127ff97fff", "0x10780017fff7fff", "0xc", - "0x400280127ff77fff", + "0x400280127ff97fff", "0x40780017fff7fff", "0x1", - "0x482680017ff78000", + "0x482680017ff98000", "0x13", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482680017ff78000", + "0x482680017ff98000", "0x13", "0x48127ffe7fff8000", "0x480680017fff8000", @@ -16853,9 +18483,9 @@ "0x400080027ff87ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ff9", - "0x48487ffa7ffc8000", - "0x48487ffa7ffc8000", + "0x40317ffc7fff7ffb", + "0x48487ffc7ffc8000", + "0x48487ffc7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480080037ff48001", @@ -16931,9 +18561,9 @@ "0x400080027ff87ffe", "0x484480017ffe8000", "0x10000000000000000", - "0x40317ffc7fff7ff9", - "0x48487ffb7ffc8000", - "0x48487ffb7ffc8000", + "0x40317ffc7fff7ffb", + "0x48487ffd7ffc8000", + "0x48487ffd7ffc8000", "0x4824800180018002", "0xffffffffffffffff0000000000000000", "0x480080037ff48001", @@ -16954,410 +18584,129 @@ "0x100000000000000000000000000000000", "0x40307ff07ffe7fff", "0x40307ffc7ff77fef", - "0x48307fee7fef8001", + "0x48307ff07fed8001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", "0x400080097fe97fff", "0x10780017fff7fff", - "0xa", + "0xc", "0x400080097fea7fff", "0x40780017fff7fff", "0x1", "0x482480017fe98000", "0xa", "0x48127ffd7fff8000", + "0x480680017fff8000", + "0x0", "0x10780017fff7fff", - "0x5", + "0x7", "0x482480017fe98000", "0xa", "0x48127ffe7fff8000", - "0x48307feb7fe88001", + "0x480680017fff8000", + "0x1", + "0x48307fe27fcb8000", + "0x48307fff7ffd8001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400080007ffb7fff", + "0x400080007ff97fff", "0x10780017fff7fff", "0xc", - "0x400080007ffc7fff", + "0x400080007ffa7fff", "0x40780017fff7fff", "0x1", - "0x482480017ffb8000", + "0x482480017ff98000", "0x1", "0x48127ffd7fff8000", "0x480680017fff8000", "0x0", "0x10780017fff7fff", "0x7", - "0x482480017ffb8000", + "0x482480017ff98000", "0x1", "0x48127ffe7fff8000", "0x480680017fff8000", "0x1", - "0x48307fff7ff98001", + "0x48307ff87fe18000", + "0x48307ffe7fff8000", + "0x48307fff7fe08001", "0xa0680017fff7fff", "0x7", "0x4824800180007fff", "0x100000000000000000000000000000000", - "0x400080007ffa7fff", + "0x400080007ff87fff", "0x10780017fff7fff", "0xa", - "0x400080007ffb7fff", + "0x400080007ff97fff", "0x40780017fff7fff", "0x1", - "0x482480017ffa8000", + "0x482480017ff88000", "0x1", "0x48127ffd7fff8000", "0x10780017fff7fff", "0x5", - "0x482480017ffa8000", + "0x482480017ff88000", "0x1", "0x48127ffe7fff8000", - "0x48307fd87fc18001", - "0xa0680017fff7fff", + "0x48127ffe7fff8000", + "0x48127f967fff8000", + "0x48127fd17fff8000", + "0x48127ff47fff8000", + "0x48127ffb7fff8000", + "0x208b7fff7fff7ffe", + "0xa0680017fff8000", "0x7", - "0x4824800180007fff", - "0x100000000000000000000000000000000", - "0x400080007ffb7fff", + "0x4825800180007ffd", + "0x10", + "0x400280007ffc7fff", "0x10780017fff7fff", - "0xa", - "0x400080007ffc7fff", - "0x40780017fff7fff", - "0x1", - "0x482480017ffb8000", + "0x6f", + "0x482680017ffd8000", + "0xfffffffffffffffffffffffffffffff0", + "0x400280007ffc7fff", + "0x4825800180007ffd", + "0x400000000000008800000000000000000000000000000000000000000000010", + "0x484480017fff8000", + "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffff", + "0x482680017ffc8000", "0x1", - "0x48127ffd7fff8000", + "0x1137ffe7fff7fff", "0x10780017fff7fff", - "0x5", - "0x482480017ffb8000", - "0x1", - "0x48127ffe7fff8000", - "0x48307fff7ff48001", - "0xa0680017fff7fff", - "0x7", - "0x4824800180007fff", - "0x100000000000000000000000000000000", - "0x400080007ffb7fff", + "0x5a", "0x10780017fff7fff", - "0xc", - "0x400080007ffc7fff", - "0x40780017fff7fff", - "0x1", - "0x482480017ffb8000", - "0x1", - "0x48127ffd7fff8000", - "0x480680017fff8000", - "0x0", + "0x54", "0x10780017fff7fff", - "0x7", - "0x482480017ffb8000", - "0x1", - "0x48127ffe7fff8000", - "0x480680017fff8000", - "0x1", - "0x48307fff7ff48001", - "0xa0680017fff7fff", - "0x7", - "0x4824800180007fff", - "0x100000000000000000000000000000000", - "0x400080007ffa7fff", + "0x4e", "0x10780017fff7fff", - "0xa", - "0x400080007ffb7fff", - "0x40780017fff7fff", - "0x1", - "0x482480017ffa8000", - "0x1", - "0x48127ffd7fff8000", + "0x48", "0x10780017fff7fff", - "0x5", - "0x482480017ffa8000", - "0x1", - "0x48127ffe7fff8000", - "0x48127f8b7fff8000", - "0x48127fc67fff8000", - "0x48127ff77fff8000", - "0x48127ffc7fff8000", - "0x480080007ffa8000", - "0x480080017ff98000", - "0x480080027ff88000", - "0x480080037ff78000", - "0x480080047ff68000", - "0x480080057ff58000", - "0x48317fff80007ffd", - "0x40780017fff7fff", - "0xc", - "0x20680017fff7ff3", - "0x8", - "0x40317ff17ff47ffc", - "0x402480017ff57ff4", - "0x1", - "0x400080067fe77ff5", + "0x42", "0x10780017fff7fff", - "0x3", - "0x400080067fe77ff3", - "0x48307ff17ff68000", - "0x48307fe880007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x40507fff7fff7fff", - "0x48307ff47fff8000", - "0x48307ff47fff8000", - "0x48307ff57fff8000", - "0x48307fec7fff8000", - "0x48307fe380007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080077fde7fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x400080087fdd7fff", - "0x48307fef7ffe8000", - "0x48307ff07fff8000", - "0x48307ff07fff8000", - "0x48307ff17fff8000", - "0x48307fdd80007fff", - "0x4844800180007fff", - "0x100000000000000000000000000000000", - "0x400080097fd77fff", - "0x482480017fff8000", - "0xfffffffffffffffffffffffffffffffc", - "0x4000800a7fd67fff", - "0xa0680017fff7fdf", - "0xc", - "0xa0680017fff8001", - "0x6", - "0x480a7ffd7fff7ffe", - "0x40127fdb7fff7ffe", + "0x3c", "0x10780017fff7fff", - "0x10", - "0x48127fdc7fff7ffe", - "0x400a7ffd7fff7ffe", + "0x36", + "0x10780017fff7fff", + "0x30", + "0x10780017fff7fff", + "0x2a", + "0x10780017fff7fff", + "0x24", + "0x10780017fff7fff", + "0x1e", + "0x10780017fff7fff", + "0x18", + "0x10780017fff7fff", + "0x12", "0x10780017fff7fff", "0xc", - "0x480780017fff7ffd", - "0x0", - "0xa0680017fff8000", + "0x10780017fff7fff", "0x6", - "0x400a7ffc7fff7ffd", - "0x40127fdc7fff7ffe", - "0x10780017fff7fff", - "0x4", - "0x40127fdc7fff7ffd", - "0x400a7ffc7fff7ffe", - "0x482480017ffd8000", - "0xffffffffffffffff0000000000000000", - "0x4000800b7fd27fff", - "0x48507ffd7ffc8000", - "0x48307fe97ff98000", - "0x48307fe67fff8000", - "0x40307ffd7fff7fd4", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800800c7fce8001", - "0x4800800d7fcd7ffe", - "0x4000800e7fcc7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fd3", - "0x48487ffc7ffc8000", - "0x48487ffc7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800800f7fc88001", - "0x480080107fc77fff", - "0x400080117fc67ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080127fc27fff", - "0x480080137fc17ffd", - "0x400080147fc07fd7", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fd77ffe7fff", - "0x40307ffc7ff77fd8", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080157fbf8001", - "0x480080167fbe7ffe", - "0x400080177fbd7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fc3", - "0x48487ffd7ffc8000", - "0x48487ffd7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080187fb98001", - "0x480080197fb87fff", - "0x4000801a7fb77ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800801b7fb37fff", - "0x4800801c7fb27ffd", - "0x4000801d7fb17fc6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fc67ffe7fff", - "0x40307ffc7ff77fc7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x4800801e7fb08001", - "0x4800801f7faf7ffe", - "0x400080207fae7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fb4", - "0x48487ffc7ffc8000", - "0x48487ffc7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080217faa8001", - "0x480080227fa97fff", - "0x400080237fa87ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080247fa47fff", - "0x480080257fa37ffd", - "0x400080267fa27fb3", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fb37ffe7fff", - "0x40307ffc7ff77fb4", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080277fa18001", - "0x480080287fa07ffe", - "0x400080297f9f7ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7fa4", - "0x48487ffd7ffc8000", - "0x48487ffd7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x4800802a7f9b8001", - "0x4800802b7f9a7fff", - "0x4000802c7f997ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x4800802d7f957fff", - "0x4800802e7f947ffd", - "0x4000802f7f937fa6", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307fa67ffe7fff", - "0x40307ffc7ff77fa7", - "0x4824800180008002", - "0xffffffffffffffff0000000000000000", - "0x480080307f928001", - "0x480080317f917ffe", - "0x400080327f907ffe", - "0x484480017ffe8000", - "0x10000000000000000", - "0x40307ffc7fff7f95", - "0x48487ffc7ffc8000", - "0x48487ffc7ffc8000", - "0x4824800180018002", - "0xffffffffffffffff0000000000000000", - "0x480080337f8c8001", - "0x480080347f8b7fff", - "0x400080357f8a7ffd", - "0x484480017ffd8000", - "0x10000000000000000", - "0x40307ffd7fff7ffb", - "0x484480017ffd8000", - "0x10000000000000000", - "0x48307fff7ff98003", - "0x482480017fff8000", - "0xfffffffffffffffe0000000000000000", - "0x480080367f867fff", - "0x480080377f857ffd", - "0x400080387f847f93", - "0x404480017ffc7ffe", - "0x100000000000000000000000000000000", - "0x40307f937ffe7fff", - "0x40307ffc7ff77f94", - "0x482480017f848000", - "0x39", - "0x48127f8d7fff8000", - "0x48127f8d7fff8000", - "0x208b7fff7fff7ffe", - "0xa0680017fff8000", - "0x7", - "0x4825800180007ffd", - "0x10", - "0x400280007ffc7fff", - "0x10780017fff7fff", - "0x6f", - "0x482680017ffd8000", - "0xfffffffffffffffffffffffffffffff0", - "0x400280007ffc7fff", - "0x4825800180007ffd", - "0x400000000000008800000000000000000000000000000000000000000000010", - "0x484480017fff8000", - "0x800000000000010ffffffffffffffffffffffffffffffffffffffffffffffff", - "0x482680017ffc8000", - "0x1", - "0x1137ffe7fff7fff", - "0x10780017fff7fff", - "0x5a", - "0x10780017fff7fff", - "0x54", - "0x10780017fff7fff", - "0x4e", - "0x10780017fff7fff", - "0x48", - "0x10780017fff7fff", - "0x42", - "0x10780017fff7fff", - "0x3c", - "0x10780017fff7fff", - "0x36", - "0x10780017fff7fff", - "0x30", - "0x10780017fff7fff", - "0x2a", - "0x10780017fff7fff", - "0x24", - "0x10780017fff7fff", - "0x1e", - "0x10780017fff7fff", - "0x18", - "0x10780017fff7fff", - "0x12", - "0x10780017fff7fff", - "0xc", - "0x10780017fff7fff", - "0x6", - "0x480680017fff8000", - "0x1", + "0x480680017fff8000", + "0x1", "0x10780017fff7fff", "0x3c", "0x480680017fff8000", @@ -17809,6 +19158,8 @@ 241, 180, 291, + 290, + 171, 336, 178, 289, @@ -17840,6 +19191,8 @@ 250, 187, 92, + 142, + 126, 106, 205, 1205, @@ -17869,7 +19222,7 @@ 258, 97, 220, - 791, + 1242, 31, 1136, 66, @@ -17877,9 +19230,9 @@ 157, 83, 239, - 706, + 1156, 199, - 552, + 271, 131, 104, 232, @@ -18586,7 +19939,7 @@ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0xc94" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -18608,23 +19961,17 @@ { "TestLessThan": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": 0 - }, - "b": { - "Immediate": "0x0" - } + "Deref": { + "register": "FP", + "offset": 1 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } @@ -18638,33 +19985,49 @@ "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 3 } }, "scalar": { - "Immediate": "0x8000000000000110000000000000000" + "Immediate": "0x110000000000000000" }, "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" + "Immediate": "0xffffffffffffffffffffffffffffffff" }, "x": { "register": "AP", - "offset": 0 + "offset": -2 }, "y": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 793, + 762, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "FP", + "offset": 1 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -18673,7 +20036,7 @@ ] ], [ - 858, + 815, [ { "AllocSegment": { @@ -18686,7 +20049,7 @@ ] ], [ - 905, + 862, [ { "AllocSegment": { @@ -18699,12 +20062,12 @@ ] ], [ - 924, + 881, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x87a" + "Immediate": "0x602c" }, "rhs": { "Deref": { @@ -18721,7 +20084,7 @@ ] ], [ - 951, + 905, [ { "AllocSegment": { @@ -18734,7 +20097,7 @@ ] ], [ - 969, + 923, [ { "AllocSegment": { @@ -18747,7 +20110,7 @@ ] ], [ - 984, + 938, [ { "AllocSegment": { @@ -18760,7 +20123,7 @@ ] ], [ - 998, + 952, [ { "AllocSegment": { @@ -18773,7 +20136,7 @@ ] ], [ - 1019, + 973, [ { "AllocSegment": { @@ -18786,7 +20149,7 @@ ] ], [ - 1033, + 987, [ { "AllocSegment": { @@ -18799,7 +20162,7 @@ ] ], [ - 1048, + 1002, [ { "TestLessThanOrEqual": { @@ -18821,64 +20184,87 @@ ] ], [ - 1082, + 1035, [ { "TestLessThan": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } + "Deref": { + "register": "AP", + "offset": -1 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 1086, + 1039, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 3 } }, "scalar": { - "Immediate": "0x8000000000000110000000000000000" + "Immediate": "0x110000000000000000" }, "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" + "Immediate": "0xffffffffffffffffffffffffffffffff" }, "x": { "register": "AP", - "offset": 0 + "offset": -2 }, "y": { "register": "AP", - "offset": 1 + "offset": -1 + } + } + } + ] + ], + [ + 1049, + [ + { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { + "register": "AP", + "offset": 0 } } } ] ], [ - 1111, + 1064, [ { "AllocSegment": { @@ -18891,17 +20277,17 @@ ] ], [ - 1130, + 1083, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1248" + "Immediate": "0x9e66" }, "rhs": { "Deref": { "register": "AP", - "offset": -16 + "offset": -18 } }, "dst": { @@ -18913,22 +20299,20 @@ ] ], [ - 1149, + 1104, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 1152, + 1122, [ { "AllocSegment": { @@ -18941,7 +20325,7 @@ ] ], [ - 1175, + 1144, [ { "AllocSegment": { @@ -18954,7 +20338,7 @@ ] ], [ - 1197, + 1158, [ { "AllocSegment": { @@ -18967,10 +20351,19 @@ ] ], [ - 1211, + 1175, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0xc94" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -18980,29 +20373,64 @@ ] ], [ - 1228, + 1209, [ { - "TestLessThanOrEqual": { + "TestLessThan": { "lhs": { - "Immediate": "0x8d54" + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": 0 + }, + "b": { + "Immediate": "0x0" + } + } }, "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 1213, + [ + { + "LinearSplit": { + "value": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -1 } }, - "dst": { + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 1327, + 1254, [ { "AllocSegment": { @@ -19015,19 +20443,10 @@ ] ], [ - 1346, + 1319, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x8070" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -42 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -19037,7 +20456,7 @@ ] ], [ - 1389, + 1366, [ { "AllocSegment": { @@ -19050,10 +20469,19 @@ ] ], [ - 1407, + 1385, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x87a" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -11 + } + }, "dst": { "register": "AP", "offset": 0 @@ -19063,7 +20491,7 @@ ] ], [ - 1422, + 1412, [ { "AllocSegment": { @@ -19076,7 +20504,7 @@ ] ], [ - 1436, + 1430, [ { "AllocSegment": { @@ -19089,7 +20517,7 @@ ] ], [ - 1450, + 1445, [ { "AllocSegment": { @@ -19102,7 +20530,7 @@ ] ], [ - 1464, + 1459, [ { "AllocSegment": { @@ -19115,7 +20543,7 @@ ] ], [ - 1486, + 1480, [ { "AllocSegment": { @@ -19128,7 +20556,7 @@ ] ], [ - 1500, + 1494, [ { "AllocSegment": { @@ -19141,7 +20569,7 @@ ] ], [ - 1517, + 1509, [ { "TestLessThanOrEqual": { @@ -19163,100 +20591,64 @@ ] ], [ - 1551, + 1543, [ { "TestLessThan": { "lhs": { - "Deref": { - "register": "FP", - "offset": 1 + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } } }, "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 1555, + 1547, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 1565, - [ - { - "LinearSplit": { - "value": { - "Deref": { - "register": "FP", - "offset": 1 + "offset": -1 } }, "scalar": { - "Immediate": "0x8000000000000000000000000000000" + "Immediate": "0x8000000000000110000000000000000" }, "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" + "Immediate": "0xfffffffffffffffffffffffffffffffe" }, "x": { "register": "AP", - "offset": -1 + "offset": 0 }, "y": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 1618, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "offset": 1 } } } ] ], [ - 1665, + 1572, [ { "AllocSegment": { @@ -19269,17 +20661,17 @@ ] ], [ - 1684, + 1591, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x28b4" + "Immediate": "0x1248" }, "rhs": { "Deref": { "register": "AP", - "offset": -11 + "offset": -16 } }, "dst": { @@ -19291,7 +20683,7 @@ ] ], [ - 1706, + 1610, [ { "SystemCall": { @@ -19306,7 +20698,7 @@ ] ], [ - 1727, + 1613, [ { "AllocSegment": { @@ -19319,7 +20711,7 @@ ] ], [ - 1742, + 1636, [ { "AllocSegment": { @@ -19332,7 +20724,7 @@ ] ], [ - 1756, + 1658, [ { "AllocSegment": { @@ -19345,7 +20737,7 @@ ] ], [ - 1777, + 1672, [ { "AllocSegment": { @@ -19358,7 +20750,29 @@ ] ], [ - 1791, + 1689, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x8d54" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 1788, [ { "AllocSegment": { @@ -19371,17 +20785,17 @@ ] ], [ - 1806, + 1807, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x8070" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -42 } }, "dst": { @@ -19393,78 +20807,63 @@ ] ], [ - 1839, + 1850, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 1843, + 1868, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -2 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 1883, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 1853, + 1897, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 1911, + [ + { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -19473,7 +20872,7 @@ ] ], [ - 1952, + 1925, [ { "AllocSegment": { @@ -19486,19 +20885,10 @@ ] ], [ - 1971, + 1947, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x5622" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -38 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -19508,7 +20898,7 @@ ] ], [ - 2000, + 1961, [ { "AllocSegment": { @@ -19521,85 +20911,7 @@ ] ], [ - 2015, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2029, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2043, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2057, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2078, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2092, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2107, + 1978, [ { "TestLessThanOrEqual": { @@ -19621,14 +20933,14 @@ ] ], [ - 2140, + 2012, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": 1 } }, "rhs": { @@ -19643,7 +20955,7 @@ ] ], [ - 2144, + 2016, [ { "LinearSplit": { @@ -19672,14 +20984,14 @@ ] ], [ - 2154, + 2026, [ { "LinearSplit": { "value": { "Deref": { - "register": "AP", - "offset": -2 + "register": "FP", + "offset": 1 } }, "scalar": { @@ -19701,7 +21013,7 @@ ] ], [ - 2169, + 2079, [ { "AllocSegment": { @@ -19714,17 +21026,30 @@ ] ], [ - 2188, + 2126, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 2145, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x128e" + "Immediate": "0x28b4" }, "rhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": -11 } }, "dst": { @@ -19736,7 +21061,7 @@ ] ], [ - 2207, + 2167, [ { "SystemCall": { @@ -19751,20 +21076,7 @@ ] ], [ - 2210, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2230, + 2188, [ { "AllocSegment": { @@ -19777,7 +21089,7 @@ ] ], [ - 2252, + 2203, [ { "AllocSegment": { @@ -19790,7 +21102,7 @@ ] ], [ - 2266, + 2217, [ { "AllocSegment": { @@ -19803,29 +21115,7 @@ ] ], [ - 2283, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2338, + 2238, [ { "AllocSegment": { @@ -19838,7 +21128,7 @@ ] ], [ - 2385, + 2252, [ { "AllocSegment": { @@ -19851,17 +21141,17 @@ ] ], [ - 2404, + 2267, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x213e" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "AP", - "offset": -11 + "register": "FP", + "offset": -6 } }, "dst": { @@ -19873,39 +21163,78 @@ ] ], [ - 2425, + 2300, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -1 } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": 4 } } } ] ], [ - 2428, + 2304, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 2448, + 2314, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -19914,7 +21243,7 @@ ] ], [ - 2463, + 2413, [ { "AllocSegment": { @@ -19927,10 +21256,19 @@ ] ], [ - 2477, + 2432, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x5622" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -38 + } + }, "dst": { "register": "AP", "offset": 0 @@ -19940,7 +21278,7 @@ ] ], [ - 2491, + 2461, [ { "AllocSegment": { @@ -19953,19 +21291,10 @@ ] ], [ - 2506, + 2476, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -19975,7 +21304,7 @@ ] ], [ - 2523, + 2490, [ { "AllocSegment": { @@ -19988,19 +21317,10 @@ ] ], [ - 2543, + 2504, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x41a" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20010,22 +21330,7 @@ ] ], [ - 2555, - [ - { - "AllocFelt252Dict": { - "segment_arena_ptr": { - "Deref": { - "register": "FP", - "offset": -7 - } - } - } - } - ] - ], - [ - 2574, + 2518, [ { "AllocSegment": { @@ -20038,7 +21343,7 @@ ] ], [ - 2585, + 2539, [ { "AllocSegment": { @@ -20051,7 +21356,7 @@ ] ], [ - 2601, + 2553, [ { "AllocSegment": { @@ -20064,12 +21369,12 @@ ] ], [ - 2619, + 2568, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x460" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -20086,14 +21391,14 @@ ] ], [ - 2653, + 2601, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -1 } }, "rhs": { @@ -20108,7 +21413,7 @@ ] ], [ - 2657, + 2605, [ { "LinearSplit": { @@ -20137,14 +21442,14 @@ ] ], [ - 2667, + 2615, [ { "LinearSplit": { "value": { "Deref": { - "register": "FP", - "offset": 1 + "register": "AP", + "offset": -2 } }, "scalar": { @@ -20166,20 +21471,7 @@ ] ], [ - 2720, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 2797, + 2630, [ { "AllocSegment": { @@ -20192,12 +21484,12 @@ ] ], [ - 2816, + 2649, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x2a94" + "Immediate": "0x128e" }, "rhs": { "Deref": { @@ -20214,7 +21506,7 @@ ] ], [ - 2842, + 2668, [ { "SystemCall": { @@ -20229,7 +21521,7 @@ ] ], [ - 2845, + 2671, [ { "AllocSegment": { @@ -20242,7 +21534,7 @@ ] ], [ - 2865, + 2691, [ { "AllocSegment": { @@ -20255,7 +21547,7 @@ ] ], [ - 2880, + 2713, [ { "AllocSegment": { @@ -20268,7 +21560,7 @@ ] ], [ - 2894, + 2727, [ { "AllocSegment": { @@ -20281,10 +21573,19 @@ ] ], [ - 2908, + 2744, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -20294,7 +21595,7 @@ ] ], [ - 2929, + 2799, [ { "AllocSegment": { @@ -20307,7 +21608,7 @@ ] ], [ - 2943, + 2846, [ { "AllocSegment": { @@ -20320,17 +21621,17 @@ ] ], [ - 2958, + 2865, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x213e" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -11 } }, "dst": { @@ -20342,7 +21643,22 @@ ] ], [ - 2975, + 2886, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 2889, [ { "AllocSegment": { @@ -20355,19 +21671,10 @@ ] ], [ - 2994, + 2909, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x76ca" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20377,7 +21684,7 @@ ] ], [ - 3014, + 2924, [ { "AllocSegment": { @@ -20390,7 +21697,7 @@ ] ], [ - 3032, + 2938, [ { "AllocSegment": { @@ -20403,7 +21710,7 @@ ] ], [ - 3047, + 2952, [ { "AllocSegment": { @@ -20416,7 +21723,7 @@ ] ], [ - 3062, + 2967, [ { "TestLessThanOrEqual": { @@ -20438,7 +21745,7 @@ ] ], [ - 3079, + 2984, [ { "AllocSegment": { @@ -20451,12 +21758,12 @@ ] ], [ - 3098, + 3004, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x3c5a" + "Immediate": "0x41a" }, "rhs": { "Deref": { @@ -20473,7 +21780,22 @@ ] ], [ - 3118, + 3016, + [ + { + "AllocFelt252Dict": { + "segment_arena_ptr": { + "Deref": { + "register": "FP", + "offset": -7 + } + } + } + } + ] + ], + [ + 3035, [ { "AllocSegment": { @@ -20486,7 +21808,7 @@ ] ], [ - 3136, + 3046, [ { "AllocSegment": { @@ -20499,7 +21821,7 @@ ] ], [ - 3151, + 3062, [ { "AllocSegment": { @@ -20512,12 +21834,12 @@ ] ], [ - 3166, + 3080, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x460" }, "rhs": { "Deref": { @@ -20534,49 +21856,78 @@ ] ], [ - 3183, + 3114, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "FP", + "offset": 1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 3208, + 3118, [ { - "TestLessThanOrEqual": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 3 } }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -10 - } + "scalar": { + "Immediate": "0x110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 3227, + 3128, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "FP", + "offset": 1 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -20585,7 +21936,7 @@ ] ], [ - 3247, + 3181, [ { "AllocSegment": { @@ -20598,7 +21949,7 @@ ] ], [ - 3263, + 3258, [ { "AllocSegment": { @@ -20611,17 +21962,17 @@ ] ], [ - 3279, + 3277, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x2a94" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -18 } }, "dst": { @@ -20633,7 +21984,22 @@ ] ], [ - 3296, + 3303, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 3306, [ { "AllocSegment": { @@ -20646,19 +22012,10 @@ ] ], [ - 3315, + 3326, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x382d4" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -7 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20668,7 +22025,7 @@ ] ], [ - 3335, + 3341, [ { "AllocSegment": { @@ -20681,7 +22038,7 @@ ] ], [ - 3353, + 3355, [ { "AllocSegment": { @@ -20694,7 +22051,7 @@ ] ], [ - 3368, + 3369, [ { "AllocSegment": { @@ -20707,7 +22064,33 @@ ] ], [ - 3383, + 3390, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3404, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3419, [ { "TestLessThanOrEqual": { @@ -20729,7 +22112,7 @@ ] ], [ - 3442, + 3436, [ { "AllocSegment": { @@ -20742,17 +22125,17 @@ ] ], [ - 3461, + 3455, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x76ca" }, "rhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": -7 } }, "dst": { @@ -20764,7 +22147,7 @@ ] ], [ - 3478, + 3475, [ { "AllocSegment": { @@ -20777,7 +22160,7 @@ ] ], [ - 3492, + 3493, [ { "AllocSegment": { @@ -20790,7 +22173,7 @@ ] ], [ - 3506, + 3508, [ { "AllocSegment": { @@ -20803,10 +22186,19 @@ ] ], [ - 3521, + 3523, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -20816,7 +22208,7 @@ ] ], [ - 3535, + 3540, [ { "AllocSegment": { @@ -20829,10 +22221,19 @@ ] ], [ - 3549, + 3559, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x3c5a" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, "dst": { "register": "AP", "offset": 0 @@ -20842,19 +22243,10 @@ ] ], [ - 3564, + 3579, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -20877,7 +22269,7 @@ ] ], [ - 3644, + 3612, [ { "AllocSegment": { @@ -20890,7 +22282,7 @@ ] ], [ - 3663, + 3627, [ { "TestLessThanOrEqual": { @@ -20899,8 +22291,8 @@ }, "rhs": { "Deref": { - "register": "AP", - "offset": -11 + "register": "FP", + "offset": -6 } }, "dst": { @@ -20912,7 +22304,7 @@ ] ], [ - 3685, + 3644, [ { "AllocSegment": { @@ -20925,7 +22317,32 @@ ] ], [ - 3705, + 3669, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -10 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 3688, [ { "AllocSegment": { @@ -20938,7 +22355,7 @@ ] ], [ - 3720, + 3708, [ { "AllocSegment": { @@ -20951,7 +22368,7 @@ ] ], [ - 3734, + 3724, [ { "AllocSegment": { @@ -20964,7 +22381,7 @@ ] ], [ - 3749, + 3740, [ { "TestLessThanOrEqual": { @@ -20986,7 +22403,7 @@ ] ], [ - 3766, + 3757, [ { "AllocSegment": { @@ -20999,12 +22416,12 @@ ] ], [ - 3785, + 3776, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x371b8" }, "rhs": { "Deref": { @@ -21021,7 +22438,7 @@ ] ], [ - 3797, + 3796, [ { "AllocSegment": { @@ -21034,7 +22451,7 @@ ] ], [ - 3812, + 3814, [ { "AllocSegment": { @@ -21047,7 +22464,7 @@ ] ], [ - 3827, + 3829, [ { "AllocSegment": { @@ -21060,7 +22477,7 @@ ] ], [ - 3842, + 3844, [ { "TestLessThanOrEqual": { @@ -21082,7 +22499,7 @@ ] ], [ - 3880, + 3903, [ { "AllocSegment": { @@ -21095,7 +22512,7 @@ ] ], [ - 3899, + 3922, [ { "TestLessThanOrEqual": { @@ -21105,7 +22522,7 @@ "rhs": { "Deref": { "register": "AP", - "offset": -12 + "offset": -17 } }, "dst": { @@ -21117,7 +22534,7 @@ ] ], [ - 3919, + 3939, [ { "AllocSegment": { @@ -21130,7 +22547,7 @@ ] ], [ - 3937, + 3953, [ { "AllocSegment": { @@ -21143,7 +22560,7 @@ ] ], [ - 3952, + 3967, [ { "AllocSegment": { @@ -21156,7 +22573,7 @@ ] ], [ - 3966, + 3982, [ { "AllocSegment": { @@ -21169,19 +22586,10 @@ ] ], [ - 3981, + 3996, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -21191,7 +22599,7 @@ ] ], [ - 4019, + 4010, [ { "AllocSegment": { @@ -21204,7 +22612,7 @@ ] ], [ - 4038, + 4025, [ { "TestLessThanOrEqual": { @@ -21213,8 +22621,8 @@ }, "rhs": { "Deref": { - "register": "AP", - "offset": -12 + "register": "FP", + "offset": -6 } }, "dst": { @@ -21238,32 +22646,6 @@ } ] ], - [ - 4076, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4091, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], [ 4105, [ @@ -21278,7 +22660,7 @@ ] ], [ - 4120, + 4124, [ { "TestLessThanOrEqual": { @@ -21287,8 +22669,8 @@ }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -11 } }, "dst": { @@ -21300,78 +22682,37 @@ ] ], [ - 4153, + 4146, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 4157, + 4166, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 4167, + 4181, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -21380,7 +22721,7 @@ ] ], [ - 4224, + 4195, [ { "AllocSegment": { @@ -21393,17 +22734,17 @@ ] ], [ - 4243, + 4210, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1de2" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "AP", - "offset": -28 + "register": "FP", + "offset": -6 } }, "dst": { @@ -21415,7 +22756,7 @@ ] ], [ - 4265, + 4227, [ { "AllocSegment": { @@ -21428,51 +22769,19 @@ ] ], [ - 4283, + 4246, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -7 } - } - } - } - ] - ], - [ - 4289, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4308, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4323, - [ - { - "AllocSegment": { + }, "dst": { "register": "AP", "offset": 0 @@ -21482,7 +22791,7 @@ ] ], [ - 4337, + 4258, [ { "AllocSegment": { @@ -21495,7 +22804,7 @@ ] ], [ - 4358, + 4273, [ { "AllocSegment": { @@ -21508,7 +22817,7 @@ ] ], [ - 4372, + 4288, [ { "AllocSegment": { @@ -21521,7 +22830,7 @@ ] ], [ - 4387, + 4303, [ { "TestLessThanOrEqual": { @@ -21543,7 +22852,7 @@ ] ], [ - 4467, + 4341, [ { "AllocSegment": { @@ -21556,20 +22865,17 @@ ] ], [ - 4492, + 4360, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -12 } }, "dst": { @@ -21581,7 +22887,7 @@ ] ], [ - 4514, + 4380, [ { "AllocSegment": { @@ -21594,7 +22900,7 @@ ] ], [ - 4534, + 4398, [ { "AllocSegment": { @@ -21607,7 +22913,7 @@ ] ], [ - 4550, + 4413, [ { "AllocSegment": { @@ -21620,7 +22926,7 @@ ] ], [ - 4565, + 4427, [ { "AllocSegment": { @@ -21633,33 +22939,7 @@ ] ], [ - 4580, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4595, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 4611, + 4442, [ { "TestLessThanOrEqual": { @@ -21681,7 +22961,7 @@ ] ], [ - 4634, + 4480, [ { "AllocSegment": { @@ -21694,20 +22974,17 @@ ] ], [ - 4664, + 4499, [ { "TestLessThanOrEqual": { "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -55 + "offset": -12 } }, "dst": { @@ -21719,7 +22996,7 @@ ] ], [ - 4687, + 4519, [ { "AllocSegment": { @@ -21732,7 +23009,7 @@ ] ], [ - 4709, + 4537, [ { "AllocSegment": { @@ -21745,7 +23022,7 @@ ] ], [ - 4726, + 4552, [ { "AllocSegment": { @@ -21758,7 +23035,7 @@ ] ], [ - 4742, + 4566, [ { "AllocSegment": { @@ -21771,12 +23048,12 @@ ] ], [ - 4759, + 4581, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x33e" + "Immediate": "0x0" }, "rhs": { "Deref": { @@ -21793,7 +23070,7 @@ ] ], [ - 4792, + 4614, [ { "TestLessThan": { @@ -21815,7 +23092,7 @@ ] ], [ - 4796, + 4618, [ { "LinearSplit": { @@ -21844,7 +23121,7 @@ ] ], [ - 4806, + 4628, [ { "LinearSplit": { @@ -21873,7 +23150,7 @@ ] ], [ - 4827, + 4685, [ { "AllocSegment": { @@ -21886,17 +23163,17 @@ ] ], [ - 4846, + 4704, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x2c24" + "Immediate": "0x1de2" }, "rhs": { "Deref": { "register": "AP", - "offset": -60 + "offset": -28 } }, "dst": { @@ -21908,7 +23185,7 @@ ] ], [ - 4858, + 4726, [ { "AllocSegment": { @@ -21921,7 +23198,7 @@ ] ], [ - 4878, + 4744, [ { "SystemCall": { @@ -21936,7 +23213,7 @@ ] ], [ - 4881, + 4750, [ { "AllocSegment": { @@ -21949,7 +23226,7 @@ ] ], [ - 4901, + 4769, [ { "AllocSegment": { @@ -21962,7 +23239,7 @@ ] ], [ - 4916, + 4784, [ { "AllocSegment": { @@ -21975,7 +23252,7 @@ ] ], [ - 4937, + 4798, [ { "AllocSegment": { @@ -21988,7 +23265,7 @@ ] ], [ - 4951, + 4819, [ { "AllocSegment": { @@ -22001,7 +23278,20 @@ ] ], [ - 4966, + 4833, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 4848, [ { "TestLessThanOrEqual": { @@ -22023,7 +23313,7 @@ ] ], [ - 4983, + 4928, [ { "AllocSegment": { @@ -22036,7 +23326,7 @@ ] ], [ - 5006, + 4953, [ { "TestLessThanOrEqual": { @@ -22049,7 +23339,7 @@ "rhs": { "Deref": { "register": "AP", - "offset": -9 + "offset": -25 } }, "dst": { @@ -22061,7 +23351,7 @@ ] ], [ - 5025, + 4975, [ { "AllocSegment": { @@ -22074,7 +23364,7 @@ ] ], [ - 5045, + 4995, [ { "AllocSegment": { @@ -22087,7 +23377,7 @@ ] ], [ - 5061, + 5011, [ { "AllocSegment": { @@ -22100,19 +23390,10 @@ ] ], [ - 5077, + 5026, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22122,7 +23403,7 @@ ] ], [ - 5115, + 5041, [ { "AllocSegment": { @@ -22135,22 +23416,10 @@ ] ], [ - 5140, + 5056, [ { - "TestLessThanOrEqual": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -15 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22160,10 +23429,19 @@ ] ], [ - 5160, + 5072, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22173,7 +23451,7 @@ ] ], [ - 5180, + 5095, [ { "AllocSegment": { @@ -22186,10 +23464,22 @@ ] ], [ - 5196, + 5125, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -55 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22199,7 +23489,7 @@ ] ], [ - 5211, + 5148, [ { "AllocSegment": { @@ -22212,19 +23502,10 @@ ] ], [ - 5227, + 5170, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22234,7 +23515,7 @@ ] ], [ - 5265, + 5187, [ { "AllocSegment": { @@ -22247,17 +23528,30 @@ ] ], [ - 5284, + 5203, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5220, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1220" + "Immediate": "0x33e" }, "rhs": { "Deref": { - "register": "AP", - "offset": -12 + "register": "FP", + "offset": -6 } }, "dst": { @@ -22269,39 +23563,78 @@ ] ], [ - 5296, + 5253, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 5316, + 5257, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": 3 } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 5319, + 5267, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -22310,7 +23643,7 @@ ] ], [ - 5339, + 5288, [ { "AllocSegment": { @@ -22323,10 +23656,19 @@ ] ], [ - 5354, + 5307, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x2c24" + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -60 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22336,7 +23678,7 @@ ] ], [ - 5368, + 5319, [ { "AllocSegment": { @@ -22349,29 +23691,22 @@ ] ], [ - 5383, + 5339, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x0" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { "register": "FP", - "offset": -6 + "offset": -5 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 5400, + 5342, [ { "AllocSegment": { @@ -22384,22 +23719,10 @@ ] ], [ - 5431, + 5362, [ { - "TestLessThanOrEqual": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -13 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22409,7 +23732,7 @@ ] ], [ - 5451, + 5377, [ { "AllocSegment": { @@ -22422,7 +23745,7 @@ ] ], [ - 5475, + 5398, [ { "AllocSegment": { @@ -22435,7 +23758,7 @@ ] ], [ - 5493, + 5412, [ { "AllocSegment": { @@ -22448,7 +23771,7 @@ ] ], [ - 5511, + 5427, [ { "TestLessThanOrEqual": { @@ -22470,7 +23793,7 @@ ] ], [ - 5528, + 5444, [ { "AllocSegment": { @@ -22483,17 +23806,20 @@ ] ], [ - 5548, + 5467, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Deref": { + "register": "AP", + "offset": -1 + } }, "rhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -9 } }, "dst": { @@ -22505,7 +23831,7 @@ ] ], [ - 5572, + 5486, [ { "AllocSegment": { @@ -22518,7 +23844,7 @@ ] ], [ - 5602, + 5506, [ { "AllocSegment": { @@ -22531,7 +23857,7 @@ ] ], [ - 5618, + 5522, [ { "AllocSegment": { @@ -22544,7 +23870,7 @@ ] ], [ - 5634, + 5538, [ { "TestLessThanOrEqual": { @@ -22566,7 +23892,7 @@ ] ], [ - 5693, + 5576, [ { "AllocSegment": { @@ -22579,17 +23905,20 @@ ] ], [ - 5712, + 5601, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Deref": { + "register": "AP", + "offset": -1 + } }, "rhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": -15 } }, "dst": { @@ -22601,7 +23930,7 @@ ] ], [ - 5724, + 5621, [ { "AllocSegment": { @@ -22614,7 +23943,7 @@ ] ], [ - 5737, + 5641, [ { "AllocSegment": { @@ -22627,7 +23956,7 @@ ] ], [ - 5752, + 5657, [ { "AllocSegment": { @@ -22640,7 +23969,7 @@ ] ], [ - 5766, + 5672, [ { "AllocSegment": { @@ -22653,7 +23982,29 @@ ] ], [ - 5780, + 5688, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 5726, [ { "AllocSegment": { @@ -22666,17 +24017,17 @@ ] ], [ - 5795, + 5745, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x0" + "Immediate": "0x1220" }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -12 } }, "dst": { @@ -22688,78 +24039,39 @@ ] ], [ - 5849, + 5757, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 5853, + 5777, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": 3 + "register": "FP", + "offset": -5 } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 } } } ] ], [ - 5863, + 5780, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -22768,7 +24080,7 @@ ] ], [ - 5899, + 5800, [ { "AllocSegment": { @@ -22781,19 +24093,10 @@ ] ], [ - 5918, + 5815, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1a5e" - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -28 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -22803,25 +24106,32 @@ ] ], [ - 5941, + 5829, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 5944, + 5844, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22831,7 +24141,7 @@ ] ], [ - 5966, + 5861, [ { "AllocSegment": { @@ -22844,10 +24154,22 @@ ] ], [ - 5981, + 5892, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -13 + } + }, "dst": { "register": "AP", "offset": 0 @@ -22857,7 +24179,7 @@ ] ], [ - 6002, + 5912, [ { "AllocSegment": { @@ -22870,7 +24192,7 @@ ] ], [ - 6016, + 5936, [ { "AllocSegment": { @@ -22883,7 +24205,7 @@ ] ], [ - 6030, + 5954, [ { "AllocSegment": { @@ -22896,7 +24218,7 @@ ] ], [ - 6045, + 5972, [ { "TestLessThanOrEqual": { @@ -22918,7 +24240,7 @@ ] ], [ - 6104, + 5989, [ { "AllocSegment": { @@ -22931,17 +24253,17 @@ ] ], [ - 6123, + 6009, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x1414" + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": -7 } }, "dst": { @@ -22953,48 +24275,7 @@ ] ], [ - 6149, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } - } - } - } - ] - ], - [ - 6152, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 6174, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 6189, + 6033, [ { "AllocSegment": { @@ -23007,7 +24288,7 @@ ] ], [ - 6203, + 6063, [ { "AllocSegment": { @@ -23020,7 +24301,7 @@ ] ], [ - 6217, + 6079, [ { "AllocSegment": { @@ -23033,17 +24314,17 @@ ] ], [ - 6232, + 6095, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x942" + "Immediate": "0x0" }, "rhs": { "Deref": { "register": "FP", - "offset": -8 + "offset": -6 } }, "dst": { @@ -23055,7 +24336,7 @@ ] ], [ - 6304, + 6154, [ { "AllocSegment": { @@ -23068,17 +24349,17 @@ ] ], [ - 6324, + 6173, [ { "TestLessThanOrEqual": { "lhs": { - "Immediate": "0x3480" + "Immediate": "0x0" }, "rhs": { "Deref": { - "register": "FP", - "offset": -10 + "register": "AP", + "offset": -17 } }, "dst": { @@ -23090,43 +24371,10 @@ ] ], [ - 6349, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -9 - } - } - } - } - ] - ], - [ - 6357, + 6185, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -8 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -3 - } - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23136,7 +24384,7 @@ ] ], [ - 6382, + 6198, [ { "AllocSegment": { @@ -23149,7 +24397,7 @@ ] ], [ - 6415, + 6213, [ { "AllocSegment": { @@ -23162,25 +24410,10 @@ ] ], [ - 6452, + 6227, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23190,93 +24423,42 @@ ] ], [ - 6456, + 6241, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 6498, + 6256, [ { - "TestLessThan": { + "TestLessThanOrEqual": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } + "Immediate": "0x0" }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 6502, - [ - { - "LinearSplit": { - "value": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -6 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "dst": { "register": "AP", "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 6543, + 6310, [ { "TestLessThan": { @@ -23298,7 +24480,7 @@ ] ], [ - 6547, + 6314, [ { "LinearSplit": { @@ -23327,7 +24509,7 @@ ] ], [ - 6557, + 6324, [ { "LinearSplit": { @@ -23356,99 +24538,60 @@ ] ], [ - 6681, + 6360, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 6685, + 6379, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x1a5e" + }, + "rhs": { "Deref": { "register": "AP", - "offset": 3 + "offset": -28 } }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 6695, + 6402, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { "register": "FP", - "offset": 2 + "offset": -5 } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { - "register": "AP", - "offset": 0 } } } ] ], [ - 6727, + 6405, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23458,33 +24601,20 @@ ] ], [ - 6729, + 6427, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "FP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 6849, + 6442, [ { "AllocSegment": { @@ -23497,19 +24627,10 @@ ] ], [ - 6963, + 6463, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23519,51 +24640,23 @@ ] ], [ - 6965, + 6477, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 7018, + 6491, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23573,54 +24666,32 @@ ] ], [ - 7022, + 6506, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x0" + }, + "rhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -6 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "dst": { "register": "AP", "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 7064, + 6565, [ { - "TestLessThan": { - "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } - } - }, - "rhs": { - "Immediate": "0x100000000" - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -23630,43 +24701,36 @@ ] ], [ - 7068, + 6584, [ { - "LinearSplit": { - "value": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x1414" + }, + "rhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -17 } }, - "scalar": { - "Immediate": "0x8000000000000110000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "dst": { "register": "AP", "offset": 0 - }, - "y": { - "register": "AP", - "offset": 1 } } } ] ], [ - 7846, + 6610, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -26 + "offset": -5 } } } @@ -23674,20 +24738,7 @@ ] ], [ - 8079, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 8093, + 6613, [ { "AllocSegment": { @@ -23700,7 +24751,7 @@ ] ], [ - 8107, + 6635, [ { "AllocSegment": { @@ -23713,7 +24764,7 @@ ] ], [ - 8171, + 6650, [ { "AllocSegment": { @@ -23726,7 +24777,7 @@ ] ], [ - 8185, + 6664, [ { "AllocSegment": { @@ -23739,7 +24790,7 @@ ] ], [ - 8208, + 6678, [ { "AllocSegment": { @@ -23752,22 +24803,29 @@ ] ], [ - 8232, + 6693, [ { - "SystemCall": { - "system": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x942" + }, + "rhs": { "Deref": { "register": "FP", "offset": -8 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 8235, + 6765, [ { "AllocSegment": { @@ -23780,127 +24838,80 @@ ] ], [ - 8251, + 6793, [ { "SystemCall": { "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -8 - }, - "b": { - "Immediate": "0xa" - } - } - } - } - } - ] - ], - [ - 8288, - [ - { - "GetSegmentArenaIndex": { - "dict_end_ptr": { "Deref": { "register": "FP", - "offset": -3 + "offset": -7 } - }, - "dict_index": { - "register": "FP", - "offset": 0 } } } ] ], [ - 8329, + 6798, [ { "AllocSegment": { "dst": { - "register": "FP", - "offset": 3 + "register": "AP", + "offset": 0 } } } ] ], [ - 8337, + 6849, [ { - "InitSquashData": { - "dict_accesses": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "ptr_diff": { - "Deref": { - "register": "FP", - "offset": 0 - } - }, - "n_accesses": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -1 + "offset": -8 } - }, - "big_keys": { - "register": "FP", - "offset": 2 - }, - "first_key": { - "register": "FP", - "offset": 1 } } } ] ], [ - 8356, + 6870, [ { - "GetCurrentAccessIndex": { - "range_check_ptr": { - "Deref": { - "register": "FP", - "offset": -9 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 8369, + 6897, [ { - "ShouldSkipSquashLoop": { - "should_skip_loop": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -4 + "offset": 0 } } } ] ], [ - 8371, + 6913, [ { - "GetCurrentAccessDelta": { - "index_delta_minus1": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -23909,92 +24920,98 @@ ] ], [ - 8382, + 6927, [ { - "ShouldContinueSquashLoop": { - "should_continue": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -4 + "offset": 0 } } } ] ], [ - 8396, + 6943, [ { - "GetNextDictKey": { - "next_key": { - "register": "FP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -4 + } } } } ] ], [ - 8415, + 6952, [ { - "AssertLeFindSmallArcs": { - "range_check_ptr": { + "SystemCall": { + "system": { "BinOp": { "op": "Add", "a": { - "register": "AP", + "register": "FP", "offset": -4 }, "b": { - "Immediate": "0x1" + "Immediate": "0x8" } } - }, - "a": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "b": { - "Deref": { - "register": "FP", - "offset": 0 - } } } } ] ], [ - 8427, + 6965, [ { - "AssertLeIsFirstArcExcluded": { - "skip_exclude_a_flag": { - "register": "AP", - "offset": 0 - } - } - } - ] + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -4 + }, + "b": { + "Immediate": "0xd" + } + } + } + } + } + ] ], [ - 8439, + 6982, [ { - "AssertLeIsSecondArcExcluded": { - "skip_exclude_b_minus_a": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -4 + }, + "b": { + "Immediate": "0x14" + } + } } } } ] ], [ - 8470, + 6985, [ { "AllocSegment": { @@ -24007,10 +25024,19 @@ ] ], [ - 8478, + 7053, [ { - "AllocSegment": { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x3480" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -10 + } + }, "dst": { "register": "AP", "offset": 0 @@ -24020,14 +25046,14 @@ ] ], [ - 8509, + 7078, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -3 + "offset": -9 } } } @@ -24035,10 +25061,28 @@ ] ], [ - 8523, + 7086, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -8 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -3 + } + } + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24048,7 +25092,7 @@ ] ], [ - 8543, + 7111, [ { "AllocSegment": { @@ -24061,7 +25105,7 @@ ] ], [ - 8557, + 7144, [ { "AllocSegment": { @@ -24074,49 +25118,81 @@ ] ], [ - 8571, + 7181, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -9 + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 8574, + 7185, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 8597, + 7227, [ { "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": -4 + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", @@ -24127,50 +25203,107 @@ ] ], [ - 8625, + 7231, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 8639, + 7272, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 8682, + 7276, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 3 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 8721, + 7286, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -24179,54 +25312,78 @@ ] ], [ - 8781, + 7410, [ { - "SystemCall": { - "system": { + "TestLessThan": { + "lhs": { "Deref": { "register": "FP", - "offset": -3 + "offset": 2 } - } - } - } - ] - ], - [ - 8791, - [ - { - "AllocSegment": { + }, + "rhs": { + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 8822, + 7414, [ { - "SystemCall": { - "system": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -6 + "offset": 3 } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 8825, + 7424, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "FP", + "offset": 2 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -1 + }, + "y": { "register": "AP", "offset": 0 } @@ -24235,21 +25392,18 @@ ] ], [ - 8849, + 7456, [ { "TestLessThan": { "lhs": { "Deref": { - "register": "AP", - "offset": -4 + "register": "FP", + "offset": 0 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "dst": { "register": "AP", @@ -24260,40 +25414,58 @@ ] ], [ - 8883, + 7458, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { - "register": "AP", - "offset": -14 + "register": "FP", + "offset": 0 } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 } } } ] ], [ - 8898, + 7578, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -2 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 8944, + 7692, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24303,7 +25475,7 @@ ] ], [ - 8963, + 7694, [ { "DivMod": { @@ -24314,63 +25486,97 @@ } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 5 + "offset": 3 }, "remainder": { "register": "AP", - "offset": 6 + "offset": 4 } } } ] ], [ - 8969, + 7747, [ { "TestLessThan": { "lhs": { - "Deref": { - "register": "AP", - "offset": 0 + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000" }, "dst": { "register": "AP", - "offset": -3 + "offset": 0 } } } ] ], [ - 9020, + 7751, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 9051, + 7793, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -1 + }, + "b": { + "Immediate": "0x0" + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, "dst": { "register": "AP", "offset": 0 @@ -24380,48 +25586,64 @@ ] ], [ - 9076, + 7797, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 9091, + 8575, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -26 + } } } } ] ], [ - 9133, + 8808, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -3 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9145, + 8822, [ { "AllocSegment": { @@ -24434,22 +25656,20 @@ ] ], [ - 9175, + 8836, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -6 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9180, + 8900, [ { "AllocSegment": { @@ -24462,22 +25682,10 @@ ] ], [ - 9203, + 8914, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -24487,29 +25695,27 @@ ] ], [ - 9237, + 8937, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -14 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9252, + 8961, [ { "SystemCall": { "system": { "Deref": { - "register": "AP", - "offset": -2 + "register": "FP", + "offset": -8 } } } @@ -24517,7 +25723,7 @@ ] ], [ - 9300, + 8964, [ { "AllocSegment": { @@ -24530,103 +25736,127 @@ ] ], [ - 9318, + 8980, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -8 + }, + "b": { + "Immediate": "0xa" + } } - }, - "quotient": { - "register": "AP", - "offset": 5 - }, - "remainder": { - "register": "AP", - "offset": 6 } } } ] ], [ - 9324, + 9017, [ { - "TestLessThan": { - "lhs": { + "GetSegmentArenaIndex": { + "dict_end_ptr": { "Deref": { - "register": "AP", - "offset": 0 + "register": "FP", + "offset": -3 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "dst": { - "register": "AP", - "offset": -3 + "dict_index": { + "register": "FP", + "offset": 0 } } } ] ], [ - 9353, + 9058, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "AP", - "offset": -22 - } + "AllocSegment": { + "dst": { + "register": "FP", + "offset": 3 } } } ] ], [ - 9403, + 9066, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "InitSquashData": { + "dict_accesses": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "ptr_diff": { + "Deref": { + "register": "FP", + "offset": 0 + } + }, + "n_accesses": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "big_keys": { + "register": "FP", + "offset": 2 + }, + "first_key": { + "register": "FP", + "offset": 1 } } } ] ], [ - 9441, + 9085, [ { - "AllocSegment": { - "dst": { + "GetCurrentAccessIndex": { + "range_check_ptr": { + "Deref": { + "register": "FP", + "offset": -9 + } + } + } + } + ] + ], + [ + 9098, + [ + { + "ShouldSkipSquashLoop": { + "should_skip_loop": { "register": "AP", - "offset": 0 + "offset": -4 } } } ] ], [ - 9468, + 9100, [ { - "AllocSegment": { - "dst": { + "GetCurrentAccessDelta": { + "index_delta_minus1": { "register": "AP", "offset": 0 } @@ -24635,12 +25865,25 @@ ] ], [ - 9484, + 9111, [ { - "AllocSegment": { - "dst": { + "ShouldContinueSquashLoop": { + "should_continue": { "register": "AP", + "offset": -4 + } + } + } + ] + ], + [ + 9125, + [ + { + "GetNextDictKey": { + "next_key": { + "register": "FP", "offset": 0 } } @@ -24648,122 +25891,83 @@ ] ], [ - 9510, + 9144, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x3a84" + "AssertLeFindSmallArcs": { + "range_check_ptr": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -4 + }, + "b": { + "Immediate": "0x1" + } + } }, - "rhs": { + "a": { "Deref": { "register": "FP", "offset": -6 } }, - "dst": { - "register": "AP", - "offset": 0 + "b": { + "Deref": { + "register": "FP", + "offset": 0 + } } } } ] ], [ - 9524, + 9156, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { + "AssertLeIsFirstArcExcluded": { + "skip_exclude_a_flag": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 9599, + 9168, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -11 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, - "dst": { + "AssertLeIsSecondArcExcluded": { + "skip_exclude_b_minus_a": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 9603, + 9199, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 9613, + 9207, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": -12 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -24772,14 +25976,14 @@ ] ], [ - 9631, + 9238, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -5 + "offset": -3 } } } @@ -24787,7 +25991,7 @@ ] ], [ - 9649, + 9252, [ { "AllocSegment": { @@ -24800,105 +26004,76 @@ ] ], [ - 9668, + 9272, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -12 - } - }, - "rhs": { - "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 9672, + 9286, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 3 - } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 9682, + 9300, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -13 + "offset": -9 } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -1 - }, - "y": { - "register": "AP", - "offset": 0 } } } ] ], [ - 9700, + 9303, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -5 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9718, + 9326, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, "dst": { "register": "AP", "offset": 0 @@ -24908,7 +26083,7 @@ ] ], [ - 9749, + 9354, [ { "AllocSegment": { @@ -24921,7 +26096,7 @@ ] ], [ - 9773, + 9368, [ { "AllocSegment": { @@ -24934,7 +26109,7 @@ ] ], [ - 9787, + 9411, [ { "AllocSegment": { @@ -24947,7 +26122,7 @@ ] ], [ - 9801, + 9450, [ { "AllocSegment": { @@ -24960,20 +26135,22 @@ ] ], [ - 9815, + 9510, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -3 + } } } } ] ], [ - 9830, + 9520, [ { "AllocSegment": { @@ -24986,29 +26163,22 @@ ] ], [ - 9845, + 9551, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x42e" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -6 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 9859, + 9554, [ { "AllocSegment": { @@ -25021,10 +26191,22 @@ ] ], [ - 9879, + 9578, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, "dst": { "register": "AP", "offset": 0 @@ -25034,29 +26216,37 @@ ] ], [ - 9893, + 9612, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x42e" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -14 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 9923, + 9627, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "AP", + "offset": -2 + } + } + } + } + ] + ], + [ + 9673, [ { "AllocSegment": { @@ -25069,216 +26259,145 @@ ] ], [ - 9942, + 9692, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -2 } }, "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + "Deref": { + "register": "AP", + "offset": -1 + } }, - "dst": { + "quotient": { "register": "AP", "offset": 5 + }, + "remainder": { + "register": "AP", + "offset": 6 } } } ] ], [ - 9946, + 9698, [ { - "LinearSplit": { - "value": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", - "offset": 4 + "offset": 0 } }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 + "rhs": { + "Immediate": "0x10000000000000000" }, - "y": { + "dst": { "register": "AP", - "offset": -1 + "offset": -3 } } } ] ], [ - 9957, + 9749, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 9983, + 9780, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -6 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 9998, + 9805, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -6 - }, - "b": { - "Immediate": "0x7" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10006, + 9820, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } } ] ], [ - 10010, + 9862, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": 4 + "register": "FP", + "offset": -3 } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { - "register": "AP", - "offset": -1 } } } ] ], [ - 10021, + 9874, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10051, + 9904, [ { "SystemCall": { "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -6 - }, - "b": { - "Immediate": "0xe" - } + "Deref": { + "register": "AP", + "offset": -6 } } } @@ -25286,39 +26405,34 @@ ] ], [ - 10067, + 9909, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -6 - }, - "b": { - "Immediate": "0x15" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10175, + 9932, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -4 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "dst": { "register": "AP", @@ -25329,45 +26443,40 @@ ] ], [ - 10177, + 9966, [ { - "DivMod": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -2 + "offset": -14 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { - "register": "AP", - "offset": 4 } } } ] ], [ - 10222, + 9981, [ { - "TestLessThan": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": -1 + "offset": -2 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + } + } + } + ] + ], + [ + 10029, + [ + { + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -25377,7 +26486,7 @@ ] ], [ - 10224, + 10047, [ { "DivMod": { @@ -25388,177 +26497,171 @@ } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "quotient": { "register": "AP", - "offset": 3 + "offset": 5 }, "remainder": { "register": "AP", - "offset": 4 + "offset": 6 } } } ] ], [ - 10333, + 10053, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", - "offset": 5 + "offset": -3 } } } ] ], [ - 10337, + 10082, [ { - "LinearSplit": { - "value": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": 4 + "offset": -22 } - }, - "scalar": { - "Immediate": "0x110000000000000000" - }, - "max_x": { - "Immediate": "0xffffffffffffffffffffffffffffffff" - }, - "x": { - "register": "AP", - "offset": -2 - }, - "y": { + } + } + } + ] + ], + [ + 10132, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10348, + 10170, [ { - "LinearSplit": { - "value": { - "Deref": { - "register": "AP", - "offset": 4 - } - }, - "scalar": { - "Immediate": "0x8000000000000000000000000000000" - }, - "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" - }, - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -2 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 10197, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10374, + 10213, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -6 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10389, + 10239, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -6 - }, - "b": { - "Immediate": "0x7" - } + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x3a84" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10396, + 10253, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -6 + "offset": 0 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x100000000" }, "dst": { "register": "AP", - "offset": 0 + "offset": -1 } } } ] ], [ - 10398, + 10328, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -11 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 3 + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" }, - "remainder": { + "dst": { "register": "AP", "offset": 4 } @@ -25567,84 +26670,122 @@ ] ], [ - 10419, + 10332, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -2 + "offset": 3 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "scalar": { + "Immediate": "0x110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 10421, + 10342, [ { - "DivMod": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -3 + "offset": -12 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "scalar": { + "Immediate": "0x8000000000000000000000000000000" }, - "quotient": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 3 + "offset": -1 }, - "remainder": { + "y": { "register": "AP", - "offset": 4 + "offset": 0 + } + } + } + ] + ], + [ + 10360, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 10378, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10451, + 10397, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -12 } }, "rhs": { - "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + "Immediate": "0x800000000000000000000000000000000000000000000000000000000000000" }, "dst": { "register": "AP", - "offset": 5 + "offset": 4 } } } ] ], [ - 10455, + 10401, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": 4 + "offset": 3 } }, "scalar": { @@ -25666,43 +26807,43 @@ ] ], [ - 10466, + 10411, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": 4 + "offset": -13 } }, "scalar": { "Immediate": "0x8000000000000000000000000000000" }, "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" + "Immediate": "0xffffffffffffffffffffffffffffffff" }, "x": { "register": "AP", - "offset": -2 + "offset": -1 }, "y": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 10497, + 10429, [ { "SystemCall": { "system": { "Deref": { - "register": "AP", - "offset": -20 + "register": "FP", + "offset": -5 } } } @@ -25710,28 +26851,20 @@ ] ], [ - 10512, + 10447, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -25 - }, - "b": { - "Immediate": "0x7" - } - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10556, + 10478, [ { "AllocSegment": { @@ -25744,7 +26877,7 @@ ] ], [ - 10575, + 10502, [ { "AllocSegment": { @@ -25757,63 +26890,81 @@ ] ], [ - 10657, + 10516, [ { - "RandomEcPoint": { - "x": { - "register": "AP", - "offset": 4 - }, - "y": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } - }, + } + ] + ], + [ + 10530, + [ { - "AllocConstantSize": { - "size": { - "Immediate": "0x2" - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 6 + "offset": 0 } } } ] ], [ - 10721, + 10544, [ { - "RandomEcPoint": { - "x": { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 4 - }, - "y": { + "offset": 0 + } + } + } + ] + ], + [ + 10559, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": 5 + "offset": 0 } } - }, + } + ] + ], + [ + 10574, + [ { - "AllocConstantSize": { - "size": { - "Immediate": "0x2" + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x42e" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 + } }, "dst": { "register": "AP", - "offset": 6 + "offset": 0 } } } ] ], [ - 10791, + 10588, [ { "AllocSegment": { @@ -25826,43 +26977,42 @@ ] ], [ - 10817, + 10608, [ { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -3 - } + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10834, + 10622, [ { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -3 - }, - "b": { - "Immediate": "0x7" - } + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x42e" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 } + }, + "dst": { + "register": "AP", + "offset": 0 } } } ] ], [ - 10876, + 10652, [ { "AllocSegment": { @@ -25875,27 +27025,115 @@ ] ], [ - 10893, + 10671, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 5 + } + } + } + ] + ], + [ + 10675, + [ + { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 10686, + [ + { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 10912, + 10712, [ { "SystemCall": { "system": { "Deref": { "register": "FP", - "offset": -4 + "offset": -6 + } + } + } + } + ] + ], + [ + 10727, + [ + { + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -6 + }, + "b": { + "Immediate": "0x7" + } } } } @@ -25903,7 +27141,7 @@ ] ], [ - 10922, + 10735, [ { "TestLessThan": { @@ -25925,7 +27163,7 @@ ] ], [ - 10926, + 10739, [ { "LinearSplit": { @@ -25954,7 +27192,7 @@ ] ], [ - 10937, + 10750, [ { "LinearSplit": { @@ -25983,7 +27221,7 @@ ] ], [ - 10981, + 10780, [ { "SystemCall": { @@ -25992,10 +27230,10 @@ "op": "Add", "a": { "register": "FP", - "offset": -4 + "offset": -6 }, "b": { - "Immediate": "0x5" + "Immediate": "0xe" } } } @@ -26004,7 +27242,7 @@ ] ], [ - 10996, + 10796, [ { "SystemCall": { @@ -26013,10 +27251,10 @@ "op": "Add", "a": { "register": "FP", - "offset": -4 + "offset": -6 }, "b": { - "Immediate": "0xc" + "Immediate": "0x15" } } } @@ -26025,21 +27263,18 @@ ] ], [ - 11006, + 10904, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -5 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "Immediate": "0x100000000000000000000000000000000" }, "dst": { "register": "AP", @@ -26050,22 +27285,45 @@ ] ], [ - 11021, + 10906, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -3 + "offset": -2 } }, "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 10951, + [ + { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", "offset": -1 } }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -26075,7 +27333,33 @@ ] ], [ - 11037, + 10953, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 11062, [ { "TestLessThan": { @@ -26097,7 +27381,7 @@ ] ], [ - 11041, + 11066, [ { "LinearSplit": { @@ -26126,7 +27410,7 @@ ] ], [ - 11052, + 11077, [ { "LinearSplit": { @@ -26155,14 +27439,14 @@ ] ], [ - 11081, + 11103, [ { "SystemCall": { "system": { "Deref": { - "register": "AP", - "offset": -29 + "register": "FP", + "offset": -6 } } } @@ -26170,7 +27454,7 @@ ] ], [ - 11097, + 11118, [ { "SystemCall": { @@ -26178,8 +27462,8 @@ "BinOp": { "op": "Add", "a": { - "register": "AP", - "offset": -35 + "register": "FP", + "offset": -6 }, "b": { "Immediate": "0x7" @@ -26191,82 +27475,19 @@ ] ], [ - 11139, + 11125, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 11157, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 11259, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 11334, - [ - { - "EvalCircuit": { - "n_add_mods": { + "TestLessThan": { + "lhs": { "Deref": { "register": "AP", "offset": -6 } }, - "add_mod_builtin": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "n_mul_mods": { - "Deref": { - "register": "AP", - "offset": -4 - } + "rhs": { + "Immediate": "0x100000000000000000000000000000000" }, - "mul_mod_builtin": { - "Deref": { - "register": "FP", - "offset": -5 - } - } - } - } - ] - ], - [ - 11391, - [ - { - "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -26276,36 +27497,45 @@ ] ], [ - 11447, + 11127, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 11540, - [ - { - "AllocSegment": { - "dst": { + "offset": 3 + }, + "remainder": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 11561, + 11148, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, "dst": { "register": "AP", "offset": 0 @@ -26315,162 +27545,149 @@ ] ], [ - 11632, + 11150, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 11660, - [ - { - "AllocSegment": { - "dst": { + "offset": 3 + }, + "remainder": { "register": "AP", - "offset": 0 + "offset": 4 } } } ] ], [ - 11731, + 11180, [ { "TestLessThan": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -1 - }, - "b": { - "Immediate": "0x0" - } + "Deref": { + "register": "AP", + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" }, "dst": { "register": "AP", - "offset": 0 + "offset": 5 } } } ] ], [ - 11735, + 11184, [ { "LinearSplit": { "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 4 } }, "scalar": { - "Immediate": "0x8000000000000110000000000000000" + "Immediate": "0x110000000000000000" }, "max_x": { - "Immediate": "0xfffffffffffffffffffffffffffffffe" + "Immediate": "0xffffffffffffffffffffffffffffffff" }, "x": { "register": "AP", - "offset": 0 + "offset": -2 }, "y": { "register": "AP", - "offset": 1 + "offset": -1 } } } ] ], [ - 11757, + 11195, [ { - "TestLessThanOrEqual": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -1 + "offset": 4 } }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -2 - } + "scalar": { + "Immediate": "0x8000000000000000000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 11771, + 11226, [ { - "TestLessThan": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": 0 + "offset": -20 } - }, - "rhs": { - "Immediate": "0x100000000" - }, - "dst": { - "register": "AP", - "offset": -1 } } } ] ], [ - 11781, + 11241, [ { - "TestLessThanOrEqual": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -1 - } - }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -2 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -25 + }, + "b": { + "Immediate": "0x7" + } } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 11804, + 11285, [ { "AllocSegment": { @@ -26483,7 +27700,7 @@ ] ], [ - 11825, + 11304, [ { "AllocSegment": { @@ -26496,42 +27713,63 @@ ] ], [ - 11846, + 11386, [ { - "AllocSegment": { + "RandomEcPoint": { + "x": { + "register": "AP", + "offset": 4 + }, + "y": { + "register": "AP", + "offset": 5 + } + } + }, + { + "AllocConstantSize": { + "size": { + "Immediate": "0x2" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 6 } } } ] ], [ - 11894, + 11450, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x1e28" + "RandomEcPoint": { + "x": { + "register": "AP", + "offset": 4 }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -8 - } + "y": { + "register": "AP", + "offset": 5 + } + } + }, + { + "AllocConstantSize": { + "size": { + "Immediate": "0x2" }, "dst": { "register": "AP", - "offset": 0 + "offset": 6 } } } ] ], [ - 11954, + 11520, [ { "AllocSegment": { @@ -26544,42 +27782,43 @@ ] ], [ - 11974, + 11546, [ { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0xcc6" - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { "register": "FP", - "offset": -7 + "offset": -3 } - }, - "dst": { - "register": "AP", - "offset": 0 } } } ] ], [ - 12053, + 11563, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -3 + }, + "b": { + "Immediate": "0x7" + } + } } } } ] ], [ - 12083, + 11605, [ { "AllocSegment": { @@ -26592,29 +27831,7 @@ ] ], [ - 12103, - [ - { - "TestLessThanOrEqual": { - "lhs": { - "Immediate": "0x10ae" - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 12204, + 11622, [ { "AllocSegment": { @@ -26627,117 +27844,151 @@ ] ], [ - 12234, + 11641, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -4 + } } } } ] ], [ - 12254, + 11651, [ { - "TestLessThanOrEqual": { + "TestLessThan": { "lhs": { - "Immediate": "0x22ce" - }, - "rhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": -1 } }, + "rhs": { + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 5 } } } ] ], [ - 12325, + 11655, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x110000000000000000" + }, + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 12346, + 11666, [ { - "DivMod": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": -2 + "offset": 4 } }, - "rhs": { - "Deref": { - "register": "AP", - "offset": -1 - } + "scalar": { + "Immediate": "0x8000000000000000000000000000000" }, - "quotient": { + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 3 + "offset": -2 }, - "remainder": { + "y": { "register": "AP", - "offset": 4 + "offset": -1 } } } ] ], [ - 12404, + 11710, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -4 + }, + "b": { + "Immediate": "0x5" + } + } } } } ] ], [ - 12457, + 11725, [ { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -4 + }, + "b": { + "Immediate": "0xc" + } + } } } } ] ], [ - 12470, + 11735, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -5 } }, "rhs": { @@ -26746,40 +27997,30 @@ "offset": -1 } }, - "quotient": { - "register": "AP", - "offset": 3 - }, - "remainder": { + "dst": { "register": "AP", - "offset": 4 + "offset": 0 } } } ] ], [ - 12478, + 11750, [ { "TestLessThan": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -6 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -1 - } - } + "Deref": { + "register": "AP", + "offset": -3 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "dst": { "register": "AP", @@ -26790,33 +28031,49 @@ ] ], [ - 12495, + 11766, [ { - "AllocSegment": { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" + }, "dst": { "register": "AP", - "offset": 0 + "offset": 5 } } } ] ], [ - 12527, + 11770, [ { - "TestLessThan": { - "lhs": { + "LinearSplit": { + "value": { "Deref": { "register": "AP", - "offset": 0 + "offset": 4 } }, - "rhs": { - "Immediate": "0x100000000" + "scalar": { + "Immediate": "0x110000000000000000" }, - "dst": { + "max_x": { + "Immediate": "0xffffffffffffffffffffffffffffffff" + }, + "x": { + "register": "AP", + "offset": -2 + }, + "y": { "register": "AP", "offset": -1 } @@ -26825,20 +28082,222 @@ ] ], [ - 12544, + 11781, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": 4 + } + }, + "scalar": { + "Immediate": "0x8000000000000000000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", - "offset": 0 + "offset": -2 + }, + "y": { + "register": "AP", + "offset": -1 } } } ] ], [ - 12560, + 11810, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "AP", + "offset": -29 + } + } + } + } + ] + ], + [ + 11826, + [ + { + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -35 + }, + "b": { + "Immediate": "0x7" + } + } + } + } + } + ] + ], + [ + 11868, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 11886, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 11988, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12063, + [ + { + "EvalCircuit": { + "n_add_mods": { + "Deref": { + "register": "AP", + "offset": -6 + } + }, + "add_mod_builtin": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "n_mul_mods": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "mul_mod_builtin": { + "Deref": { + "register": "FP", + "offset": -5 + } + } + } + } + ] + ], + [ + 12120, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12176, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12269, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12290, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12361, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12389, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12460, [ { "TestLessThan": { @@ -26850,15 +28309,12 @@ "offset": -1 }, "b": { - "Deref": { - "register": "AP", - "offset": -3 - } + "Immediate": "0x0" } } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000" }, "dst": { "register": "AP", @@ -26869,52 +28325,86 @@ ] ], [ - 12582, + 12464, [ { - "AllocSegment": { - "dst": { + "LinearSplit": { + "value": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "scalar": { + "Immediate": "0x8000000000000110000000000000000" + }, + "max_x": { + "Immediate": "0xfffffffffffffffffffffffffffffffe" + }, + "x": { "register": "AP", "offset": 0 + }, + "y": { + "register": "AP", + "offset": 1 } } } ] ], [ - 12639, + 12486, [ { - "DivMod": { + "TestLessThanOrEqual": { "lhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -1 } }, "rhs": { "Deref": { "register": "AP", - "offset": -3 + "offset": -2 } }, - "quotient": { + "dst": { "register": "AP", - "offset": 3 + "offset": 0 + } + } + } + ] + ], + [ + 12500, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } }, - "remainder": { + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { "register": "AP", - "offset": 4 + "offset": -1 } } } ] ], [ - 12648, + 12510, [ { - "TestLessThan": { + "TestLessThanOrEqual": { "lhs": { "Deref": { "register": "AP", @@ -26922,7 +28412,10 @@ } }, "rhs": { - "Immediate": "0x100000000" + "Deref": { + "register": "AP", + "offset": -2 + } }, "dst": { "register": "AP", @@ -26933,27 +28426,92 @@ ] ], [ - 12658, + 12533, [ { - "TestLessThan": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12554, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12575, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12623, + [ + { + "TestLessThanOrEqual": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -3 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -9 - } - } + "Immediate": "0x1e28" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -8 } }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12683, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12703, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0xcc6" + }, "rhs": { - "Immediate": "0x100000000" + "Deref": { + "register": "FP", + "offset": -7 + } }, "dst": { "register": "AP", @@ -26964,7 +28522,7 @@ ] ], [ - 12680, + 12782, [ { "AllocSegment": { @@ -26977,7 +28535,7 @@ ] ], [ - 12695, + 12812, [ { "AllocSegment": { @@ -26990,27 +28548,66 @@ ] ], [ - 12720, + 12832, [ { - "TestLessThan": { + "TestLessThanOrEqual": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -2 - }, - "b": { - "Deref": { - "register": "AP", - "offset": -1 - } - } + "Immediate": "0x10ae" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -7 } }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12933, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12963, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 12983, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x22ce" + }, "rhs": { - "Immediate": "0x100000000" + "Deref": { + "register": "FP", + "offset": -7 + } }, "dst": { "register": "AP", @@ -27021,7 +28618,20 @@ ] ], [ - 12734, + 13054, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13075, [ { "DivMod": { @@ -27050,18 +28660,82 @@ ] ], [ - 12751, + 13133, [ { - "TestLessThan": { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13186, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13199, + [ + { + "DivMod": { "lhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "rhs": { "Deref": { "register": "AP", "offset": -1 } }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 13207, + [ + { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -6 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -1 + } + } + } + }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" }, "dst": { "register": "AP", @@ -27072,19 +28746,45 @@ ] ], [ - 12763, + 13224, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13256, [ { "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 0 } }, "rhs": { "Immediate": "0x100000000" }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13273, + [ + { + "AllocSegment": { "dst": { "register": "AP", "offset": 0 @@ -27094,7 +28794,7 @@ ] ], [ - 12773, + 13289, [ { "TestLessThan": { @@ -27103,7 +28803,7 @@ "op": "Add", "a": { "register": "AP", - "offset": -6 + "offset": -1 }, "b": { "Deref": { @@ -27114,35 +28814,1198 @@ } }, "rhs": { - "Immediate": "0x100000000" + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13311, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13368, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 13377, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13387, + [ + { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -3 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -9 + } + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13409, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13424, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13449, + [ + { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -2 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -1 + } + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13463, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "quotient": { + "register": "AP", + "offset": 3 + }, + "remainder": { + "register": "AP", + "offset": 4 + } + } + } + ] + ], + [ + 13480, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13492, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13502, + [ + { + "TestLessThan": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -6 + }, + "b": { + "Deref": { + "register": "AP", + "offset": -3 + } + } + } + }, + "rhs": { + "Immediate": "0x100000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13525, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13540, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13555, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13570, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13583, + [ + { + "TestLessThanOrEqual": { + "lhs": { + "Immediate": "0x32f0" + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -7 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13593, + [ + { + "TestLessThanOrEqualAddress": { + "lhs": { + "BinOp": { + "op": "Add", + "a": { + "register": "FP", + "offset": -5 + }, + "b": { + "Immediate": "0x10" + } + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13630, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -6 + } + } + } + } + ] + ], + [ + 13663, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13697, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13719, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13756, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13778, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13854, + [ + { + "AllocSegment": { + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 13919, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13943, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 13984, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 14010, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 14054, + [ + { + "U256InvModN": { + "b0": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "b1": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "n0": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "n1": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "g0_or_no_inv": { + "register": "AP", + "offset": 0 + }, + "g1_option": { + "register": "AP", + "offset": 1 + }, + "s_or_r0": { + "register": "AP", + "offset": 2 + }, + "s_or_r1": { + "register": "AP", + "offset": 3 + }, + "t_or_k0": { + "register": "AP", + "offset": 4 + }, + "t_or_k1": { + "register": "AP", + "offset": 5 + } + } + } + ] + ], + [ + 14072, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -22 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "high": { + "register": "AP", + "offset": -14 + }, + "low": { + "register": "AP", + "offset": -15 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -22 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "high": { + "register": "AP", + "offset": -12 + }, + "low": { + "register": "AP", + "offset": -13 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "high": { + "register": "AP", + "offset": -10 + }, + "low": { + "register": "AP", + "offset": -11 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "high": { + "register": "AP", + "offset": -8 + }, + "low": { + "register": "AP", + "offset": -9 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -26 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -6 + }, + "low": { + "register": "AP", + "offset": -7 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -26 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "high": { + "register": "AP", + "offset": -4 + }, + "low": { + "register": "AP", + "offset": -5 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -25 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -2 + }, + "low": { + "register": "AP", + "offset": -3 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -25 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 14125, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -5 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "FP", + "offset": -5 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "high": { + "register": "AP", + "offset": 1 + }, + "low": { + "register": "AP", + "offset": -9 + } + } + } + ] + ], + [ + 14129, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -10 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 2 + } + } + } + ] + ], + [ + 14143, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -11 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14156, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -47 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14166, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 14177, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -35 + } + } + } + ] + ], + [ + 14186, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -62 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14196, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 14207, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -52 + } + } + } + ] + ], + [ + 14216, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -78 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14226, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 12796, + 14237, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -69 } } } ] ], [ - 12811, + 14246, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -93 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { "register": "AP", "offset": 0 } @@ -27151,46 +30014,76 @@ ] ], [ - 12826, + 14256, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { "register": "AP", "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 12841, + 14267, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -86 } } } ] ], [ - 12854, + 14276, [ { - "TestLessThanOrEqual": { + "DivMod": { "lhs": { - "Immediate": "0x32f0" - }, - "rhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": -103 } }, - "dst": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { "register": "AP", "offset": 0 } @@ -27199,303 +30092,353 @@ ] ], [ - 12864, + 14286, [ { - "TestLessThanOrEqualAddress": { + "DivMod": { "lhs": { - "BinOp": { - "op": "Add", - "a": { - "register": "FP", - "offset": -5 - }, - "b": { - "Immediate": "0x10" - } + "Deref": { + "register": "AP", + "offset": -1 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 12901, + 14297, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": 2 } - } - } - } - ] - ], - [ - 12934, - [ - { - "AllocSegment": { - "dst": { + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -103 } } } ] ], [ - 12968, + 14306, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -118 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 12990, + 14316, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 13027, + 14327, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": 2 } }, "rhs": { "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -120 } } } ] ], [ - 13049, + 14336, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -134 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 13125, + 14346, [ { - "AllocSegment": { - "dst": { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { "register": "AP", "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 13190, + 14357, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": 2 } }, "rhs": { "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -137 } } } ] ], [ - 13214, + 14366, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -149 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 13255, + 14376, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 13281, + 14387, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": 2 } }, "rhs": { "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -154 } } } ] ], [ - 13325, + 14408, [ { - "U256InvModN": { - "b0": { + "Uint512DivModByUint256": { + "dividend0": { "Deref": { - "register": "FP", + "register": "AP", + "offset": -6 + } + }, + "dividend1": { + "Deref": { + "register": "AP", "offset": -5 } }, - "b1": { + "dividend2": { "Deref": { - "register": "FP", + "register": "AP", "offset": -4 } }, - "n0": { + "dividend3": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "divisor0": { "Deref": { "register": "AP", "offset": -2 } }, - "n1": { + "divisor1": { "Deref": { "register": "AP", "offset": -1 } }, - "g0_or_no_inv": { + "quotient0": { "register": "AP", "offset": 0 }, - "g1_option": { + "quotient1": { "register": "AP", "offset": 1 }, - "s_or_r0": { + "quotient2": { "register": "AP", "offset": 2 }, - "s_or_r1": { + "quotient3": { "register": "AP", "offset": 3 }, - "t_or_k0": { + "remainder0": { "register": "AP", "offset": 4 }, - "t_or_k1": { + "remainder1": { "register": "AP", "offset": 5 } @@ -27504,29 +30447,29 @@ ] ], [ - 13343, + 14426, [ { "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -22 + "offset": -19 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -21 } }, "high": { "register": "AP", - "offset": -14 + "offset": -9 }, "low": { "register": "AP", - "offset": -15 + "offset": -10 } } }, @@ -27535,22 +30478,22 @@ "lhs": { "Deref": { "register": "AP", - "offset": -22 + "offset": -18 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -21 } }, "high": { "register": "AP", - "offset": -12 + "offset": -7 }, "low": { "register": "AP", - "offset": -13 + "offset": -8 } } }, @@ -27559,22 +30502,22 @@ "lhs": { "Deref": { "register": "AP", - "offset": -21 + "offset": -19 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -20 } }, "high": { "register": "AP", - "offset": -10 + "offset": -5 }, "low": { "register": "AP", - "offset": -11 + "offset": -6 } } }, @@ -27583,22 +30526,22 @@ "lhs": { "Deref": { "register": "AP", - "offset": -21 + "offset": -18 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -4 + "register": "AP", + "offset": -20 } }, "high": { "register": "AP", - "offset": -8 + "offset": -3 }, "low": { "register": "AP", - "offset": -9 + "offset": -4 } } }, @@ -27607,205 +30550,242 @@ "lhs": { "Deref": { "register": "AP", - "offset": -26 + "offset": -17 } }, "rhs": { "Deref": { "register": "AP", - "offset": -20 + "offset": -21 } }, "high": { "register": "AP", - "offset": -6 + "offset": -1 }, "low": { "register": "AP", - "offset": -7 + "offset": -2 } } - }, + } + ] + ], + [ + 14455, + [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -26 + "offset": -35 } }, "rhs": { "Deref": { "register": "AP", - "offset": -19 + "offset": -38 } }, - "high": { - "register": "AP", - "offset": -4 - }, - "low": { + "dst": { "register": "AP", - "offset": -5 + "offset": 1 } } - }, + } + ] + ], + [ + 14467, + [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -35 } }, "rhs": { "Deref": { "register": "AP", - "offset": -20 + "offset": -40 } }, - "high": { - "register": "AP", - "offset": -2 - }, - "low": { + "dst": { "register": "AP", - "offset": -3 + "offset": 0 } } - }, + } + ] + ], + [ + 14482, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -41 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -19 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": 0 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 13396, + 14492, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -5 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", "offset": 0 }, - "low": { - "register": "FP", - "offset": -5 + "remainder": { + "register": "AP", + "offset": 1 } } - }, + } + ] + ], + [ + 14503, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": 2 } }, "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -38 + } + } + } + ] + ], + [ + 14512, + [ + { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -3 + "offset": -57 } }, - "high": { + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { "register": "AP", "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -9 + "offset": 0 } } } ] ], [ - 13400, + 14522, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -10 + "offset": -1 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 2 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 13414, + 14533, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -11 + "offset": 2 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -55 } } } ] ], [ - 13427, + 14542, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -47 + "offset": -72 } }, "rhs": { @@ -27824,7 +30804,7 @@ ] ], [ - 13437, + 14552, [ { "DivMod": { @@ -27850,7 +30830,7 @@ ] ], [ - 13448, + 14563, [ { "DivMod": { @@ -27869,21 +30849,21 @@ }, "remainder": { "register": "AP", - "offset": -35 + "offset": -74 } } } ] ], [ - 13457, + 14572, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -62 + "offset": -88 } }, "rhs": { @@ -27902,7 +30882,7 @@ ] ], [ - 13467, + 14582, [ { "DivMod": { @@ -27928,7 +30908,7 @@ ] ], [ - 13478, + 14593, [ { "DivMod": { @@ -27947,21 +30927,21 @@ }, "remainder": { "register": "AP", - "offset": -52 + "offset": -87 } } } ] ], [ - 13487, + 14602, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -78 + "offset": -103 } }, "rhs": { @@ -27980,7 +30960,7 @@ ] ], [ - 13497, + 14612, [ { "DivMod": { @@ -28006,7 +30986,7 @@ ] ], [ - 13508, + 14623, [ { "DivMod": { @@ -28025,21 +31005,265 @@ }, "remainder": { "register": "AP", - "offset": -69 + "offset": -106 + } + } + } + ] + ], + [ + 14644, + [ + { + "Uint512DivModByUint256": { + "dividend0": { + "Deref": { + "register": "AP", + "offset": -6 + } + }, + "dividend1": { + "Deref": { + "register": "AP", + "offset": -5 + } + }, + "dividend2": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "dividend3": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "divisor0": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "divisor1": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "quotient0": { + "register": "AP", + "offset": 0 + }, + "quotient1": { + "register": "AP", + "offset": 1 + }, + "quotient2": { + "register": "AP", + "offset": 2 + }, + "quotient3": { + "register": "AP", + "offset": 3 + }, + "remainder0": { + "register": "AP", + "offset": 4 + }, + "remainder1": { + "register": "AP", + "offset": 5 + } + } + } + ] + ], + [ + 14662, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "high": { + "register": "AP", + "offset": -9 + }, + "low": { + "register": "AP", + "offset": -10 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -18 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "high": { + "register": "AP", + "offset": -7 + }, + "low": { + "register": "AP", + "offset": -8 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -5 + }, + "low": { + "register": "AP", + "offset": -6 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -18 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -3 + }, + "low": { + "register": "AP", + "offset": -4 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -17 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "high": { + "register": "AP", + "offset": -1 + }, + "low": { + "register": "AP", + "offset": -2 } } } ] ], [ - 13517, + 14691, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -35 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -38 + } + }, + "dst": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 14703, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -35 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -40 + } + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 14718, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -93 + "offset": -41 } }, "rhs": { @@ -28058,7 +31282,7 @@ ] ], [ - 13527, + 14728, [ { "DivMod": { @@ -28084,7 +31308,7 @@ ] ], [ - 13538, + 14739, [ { "DivMod": { @@ -28103,21 +31327,21 @@ }, "remainder": { "register": "AP", - "offset": -86 + "offset": -38 } } } ] ], [ - 13547, + 14748, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -57 } }, "rhs": { @@ -28136,7 +31360,7 @@ ] ], [ - 13557, + 14758, [ { "DivMod": { @@ -28162,7 +31386,7 @@ ] ], [ - 13568, + 14769, [ { "DivMod": { @@ -28181,21 +31405,21 @@ }, "remainder": { "register": "AP", - "offset": -103 + "offset": -55 } } } ] ], [ - 13577, + 14778, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -118 + "offset": -72 } }, "rhs": { @@ -28214,7 +31438,7 @@ ] ], [ - 13587, + 14788, [ { "DivMod": { @@ -28240,7 +31464,7 @@ ] ], [ - 13598, + 14799, [ { "DivMod": { @@ -28259,21 +31483,21 @@ }, "remainder": { "register": "AP", - "offset": -120 + "offset": -74 } } } ] ], [ - 13607, + 14808, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -134 + "offset": -88 } }, "rhs": { @@ -28292,7 +31516,7 @@ ] ], [ - 13617, + 14818, [ { "DivMod": { @@ -28318,7 +31542,7 @@ ] ], [ - 13628, + 14829, [ { "DivMod": { @@ -28337,21 +31561,21 @@ }, "remainder": { "register": "AP", - "offset": -137 + "offset": -87 } } } ] ], [ - 13637, + 14838, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -149 + "offset": -103 } }, "rhs": { @@ -28370,7 +31594,7 @@ ] ], [ - 13647, + 14848, [ { "DivMod": { @@ -28396,7 +31620,7 @@ ] ], [ - 13658, + 14859, [ { "DivMod": { @@ -28415,14 +31639,14 @@ }, "remainder": { "register": "AP", - "offset": -154 + "offset": -106 } } } ] ], [ - 13706, + 14886, [ { "SystemCall": { @@ -28437,7 +31661,7 @@ ] ], [ - 13723, + 14903, [ { "SystemCall": { @@ -28452,7 +31676,7 @@ ] ], [ - 13735, + 14915, [ { "SystemCall": { @@ -28473,7 +31697,7 @@ ] ], [ - 13746, + 14926, [ { "SystemCall": { @@ -28494,7 +31718,7 @@ ] ], [ - 13756, + 14936, [ { "SystemCall": { @@ -28515,7 +31739,7 @@ ] ], [ - 13841, + 15021, [ { "AllocSegment": { @@ -28528,14 +31752,14 @@ ] ], [ - 13870, + 15050, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -669 + "offset": -642 } }, "rhs": { @@ -28554,7 +31778,7 @@ ] ], [ - 13880, + 15060, [ { "DivMod": { @@ -28580,7 +31804,7 @@ ] ], [ - 13891, + 15071, [ { "DivMod": { @@ -28599,21 +31823,21 @@ }, "remainder": { "register": "AP", - "offset": -683 + "offset": -656 } } } ] ], [ - 13900, + 15080, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -684 + "offset": -657 } }, "rhs": { @@ -28632,7 +31856,7 @@ ] ], [ - 13910, + 15090, [ { "DivMod": { @@ -28658,7 +31882,7 @@ ] ], [ - 13921, + 15101, [ { "DivMod": { @@ -28684,7 +31908,7 @@ ] ], [ - 13930, + 15110, [ { "AllocSegment": { @@ -28697,7 +31921,7 @@ ] ], [ - 13999, + 15179, [ { "TestLessThan": { @@ -28728,7 +31952,7 @@ ] ], [ - 14014, + 15194, [ { "TestLessThan": { @@ -28750,7 +31974,7 @@ ] ], [ - 14033, + 15213, [ { "TestLessThan": { @@ -28772,7 +31996,7 @@ ] ], [ - 14052, + 15232, [ { "TestLessThan": { @@ -28794,7 +32018,7 @@ ] ], [ - 14062, + 15242, [ { "TestLessThan": { @@ -28816,7 +32040,7 @@ ] ], [ - 14064, + 15244, [ { "DivMod": { @@ -28842,7 +32066,7 @@ ] ], [ - 14101, + 15281, [ { "TestLessThan": { @@ -28864,7 +32088,7 @@ ] ], [ - 14120, + 15300, [ { "AllocSegment": { @@ -28877,7 +32101,7 @@ ] ], [ - 14131, + 15311, [ { "DivMod": { @@ -28906,7 +32130,7 @@ ] ], [ - 14137, + 15317, [ { "TestLessThan": { @@ -28928,7 +32152,7 @@ ] ], [ - 14151, + 15331, [ { "TestLessThan": { @@ -28950,7 +32174,7 @@ ] ], [ - 14165, + 15345, [ { "TestLessThan": { @@ -28972,7 +32196,7 @@ ] ], [ - 14176, + 15356, [ { "TestLessThan": { @@ -28994,7 +32218,7 @@ ] ], [ - 14205, + 15385, [ { "AllocSegment": { @@ -29007,7 +32231,7 @@ ] ], [ - 14230, + 15410, [ { "TestLessThan": { @@ -29029,7 +32253,7 @@ ] ], [ - 14234, + 15414, [ { "LinearSplit": { @@ -29058,7 +32282,7 @@ ] ], [ - 14244, + 15424, [ { "LinearSplit": { @@ -29087,7 +32311,7 @@ ] ], [ - 14264, + 15444, [ { "AllocSegment": { @@ -29100,7 +32324,7 @@ ] ], [ - 14285, + 15465, [ { "AllocSegment": { @@ -29113,7 +32337,7 @@ ] ], [ - 14306, + 15486, [ { "AllocSegment": { @@ -29126,7 +32350,7 @@ ] ], [ - 14326, + 15506, [ { "TestLessThan": { @@ -29148,7 +32372,7 @@ ] ], [ - 14328, + 15508, [ { "DivMod": { @@ -29174,7 +32398,7 @@ ] ], [ - 14372, + 15552, [ { "AllocSegment": { @@ -29187,7 +32411,7 @@ ] ], [ - 14383, + 15563, [ { "DivMod": { @@ -29216,7 +32440,7 @@ ] ], [ - 14389, + 15569, [ { "TestLessThan": { @@ -29238,7 +32462,7 @@ ] ], [ - 14403, + 15583, [ { "TestLessThan": { @@ -29260,7 +32484,7 @@ ] ], [ - 14421, + 15601, [ { "TestLessThan": { @@ -29282,7 +32506,7 @@ ] ], [ - 14434, + 15614, [ { "TestLessThan": { @@ -29304,7 +32528,7 @@ ] ], [ - 14445, + 15625, [ { "TestLessThan": { @@ -29326,7 +32550,7 @@ ] ], [ - 14474, + 15654, [ { "AllocSegment": { @@ -29339,7 +32563,7 @@ ] ], [ - 14499, + 15679, [ { "TestLessThan": { @@ -29361,7 +32585,7 @@ ] ], [ - 14503, + 15683, [ { "LinearSplit": { @@ -29390,7 +32614,7 @@ ] ], [ - 14513, + 15693, [ { "LinearSplit": { @@ -29419,7 +32643,7 @@ ] ], [ - 14533, + 15713, [ { "AllocSegment": { @@ -29432,7 +32656,7 @@ ] ], [ - 14554, + 15734, [ { "AllocSegment": { @@ -29445,7 +32669,7 @@ ] ], [ - 14575, + 15755, [ { "AllocSegment": { @@ -29458,7 +32682,7 @@ ] ], [ - 14604, + 15784, [ { "TestLessThan": { @@ -29480,7 +32704,7 @@ ] ], [ - 14606, + 15786, [ { "DivMod": { @@ -29506,7 +32730,7 @@ ] ], [ - 14643, + 15823, [ { "TestLessThan": { @@ -29528,7 +32752,7 @@ ] ], [ - 14654, + 15834, [ { "TestLessThan": { @@ -29550,7 +32774,7 @@ ] ], [ - 14665, + 15845, [ { "TestLessThan": { @@ -29572,7 +32796,7 @@ ] ], [ - 14694, + 15874, [ { "AllocSegment": { @@ -29585,7 +32809,7 @@ ] ], [ - 14719, + 15899, [ { "TestLessThan": { @@ -29607,7 +32831,7 @@ ] ], [ - 14723, + 15903, [ { "LinearSplit": { @@ -29636,7 +32860,7 @@ ] ], [ - 14733, + 15913, [ { "LinearSplit": { @@ -29665,7 +32889,7 @@ ] ], [ - 14759, + 15939, [ { "AllocSegment": { @@ -29678,7 +32902,7 @@ ] ], [ - 14780, + 15960, [ { "AllocSegment": { @@ -29691,7 +32915,7 @@ ] ], [ - 14802, + 15982, [ { "AllocSegment": { @@ -29704,7 +32928,7 @@ ] ], [ - 14824, + 16004, [ { "TestLessThan": { @@ -29726,7 +32950,7 @@ ] ], [ - 14835, + 16015, [ { "TestLessThan": { @@ -29748,7 +32972,7 @@ ] ], [ - 14864, + 16044, [ { "AllocSegment": { @@ -29761,7 +32985,7 @@ ] ], [ - 14889, + 16069, [ { "TestLessThan": { @@ -29783,7 +33007,7 @@ ] ], [ - 14893, + 16073, [ { "LinearSplit": { @@ -29812,7 +33036,7 @@ ] ], [ - 14903, + 16083, [ { "LinearSplit": { @@ -29841,7 +33065,7 @@ ] ], [ - 14926, + 16106, [ { "AllocSegment": { @@ -29854,7 +33078,7 @@ ] ], [ - 14971, + 16151, [ { "TestLessThan": { @@ -29876,7 +33100,7 @@ ] ], [ - 14982, + 16162, [ { "TestLessThan": { @@ -29898,7 +33122,7 @@ ] ], [ - 15011, + 16191, [ { "AllocSegment": { @@ -29911,7 +33135,7 @@ ] ], [ - 15034, + 16214, [ { "TestLessThan": { @@ -29942,7 +33166,7 @@ ] ], [ - 15058, + 16238, [ { "AllocSegment": { @@ -29955,7 +33179,7 @@ ] ], [ - 15102, + 16282, [ { "AllocSegment": { @@ -29968,7 +33192,7 @@ ] ], [ - 15129, + 16309, [ { "TestLessThanOrEqual": { @@ -29990,7 +33214,7 @@ ] ], [ - 15181, + 16361, [ { "AllocSegment": { @@ -30003,7 +33227,7 @@ ] ], [ - 15238, + 16418, [ { "TestLessThan": { @@ -30031,7 +33255,7 @@ ] ], [ - 15242, + 16422, [ { "LinearSplit": { @@ -30060,7 +33284,7 @@ ] ], [ - 15284, + 16464, [ { "TestLessThan": { @@ -30082,7 +33306,7 @@ ] ], [ - 15286, + 16466, [ { "DivMod": { @@ -30108,7 +33332,7 @@ ] ], [ - 15373, + 16553, [ { "DivMod": { @@ -30137,7 +33361,7 @@ ] ], [ - 15379, + 16559, [ { "TestLessThan": { @@ -30159,7 +33383,7 @@ ] ], [ - 15390, + 16570, [ { "TestLessThan": { @@ -30181,7 +33405,7 @@ ] ], [ - 15400, + 16580, [ { "TestLessThan": { @@ -30203,7 +33427,7 @@ ] ], [ - 15414, + 16594, [ { "DivMod": { @@ -30232,7 +33456,7 @@ ] ], [ - 15420, + 16600, [ { "TestLessThan": { @@ -30254,7 +33478,7 @@ ] ], [ - 15434, + 16614, [ { "TestLessThan": { @@ -30276,7 +33500,7 @@ ] ], [ - 15444, + 16624, [ { "TestLessThan": { @@ -30298,7 +33522,7 @@ ] ], [ - 15466, + 16646, [ { "AllocSegment": { @@ -30311,7 +33535,7 @@ ] ], [ - 15480, + 16660, [ { "AllocSegment": { @@ -30324,7 +33548,7 @@ ] ], [ - 15498, + 16678, [ { "AllocSegment": { @@ -30337,7 +33561,7 @@ ] ], [ - 15512, + 16692, [ { "AllocSegment": { @@ -30350,7 +33574,7 @@ ] ], [ - 15528, + 16708, [ { "TestLessThanOrEqual": { @@ -30372,7 +33596,7 @@ ] ], [ - 15555, + 16735, [ { "TestLessThan": { @@ -30394,7 +33618,7 @@ ] ], [ - 15572, + 16752, [ { "AllocSegment": { @@ -30407,7 +33631,7 @@ ] ], [ - 15597, + 16777, [ { "AllocSegment": { @@ -30420,395 +33644,863 @@ ] ], [ - 15857, + 17037, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "FP", + "offset": -10 + } + } + } + } + ] + ], + [ + 17063, + [ + { + "SystemCall": { + "system": { + "Deref": { + "register": "AP", + "offset": -6 + } + } + } + } + ] + ], + [ + 17077, + [ + { + "U256InvModN": { + "b0": { + "Deref": { + "register": "FP", + "offset": -7 + } + }, + "b1": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "n0": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "n1": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "g0_or_no_inv": { + "register": "AP", + "offset": 0 + }, + "g1_option": { + "register": "AP", + "offset": 1 + }, + "s_or_r0": { + "register": "AP", + "offset": 2 + }, + "s_or_r1": { + "register": "AP", + "offset": 3 + }, + "t_or_k0": { + "register": "AP", + "offset": 4 + }, + "t_or_k1": { + "register": "AP", + "offset": 5 + } + } + } + ] + ], + [ + 17095, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -22 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -7 + } + }, + "high": { + "register": "AP", + "offset": -14 + }, + "low": { + "register": "AP", + "offset": -15 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -22 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "high": { + "register": "AP", + "offset": -12 + }, + "low": { + "register": "AP", + "offset": -13 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -7 + } + }, + "high": { + "register": "AP", + "offset": -10 + }, + "low": { + "register": "AP", + "offset": -11 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -6 + } + }, + "high": { + "register": "AP", + "offset": -8 + }, + "low": { + "register": "AP", + "offset": -9 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -26 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -6 + }, + "low": { + "register": "AP", + "offset": -7 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -26 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "high": { + "register": "AP", + "offset": -4 + }, + "low": { + "register": "AP", + "offset": -5 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -25 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -2 + }, + "low": { + "register": "AP", + "offset": -3 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -25 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 17148, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -5 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "FP", + "offset": -7 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -7 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "high": { + "register": "AP", + "offset": 1 + }, + "low": { + "register": "AP", + "offset": -9 + } + } + } + ] + ], + [ + 17152, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -10 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 2 + } + } + } + ] + ], + [ + 17166, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -11 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "dst": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 17179, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -47 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 + } + } + } + ] + ], + [ + 17189, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 17200, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -35 + } + } + } + ] + ], + [ + 17209, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { - "register": "FP", - "offset": -10 + "register": "AP", + "offset": -62 } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 15883, + 17219, [ { - "SystemCall": { - "system": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -6 + "offset": -1 } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 15897, + 17230, [ { - "U256InvModN": { - "b0": { - "Deref": { - "register": "FP", - "offset": -7 - } - }, - "b1": { - "Deref": { - "register": "FP", - "offset": -6 - } - }, - "n0": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "n1": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 2 } }, - "g0_or_no_inv": { - "register": "AP", - "offset": 0 - }, - "g1_option": { - "register": "AP", - "offset": 1 - }, - "s_or_r0": { - "register": "AP", - "offset": 2 - }, - "s_or_r1": { - "register": "AP", - "offset": 3 + "rhs": { + "Immediate": "0x100000000000000000000000000000000" }, - "t_or_k0": { + "quotient": { "register": "AP", - "offset": 4 + "offset": -1 }, - "t_or_k1": { + "remainder": { "register": "AP", - "offset": 5 + "offset": -52 } } } ] ], [ - 15915, + 17239, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -22 + "offset": -78 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -14 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -15 + "offset": 0 } } - }, + } + ] + ], + [ + 17249, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -22 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -12 + "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -13 + "offset": 1 } } - }, + } + ] + ], + [ + 17260, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -21 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -7 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -10 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": -11 + "offset": -69 } } - }, + } + ] + ], + [ + 17269, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -21 + "offset": -93 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -8 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -9 + "offset": 0 } } - }, + } + ] + ], + [ + 17279, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -26 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -6 + "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -7 + "offset": 1 } } - }, + } + ] + ], + [ + 17290, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -26 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -19 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -4 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": -5 + "offset": -86 } } - }, + } + ] + ], + [ + 17299, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -103 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -20 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -2 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -3 + "offset": 0 } } - }, + } + ] + ], + [ + 17309, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -25 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -19 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -1 + "offset": 1 } } } ] ], [ - 15968, + 17320, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -5 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 }, - "low": { - "register": "FP", - "offset": -7 + "remainder": { + "register": "AP", + "offset": -103 } } - }, + } + ] + ], + [ + 17329, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -7 + "offset": -118 } }, "rhs": { - "Deref": { - "register": "AP", - "offset": -3 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -9 + "offset": 0 } } } ] ], [ - 15972, + 17339, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -10 + "offset": -1 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 2 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 15986, + 17350, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -11 + "offset": 2 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -120 } } } ] ], [ - 15999, + 17359, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -47 + "offset": -134 } }, "rhs": { @@ -30827,7 +34519,7 @@ ] ], [ - 16009, + 17369, [ { "DivMod": { @@ -30853,7 +34545,7 @@ ] ], [ - 16020, + 17380, [ { "DivMod": { @@ -30872,21 +34564,21 @@ }, "remainder": { "register": "AP", - "offset": -35 + "offset": -137 } } } ] ], [ - 16029, + 17389, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -62 + "offset": -149 } }, "rhs": { @@ -30905,7 +34597,7 @@ ] ], [ - 16039, + 17399, [ { "DivMod": { @@ -30931,7 +34623,7 @@ ] ], [ - 16050, + 17410, [ { "DivMod": { @@ -30950,57 +34642,224 @@ }, "remainder": { "register": "AP", - "offset": -52 + "offset": -154 } } } ] ], [ - 16059, + 17431, [ { - "DivMod": { + "Uint512DivModByUint256": { + "dividend0": { + "Deref": { + "register": "AP", + "offset": -6 + } + }, + "dividend1": { + "Deref": { + "register": "AP", + "offset": -5 + } + }, + "dividend2": { + "Deref": { + "register": "AP", + "offset": -4 + } + }, + "dividend3": { + "Deref": { + "register": "AP", + "offset": -3 + } + }, + "divisor0": { + "Deref": { + "register": "AP", + "offset": -2 + } + }, + "divisor1": { + "Deref": { + "register": "AP", + "offset": -1 + } + }, + "quotient0": { + "register": "AP", + "offset": 0 + }, + "quotient1": { + "register": "AP", + "offset": 1 + }, + "quotient2": { + "register": "AP", + "offset": 2 + }, + "quotient3": { + "register": "AP", + "offset": 3 + }, + "remainder0": { + "register": "AP", + "offset": 4 + }, + "remainder1": { + "register": "AP", + "offset": 5 + } + } + } + ] + ], + [ + 17449, + [ + { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -78 + "offset": -19 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -21 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -9 + }, + "low": { + "register": "AP", + "offset": -10 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -18 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "high": { + "register": "AP", + "offset": -7 + }, + "low": { + "register": "AP", + "offset": -8 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -19 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -5 + }, + "low": { + "register": "AP", + "offset": -6 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -18 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -20 + } + }, + "high": { + "register": "AP", + "offset": -3 + }, + "low": { + "register": "AP", + "offset": -4 + } + } + }, + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "AP", + "offset": -17 + } + }, + "rhs": { + "Deref": { + "register": "AP", + "offset": -21 + } + }, + "high": { + "register": "AP", + "offset": -1 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -2 } } } ] ], [ - 16069, + 17478, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -35 } }, "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 + "Deref": { + "register": "AP", + "offset": -38 + } }, - "remainder": { + "dst": { "register": "AP", "offset": 1 } @@ -31009,40 +34868,39 @@ ] ], [ - 16080, + 17490, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -35 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 + "Deref": { + "register": "AP", + "offset": -40 + } }, - "remainder": { + "dst": { "register": "AP", - "offset": -69 + "offset": 0 } } } ] ], [ - 16089, + 17505, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -93 + "offset": -41 } }, "rhs": { @@ -31061,7 +34919,7 @@ ] ], [ - 16099, + 17515, [ { "DivMod": { @@ -31087,7 +34945,7 @@ ] ], [ - 16110, + 17526, [ { "DivMod": { @@ -31106,21 +34964,21 @@ }, "remainder": { "register": "AP", - "offset": -86 + "offset": -38 } } } ] ], [ - 16119, + 17535, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -57 } }, "rhs": { @@ -31139,7 +34997,7 @@ ] ], [ - 16129, + 17545, [ { "DivMod": { @@ -31165,7 +35023,7 @@ ] ], [ - 16140, + 17556, [ { "DivMod": { @@ -31184,21 +35042,21 @@ }, "remainder": { "register": "AP", - "offset": -103 + "offset": -55 } } } ] ], [ - 16149, + 17565, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -118 + "offset": -72 } }, "rhs": { @@ -31217,7 +35075,7 @@ ] ], [ - 16159, + 17575, [ { "DivMod": { @@ -31243,7 +35101,7 @@ ] ], [ - 16170, + 17586, [ { "DivMod": { @@ -31262,21 +35120,21 @@ }, "remainder": { "register": "AP", - "offset": -120 + "offset": -74 } } } ] ], [ - 16179, + 17595, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -134 + "offset": -88 } }, "rhs": { @@ -31295,7 +35153,7 @@ ] ], [ - 16189, + 17605, [ { "DivMod": { @@ -31321,7 +35179,7 @@ ] ], [ - 16200, + 17616, [ { "DivMod": { @@ -31340,21 +35198,21 @@ }, "remainder": { "register": "AP", - "offset": -137 + "offset": -87 } } } ] ], [ - 16209, + 17625, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -149 + "offset": -103 } }, "rhs": { @@ -31373,7 +35231,7 @@ ] ], [ - 16219, + 17635, [ { "DivMod": { @@ -31399,7 +35257,7 @@ ] ], [ - 16230, + 17646, [ { "DivMod": { @@ -31418,14 +35276,14 @@ }, "remainder": { "register": "AP", - "offset": -154 + "offset": -106 } } } ] ], [ - 16254, + 17658, [ { "TestLessThan": { @@ -31447,7 +35305,7 @@ ] ], [ - 16279, + 17683, [ { "TestLessThan": { @@ -31469,7 +35327,7 @@ ] ], [ - 16299, + 17703, [ { "TestLessThan": { @@ -31491,512 +35349,258 @@ ] ], [ - 16344, + 17739, [ { - "SystemCall": { - "system": { + "Uint512DivModByUint256": { + "dividend0": { "Deref": { "register": "AP", - "offset": -695 - } - } - } - } - ] - ], - [ - 16356, - [ - { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -699 - }, - "b": { - "Immediate": "0x8" - } - } - } - } - } - ] - ], - [ - 16367, - [ - { - "SystemCall": { - "system": { - "BinOp": { - "op": "Add", - "a": { - "register": "AP", - "offset": -703 - }, - "b": { - "Immediate": "0x10" - } + "offset": -6 } - } - } - } - ] - ], - [ - 16413, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16429, - [ - { - "DivMod": { - "lhs": { + }, + "dividend1": { "Deref": { "register": "AP", - "offset": -669 + "offset": -5 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16439, - [ - { - "DivMod": { - "lhs": { + "dividend2": { "Deref": { "register": "AP", - "offset": -1 + "offset": -4 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 - } - } - } - ] - ], - [ - 16450, - [ - { - "DivMod": { - "lhs": { + "dividend3": { "Deref": { "register": "AP", - "offset": 2 + "offset": -3 } }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -683 - } - } - } - ] - ], - [ - 16459, - [ - { - "DivMod": { - "lhs": { + "divisor0": { "Deref": { "register": "AP", - "offset": -684 + "offset": -2 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16469, - [ - { - "DivMod": { - "lhs": { + "divisor1": { "Deref": { "register": "AP", "offset": -1 } }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { + "quotient0": { "register": "AP", "offset": 0 }, - "remainder": { + "quotient1": { "register": "AP", "offset": 1 - } - } - } - ] - ], - [ - 16480, - [ - { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" }, - "quotient": { + "quotient2": { "register": "AP", - "offset": -1 + "offset": 2 }, - "remainder": { - "register": "FP", - "offset": -7 - } - } - } - ] - ], - [ - 16489, - [ - { - "AllocSegment": { - "dst": { - "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16506, - [ - { - "AllocSegment": { - "dst": { + "quotient3": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16563, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": -4 - } - } - } - } - ] - ], - [ - 16570, - [ - { - "AllocConstantSize": { - "size": { - "Immediate": "0x4" + "offset": 3 }, - "dst": { + "remainder0": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16574, - [ - { - "AllocSegment": { - "dst": { + "offset": 4 + }, + "remainder1": { "register": "AP", - "offset": 0 - } - } - } - ] - ], - [ - 16609, - [ - { - "SystemCall": { - "system": { - "Deref": { - "register": "FP", - "offset": 1 - } + "offset": 5 } } } ] ], [ - 16682, + 17757, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -2 + "offset": -19 } }, "rhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -21 } }, - "quotient": { + "high": { "register": "AP", - "offset": 5 + "offset": -9 }, - "remainder": { + "low": { "register": "AP", - "offset": 6 + "offset": -10 } } - } - ] - ], - [ - 16688, - [ + }, { - "TestLessThan": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -18 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -21 + } }, - "dst": { + "high": { "register": "AP", - "offset": -3 + "offset": -7 + }, + "low": { + "register": "AP", + "offset": -8 } } - } - ] - ], - [ - 16755, - [ + }, { "WideMul128": { "lhs": { "Deref": { - "register": "FP", - "offset": -8 + "register": "AP", + "offset": -19 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -6 + "register": "AP", + "offset": -20 } }, "high": { "register": "AP", - "offset": 0 + "offset": -5 }, "low": { "register": "AP", - "offset": 1 + "offset": -6 } } - } - ] - ], - [ - 16757, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { - "register": "FP", - "offset": -8 + "register": "AP", + "offset": -18 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -20 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 1 + "offset": -3 }, - "remainder": { + "low": { "register": "AP", - "offset": 0 + "offset": -4 } } - } - ] - ], - [ - 16767, - [ + }, { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": -17 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "AP", + "offset": -21 + } }, - "quotient": { + "high": { "register": "AP", - "offset": 0 + "offset": -1 }, - "remainder": { + "low": { "register": "AP", - "offset": 1 + "offset": -2 } } } ] ], [ - 16778, + 17786, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -35 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 + "Deref": { + "register": "AP", + "offset": -38 + } }, - "remainder": { + "dst": { "register": "AP", - "offset": -13 + "offset": 1 } } } ] ], [ - 16787, + 17798, [ { - "WideMul128": { + "TestLessThan": { "lhs": { "Deref": { - "register": "FP", - "offset": -8 + "register": "AP", + "offset": -35 } }, "rhs": { "Deref": { - "register": "FP", - "offset": -5 + "register": "AP", + "offset": -40 } }, - "high": { + "dst": { "register": "AP", "offset": 0 - }, - "low": { - "register": "AP", - "offset": 1 } } } ] ], [ - 16789, + 17813, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -8 + "register": "AP", + "offset": -41 } }, "rhs": { @@ -32015,7 +35619,7 @@ ] ], [ - 16799, + 17823, [ { "DivMod": { @@ -32041,91 +35645,40 @@ ] ], [ - 16810, + 17834, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "quotient": { - "register": "AP", - "offset": -1 - }, - "remainder": { - "register": "AP", - "offset": -13 - } - } - } - ] - ], - [ - 16820, - [ - { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 - } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 - } - } - } - ] - ], - [ - 16842, - [ - { - "WideMul128": { - "lhs": { - "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -6 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": 1 + "offset": -38 } } } ] ], [ - 16844, + 17843, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": -57 } }, "rhs": { @@ -32144,7 +35697,7 @@ ] ], [ - 16854, + 17853, [ { "DivMod": { @@ -32170,7 +35723,7 @@ ] ], [ - 16865, + 17864, [ { "DivMod": { @@ -32189,94 +35742,99 @@ }, "remainder": { "register": "AP", - "offset": -13 + "offset": -55 } } } ] ], [ - 16875, + 17873, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -72 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 16898, + 17883, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 16920, + 17894, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -5 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": 0 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": 1 + "offset": -74 } } } ] ], [ - 16922, + 17903, [ { "DivMod": { "lhs": { "Deref": { - "register": "FP", - "offset": -7 + "register": "AP", + "offset": -88 } }, "rhs": { @@ -32295,7 +35853,7 @@ ] ], [ - 16932, + 17913, [ { "DivMod": { @@ -32321,7 +35879,7 @@ ] ], [ - 16943, + 17924, [ { "DivMod": { @@ -32340,379 +35898,364 @@ }, "remainder": { "register": "AP", - "offset": -13 + "offset": -87 } } } ] ], [ - 16953, + 17933, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -103 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 16972, + 17943, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": -1 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, - "dst": { + "quotient": { "register": "AP", - "offset": -1 + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 } } } ] ], [ - 16995, + 17954, [ { - "TestLessThan": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 0 + "offset": 2 } }, "rhs": { "Immediate": "0x100000000000000000000000000000000" }, - "dst": { + "quotient": { "register": "AP", "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -106 } } } ] ], [ - 17014, + 17974, [ { - "TestLessThan": { - "lhs": { + "SystemCall": { + "system": { "Deref": { "register": "AP", - "offset": 0 + "offset": -668 } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 } } } ] ], [ - 17033, + 17986, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -672 + }, + "b": { + "Immediate": "0x8" + } } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, - "dst": { - "register": "AP", - "offset": -1 } } } ] ], [ - 17056, + 17997, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": 0 + "SystemCall": { + "system": { + "BinOp": { + "op": "Add", + "a": { + "register": "AP", + "offset": -676 + }, + "b": { + "Immediate": "0x10" + } } - }, - "rhs": { - "Immediate": "0x100000000000000000000000000000000" - }, + } + } + } + ] + ], + [ + 18043, + [ + { + "AllocSegment": { "dst": { "register": "AP", - "offset": -1 + "offset": 0 } } } ] ], [ - 17078, + 18059, [ { - "Uint512DivModByUint256": { - "dividend0": { - "Deref": { - "register": "AP", - "offset": -4 - } - }, - "dividend1": { - "Deref": { - "register": "AP", - "offset": -3 - } - }, - "dividend2": { - "Deref": { - "register": "AP", - "offset": -2 - } - }, - "dividend3": { + "DivMod": { + "lhs": { "Deref": { "register": "AP", - "offset": -1 - } - }, - "divisor0": { - "Deref": { - "register": "FP", - "offset": -4 - } - }, - "divisor1": { - "Deref": { - "register": "FP", - "offset": -3 + "offset": -642 } }, - "quotient0": { - "register": "AP", - "offset": 0 + "rhs": { + "Immediate": "0x10000000000000000" }, - "quotient1": { + "quotient": { "register": "AP", "offset": 1 }, - "quotient2": { - "register": "AP", - "offset": 2 - }, - "quotient3": { - "register": "AP", - "offset": 3 - }, - "remainder0": { - "register": "AP", - "offset": 4 - }, - "remainder1": { + "remainder": { "register": "AP", - "offset": 5 + "offset": 0 } } } ] ], [ - 17096, + 18069, [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -19 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -9 + "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -10 + "offset": 1 } } - }, + } + ] + ], + [ + 18080, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -7 + "offset": -1 }, - "low": { + "remainder": { "register": "AP", - "offset": -8 + "offset": -656 } } - }, + } + ] + ], + [ + 18089, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -19 + "offset": -657 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -3 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -5 + "offset": 1 }, - "low": { + "remainder": { "register": "AP", - "offset": -6 + "offset": 0 } } - }, + } + ] + ], + [ + 18099, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -18 + "offset": -1 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -3 - } + "Immediate": "0x10000000000000000" }, - "high": { + "quotient": { "register": "AP", - "offset": -3 + "offset": 0 }, - "low": { + "remainder": { "register": "AP", - "offset": -4 + "offset": 1 } } - }, + } + ] + ], + [ + 18110, + [ { - "WideMul128": { + "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -17 + "offset": 2 } }, "rhs": { - "Deref": { - "register": "FP", - "offset": -4 - } + "Immediate": "0x100000000000000000000000000000000" }, - "high": { + "quotient": { "register": "AP", "offset": -1 }, - "low": { + "remainder": { + "register": "FP", + "offset": -7 + } + } + } + ] + ], + [ + 18119, + [ + { + "AllocSegment": { + "dst": { "register": "AP", - "offset": -2 + "offset": 0 } } } ] ], [ - 17125, + 18136, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { - "Deref": { - "register": "FP", - "offset": -3 - } - }, + "AllocSegment": { "dst": { "register": "AP", - "offset": 1 + "offset": 0 } } } ] ], [ - 17137, + 18193, [ { - "TestLessThan": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -35 - } - }, - "rhs": { + "SystemCall": { + "system": { "Deref": { "register": "FP", "offset": -4 } + } + } + } + ] + ], + [ + 18200, + [ + { + "AllocConstantSize": { + "size": { + "Immediate": "0x4" }, "dst": { "register": "AP", @@ -32723,24 +36266,11 @@ ] ], [ - 17152, + 18204, [ { - "DivMod": { - "lhs": { - "Deref": { - "register": "AP", - "offset": -41 - } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { + "AllocSegment": { + "dst": { "register": "AP", "offset": 0 } @@ -32749,102 +36279,93 @@ ] ], [ - 17162, + 18239, [ { - "DivMod": { - "lhs": { + "SystemCall": { + "system": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": 1 } - }, - "rhs": { - "Immediate": "0x10000000000000000" - }, - "quotient": { - "register": "AP", - "offset": 0 - }, - "remainder": { - "register": "AP", - "offset": 1 } } } ] ], [ - 17173, + 18312, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": 2 + "offset": -2 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "AP", + "offset": -1 + } }, "quotient": { "register": "AP", - "offset": -1 + "offset": 5 }, "remainder": { "register": "AP", - "offset": -38 + "offset": 6 } } } ] ], [ - 17182, + 18318, [ { - "DivMod": { + "TestLessThan": { "lhs": { "Deref": { "register": "AP", - "offset": -57 + "offset": 0 } }, "rhs": { "Immediate": "0x10000000000000000" }, - "quotient": { - "register": "AP", - "offset": 1 - }, - "remainder": { + "dst": { "register": "AP", - "offset": 0 + "offset": -3 } } } ] ], [ - 17192, + 18385, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { - "register": "AP", - "offset": -1 + "register": "FP", + "offset": -6 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Deref": { + "register": "FP", + "offset": -4 + } }, - "quotient": { + "high": { "register": "AP", "offset": 0 }, - "remainder": { + "low": { "register": "AP", "offset": 1 } @@ -32853,40 +36374,40 @@ ] ], [ - 17203, + 18387, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "FP", + "offset": -6 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Immediate": "0x10000000000000000" }, "quotient": { "register": "AP", - "offset": -1 + "offset": 1 }, "remainder": { "register": "AP", - "offset": -55 + "offset": 0 } } } ] ], [ - 17212, + 18397, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -72 + "offset": -1 } }, "rhs": { @@ -32894,77 +36415,80 @@ }, "quotient": { "register": "AP", - "offset": 1 + "offset": 0 }, "remainder": { "register": "AP", - "offset": 0 + "offset": 1 } } } ] ], [ - 17222, + 18408, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -1 + "offset": 2 } }, "rhs": { - "Immediate": "0x10000000000000000" + "Immediate": "0x100000000000000000000000000000000" }, "quotient": { "register": "AP", - "offset": 0 + "offset": -1 }, "remainder": { "register": "AP", - "offset": 1 + "offset": -13 } } } ] ], [ - 17233, + 18417, [ { - "DivMod": { + "WideMul128": { "lhs": { "Deref": { - "register": "AP", - "offset": 2 + "register": "FP", + "offset": -6 } }, "rhs": { - "Immediate": "0x100000000000000000000000000000000" + "Deref": { + "register": "FP", + "offset": -3 + } }, - "quotient": { + "high": { "register": "AP", - "offset": -1 + "offset": 0 }, - "remainder": { + "low": { "register": "AP", - "offset": -74 + "offset": 1 } } } ] ], [ - 17242, + 18419, [ { "DivMod": { "lhs": { "Deref": { - "register": "AP", - "offset": -88 + "register": "FP", + "offset": -6 } }, "rhs": { @@ -32983,7 +36507,7 @@ ] ], [ - 17252, + 18429, [ { "DivMod": { @@ -33009,7 +36533,7 @@ ] ], [ - 17263, + 18440, [ { "DivMod": { @@ -33028,21 +36552,223 @@ }, "remainder": { "register": "AP", - "offset": -87 + "offset": -13 + } + } + } + ] + ], + [ + 18450, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 18472, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -4 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 18474, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 1 + }, + "remainder": { + "register": "AP", + "offset": 0 } } } ] ], [ - 17272, + 18484, [ { "DivMod": { "lhs": { "Deref": { "register": "AP", - "offset": -103 + "offset": -1 + } + }, + "rhs": { + "Immediate": "0x10000000000000000" + }, + "quotient": { + "register": "AP", + "offset": 0 + }, + "remainder": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 18495, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 2 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "quotient": { + "register": "AP", + "offset": -1 + }, + "remainder": { + "register": "AP", + "offset": -13 + } + } + } + ] + ], + [ + 18505, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 18528, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 18550, + [ + { + "WideMul128": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -5 + } + }, + "rhs": { + "Deref": { + "register": "FP", + "offset": -3 + } + }, + "high": { + "register": "AP", + "offset": 0 + }, + "low": { + "register": "AP", + "offset": 1 + } + } + } + ] + ], + [ + 18552, + [ + { + "DivMod": { + "lhs": { + "Deref": { + "register": "FP", + "offset": -5 } }, "rhs": { @@ -33061,7 +36787,7 @@ ] ], [ - 17282, + 18562, [ { "DivMod": { @@ -33087,7 +36813,7 @@ ] ], [ - 17293, + 18573, [ { "DivMod": { @@ -33106,14 +36832,80 @@ }, "remainder": { "register": "AP", - "offset": -106 + "offset": -13 + } + } + } + ] + ], + [ + 18583, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 18607, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 } } } ] ], [ - 17307, + 18632, + [ + { + "TestLessThan": { + "lhs": { + "Deref": { + "register": "AP", + "offset": 0 + } + }, + "rhs": { + "Immediate": "0x100000000000000000000000000000000" + }, + "dst": { + "register": "AP", + "offset": -1 + } + } + } + ] + ], + [ + 18656, [ { "TestLessThan": { @@ -33135,7 +36927,7 @@ ] ], [ - 17425, + 18774, [ { "AllocSegment": { @@ -33148,7 +36940,7 @@ ] ], [ - 17448, + 18797, [ { "TestLessThanOrEqual": { @@ -33173,7 +36965,7 @@ ] ], [ - 17523, + 18872, [ { "AllocSegment": { @@ -33186,7 +36978,7 @@ ] ], [ - 17578, + 18927, [ { "DivMod": { @@ -33215,7 +37007,7 @@ ] ], [ - 17584, + 18933, [ { "TestLessThan": { @@ -33237,7 +37029,7 @@ ] ], [ - 17597, + 18946, [ { "TestLessThan": { @@ -33259,7 +37051,7 @@ ] ], [ - 17607, + 18956, [ { "TestLessThan": { @@ -33281,7 +37073,7 @@ ] ], [ - 17655, + 19004, [ { "DivMod": { @@ -33310,7 +37102,7 @@ ] ], [ - 17661, + 19010, [ { "TestLessThan": { @@ -33332,7 +37124,7 @@ ] ], [ - 17677, + 19026, [ { "TestLessThan": { @@ -33354,7 +37146,7 @@ ] ], [ - 17687, + 19036, [ { "TestLessThan": { @@ -33376,7 +37168,7 @@ ] ], [ - 17710, + 19059, [ { "AllocSegment": { @@ -33389,7 +37181,7 @@ ] ], [ - 17724, + 19073, [ { "AllocSegment": { @@ -33402,7 +37194,7 @@ ] ], [ - 17743, + 19092, [ { "AllocSegment": { @@ -33415,7 +37207,7 @@ ] ], [ - 17757, + 19106, [ { "AllocSegment": { @@ -33432,14 +37224,14 @@ "EXTERNAL": [ { "selector": "0x1143aa89c8e3ebf8ed14df2a3606c1cd2dd513fac8040b0f8ab441f5c52fe4", - "offset": 3981, + "offset": 4442, "builtins": [ "range_check" ] }, { "selector": "0x3541591104188daef4379e06e92ecce09094a3b381da2e654eb041d00566d8", - "offset": 5511, + "offset": 5972, "builtins": [ "range_check", "range_check96" @@ -33447,35 +37239,35 @@ }, { "selector": "0x3c118a68e16e12e97ed25cb4901c12f4d3162818669cc44c391d8049924c14", - "offset": 1226, + "offset": 1687, "builtins": [ "range_check" ] }, { "selector": "0x5562b3e932b4d139366854d5a2e578382e6a3b6572ac9943d55e7efbe43d00", - "offset": 3383, + "offset": 3844, "builtins": [ "range_check" ] }, { "selector": "0x600c98a299d72ef1e09a2e1503206fbc76081233172c65f7e2438ef0069d8d", - "offset": 4120, + "offset": 4581, "builtins": [ "range_check" ] }, { "selector": "0x62c83572d28cb834a3de3c1e94977a4191469a4a8c26d1d7bc55305e640ed5", - "offset": 3564, + "offset": 4025, "builtins": [ "range_check" ] }, { "selector": "0x679c22735055a10db4f275395763a3752a1e3a3043c192299ab6b574fba8d6", - "offset": 4966, + "offset": 5427, "builtins": [ "range_check", "ec_op" @@ -33483,7 +37275,7 @@ }, { "selector": "0x7772be8b80a8a33dc6c1f9a6ab820c02e537c73e859de67f288c70f92571bb", - "offset": 4611, + "offset": 5072, "builtins": [ "pedersen", "range_check", @@ -33499,21 +37291,21 @@ }, { "selector": "0xe7510edcf6e9f1b70f7bd1f488767b50f0363422f3c563160ab77adf62467b", - "offset": 2107, + "offset": 2568, "builtins": [ "range_check" ] }, { "selector": "0xf818e4530ec36b83dfe702489b4df537308c3b798b0cc120e32c2056d68b7d", - "offset": 2958, + "offset": 3419, "builtins": [ "range_check" ] }, { "selector": "0x10d2fede95e3ec06a875a67219425c27c5bd734d57f1b221d729a2337b6b556", - "offset": 2506, + "offset": 2967, "builtins": [ "range_check", "segment_arena" @@ -33521,36 +37313,43 @@ }, { "selector": "0x12ead94ae9d3f9d2bdb6b847cf255f1f398193a1f88884a0ae8e18f24a037b6", - "offset": 5227, + "offset": 5688, "builtins": [ "range_check" ] }, { "selector": "0x14dae1999ae9ab799bc72def6dc6e90890cf8ac0d64525021b7e71d05cb13e8", - "offset": 712, + "offset": 1173, "builtins": [ "range_check" ] }, { "selector": "0x169f135eddda5ab51886052d777a57f2ea9c162d713691b5e04a6d4ed71d47f", - "offset": 2617, + "offset": 3078, "builtins": [ "range_check" ] }, { "selector": "0x1ae1a515cf2d214b29bdf63a79ee2d490efd4dd1acc99d383a8e549c3cecb5d", - "offset": 5077, + "offset": 5538, "builtins": [ "pedersen", "range_check" ] }, + { + "selector": "0x1e4089d1f1349077b1970f9937c904e27c4582b49a60b6078946dba95bc3c08", + "offset": 1002, + "builtins": [ + "range_check" + ] + }, { "selector": "0x23039bef544cff56442d9f61ae9b13cf9e36fcce009102c5b678aac93f37b36", - "offset": 1048, + "offset": 1509, "builtins": [ "range_check" ] @@ -33564,21 +37363,28 @@ }, { "selector": "0x2d7cf5d5a324a320f9f37804b1615a533fde487400b41af80f13f7ac5581325", - "offset": 2281, + "offset": 2742, "builtins": [ "range_check" ] }, { "selector": "0x30f842021fbf02caf80d09a113997c1e00a32870eee0c6136bed27acb348bea", - "offset": 4759, + "offset": 5220, + "builtins": [ + "range_check" + ] + }, + { + "selector": "0x31401f504973a5e8e1bb41e9c592519e3aa0b8cf6bbfb9c91b532aab8db54b0", + "offset": 712, "builtins": [ "range_check" ] }, { "selector": "0x317eb442b72a9fae758d4fb26830ed0d9f31c8e7da4dbff4e8c59ea6a158e7f", - "offset": 4387, + "offset": 4848, "builtins": [ "pedersen", "range_check" @@ -33586,28 +37392,28 @@ }, { "selector": "0x32564d7e0fe091d49b4c20f4632191e4ed6986bf993849879abfef9465def25", - "offset": 3749, + "offset": 4210, "builtins": [ "range_check" ] }, { "selector": "0x3604cea1cdb094a73a31144f14a3e5861613c008e1e879939ebc4827d10cd50", - "offset": 1515, + "offset": 1976, "builtins": [ "range_check" ] }, { "selector": "0x382be990ca34815134e64a9ac28f41a907c62e5ad10547f97174362ab94dc89", - "offset": 3062, + "offset": 3523, "builtins": [ "range_check" ] }, { "selector": "0x38be5d5f7bf135b52888ba3e440a457d11107aca3f6542e574b016bf3f074d8", - "offset": 3166, + "offset": 3627, "builtins": [ "range_check", "bitwise" @@ -33615,7 +37421,7 @@ }, { "selector": "0x3a6a8bae4c51d5959683ae246347ffdd96aa5b2bfa68cc8c3a6a7c2ed0be331", - "offset": 1806, + "offset": 2267, "builtins": [ "range_check" ] @@ -33629,7 +37435,7 @@ }, { "selector": "0x3d3da80997f8be5d16e9ae7ee6a4b5f7191d60765a1a6c219ab74269c85cf97", - "offset": 5383, + "offset": 5844, "builtins": [ "range_check", "range_check96", @@ -33639,14 +37445,14 @@ }, { "selector": "0x3d95049b565ec2d4197a55108ef03996381d31c84acf392a0a42b28163d69d1", - "offset": 3279, + "offset": 3740, "builtins": [ "range_check" ] }, { "selector": "0x3eb640b15f75fcc06d43182cdb94ed38c8e71755d5fb57c16dd673b466db1d4", - "offset": 3842, + "offset": 4303, "builtins": [ "range_check" ] @@ -33655,14 +37461,14 @@ "L1_HANDLER": [ { "selector": "0x205500a208d0d49d79197fea83cc3f5fde99ac2e1909ae0a5d9f394c0c52ed0", - "offset": 5795, + "offset": 6256, "builtins": [ "range_check" ] }, { "selector": "0x39edbbb129ad752107a94d40c3873cae369a46fd2fc578d075679aa67e85d12", - "offset": 5634, + "offset": 6095, "builtins": [ "range_check" ] @@ -33671,7 +37477,7 @@ "CONSTRUCTOR": [ { "selector": "0x28ffe4ff0f226a9107253e17a904099aa4f63a02a5621de0576e5aa71bc5194", - "offset": 6045, + "offset": 6506, "builtins": [ "range_check" ] diff --git a/crates/blockifier/src/execution/entry_point.rs b/crates/blockifier/src/execution/entry_point.rs index 18ee0fef04..907a39646e 100644 --- a/crates/blockifier/src/execution/entry_point.rs +++ b/crates/blockifier/src/execution/entry_point.rs @@ -20,7 +20,9 @@ use crate::execution::call_info::CallInfo; use crate::execution::common_hints::ExecutionMode; use crate::execution::contract_class::TrackedResource; use crate::execution::errors::{ - ConstructorEntryPointExecutionError, EntryPointExecutionError, PreExecutionError, + ConstructorEntryPointExecutionError, + EntryPointExecutionError, + PreExecutionError, }; use crate::execution::execution_utils::execute_entry_point_call_wrapper; use crate::state::state_api::{State, StateResult};