From 65769ce23dfb42ee7cc292f70ed733a6d939b842 Mon Sep 17 00:00:00 2001 From: hana <81144685+2501babe@users.noreply.github.com> Date: Thu, 18 Aug 2022 12:16:02 -0700 Subject: [PATCH] Update rust to 1.60, solana to 1.11.6 (#3492) also change bpf to sbf throughout the codebase Co-authored-by: Jon Cinque --- .../pull-request-binary-oracle-pair.yml | 6 +- .github/workflows/pull-request-examples.yml | 6 +- .../pull-request-feature-proposal.yml | 6 +- .github/workflows/pull-request-governance.yml | 6 +- .github/workflows/pull-request-libraries.yml | 6 +- .github/workflows/pull-request-memo.yml | 6 +- .../workflows/pull-request-name-service.yml | 6 +- .github/workflows/pull-request-record.yml | 6 +- .../workflows/pull-request-shared-memory.yml | 6 +- .github/workflows/pull-request-stake-pool.yml | 10 +- .../workflows/pull-request-token-lending.yml | 8 +- .github/workflows/pull-request-token-swap.yml | 12 +- .github/workflows/pull-request-token.yml | 14 +- .github/workflows/pull-request.yml | 2 +- Anchor.toml | 2 +- Cargo.lock | 1301 ++++++++--------- README.md | 12 +- .../program-test/Cargo.toml | 8 +- .../program-test/tests/create_idempotent.rs | 2 +- .../program-test/tests/extended_mint.rs | 2 +- ...process_create_associated_token_account.rs | 2 +- .../program-test/tests/recover_nested.rs | 2 +- .../program-test/tests/spl_token_create.rs | 2 +- associated-token-account/program/Cargo.toml | 4 +- associated-token-account/program/run-tests.sh | 4 +- binary-option/program/Cargo.toml | 4 +- binary-oracle-pair/program/Cargo.toml | 8 +- binary-oracle-pair/program/tests/tests.rs | 2 +- ci/{cargo-test-bpf.sh => cargo-test-sbf.sh} | 6 +- ci/install-program-deps.sh | 2 +- ci/solana-version.sh | 2 +- .../rust/cross-program-invocation/Cargo.toml | 8 +- .../tests/functional.rs | 2 +- examples/rust/custom-heap/Cargo.toml | 8 +- examples/rust/logging/Cargo.toml | 8 +- examples/rust/sysvar/Cargo.toml | 8 +- examples/rust/transfer-lamports/Cargo.toml | 8 +- farms/docs/fund.md | 2 +- farms/docs/governance.md | 2 +- farms/docs/quick_start.md | 8 +- farms/farm-sdk/build.rs | 2 +- farms/vaults/Cargo.toml | 2 +- feature-proposal/cli/Cargo.toml | 10 +- feature-proposal/program/Cargo.toml | 8 +- feature-proposal/program/run-tests.sh | 4 +- feature-proposal/program/tests/functional.rs | 2 +- governance/addin-api/Cargo.toml | 2 +- governance/addin-mock/program/Cargo.toml | 8 +- governance/chat/program/Cargo.toml | 8 +- .../program/tests/process_post_message.rs | 2 +- governance/program/Cargo.toml | 8 +- .../program/tests/process_add_signatory.rs | 2 +- .../program/tests/process_cancel_proposal.rs | 2 +- governance/program/tests/process_cast_vote.rs | 2 +- .../tests/process_create_governance.rs | 2 +- .../tests/process_create_mint_governance.rs | 2 +- .../tests/process_create_native_treasury.rs | 2 +- .../process_create_program_governance.rs | 2 +- .../program/tests/process_create_proposal.rs | 2 +- .../program/tests/process_create_realm.rs | 2 +- .../tests/process_create_token_governance.rs | 2 +- .../process_create_token_owner_record.rs | 2 +- .../tests/process_deposit_governing_tokens.rs | 2 +- .../tests/process_execute_transaction.rs | 2 +- .../program/tests/process_finalize_vote.rs | 2 +- .../tests/process_flag_transaction_error.rs | 2 +- .../tests/process_insert_transaction.rs | 2 +- .../program/tests/process_relinquish_vote.rs | 2 +- .../program/tests/process_remove_signatory.rs | 2 +- .../tests/process_remove_transaction.rs | 2 +- .../tests/process_set_governance_config.rs | 2 +- .../tests/process_set_governance_delegate.rs | 2 +- .../tests/process_set_realm_authority.rs | 2 +- .../program/tests/process_set_realm_config.rs | 2 +- .../tests/process_sign_off_proposal.rs | 2 +- .../tests/process_update_program_metadata.rs | 2 +- .../process_withdraw_governing_tokens.rs | 2 +- governance/program/tests/program_test/mod.rs | 24 +- .../tests/setup_realm_with_all_addins.rs | 2 +- ...setup_realm_with_max_voter_weight_addin.rs | 2 +- .../setup_realm_with_voter_weight_addin.rs | 2 +- .../use_proposals_with_multiple_options.rs | 2 +- .../tests/use_realm_with_all_addins.rs | 2 +- .../use_realm_with_max_voter_weight_addin.rs | 2 +- .../use_realm_with_voter_weight_addin.rs | 2 +- governance/program/tests/use_veto_vote.rs | 2 +- governance/test-sdk/Cargo.toml | 6 +- governance/test-sdk/src/addins.rs | 2 +- governance/tools/Cargo.toml | 2 +- libraries/math/Cargo.toml | 8 +- libraries/math/tests/instruction_count.rs | 2 +- memo/program/Cargo.toml | 8 +- memo/program/tests/functional.rs | 2 +- name-service/program/Cargo.toml | 8 +- name-service/program/tests/functional.rs | 2 +- record/program/Cargo.toml | 8 +- record/program/tests/functional.rs | 2 +- rust-toolchain.toml | 2 +- shared-memory/program/Cargo.toml | 8 +- shared-memory/program/tests/shared-memory.rs | 6 +- stake-pool/cli/Cargo.toml | 18 +- stake-pool/cli/src/client.rs | 18 +- stake-pool/program/Cargo.toml | 10 +- .../tests/create_pool_token_metadata.rs | 2 +- stake-pool/program/tests/decrease.rs | 2 +- stake-pool/program/tests/deposit.rs | 2 +- stake-pool/program/tests/deposit_authority.rs | 2 +- stake-pool/program/tests/deposit_sol.rs | 2 +- stake-pool/program/tests/force_destake.rs | 2 +- stake-pool/program/tests/huge_pool.rs | 2 +- stake-pool/program/tests/increase.rs | 2 +- stake-pool/program/tests/initialize.rs | 2 +- stake-pool/program/tests/set_deposit_fee.rs | 2 +- stake-pool/program/tests/set_epoch_fee.rs | 2 +- .../program/tests/set_funding_authority.rs | 2 +- stake-pool/program/tests/set_manager.rs | 2 +- stake-pool/program/tests/set_preferred.rs | 2 +- stake-pool/program/tests/set_referral_fee.rs | 2 +- stake-pool/program/tests/set_staker.rs | 2 +- .../program/tests/set_withdrawal_fee.rs | 2 +- .../tests/update_pool_token_metadata.rs | 2 +- .../tests/update_stake_pool_balance.rs | 2 +- .../tests/update_validator_list_balance.rs | 2 +- stake-pool/program/tests/vsa_add.rs | 2 +- stake-pool/program/tests/vsa_remove.rs | 2 +- stake-pool/program/tests/withdraw.rs | 2 +- stake-pool/program/tests/withdraw_sol.rs | 2 +- stake-pool/py/tests/test_bot_rebalance.py | 9 +- stake-pool/py/tests/test_stake.py | 2 +- stateless-asks/program/Cargo.toml | 8 +- token-lending/README.md | 2 +- token-lending/cli/Cargo.toml | 12 +- token-lending/flash_loan_receiver/Cargo.toml | 2 +- token-lending/program/Cargo.toml | 8 +- .../tests/borrow_obligation_liquidity.rs | 2 +- .../tests/deposit_obligation_collateral.rs | 2 +- .../tests/deposit_reserve_liquidity.rs | 2 +- token-lending/program/tests/flash_loan.rs | 2 +- .../program/tests/helpers/genesis.rs | 2 +- .../program/tests/init_lending_market.rs | 2 +- .../program/tests/init_obligation.rs | 2 +- token-lending/program/tests/init_reserve.rs | 2 +- .../program/tests/liquidate_obligation.rs | 2 +- .../program/tests/modify_reserve_config.rs | 2 +- .../program/tests/obligation_end_to_end.rs | 2 +- .../tests/redeem_reserve_collateral.rs | 2 +- .../program/tests/refresh_obligation.rs | 2 +- .../program/tests/refresh_reserve.rs | 2 +- .../tests/repay_obligation_liquidity.rs | 2 +- .../program/tests/set_lending_market_owner.rs | 2 +- .../tests/withdraw_obligation_collateral.rs | 2 +- token-swap/README.md | 4 +- token-swap/js/package.json | 2 +- token-swap/program/Cargo.toml | 4 +- token-swap/program/fuzz/Cargo.toml | 2 +- token/cli/Cargo.toml | 20 +- token/cli/build.rs | 4 +- token/client/Cargo.toml | 6 +- token/js/package.json | 2 +- token/program-2022-test/Cargo.toml | 8 +- token/program-2022-test/build.rs | 4 +- token/program-2022-test/tests/burn.rs | 2 +- .../program-2022-test/tests/close_account.rs | 2 +- .../tests/confidential_transfer.rs | 2 +- .../tests/default_account_state.rs | 2 +- token/program-2022-test/tests/delegate.rs | 2 +- token/program-2022-test/tests/freeze.rs | 2 +- .../tests/initialize_account.rs | 2 +- .../tests/initialize_mint.rs | 2 +- .../tests/interest_bearing_mint.rs | 2 +- .../program-2022-test/tests/memo_transfer.rs | 2 +- .../tests/mint_close_authority.rs | 2 +- token/program-2022-test/tests/reallocate.rs | 2 +- token/program-2022-test/tests/sync_native.rs | 2 +- token/program-2022-test/tests/transfer.rs | 2 +- token/program-2022-test/tests/transfer_fee.rs | 2 +- token/program-2022/Cargo.toml | 10 +- .../tests/assert_instruction_count.rs | 2 +- token/program/Cargo.toml | 8 +- .../program/tests/assert_instruction_count.rs | 2 +- token/program/tests/close_account.rs | 2 +- utils/test-client/Cargo.toml | 2 +- 182 files changed, 955 insertions(+), 1061 deletions(-) rename ci/{cargo-test-bpf.sh => cargo-test-sbf.sh} (85%) diff --git a/.github/workflows/pull-request-binary-oracle-pair.yml b/.github/workflows/pull-request-binary-oracle-pair.yml index d5fa38e3057..3794607ace9 100644 --- a/.github/workflows/pull-request-binary-oracle-pair.yml +++ b/.github/workflows/pull-request-binary-oracle-pair.yml @@ -14,7 +14,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -57,4 +57,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh binary-oracle-pair + run: ./ci/cargo-test-sbf.sh binary-oracle-pair diff --git a/.github/workflows/pull-request-examples.yml b/.github/workflows/pull-request-examples.yml index 6bdccf6e607..3f7e06b26e2 100644 --- a/.github/workflows/pull-request-examples.yml +++ b/.github/workflows/pull-request-examples.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,4 +55,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh examples/rust + run: ./ci/cargo-test-sbf.sh examples/rust diff --git a/.github/workflows/pull-request-feature-proposal.yml b/.github/workflows/pull-request-feature-proposal.yml index e5ad8a7748a..f401d99892e 100644 --- a/.github/workflows/pull-request-feature-proposal.yml +++ b/.github/workflows/pull-request-feature-proposal.yml @@ -14,7 +14,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -57,4 +57,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh feature-proposal + run: ./ci/cargo-test-sbf.sh feature-proposal diff --git a/.github/workflows/pull-request-governance.yml b/.github/workflows/pull-request-governance.yml index e001f16bc4b..615fdca3c21 100644 --- a/.github/workflows/pull-request-governance.yml +++ b/.github/workflows/pull-request-governance.yml @@ -14,7 +14,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -57,4 +57,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh governance + run: ./ci/cargo-test-sbf.sh governance diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index 8afca9d17a5..57dfa68b420 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,4 +55,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh libraries + run: ./ci/cargo-test-sbf.sh libraries diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 51585f0475a..bb5a7c39b9a 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,7 +55,7 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh memo + run: ./ci/cargo-test-sbf.sh memo js-test: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 24dbe65a8a9..f3bea00e5d5 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,7 +55,7 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh name-service + run: ./ci/cargo-test-sbf.sh name-service js-test: runs-on: ubuntu-latest diff --git a/.github/workflows/pull-request-record.yml b/.github/workflows/pull-request-record.yml index c487c4b2e51..fe4e76e31c1 100644 --- a/.github/workflows/pull-request-record.yml +++ b/.github/workflows/pull-request-record.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,4 +55,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh record + run: ./ci/cargo-test-sbf.sh record diff --git a/.github/workflows/pull-request-shared-memory.yml b/.github/workflows/pull-request-shared-memory.yml index f371bd11aa8..6000ec91919 100644 --- a/.github/workflows/pull-request-shared-memory.yml +++ b/.github/workflows/pull-request-shared-memory.yml @@ -12,7 +12,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -41,7 +41,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -55,4 +55,4 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh shared-memory + run: ./ci/cargo-test-sbf.sh shared-memory diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index 04efa394ffd..8aea25904c2 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -14,7 +14,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -57,7 +57,7 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh stake-pool + run: ./ci/cargo-test-sbf.sh stake-pool - name: Upload programs uses: actions/upload-artifact@v2 @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest env: NODE_VERSION: 16.x - needs: cargo-test-bpf + needs: cargo-test-sbf steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ env.NODE_VERSION }} @@ -92,7 +92,7 @@ jobs: py-test: runs-on: ubuntu-latest - needs: cargo-test-bpf + needs: cargo-test-sbf steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index d72f0163c9c..967b3910d45 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -14,7 +14,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -43,7 +43,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -57,7 +57,7 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh token-lending + run: ./ci/cargo-test-sbf.sh token-lending - name: Upload programs uses: actions/upload-artifact@v2 @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest env: NODE_VERSION: 14.x - needs: cargo-test-bpf + needs: cargo-test-sbf steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ env.NODE_VERSION }} diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index b43a514bc24..c74382e5712 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -16,7 +16,7 @@ on: - 'ci/*-version.sh' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -45,7 +45,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -59,14 +59,14 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test - run: ./ci/cargo-test-bpf.sh token-swap + run: ./ci/cargo-test-sbf.sh token-swap - name: Build production version run: | - cargo +"$RUST_STABLE" build-bpf \ + cargo +"$RUST_STABLE" build-sbf \ --manifest-path=token-swap/program/Cargo.toml \ --features production \ - --bpf-out-dir target/deploy-production + --sbf-out-dir target/deploy-production env: SWAP_PROGRAM_OWNER_FEE_ADDRESS: HfoTxFR1Tm6kGmWgYWD6J7YHVy1UwqSULUGVLXkJqaKN @@ -85,7 +85,7 @@ jobs: runs-on: ubuntu-latest env: NODE_VERSION: 14.x - needs: cargo-test-bpf + needs: cargo-test-sbf steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ env.NODE_VERSION }} diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index c555d8e1af5..760d92b9819 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -16,7 +16,7 @@ on: - '.github/workflows/pull-request-token.yml' jobs: - cargo-test-bpf: + cargo-test-sbf: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -45,7 +45,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: @@ -59,10 +59,10 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Build and test token - run: ./ci/cargo-test-bpf.sh token + run: ./ci/cargo-test-sbf.sh token - name: Build and test ATA - run: ./ci/cargo-test-bpf.sh associated-token-account + run: ./ci/cargo-test-sbf.sh associated-token-account - name: Build and test token-2022 with "serde" activated run: | @@ -79,7 +79,7 @@ jobs: path: "target/deploy/*.so" if-no-files-found: error - cargo-test-bpf-twoxtx: + cargo-test-sbf-twoxtx: if: ${{ false }} # disable for now runs-on: ubuntu-latest steps: @@ -115,13 +115,13 @@ jobs: - name: Build and test token-2022 twoxtx (TEMPORARY) run: | ./token/twoxtx-setup.sh - ./ci/cargo-test-bpf.sh token/program-2022-test + ./ci/cargo-test-sbf.sh token/program-2022-test js-test: runs-on: ubuntu-latest env: NODE_VERSION: 14.x - needs: cargo-test-bpf + needs: cargo-test-sbf steps: - uses: actions/checkout@v2 - name: Use Node.js ${{ env.NODE_VERSION }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index badd9244b98..d81dc72f9d6 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -134,7 +134,7 @@ jobs: with: path: | ~/.cargo/bin/rustfilt - key: cargo-bpf-bins-${{ runner.os }} + key: cargo-sbf-bins-${{ runner.os }} - uses: actions/cache@v2 with: diff --git a/Anchor.toml b/Anchor.toml index 2ed57d8c0de..d428758b68a 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,5 +1,5 @@ anchor_version = "0.24.2" -solana_version = "1.10.35" +solana_version = "1.11.6" [workspace] members = [ diff --git a/Cargo.lock b/Cargo.lock index 66ff8e36b67..f1e0425c320 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,9 +165,9 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "synstructure", ] @@ -177,9 +177,9 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -241,20 +241,20 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -274,6 +274,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "autotools" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701" +dependencies = [ + "cc", +] + [[package]] name = "axum" version = "0.5.1" @@ -288,7 +297,7 @@ dependencies = [ "http", "http-body", "hyper", - "itoa 1.0.1", + "itoa", "matchit", "memchr", "mime", @@ -331,12 +340,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.12.3" @@ -378,9 +381,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", @@ -388,8 +391,8 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "regex", "rustc-hash", "shlex", @@ -492,7 +495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" dependencies = [ "borsh-derive", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -504,8 +507,8 @@ dependencies = [ "borsh-derive-internal", "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", - "proc-macro2 1.0.36", - "syn 1.0.91", + "proc-macro2 1.0.43", + "syn 1.0.99", ] [[package]] @@ -514,9 +517,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -525,9 +528,9 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -592,22 +595,22 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.8.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" +checksum = "2f5715e491b5a1598fc2bef5a606847b5dc1d48ea625bd3c02c00de8285591da" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e" +checksum = "1b9e1f5fa78f69496407a27ae9ed989e3c3b072310286f5ef385525e4cbc24a9" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -660,15 +663,15 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9344318b9c787667b95cd2c5124f5eaf2bde35e959dd01ea04fc5b234c542c11" dependencies = [ - "clap", + "clap 2.34.0", "heck 0.3.3", "indexmap", "log", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "serde", "serde_json", - "syn 1.0.91", + "syn 1.0.99", "tempfile", "toml", ] @@ -773,18 +776,34 @@ dependencies = [ "atty", "bitflags", "strsim 0.8.0", - "textwrap", + "textwrap 0.11.0", "unicode-width", "vec_map", ] [[package]] -name = "cmake" -version = "0.1.48" +name = "clap" +version = "3.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b" dependencies = [ - "cc", + "atty", + "bitflags", + "clap_lex", + "indexmap", + "once_cell", + "strsim 0.10.0", + "termcolor", + "textwrap 0.15.0", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -856,12 +875,6 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1031,10 +1044,10 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "strsim 0.10.0", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] @@ -1044,8 +1057,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core", - "quote 1.0.14", - "syn 1.0.91", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1094,26 +1107,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e5c37193a1db1d8ed868c03ec7b152175f26160a5b740e5e484143877e0adf0" -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", -] - [[package]] name = "derive_arbitrary" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b24629208e87a2d8b396ff43b15c4afb0a69cea3fbbaa9ed9b92b7c02f0aed73" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1123,17 +1125,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", - "proc-macro2 1.0.36", - "quote 1.0.14", - "rustc_version 0.4.0", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "rustc_version", + "syn 1.0.99", ] [[package]] name = "dialoguer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d6b4fabcd9e97e1df1ae15395ac7e49fb144946a0d453959dc2696273b9da" +checksum = "a92e7e37ecef6857fdc0c0c5d42fd5b0938e46590c2183cc92dd310a6d078eb1" dependencies = [ "console 0.15.0", "tempfile", @@ -1205,21 +1207,15 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "displaydoc" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1251,6 +1247,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "eager" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe71d579d1812060163dff96056261deb5bf6729b100fa2e36a68b9649ba3d3" + [[package]] name = "ed25519" version = "1.3.0" @@ -1293,16 +1295,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f86b50932a01e7ec5c06160492ab660fb19b6bb2a7878030dd6cd68d21df9d4d" dependencies = [ "enum-ordinalize", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] name = "either" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" [[package]] name = "encode_unicode" @@ -1321,22 +1323,22 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6" +checksum = "2953d1df47ac0eb70086ccabf0275aa8da8591a28bd358ee2b52bd9f9e3ff9e9" dependencies = [ "enum-iterator-derive", ] [[package]] name = "enum-iterator-derive" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159" +checksum = "8958699f9359f0b04e691a13850d48b7de329138023876d07cbd024c2c820598" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1347,9 +1349,9 @@ checksum = "0b166c9e378360dd5a6666a9604bb4f54ae0cac39023ffbac425e917a2a04fef" dependencies = [ "num-bigint 0.4.3", "num-traits", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1359,9 +1361,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eb359f1476bf611266ac1f5355bc14aeca37b299d0ebccc038ee7058891c9cb" dependencies = [ "once_cell", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1478,13 +1480,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.23" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "miniz_oxide", ] @@ -1586,9 +1586,9 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -1681,8 +1681,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.10.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1706,9 +1708,9 @@ dependencies = [ [[package]] name = "goauth" -version = "0.11.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f3d68c8343245dc047982651b5afb8bd659c9959ed72efe5a73bf22684e5fd" +checksum = "f8af59a261bcf42f45d1b261232847b9b850ba0a1419d6100698246fb66e9240" dependencies = [ "arc-swap", "futures 0.3.21", @@ -1725,9 +1727,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.4.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" +checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" dependencies = [ "log", "plain", @@ -1755,9 +1757,9 @@ dependencies = [ [[package]] name = "hash32" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4041af86e63ac4298ce40e5cca669066e75b6f1aa3390fe2561ffa5e1d9f4cc" +checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67" dependencies = [ "byteorder", ] @@ -1771,6 +1773,15 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] + [[package]] name = "headers" version = "0.3.7" @@ -1886,13 +1897,13 @@ dependencies = [ [[package]] name = "http" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" +checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" dependencies = [ "bytes", "fnv", - "itoa 1.0.1", + "itoa", ] [[package]] @@ -1914,9 +1925,9 @@ checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" [[package]] name = "httparse" -version = "1.5.1" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1932,9 +1943,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.16" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" +checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" dependencies = [ "bytes", "futures-channel", @@ -1945,7 +1956,7 @@ dependencies = [ "http-body", "httparse", "httpdate", - "itoa 0.4.8", + "itoa", "pin-project-lite", "socket2", "tokio", @@ -1980,7 +1991,7 @@ checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" dependencies = [ "http", "hyper", - "rustls 0.20.4", + "rustls 0.20.6", "tokio", "tokio-rustls 0.23.2", ] @@ -2068,12 +2079,12 @@ checksum = "5a9d968042a4902e08810946fc7cd5851eb75e80301342305af755ca06cb82ce" [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "rayon", ] @@ -2106,9 +2117,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0" dependencies = [ "proc-macro-hack", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "unindent", ] @@ -2145,12 +2156,6 @@ dependencies = [ "either", ] -[[package]] -name = "itoa" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - [[package]] name = "itoa" version = "1.0.1" @@ -2168,9 +2173,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" dependencies = [ "wasm-bindgen", ] @@ -2234,9 +2239,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b939a78fa820cdfcb7ee7484466746a7377760970f6f9c6fe19f9edcc8a38d2" dependencies = [ "proc-macro-crate 0.1.5", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -2318,9 +2323,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.124" +version = "0.2.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" +checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5" [[package]] name = "libloading" @@ -2340,9 +2345,9 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "librocksdb-sys" -version = "0.6.1+6.28.2" +version = "0.8.0+7.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" +checksum = "611804e4666a25136fcc5f8cf425ab4d26c7f74ea245ffe92ea23b85b6420b5d" dependencies = [ "bindgen", "bzip2-sys", @@ -2428,20 +2433,20 @@ dependencies = [ [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "lru" -version = "0.7.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" +checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" dependencies = [ - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -2623,9 +2628,9 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -2697,12 +2702,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", "cfg-if 1.0.0", "libc", "memoffset", @@ -2779,9 +2783,9 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -2839,24 +2843,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "085fe377a4b2805c0fbc09484415ec261174614b7f080b0e0d520456ac421a67" +checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" dependencies = [ - "derivative", "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5249369707a1e07b39f78d98c8f34e00aca7dcb053812fdbb5ad7be82c1bba38" +checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" dependencies = [ "proc-macro-crate 1.1.0", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -2885,9 +2888,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.9.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" [[package]] name = "opaque-debug" @@ -2946,13 +2949,15 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf9b1c4e9a6c4de793c632496fa490bdc0e1eea73f0c91394f7b6990935d22" +checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ "async-trait", "crossbeam-channel", - "futures 0.3.21", + "futures-channel", + "futures-executor", + "futures-util", "js-sys", "lazy_static", "percent-encoding 2.1.0", @@ -2961,28 +2966,33 @@ dependencies = [ "thiserror", ] +[[package]] +name = "os_str_bytes" +version = "6.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" + [[package]] name = "ouroboros" -version = "0.14.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71643f290d126e18ac2598876d01e1d57aed164afc78fdb6e2a0c6589a1f6662" +checksum = "7425ea87a1e31df63a27b6d31e21a35a9003268032a876465e8d43c2364b0de2" dependencies = [ "aliasable", "ouroboros_macro", - "stable_deref_trait", ] [[package]] name = "ouroboros_macro" -version = "0.14.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9a247206016d424fe8497bc611e510887af5c261fbbf977877c4bb55ca4d82" +checksum = "734aa7a4a6390b162112523cac2923a18e4f23b917880a68c826bf6e8bf48f06" dependencies = [ "Inflector", "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3063,9 +3073,9 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.3", ] @@ -3133,9 +3143,9 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3174,9 +3184,9 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b95af56fee93df76d721d356ac1ca41fccf168bc448eb14049234df764ba3e76" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3259,14 +3269,20 @@ dependencies = [ "termtree", ] +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + [[package]] name = "prettyplease" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" dependencies = [ - "proc-macro2 1.0.36", - "syn 1.0.91", + "proc-macro2 1.0.43", + "syn 1.0.99", ] [[package]] @@ -3295,9 +3311,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "version_check", ] @@ -3307,8 +3323,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "version_check", ] @@ -3329,11 +3345,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab" dependencies = [ - "unicode-xid 0.2.2", + "unicode-ident", ] [[package]] @@ -3368,12 +3384,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd5316aa8f5c82add416dfbc25116b84b748a21153f512917e8143640a71bbd" +checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" dependencies = [ "bytes", - "prost-derive 0.10.0", + "prost-derive 0.11.0", ] [[package]] @@ -3398,21 +3414,19 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "328f9f29b82409216decb172d81e936415d21245befa79cd34c3f29d87d1c50b" +checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" dependencies = [ "bytes", - "cfg-if 1.0.0", - "cmake", "heck 0.4.0", "itertools", "lazy_static", "log", "multimap", "petgraph", - "prost 0.10.0", - "prost-types 0.10.0", + "prost 0.11.0", + "prost-types 0.11.1", "regex", "tempfile", "which", @@ -3426,22 +3440,22 @@ checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] name = "prost-derive" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df35198f0777b75e9ff669737c6da5136b59dba33cf5a010a6d1cc4d56defc6f" +checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" dependencies = [ "anyhow", "itertools", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3456,12 +3470,21 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926681c118ae6e512a3ccefd4abbe5521a14f4cc1e207356d4d00c0b7f2006fd" +checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" dependencies = [ "bytes", - "prost 0.10.0", + "prost 0.11.0", +] + +[[package]] +name = "protobuf-src" +version = "1.0.5+3.19.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe57f68bf9767f48f8cbcbceb5da21524e2b1330a821c1c2502c447d8043f078" +dependencies = [ + "autotools", ] [[package]] @@ -3496,8 +3519,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" dependencies = [ "pyo3-macros-backend", - "quote 1.0.14", - "syn 1.0.91", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3506,10 +3529,10 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.43", "pyo3-build-config", - "quote 1.0.14", - "syn 1.0.91", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -3545,7 +3568,7 @@ dependencies = [ "fxhash", "quinn-proto", "quinn-udp", - "rustls 0.20.4", + "rustls 0.20.6", "thiserror", "tokio", "tracing", @@ -3562,7 +3585,7 @@ dependencies = [ "fxhash", "rand 0.8.5", "ring", - "rustls 0.20.4", + "rustls 0.20.6", "rustls-native-certs", "rustls-pemfile 0.2.1", "slab", @@ -3598,11 +3621,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.14" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" +checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.43", ] [[package]] @@ -3616,7 +3639,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -3687,15 +3709,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xorshift" version = "0.3.0" @@ -3716,9 +3729,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.2" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" dependencies = [ "autocfg", "crossbeam-deque", @@ -3771,9 +3784,9 @@ dependencies = [ [[package]] name = "reed-solomon-erasure" -version = "5.0.1" +version = "5.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170bac0d8306941e101df0caaa6518b10bc4232dd36c34f1cb78b8a063024db" +checksum = "c2fe31452b684b8b33f65f8730c8b8812c3f5a0bb8a096934717edb1ac488641" dependencies = [ "cc", "libc", @@ -3785,9 +3798,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" dependencies = [ "aho-corasick", "memchr", @@ -3802,9 +3815,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "remove_dir_all" @@ -3817,9 +3830,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb" +checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92" dependencies = [ "async-compression", "base64 0.13.0", @@ -3841,15 +3854,16 @@ dependencies = [ "native-tls", "percent-encoding 2.1.0", "pin-project-lite", - "rustls 0.20.4", - "rustls-pemfile 0.3.0", + "rustls 0.20.6", + "rustls-pemfile 1.0.1", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-native-tls", "tokio-rustls 0.23.2", - "tokio-util 0.6.9", + "tokio-util 0.7.1", + "tower-service", "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", @@ -3858,12 +3872,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "retain_mut" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c31b5c4033f8fdde8700e4657be2c497e7288f01515be52168c631e2e4d4086" - [[package]] name = "ring" version = "0.16.20" @@ -3881,9 +3889,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" +checksum = "7e9562ea1d70c0cc63a34a22d977753b50cca91cc6b6527750463bd5dd8697bc" dependencies = [ "libc", "librocksdb-sys", @@ -3919,22 +3927,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.7", + "semver", ] [[package]] @@ -3961,9 +3960,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -3994,18 +3993,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "0.3.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee86d63972a7c661d1536fefe8c3c8407321c3df668891286de28abcd087360" +checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" dependencies = [ "base64 0.13.0", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" [[package]] name = "rusty-fork" @@ -4052,22 +4051,22 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scroll" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" dependencies = [ "scroll_derive", ] [[package]] name = "scroll_derive" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -4115,52 +4114,37 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" [[package]] name = "serde" -version = "1.0.137" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553" dependencies = [ "serde_derive", ] [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "cfc50e8183eeeb6178dcb167ae34a8051d63535023ae38b5d8d12beae193d37b" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -4169,7 +4153,7 @@ version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -4181,7 +4165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa 1.0.1", + "itoa", "ryu", "serde", ] @@ -4203,16 +4187,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] name = "serde_yaml" -version = "0.8.23" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ "indexmap", "ryu", @@ -4250,9 +4234,9 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2acd6defeddb41eb60bb468f8825d0cfd0c2a76bc03bfd235b6a1dc4f6a1ad5" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -4262,10 +4246,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b95bb2f4f624565e8fe8140c789af7e2082c0e0561b5a82a1b678baa9703dc" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "rustversion", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] @@ -4304,21 +4288,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.9.8" @@ -4380,10 +4349,10 @@ version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dd835154aa943dfc958f5a208f2e82b7d2a2c52b024229168c211ecc2d2bfd1" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "shank_macro_impl", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] @@ -4393,10 +4362,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d99ad9d5137704e86e2e4a54a121b9c443c37b60ce6638a7723ab700dbd2232a" dependencies = [ "anyhow", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "serde", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] @@ -4466,9 +4435,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "smpl_jwt" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4370044f8b20f944e05c35d77edd3518e6f21fc4de77e593919f287c6a3f428a" +checksum = "95b6ff8c21c74ce7744643a7cddbb02579a44f1f77e4316bff1ddb741aca8ac9" dependencies = [ "base64 0.13.0", "log", @@ -4477,7 +4446,7 @@ dependencies = [ "serde_derive", "serde_json", "simpl", - "time 0.2.27", + "time 0.3.9", ] [[package]] @@ -4507,9 +4476,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5144c8430126674afc11fb2d7812d860b8576b60f8d55cc1770a8762787d4c" +checksum = "796a1605db8587e8126fa3aa56a7166022dfd0c661962e9f3e57d7e1892d2ab7" dependencies = [ "Inflector", "base64 0.13.0", @@ -4531,16 +4500,16 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2d41fe6f6e52befcb9986d2da0a1b8ce3d3e33549937337f935924e09513fd" +checksum = "9b1fa1f1da46d31404c2700557d10796cba44483cf2d07ba92400fc31202b813" dependencies = [ "bincode", "bytemuck", "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", @@ -4552,9 +4521,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0711e1f1d8184b85212ed641f21794cb8e8605c19fbf107257f90bd268f474e5" +checksum = "b1ca4bc37728cd7c9f1387df8abc152b2ebed8bcdb15e3e45a7322133cce3e6e" dependencies = [ "borsh", "futures 0.3.21", @@ -4569,9 +4538,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d2d2721fe2e7d30895fdc53ab4e2f09fdc596f3515fa574150496c3af8c5b5b" +checksum = "542382271e43edf8737f47a9499edc3d32551d7b21fc9aa6551b9ac7da7dcf28" dependencies = [ "serde", "solana-sdk", @@ -4580,9 +4549,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9298aa95592c2bff397040bf6accf56eec3899d1b55f210f8c2891e19a84fa9" +checksum = "108bdd180e71fd82ce76182770a92ef6e32b7a0940ca1e132e5d34a2d1ade6d3" dependencies = [ "bincode", "crossbeam-channel", @@ -4600,16 +4569,16 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b417fc68ac85d24b26577720f351f95f6a763a1a9d1dbfd3519732627d880ab" +checksum = "0f6abe54877a6cb58aa681c8e09c26b3e50ffe5bcb60d48f66ddb31660558c19" dependencies = [ "bv", "fnv", "log", "rand 0.7.3", "rayon", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-frozen-abi", @@ -4619,9 +4588,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c235d548865070498b33555547f870bb0adfaf8f21f80b1b49b380bac897f88" +checksum = "01060b232a3b5413d6fbc69b03171f1754971c72a7206bc37c96de86ad484660" dependencies = [ "bincode", "byteorder", @@ -4638,9 +4607,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f945ea2c94d01b76cbbcc1a8edd89917e03a722cb527d5391fb90e53533312" +checksum = "369e48a0ae9fb6e36af070b3c1ac1639f191dd6ad2132465e97b2cf2fabe3f38" dependencies = [ "log", "memmap2", @@ -4653,12 +4622,12 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c39a39251f47d0644c9e0e65b53fe9cbb879f68a8810db3997becd91a5004c" +checksum = "e1ca641dae14e71811071177e7bab57d0c0f2dbf0274af2b29d409cbc7d194b2" dependencies = [ "chrono", - "clap", + "clap 2.34.0", "rpassword", "solana-perf", "solana-remote-wallet", @@ -4671,9 +4640,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d79f3ed77fd9d49d36c1064f460948b9de7db081f38def534d9ed03ab31a48a6" +checksum = "d8d6a92fb3c00b4b6713ef07f013b5660d753a42fc341bb66d0e545060a2141a" dependencies = [ "dirs-next", "lazy_static", @@ -4687,18 +4656,19 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b394529d3c7719fdf70ddaeaeed33f216be48f81de390cc2f5aa56631d2a12a3" +checksum = "08d347c84474ac6ea46dc5a4ac0dbdd966781ffb01497afb8b4882ef546d72cd" dependencies = [ "Inflector", "base64 0.13.0", "chrono", - "clap", + "clap 2.34.0", "console 0.15.0", "humantime", "indicatif", - "semver 1.0.7", + "pretty-hex", + "semver", "serde", "serde_json", "solana-account-decoder", @@ -4713,9 +4683,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4a2334d59d3940f49bfeeb1b52cddd3bc2fb1268d4a65ce0c55d76aafd4361" +checksum = "a972fb37284397bba430ea48cd07ed9e140b61896da1ef8d8d30d65a6e3b094a" dependencies = [ "async-mutex", "async-trait", @@ -4723,7 +4693,7 @@ dependencies = [ "bincode", "bs58", "bytes", - "clap", + "clap 2.34.0", "crossbeam-channel", "enum_dispatch", "futures 0.3.21", @@ -4734,15 +4704,14 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "lru", "quinn", "quinn-proto", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", "reqwest", - "rustls 0.20.4", - "semver 1.0.7", + "rustls 0.20.6", + "semver", "serde", "serde_derive", "serde_json", @@ -4768,9 +4737,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eea0851474a6420c0fc731b09755baaa5a8f9189c797ebd1f569f1f2a5247ac" +checksum = "5f829879c7e4fdcb2326dda171619e5bcd9d6d7154f752e62394e6eaa8bf4f1e" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -4778,9 +4747,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4767691bf3743e3a8fa6cedfc82920140d2d9dafa9fd4aef13e644efe443d188" +checksum = "da4a1abc29b28b68ff8292896cd579e610e29b8aca9e623570f278f707e5f09a" dependencies = [ "bincode", "chrono", @@ -4792,9 +4761,9 @@ dependencies = [ [[package]] name = "solana-core" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78d9c940bf967f02faeedb5b1d9ee799edb4bbf8614d174f0a889394e8e3b26d" +checksum = "748e97a840cbf3992e998f81476e3bb785cafd49f450dcbbf029f2ad22b20530" dependencies = [ "ahash", "base64 0.13.0", @@ -4803,18 +4772,19 @@ dependencies = [ "chrono", "crossbeam-channel", "dashmap", + "eager", "etcd-client", "fs_extra", "histogram", "itertools", + "lazy_static", "log", "lru", "min-max-heap", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", - "retain_mut", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-address-lookup-table-program", @@ -4833,7 +4803,6 @@ dependencies = [ "solana-poh", "solana-program-runtime", "solana-rayon-threadlimit", - "solana-replica-lib", "solana-rpc", "solana-runtime", "solana-sdk", @@ -4852,14 +4821,15 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b182d2ac4b9ca43b7a2b6e687ea25f2cb4eea29e7105cbaa97fe3b4404580992" +checksum = "161f5d3322694024a6b4eec4bd19d5162f8c978af831f48356007c535b8d061c" dependencies = [ "bincode", "crossbeam-channel", "dlopen", "dlopen_derive", + "lazy_static", "log", "rand 0.7.3", "rayon", @@ -4874,13 +4844,13 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72d1e9e924b590bca1df6de3b5b05dc6a6e8001fb608a425992eabdfcfca63e" +checksum = "8412e1fbecb51fe5351f8afe3c7e3bf469681362f15dfb316f665f18c78ae809" dependencies = [ "bincode", "byteorder", - "clap", + "clap 2.34.0", "crossbeam-channel", "log", "serde", @@ -4898,43 +4868,55 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e73830d41b18597084df1d216b997c4a7396f0eb6674b4d411c30a4ba68d189" +checksum = "8423244f24faadb80bb4935a5869a74319c43cd037b52e4dfdd04c7e42576793" dependencies = [ + "ahash", + "blake3", + "block-buffer 0.9.0", "bs58", "bv", + "byteorder", + "cc", + "either", "generic-array 0.14.5", + "getrandom 0.1.16", + "hashbrown 0.12.3", "im", "lazy_static", "log", "memmap2", - "rustc_version 0.4.0", + "once_cell", + "rand_core 0.6.3", + "rustc_version", "serde", "serde_bytes", "serde_derive", + "serde_json", "sha2 0.10.2", "solana-frozen-abi-macro", + "subtle", "thiserror", ] [[package]] name = "solana-frozen-abi-macro" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8dbca5d2413ddb4885b9bbaa14fdb9dd134539cabda8169a51b8990ee798bf4" +checksum = "f8087ccb03df3fc5e4ae4b3ff81b67e701a4470cdda6b8ee0711e3431f7a0a71" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "rustc_version 0.4.0", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "rustc_version", + "syn 1.0.99", ] [[package]] name = "solana-geyser-plugin-interface" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc98399cf8e266c16f1ce603b3cc442b66e17adb2d4cefeabc30f6ac2c7cdc1e" +checksum = "f87b0d04024a2124f0a7d2a33af671e6272b733dd06e942b1a66deb83cdcb408" dependencies = [ "log", "solana-sdk", @@ -4944,9 +4926,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-manager" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a37a14719dae60ed8df12f1f82ed409c91d23d0c69ac6ec9d071e112c55c1fc" +checksum = "e459f5c02350cc63a8d2fd4592612e06c2f9149630be536cec0dbc97f7f39cac" dependencies = [ "bs58", "crossbeam-channel", @@ -4966,13 +4948,13 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4a15f633ccf3a9cfdf3674e26b8d6c5f90cd35e949884e6f269ad70036ab7b" +checksum = "98881c2a244d5c556084552cdb06730101357dd66e9e15ff782e822d2539390a" dependencies = [ "bincode", "bv", - "clap", + "clap 2.34.0", "crossbeam-channel", "flate2", "indexmap", @@ -4984,7 +4966,7 @@ dependencies = [ "rand 0.7.3", "rand_chacha 0.2.2", "rayon", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_bytes", "serde_derive", @@ -5011,9 +4993,9 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88fa564d42a183383dda3ce2f0255079a8d876749ccc5c7d962755284eb52d6f" +checksum = "17351974c89c498deef75e41b2756031efba35c6131c2d0ba66224e56f70b293" dependencies = [ "bincode", "bitflags", @@ -5021,6 +5003,7 @@ dependencies = [ "chrono", "chrono-humanize", "crossbeam-channel", + "dashmap", "fs_extra", "futures 0.3.21", "itertools", @@ -5030,13 +5013,13 @@ dependencies = [ "lru", "num_cpus", "num_enum", - "prost 0.10.0", + "prost 0.11.0", "rand 0.7.3", "rand_chacha 0.2.2", "rayon", "reed-solomon-erasure", "rocksdb", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_bytes", "sha2 0.10.2", @@ -5052,12 +5035,14 @@ dependencies = [ "solana-rayon-threadlimit", "solana-runtime", "solana-sdk", + "solana-stake-program", "solana-storage-bigtable", "solana-storage-proto", "solana-transaction-status", "solana-vote-program", "spl-token 3.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "spl-token-2022 0.4.2", + "static_assertions", "tempfile", "thiserror", "tokio", @@ -5067,9 +5052,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f48e928cd31684d1b9aa993e9c69dc203ce5804372930f6a5ddf0db7e3be1f94" +checksum = "79d439a3e3ea20e0de42b8392b7e8f126b8d95019777d2701e12b034031c2ac5" dependencies = [ "env_logger", "lazy_static", @@ -5078,9 +5063,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff96807e4cf467a3643e47816f976adac135dacfd3fe6e90171c7ce0e9dad9b" +checksum = "0b33325847e152c2e43296a19849017c69986c2e1bfb09105b69c087ca2fe1b7" dependencies = [ "log", "solana-sdk", @@ -5088,9 +5073,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0b054463adb10001e65942c5292e364ff492d33a0b316d28ac9e8674eca4e7" +checksum = "8c59fc1f5090683631cdace9dc9ed3f5d2c4ce60fac2f89689a2d23e996779c3" dependencies = [ "fast-math", "matches", @@ -5099,9 +5084,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f528b6f6bf473b6f434f7c836e07fef06f075f4ae542575aae5d569f6069b787" +checksum = "09f97f46bf85890e87038fba29cdb0dc33bbeee35fd630891ab222c4635a8713" dependencies = [ "crossbeam-channel", "gethostname", @@ -5113,12 +5098,12 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5554713bec31030a3f237dfddac06b1777ddcc3efb9d88b44133ddf0d8154db" +checksum = "8285fb0f248b17a6d2b6ea4f1d39b00270073bb89d80fc180ca3b78a30dd36a5" dependencies = [ "bincode", - "clap", + "clap 3.2.17", "crossbeam-channel", "log", "nix", @@ -5135,9 +5120,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875983b5a2230bc3388936b39bbee18841b5efff8e0de609575e7ed45fcb36fb" +checksum = "a735c27aae8f1f4facab973d4d2cf9516fb66a487ca592110d4f89cadbe38506" dependencies = [ "ahash", "bincode", @@ -5162,9 +5147,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd241ff75afe45a17d796d73bf0c6ffde1a7000841b93a95661edc6c4bcd343" +checksum = "f0b44bc47abbfc08bd5c36ae8cd0e4c7cbc62d8ec915202eae5c42e2a0d738a1" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5181,9 +5166,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352ca385618fc739f45e98fde4b340cfd0570d3d1c31e1657a72fd71f51c6ead" +checksum = "11966ec9acf9cae1162d4c65f5f601c7f2a2d3aa8ace7366f63d3a6a788f27fc" dependencies = [ "base64 0.13.0", "bincode", @@ -5194,41 +5179,49 @@ dependencies = [ "bs58", "bv", "bytemuck", + "cc", "console_error_panic_hook", "console_log", "curve25519-dalek", - "getrandom 0.1.16", + "getrandom 0.2.3", "itertools", "js-sys", "lazy_static", + "libc", "libsecp256k1", "log", + "memoffset", "num-derive", "num-traits", "parking_lot 0.12.0", "rand 0.7.3", - "rustc_version 0.4.0", + "rand_chacha 0.2.2", + "rustc_version", "rustversion", "serde", "serde_bytes", "serde_derive", + "serde_json", "sha2 0.10.2", "sha3 0.10.1", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro", "thiserror", + "tiny-bip39", "wasm-bindgen", + "zeroize", ] [[package]] name = "solana-program-runtime" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c04fa734343cd31a4fbfb8292df367816995f99db99728a748465d1a18596f9e" +checksum = "e05eb0030f60fb5ef16a9076fcb3a8a21935814006d475b311cb392f8136f260" dependencies = [ "base64 0.13.0", "bincode", + "eager", "enum-iterator", "itertools", "libc", @@ -5236,21 +5229,23 @@ dependencies = [ "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-measure", + "solana-metrics", "solana-sdk", "thiserror", ] [[package]] name = "solana-program-test" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab0ec8f8d106df0d950139128af13124745935b5544031d02f7609e73b027ed4" +checksum = "32f3549e9655b690920cd40abd2bb95cdbb3df8e47f20e7e3bca8219c7dddc56" dependencies = [ + "assert_matches", "async-trait", "base64 0.13.0", "bincode", @@ -5271,9 +5266,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6be1d60635644e5d49ebcc997bf41a2ba299775c4a47e6652558e1be35ca00d" +checksum = "bd7e38ba7c9fb1d4a452f46d37e9c244696062ed8eff9086815c1183713e9fee" dependencies = [ "lazy_static", "num_cpus", @@ -5281,9 +5276,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5bb7538dc7ce62dcd0ba346c8d30d81c63004e592641d7df9ac57d609dda6ca" +checksum = "3e9fb812f9c22176453e9197c551c57c652f7acda8f1ac9624a2a3e496a65444" dependencies = [ "console 0.15.0", "dialoguer", @@ -5293,35 +5288,17 @@ dependencies = [ "num-traits", "parking_lot 0.12.0", "qstring", - "semver 1.0.7", + "semver", "solana-sdk", "thiserror", "uriparse", ] -[[package]] -name = "solana-replica-lib" -version = "1.10.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5afc53b05de664a8207e2e6d48507bf604236fbf8b455b5e40edcba7769ba3b" -dependencies = [ - "crossbeam-channel", - "futures-util", - "log", - "prost 0.10.0", - "solana-rpc", - "solana-runtime", - "solana-sdk", - "tokio", - "tonic 0.7.1", - "tonic-build 0.7.0", -] - [[package]] name = "solana-rpc" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac64c4c13b6792eceac97f515a898a76f16e5dd8388948e7b58b15824768f144" +checksum = "649979309de04cc7d528237b7f073dbe19e8ed9da066da4e5a0f581f3db1c8cb" dependencies = [ "base64 0.13.0", "bincode", @@ -5356,6 +5333,7 @@ dependencies = [ "solana-runtime", "solana-sdk", "solana-send-transaction-service", + "solana-stake-program", "solana-storage-bigtable", "solana-streamer", "solana-transaction-status", @@ -5371,9 +5349,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fd4514aca1b82c7f0fcb84095c040c9a633a2d24fbd6dae9f186f64ce753f4" +checksum = "ff98ca924f02a04763cbb29064d01aa38e3b646b2ae351bcc2d922e9b060c7f7" dependencies = [ "arrayref", "bincode", @@ -5397,11 +5375,12 @@ dependencies = [ "num-derive", "num-traits", "num_cpus", + "once_cell", "ouroboros", "rand 0.7.3", "rayon", "regex", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-address-lookup-table-program", @@ -5430,9 +5409,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebb1a97dbb9fec5ecf7618d42885a3f9e397f8618854e80d03bf5f8f80694fa" +checksum = "945f207f08366144b37425ada28676e37309024d4f7285017ed0e9ec664b1167" dependencies = [ "assert_matches", "base64 0.13.0", @@ -5457,11 +5436,11 @@ dependencies = [ "memmap2", "num-derive", "num-traits", - "pbkdf2 0.10.1", + "pbkdf2 0.11.0", "qstring", "rand 0.7.3", "rand_chacha 0.2.2", - "rustc_version 0.4.0", + "rustc_version", "rustversion", "serde", "serde_bytes", @@ -5481,22 +5460,22 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65b8de75a25a8d7358b58d4a1899843f4c1e22fe5e760a4d1931adbc7975d9e" +checksum = "a9c926c8e263021fd6b9c6f42b1c1294f4db457d6afea7a65e2951d7d1285786" dependencies = [ "bs58", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "rustversion", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] name = "solana-send-transaction-service" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8d450a4f94c0e5967e356f0647c292b4e06117636dba8f6bd10469063fe8c7" +checksum = "47ff1b84910a659d52c6a725b68c860a595e0ec01c8a9f2793d6e06badda3634" dependencies = [ "crossbeam-channel", "log", @@ -5509,15 +5488,15 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4773d42d25dc8253fcd50c7b17686b72d4f7e1a02b6c440a3bdc1c93645d7f7b" +checksum = "d4f8a4d52dba49ec00565d34f2f11c4230892f5cc734396d066f8aa7587ca120" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-config-program", @@ -5532,9 +5511,9 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b284a6ab0cb250656d8c8e5524ae3203c4f6471ef592297a6ed441dbd1ca724b" +checksum = "25c561333d224e563f9f063c3fa4bc9dd7c3511fad24ab06995ee2615f0a936c" dependencies = [ "backoff", "bincode", @@ -5549,8 +5528,8 @@ dependencies = [ "hyper-proxy", "log", "openssl", - "prost 0.10.0", - "prost-types 0.10.0", + "prost 0.11.0", + "prost-types 0.11.1", "serde", "serde_derive", "smpl_jwt", @@ -5560,31 +5539,32 @@ dependencies = [ "solana-transaction-status", "thiserror", "tokio", - "tonic 0.7.1", + "tonic 0.8.0", "zstd", ] [[package]] name = "solana-storage-proto" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d675226e7a7e7921dd317e0c50d088d573718042ae2378c8f204912659db9910" +checksum = "3c62b15824f0f58a812b23d59da2f86a014c74ded0fe4efe4837900de00096ae" dependencies = [ "bincode", "bs58", - "prost 0.10.0", + "prost 0.11.0", + "protobuf-src", "serde", "solana-account-decoder", "solana-sdk", "solana-transaction-status", - "tonic-build 0.7.0", + "tonic-build 0.8.0", ] [[package]] name = "solana-streamer" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe086ff7dee82d8762e81a37350df7b9669eeaea8ebc4feeddeefe9ae9cfbe4" +checksum = "38e228aad64ec6374e4b6123f3dd924e8a0ac7faa63798888e9fd62adf22f1f6" dependencies = [ "crossbeam-channel", "futures-util", @@ -5600,7 +5580,7 @@ dependencies = [ "quinn", "rand 0.7.3", "rcgen", - "rustls 0.20.4", + "rustls 0.20.6", "solana-metrics", "solana-perf", "solana-sdk", @@ -5611,11 +5591,11 @@ dependencies = [ [[package]] name = "solana-sys-tuner" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da22612af8636dd15a53d055d0b66298c1f076202a0f94584f65b440ed73dcca" +checksum = "08952efb6952cd1cbd662fc099885abc7636b94420d4460a5afda6bc34a87f42" dependencies = [ - "clap", + "clap 2.34.0", "libc", "log", "nix", @@ -5628,9 +5608,9 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93c039756ca3f27e6a65d6b12d8d00549aab5d0b527d1291f6744b6a97a6b00" +checksum = "e65cc605c26e63775475f049511d4c2796f30b343a32f0951d2a67ac788a9051" dependencies = [ "base64 0.13.0", "log", @@ -5643,6 +5623,7 @@ dependencies = [ "solana-ledger", "solana-logger", "solana-net-utils", + "solana-program-runtime", "solana-program-test", "solana-rpc", "solana-runtime", @@ -5653,9 +5634,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82733ac4a3298ace97281dcdd20bb000e9c19458789f7b0c269556446eb0c453" +checksum = "d3f2777fc2d8536ad789f9d9c8f2668f333196c3e10cd8353abc3d4395284417" dependencies = [ "Inflector", "base64 0.13.0", @@ -5681,13 +5662,13 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c4eed14a3bab6fc8c12a95891496f9c53db7fb4f891943d7c271725ea79afb" +checksum = "ef816837a2f354bdb12d95dbd885d19195fee5a838b1ebc299884cd316c20eb2" dependencies = [ "log", - "rustc_version 0.4.0", - "semver 1.0.7", + "rustc_version", + "semver", "serde", "serde_derive", "solana-frozen-abi", @@ -5697,15 +5678,15 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a6f3cd2673ba295354cdebaf74d8ab2b89a37f79e1e462026ae73b5cc0fd5d" +checksum = "a358aef04d3f29b25b377c6a19f978dc396c3c843961af017128b7a8557bcf97" dependencies = [ "bincode", "log", "num-derive", "num-traits", - "rustc_version 0.4.0", + "rustc_version", "serde", "serde_derive", "solana-frozen-abi", @@ -5718,9 +5699,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b029edc2f22f48e8e02c3b4cd80e3b88aec3a09af6971e61dd1f09c721e5ad" +checksum = "9e0a9bda6859c3447635d115813df2456353bbe3a1eaa38f35e0329829492577" dependencies = [ "bytemuck", "getrandom 0.1.16", @@ -5733,9 +5714,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.10.35" +version = "1.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6049c87802e1d91d0d5a9b027a1ab1d6e70e97a9bec331661bd556f795674aa8" +checksum = "c83383ebf7ac256392c6776f5b882147a237174073a5ee18596899b599acacaf" dependencies = [ "aes-gcm-siv", "arrayref", @@ -5763,9 +5744,9 @@ dependencies = [ [[package]] name = "solana_rbpf" -version = "0.2.24" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e138f6d6d4eb6a65f8e9f01ca620bc9907d79648d5038a69dd3f07b6ed3f1f" +checksum = "80a28c5dfe7e8af38daa39d6561c8e8b9ed7a2f900951ebe7362ad6348d36c73" dependencies = [ "byteorder", "combine", @@ -5773,11 +5754,10 @@ dependencies = [ "hash32", "libc", "log", - "rand 0.7.3", + "rand 0.8.5", "rustc-demangle", "scroll", "thiserror", - "time 0.1.44", ] [[package]] @@ -5934,7 +5914,7 @@ name = "spl-feature-proposal-cli" version = "1.2.0" dependencies = [ "chrono", - "clap", + "clap 2.34.0", "solana-clap-utils", "solana-cli-config", "solana-client", @@ -6172,7 +6152,7 @@ dependencies = [ "bincode", "borsh", "bs58", - "clap", + "clap 2.34.0", "serde", "serde_derive", "serde_json", @@ -6285,7 +6265,7 @@ name = "spl-token-cli" version = "2.0.16" dependencies = [ "assert_cmd", - "clap", + "clap 2.34.0", "console 0.14.1", "indicatif", "serde", @@ -6354,7 +6334,7 @@ dependencies = [ name = "spl-token-lending-cli" version = "0.2.0" dependencies = [ - "clap", + "clap 2.34.0", "solana-clap-utils", "solana-cli-config", "solana-client", @@ -6398,21 +6378,6 @@ dependencies = [ "spl-token-swap", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check", -] - [[package]] name = "stateless-asks" version = "0.1.0" @@ -6433,55 +6398,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "serde", - "serde_derive", - "syn 1.0.91", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2 1.0.36", - "quote 1.0.14", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.91", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stream-cancel" version = "0.8.1" @@ -6521,10 +6437,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" dependencies = [ "heck 0.4.0", - "proc-macro2 1.0.36", - "quote 1.0.14", + "proc-macro2 1.0.43", + "quote 1.0.21", "rustversion", - "syn 1.0.91", + "syn 1.0.99", ] [[package]] @@ -6552,13 +6468,13 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.91" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "unicode-xid 0.2.2", + "proc-macro2 1.0.43", + "quote 1.0.21", + "unicode-ident", ] [[package]] @@ -6573,9 +6489,9 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "unicode-xid 0.2.2", ] @@ -6615,9 +6531,9 @@ dependencies = [ [[package]] name = "tarpc" -version = "0.27.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d0a9369a919ba0db919b142a2b704cd207dfc676f7a43c2d105d0bc225487" +checksum = "1c38a012bed6fb9681d3bf71ffaa4f88f3b4b9ed3198cda6e4c8462d24d4bb80" dependencies = [ "anyhow", "fnv", @@ -6643,9 +6559,9 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee42b4e559f17bce0385ebf511a7beb67d5cc33c12c96b7f4e9789919d9c10f" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -6704,9 +6620,9 @@ checksum = "c95968eedc6fc4f5c21920e0f4264f78ec5e4c56bb394f319becc1a5830b3e54" dependencies = [ "cfg-if 1.0.0", "proc-macro-error", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -6728,24 +6644,30 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -6768,41 +6690,16 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "time" -version = "0.2.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi 0.3.9", -] - [[package]] name = "time" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ - "itoa 1.0.1", + "itoa", "libc", "num_threads", - "time-macros 0.2.4", -] - -[[package]] -name = "time-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", + "time-macros", ] [[package]] @@ -6811,19 +6708,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2 1.0.36", - "quote 1.0.14", - "standback", - "syn 1.0.91", -] - [[package]] name = "tiny-bip39" version = "0.8.2" @@ -6894,9 +6778,9 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -6926,7 +6810,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ - "rustls 0.20.4", + "rustls 0.20.6", "tokio", "webpki 0.22.0", ] @@ -6949,9 +6833,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" dependencies = [ "futures-core", "pin-project-lite", @@ -6966,7 +6850,7 @@ checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" dependencies = [ "futures-util", "log", - "rustls 0.20.4", + "rustls 0.20.6", "tokio", "tokio-rustls 0.23.2", "tungstenite", @@ -7047,9 +6931,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30fb54bf1e446f44d870d260d99957e7d11fb9d0a0f5bd1a662ad1411cc103f9" +checksum = "498f271adc46acce75d66f639e4d35b31b2394c295c82496727dafa16d465dd2" dependencies = [ "async-stream", "async-trait", @@ -7065,9 +6949,9 @@ dependencies = [ "hyper-timeout", "percent-encoding 2.1.0", "pin-project", - "prost 0.10.0", - "prost-derive 0.10.0", - "rustls-pemfile 0.3.0", + "prost 0.11.0", + "prost-derive 0.11.0", + "rustls-pemfile 1.0.1", "tokio", "tokio-rustls 0.23.2", "tokio-stream", @@ -7085,23 +6969,23 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" dependencies = [ - "proc-macro2 1.0.36", + "proc-macro2 1.0.43", "prost-build 0.9.0", - "quote 1.0.14", - "syn 1.0.91", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] name = "tonic-build" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d17087af5c80e5d5fc8ba9878e60258065a0a757e35efe7a05b7904bece1943" +checksum = "2fbcd2800e34e743b9ae795867d5f77b535d3a3be69fd731e39145719752df8c" dependencies = [ "prettyplease", - "proc-macro2 1.0.36", - "prost-build 0.10.0", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "prost-build 0.11.1", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -7174,9 +7058,9 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", ] [[package]] @@ -7200,10 +7084,11 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.15.0" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599f388ecb26b28d9c1b2e4437ae019a7b336018b45ed911458cd9ebf91129f6" +checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" dependencies = [ + "once_cell", "opentelemetry", "tracing", "tracing-core", @@ -7212,9 +7097,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.25" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" +checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" dependencies = [ "sharded-slab", "thread_local", @@ -7246,7 +7131,7 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls 0.20.4", + "rustls 0.20.6", "sha-1 0.10.0", "thiserror", "url 2.2.2", @@ -7294,6 +7179,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +[[package]] +name = "unicode-ident" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -7484,9 +7375,9 @@ checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -7494,16 +7385,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" dependencies = [ "bumpalo", - "lazy_static", "log", - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "once_cell", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "wasm-bindgen-shared", ] @@ -7521,32 +7412,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" dependencies = [ - "quote 1.0.14", + "quote 1.0.21", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" [[package]] name = "web-sys" @@ -7753,17 +7644,17 @@ version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73" dependencies = [ - "proc-macro2 1.0.36", - "quote 1.0.14", - "syn 1.0.91", + "proc-macro2 1.0.43", + "quote 1.0.21", + "syn 1.0.99", "synstructure", ] [[package]] name = "zstd" -version = "0.11.1+zstd.1.5.2" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a16b8414fde0414e90c612eba70985577451c4c504b99885ebed24762cb81a" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ "zstd-safe", ] diff --git a/README.md b/README.md index 390f8f5465d..022433f1c39 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,11 @@ TypeDocs: https://solana-labs.github.io/solana-program-library/token/js/ ```bash # To build all on-chain programs -$ cargo build-bpf +$ cargo build-sbf # To build a specific on-chain program $ cd /program -$ cargo build-bpf +$ cargo build-sbf ``` ### Build clients @@ -54,14 +54,14 @@ $ cargo build Unit tests contained within all projects can be run with: ```bash $ cargo test # <-- runs host-based tests -$ cargo test-bpf # <-- runs BPF program tests +$ cargo test-sbf # <-- runs BPF program tests ``` To run a specific program's tests, such as SPL Token: ```bash $ cd token/program $ cargo test # <-- runs host-based tests -$ cargo test-bpf # <-- runs BPF program tests +$ cargo test-sbf # <-- runs BPF program tests ``` Integration testing may be performed via the per-project .js bindings. See the @@ -72,7 +72,7 @@ Solutions to a few issues you might run into are mentioned here. 1. `Failed to open: ../../deploy/spl_.so` - Update your Rust and Cargo to the latest versions and re-run `cargo build-bpf` in the relevant `` directory, + Update your Rust and Cargo to the latest versions and re-run `cargo build-sbf` in the relevant `` directory, or run it at the repository root to rebuild all on-chain programs. 2. [Error while loading shared libraries. (libssl.so.1.1)](https://github.com/project-serum/anchor/issues/1831) @@ -118,7 +118,7 @@ master. Once a program is tested and deemed ready for release: * Increment the version number in the program's Cargo.toml * Generate a new program ID and replace in `/program-id.md` and `/src/lib.rs` - * Run `cargo build-bpf ` to update relevant C bindings. (Note the + * Run `cargo build-sbf ` to update relevant C bindings. (Note the location of the generated `spl_.so` for attaching to the Github release.) * Open a PR with these version changes and merge after passing CI. diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml index 22df89a7bbd..0e7aeb8592a 100644 --- a/associated-token-account/program-test/Cargo.toml +++ b/associated-token-account/program-test/Cargo.toml @@ -8,12 +8,12 @@ repository = "https://github.com/solana-labs/solana-program-library" version = "0.0.1" [features] -test-bpf = [] +test-sbf = [] [dev-dependencies] -solana-program = "1.10.35" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program = "1.11.6" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" spl-associated-token-account = { version = "1.1", path = "../program", features = ["no-entrypoint"] } spl-token = { version = "3.5", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.4", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program-test/tests/create_idempotent.rs b/associated-token-account/program-test/tests/create_idempotent.rs index 9d2c29f98fc..9fe83506438 100644 --- a/associated-token-account/program-test/tests/create_idempotent.rs +++ b/associated-token-account/program-test/tests/create_idempotent.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/associated-token-account/program-test/tests/extended_mint.rs b/associated-token-account/program-test/tests/extended_mint.rs index cc131c0d716..5c81de80320 100644 --- a/associated-token-account/program-test/tests/extended_mint.rs +++ b/associated-token-account/program-test/tests/extended_mint.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/associated-token-account/program-test/tests/process_create_associated_token_account.rs b/associated-token-account/program-test/tests/process_create_associated_token_account.rs index c988e6e2446..d90999f2243 100644 --- a/associated-token-account/program-test/tests/process_create_associated_token_account.rs +++ b/associated-token-account/program-test/tests/process_create_associated_token_account.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/associated-token-account/program-test/tests/recover_nested.rs b/associated-token-account/program-test/tests/recover_nested.rs index d86c59eb6fb..2c9705f29d4 100644 --- a/associated-token-account/program-test/tests/recover_nested.rs +++ b/associated-token-account/program-test/tests/recover_nested.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/associated-token-account/program-test/tests/spl_token_create.rs b/associated-token-account/program-test/tests/spl_token_create.rs index a1e465ce739..ec476e61bb3 100644 --- a/associated-token-account/program-test/tests/spl_token_create.rs +++ b/associated-token-account/program-test/tests/spl_token_create.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index dc0ce914d9e..89dcc9b7c21 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] assert_matches = "1.5.0" borsh = "0.9.1" num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.4", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" diff --git a/associated-token-account/program/run-tests.sh b/associated-token-account/program/run-tests.sh index 74e4f115360..603e3c552b2 100755 --- a/associated-token-account/program/run-tests.sh +++ b/associated-token-account/program/run-tests.sh @@ -4,11 +4,11 @@ set -ex cd "$(dirname "$0")" cargo clippy cargo build -cargo build-bpf +cargo build-sbf if [[ $1 = -v ]]; then export RUST_LOG=solana=debug fi cargo test -cargo test-bpf +cargo test-sbf diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index df100e60507..043dca68258 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -6,10 +6,10 @@ license = "WTFPL" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" thiserror = "1.0" spl-token = {version = "3.1.1", path = "../../token/program", features = ["no-entrypoint"]} arrayref = "0.3.6" diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 55c2708abff..21a9fb907c7 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -8,20 +8,20 @@ license = "Apache-2.0" edition = "2018" [features] -test-bpf = [] +test-sbf = [] [dependencies] num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" borsh = "0.9.1" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/binary-oracle-pair/program/tests/tests.rs b/binary-oracle-pair/program/tests/tests.rs index d4a93f4ff7d..5325c12c949 100644 --- a/binary-oracle-pair/program/tests/tests.rs +++ b/binary-oracle-pair/program/tests/tests.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use borsh::de::BorshDeserialize; use solana_program::{hash::Hash, program_pack::Pack, pubkey::Pubkey, system_instruction}; diff --git a/ci/cargo-test-bpf.sh b/ci/cargo-test-sbf.sh similarity index 85% rename from ci/cargo-test-bpf.sh rename to ci/cargo-test-sbf.sh index ab9dc7cb164..498c2252fdb 100755 --- a/ci/cargo-test-bpf.sh +++ b/ci/cargo-test-sbf.sh @@ -31,7 +31,7 @@ if [[ -r $run_dir/Cargo.toml ]]; then # Build/test just one BPF program set -x cd $run_dir - cargo +"$rust_stable" test-bpf -- --nocapture + cargo +"$rust_stable" test-sbf -- --nocapture exit 0 fi @@ -43,7 +43,7 @@ for program in $run_dir/program{,-*}; do ( set -x cd $program - cargo +"$rust_stable" test-bpf -- --nocapture + cargo +"$rust_stable" test-sbf -- --nocapture ) fi done @@ -53,6 +53,6 @@ if [[ -n $run_all ]]; then set -x for directory in $(ls -d $run_dir/*/); do cd $directory - cargo +"$rust_stable" test-bpf -- --nocapture + cargo +"$rust_stable" test-sbf -- --nocapture done fi diff --git a/ci/install-program-deps.sh b/ci/install-program-deps.sh index 020b945eff1..14f10b5eb64 100755 --- a/ci/install-program-deps.sh +++ b/ci/install-program-deps.sh @@ -11,4 +11,4 @@ cargo --version cargo install rustfilt || true cargo install honggfuzz --version=0.5.54 --force || true -cargo +"$rust_stable" build-bpf --version +cargo +"$rust_stable" build-sbf --version diff --git a/ci/solana-version.sh b/ci/solana-version.sh index 01e5d98d038..791f9d0e3bf 100755 --- a/ci/solana-version.sh +++ b/ci/solana-version.sh @@ -14,7 +14,7 @@ if [[ -n $SOLANA_VERSION ]]; then solana_version="$SOLANA_VERSION" else - solana_version=v1.10.35 + solana_version=v1.11.6 fi export solana_version="$solana_version" diff --git a/examples/rust/cross-program-invocation/Cargo.toml b/examples/rust/cross-program-invocation/Cargo.toml index 14e16d907aa..e63ac3afe7c 100644 --- a/examples/rust/cross-program-invocation/Cargo.toml +++ b/examples/rust/cross-program-invocation/Cargo.toml @@ -10,14 +10,14 @@ publish = false [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/cross-program-invocation/tests/functional.rs b/examples/rust/cross-program-invocation/tests/functional.rs index 05847047526..b4b2aebbc55 100644 --- a/examples/rust/cross-program-invocation/tests/functional.rs +++ b/examples/rust/cross-program-invocation/tests/functional.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use { solana_program::{ diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml index 7d3ca7c52fb..730226cd2d1 100644 --- a/examples/rust/custom-heap/Cargo.toml +++ b/examples/rust/custom-heap/Cargo.toml @@ -12,14 +12,14 @@ publish = false default = ["custom-heap"] custom-heap = [] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml index 59662b72456..7cd4ab3b1fd 100644 --- a/examples/rust/logging/Cargo.toml +++ b/examples/rust/logging/Cargo.toml @@ -10,14 +10,14 @@ publish = false [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml index 0f37f012034..93f41e61866 100644 --- a/examples/rust/sysvar/Cargo.toml +++ b/examples/rust/sysvar/Cargo.toml @@ -10,14 +10,14 @@ publish = false [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml index 7430a476839..8d88401fa1e 100644 --- a/examples/rust/transfer-lamports/Cargo.toml +++ b/examples/rust/transfer-lamports/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/farms/docs/fund.md b/farms/docs/fund.md index b5ecda39657..c171aa98ddf 100755 --- a/farms/docs/fund.md +++ b/farms/docs/fund.md @@ -14,7 +14,7 @@ To build and deploy the Fund program, run: ```sh cd solana-program-library/farms/fund -cargo build-bpf +cargo build-sbf solana program deploy ../target/deploy/solana_fund.so ``` diff --git a/farms/docs/governance.md b/farms/docs/governance.md index d804aa8d085..fd1daea95b3 100755 --- a/farms/docs/governance.md +++ b/farms/docs/governance.md @@ -4,7 +4,7 @@ To initialize the DAO, first build and deploy the governance program: ```sh cd solana-program-library/governance/program -cargo build-bpf +cargo build-sbf solana program deploy --commitment finalized target/deploy/spl_governance.so ``` diff --git a/farms/docs/quick_start.md b/farms/docs/quick_start.md index 5e1372d232a..bc89c45b085 100755 --- a/farms/docs/quick_start.md +++ b/farms/docs/quick_start.md @@ -42,12 +42,12 @@ popd Alternatively, you can execute instructions directly using [HTTP Client](https://github.com/solana-labs/solana-program-library/blob/master/farms/docs/http_client.md) or [Rust Client](https://github.com/solana-labs/solana-program-library/blob/master/farms/docs/rust_client.md). -To build on-chain programs, use the standard `cargo build-bpf` command for Solana programs: +To build on-chain programs, use the standard `cargo build-sbf` command for Solana programs: ```sh for program in router-*; do pushd $program &>/dev/null - cargo build-bpf + cargo build-sbf popd &>/dev/null done ``` @@ -56,7 +56,7 @@ To build Vaults, specify an additional argument that tells the compiler which st ```sh pusdh vaults -cargo build-bpf --no-default-features --features SBR-STAKE-LP-COMPOUND +cargo build-sbf --no-default-features --features SBR-STAKE-LP-COMPOUND popd ``` @@ -66,7 +66,7 @@ Every time you re-build the vault program with another strategy, it overwrites t pushd vaults &>/dev/null for strategy in RDM SBR ORC; do solana-keygen new -o vault_$strategy.json - cargo build-bpf --no-default-features --features $strategy-STAKE-LP-COMPOUND + cargo build-sbf --no-default-features --features $strategy-STAKE-LP-COMPOUND solana program deploy --program-id vault_$strategy.json target/deploy/solana_vaults.so done popd &>/dev/null diff --git a/farms/farm-sdk/build.rs b/farms/farm-sdk/build.rs index 9aec28bcf1c..f1a67633af6 100644 --- a/farms/farm-sdk/build.rs +++ b/farms/farm-sdk/build.rs @@ -1,6 +1,6 @@ //! Creates a file that will set constants captured from the environment. //! These constants represent official accounts, program ids, and names. -//! Normally lazy_static! would work, but it is not supported with build-bpf. +//! Normally lazy_static! would work, but it is not supported with build-sbf. use { solana_program::pubkey::Pubkey, diff --git a/farms/vaults/Cargo.toml b/farms/vaults/Cargo.toml index 27099f4957b..0a4d5ffbeac 100644 --- a/farms/vaults/Cargo.toml +++ b/farms/vaults/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" [features] no-entrypoint = [] debug = [] -test-bpf = [] +test-sbf = [] RDM-STAKE-LP-COMPOUND = [] SBR-STAKE-LP-COMPOUND = [] ORC-STAKE-LP-COMPOUND = [] diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml index 7ca9b93178c..9d44e6431aa 100644 --- a/feature-proposal/cli/Cargo.toml +++ b/feature-proposal/cli/Cargo.toml @@ -10,11 +10,11 @@ edition = "2018" [dependencies] chrono = "0.4.19" clap = "2.33.3" -solana-clap-utils = "1.10.35" -solana-cli-config = "1.10.35" -solana-client = "1.10.35" -solana-logger = "1.10.35" -solana-sdk = "1.10.35" +solana-clap-utils = "1.11.6" +solana-cli-config = "1.11.6" +solana-client = "1.11.6" +solana-logger = "1.11.6" +solana-sdk = "1.11.6" spl-feature-proposal = { version = "1.0", path = "../program", features = ["no-entrypoint"] } [[bin]] diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml index f1cefefb174..36c8a36d877 100644 --- a/feature-proposal/program/Cargo.toml +++ b/feature-proposal/program/Cargo.toml @@ -9,17 +9,17 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] borsh = "0.9" borsh-derive = "0.9.0" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = ["no-entrypoint"] } [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-proposal/program/run-tests.sh b/feature-proposal/program/run-tests.sh index 802b1ee53c2..7ee90bf4b3e 100755 --- a/feature-proposal/program/run-tests.sh +++ b/feature-proposal/program/run-tests.sh @@ -5,11 +5,11 @@ cd "$(dirname "$0")" cargo fmt -- --check cargo clippy cargo build -cargo build-bpf +cargo build-sbf if [[ $1 = -v ]]; then export RUST_LOG=solana=debug fi cargo test -cargo test-bpf +cargo test-sbf diff --git a/feature-proposal/program/tests/functional.rs b/feature-proposal/program/tests/functional.rs index 7fd6cd37ea7..d9928c3e859 100644 --- a/feature-proposal/program/tests/functional.rs +++ b/feature-proposal/program/tests/functional.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use { solana_program::{ diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index d9304ee0f0d..c2492cadfc2 100644 --- a/governance/addin-api/Cargo.toml +++ b/governance/addin-api/Cargo.toml @@ -10,5 +10,5 @@ edition = "2018" [dependencies] borsh = "0.9.1" spl-governance-tools= { version = "0.1.2", path ="../tools"} -solana-program = "1.10.35" +solana-program = "1.11.6" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index bb7955301a2..14c831f5cf0 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" @@ -19,7 +19,7 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.127" serde_derive = "1.0.103" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-governance-addin-api= { version = "0.1.2", path ="../../addin-api"} spl-governance-tools= { version = "0.1.2", path ="../../tools"} @@ -30,8 +30,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.13" proptest = "1.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" spl-governance-test-sdk = { version = "0.1.2", path ="../../test-sdk"} diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index e2a77dcddc7..7b02e207800 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" @@ -19,7 +19,7 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.127" serde_derive = "1.0.103" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-governance= { version = "3.0.0", path ="../../program", features = [ "no-entrypoint" ]} spl-governance-tools= { version = "0.1.2", path ="../../tools"} @@ -31,8 +31,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.13" proptest = "1.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" spl-governance-test-sdk = { version = "0.1.2", path ="../../test-sdk"} spl-governance-addin-mock = { version = "0.1.2", path ="../../addin-mock/program"} diff --git a/governance/chat/program/tests/process_post_message.rs b/governance/chat/program/tests/process_post_message.rs index fa0945a23ea..3ae5df5db55 100644 --- a/governance/chat/program/tests/process_post_message.rs +++ b/governance/chat/program/tests/process_post_message.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use program_test::GovernanceChatProgramTest; use solana_program_test::tokio; diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index fd094893eba..f9c044c94dc 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" @@ -19,7 +19,7 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.130" serde_derive = "1.0.103" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } spl-governance-tools= { version = "0.1.2", path ="../tools"} spl-governance-addin-api= { version = "0.1.2", path ="../addin-api"} @@ -29,8 +29,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.13" proptest = "1.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" spl-governance-test-sdk = { version = "0.1.2", path ="../test-sdk"} spl-governance-addin-mock = { version = "0.1.2", path ="../addin-mock/program"} diff --git a/governance/program/tests/process_add_signatory.rs b/governance/program/tests/process_add_signatory.rs index 0bdcfd18e03..6715cc562ab 100644 --- a/governance/program/tests/process_add_signatory.rs +++ b/governance/program/tests/process_add_signatory.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_cancel_proposal.rs b/governance/program/tests/process_cancel_proposal.rs index 382efc89584..d1153028dd8 100644 --- a/governance/program/tests/process_cancel_proposal.rs +++ b/governance/program/tests/process_cancel_proposal.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_cast_vote.rs b/governance/program/tests/process_cast_vote.rs index 5050f231d11..414cf5ed4e8 100644 --- a/governance/program/tests/process_cast_vote.rs +++ b/governance/program/tests/process_cast_vote.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_create_governance.rs b/governance/program/tests/process_create_governance.rs index 490f90a7703..000e25c9a75 100644 --- a/governance/program/tests/process_create_governance.rs +++ b/governance/program/tests/process_create_governance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use solana_program_test::*; diff --git a/governance/program/tests/process_create_mint_governance.rs b/governance/program/tests/process_create_mint_governance.rs index fd52181abca..82fb83f401b 100644 --- a/governance/program/tests/process_create_mint_governance.rs +++ b/governance/program/tests/process_create_mint_governance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use solana_program_test::*; diff --git a/governance/program/tests/process_create_native_treasury.rs b/governance/program/tests/process_create_native_treasury.rs index e44f0527e6e..6e8fb96e3ef 100644 --- a/governance/program/tests/process_create_native_treasury.rs +++ b/governance/program/tests/process_create_native_treasury.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/process_create_program_governance.rs b/governance/program/tests/process_create_program_governance.rs index e8dd1414bee..332e95cf2f9 100644 --- a/governance/program/tests/process_create_program_governance.rs +++ b/governance/program/tests/process_create_program_governance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use solana_program_test::*; diff --git a/governance/program/tests/process_create_proposal.rs b/governance/program/tests/process_create_proposal.rs index 4dd29b56eee..13cf0319393 100644 --- a/governance/program/tests/process_create_proposal.rs +++ b/governance/program/tests/process_create_proposal.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::{instruction::AccountMeta, pubkey::Pubkey}; use solana_program_test::*; diff --git a/governance/program/tests/process_create_realm.rs b/governance/program/tests/process_create_realm.rs index 48e2e8404da..bc6fd0cc0aa 100644 --- a/governance/program/tests/process_create_realm.rs +++ b/governance/program/tests/process_create_realm.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/process_create_token_governance.rs b/governance/program/tests/process_create_token_governance.rs index 55486a85e0d..2c5cf14ede8 100644 --- a/governance/program/tests/process_create_token_governance.rs +++ b/governance/program/tests/process_create_token_governance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use solana_program_test::*; diff --git a/governance/program/tests/process_create_token_owner_record.rs b/governance/program/tests/process_create_token_owner_record.rs index 2b81bd6d81c..d5863ec579f 100644 --- a/governance/program/tests/process_create_token_owner_record.rs +++ b/governance/program/tests/process_create_token_owner_record.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/process_deposit_governing_tokens.rs b/governance/program/tests/process_deposit_governing_tokens.rs index b5163ac5df3..cf39b3fb1ba 100644 --- a/governance/program/tests/process_deposit_governing_tokens.rs +++ b/governance/program/tests/process_deposit_governing_tokens.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::instruction::AccountMeta; use solana_program_test::*; diff --git a/governance/program/tests/process_execute_transaction.rs b/governance/program/tests/process_execute_transaction.rs index cd7c2e05f31..7958ae3e1ba 100644 --- a/governance/program/tests/process_execute_transaction.rs +++ b/governance/program/tests/process_execute_transaction.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_finalize_vote.rs b/governance/program/tests/process_finalize_vote.rs index 6a56dcce57c..ae0aa37f229 100644 --- a/governance/program/tests/process_finalize_vote.rs +++ b/governance/program/tests/process_finalize_vote.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_flag_transaction_error.rs b/governance/program/tests/process_flag_transaction_error.rs index 0022cde4221..aa4c39bd1f5 100644 --- a/governance/program/tests/process_flag_transaction_error.rs +++ b/governance/program/tests/process_flag_transaction_error.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_insert_transaction.rs b/governance/program/tests/process_insert_transaction.rs index 5bad103bee5..449e477a6c4 100644 --- a/governance/program/tests/process_insert_transaction.rs +++ b/governance/program/tests/process_insert_transaction.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_relinquish_vote.rs b/governance/program/tests/process_relinquish_vote.rs index 34f3a556036..320f61cb7de 100644 --- a/governance/program/tests/process_relinquish_vote.rs +++ b/governance/program/tests/process_relinquish_vote.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_remove_signatory.rs b/governance/program/tests/process_remove_signatory.rs index deecefe3a4f..0fc04ce4766 100644 --- a/governance/program/tests/process_remove_signatory.rs +++ b/governance/program/tests/process_remove_signatory.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_remove_transaction.rs b/governance/program/tests/process_remove_transaction.rs index 34363d42b19..576d97fd4f5 100644 --- a/governance/program/tests/process_remove_transaction.rs +++ b/governance/program/tests/process_remove_transaction.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_set_governance_config.rs b/governance/program/tests/process_set_governance_config.rs index 8d2c5d24f91..546e7adcffb 100644 --- a/governance/program/tests/process_set_governance_config.rs +++ b/governance/program/tests/process_set_governance_config.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_set_governance_delegate.rs b/governance/program/tests/process_set_governance_delegate.rs index fa5452584d6..d9050798b0e 100644 --- a/governance/program/tests/process_set_governance_delegate.rs +++ b/governance/program/tests/process_set_governance_delegate.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::instruction::AccountMeta; use solana_program_test::*; diff --git a/governance/program/tests/process_set_realm_authority.rs b/governance/program/tests/process_set_realm_authority.rs index d6ed16e8039..4628e82d35a 100644 --- a/governance/program/tests/process_set_realm_authority.rs +++ b/governance/program/tests/process_set_realm_authority.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/process_set_realm_config.rs b/governance/program/tests/process_set_realm_config.rs index 0b675158abc..83ab2ed632e 100644 --- a/governance/program/tests/process_set_realm_config.rs +++ b/governance/program/tests/process_set_realm_config.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/process_sign_off_proposal.rs b/governance/program/tests/process_sign_off_proposal.rs index e7b53e8af53..a99c0d5d9e6 100644 --- a/governance/program/tests/process_sign_off_proposal.rs +++ b/governance/program/tests/process_sign_off_proposal.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/program/tests/process_update_program_metadata.rs b/governance/program/tests/process_update_program_metadata.rs index a9e4a13f9f9..8e7a205be9a 100644 --- a/governance/program/tests/process_update_program_metadata.rs +++ b/governance/program/tests/process_update_program_metadata.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/process_withdraw_governing_tokens.rs b/governance/program/tests/process_withdraw_governing_tokens.rs index 7702a60bb0f..10eb166a7f7 100644 --- a/governance/program/tests/process_withdraw_governing_tokens.rs +++ b/governance/program/tests/process_withdraw_governing_tokens.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::{instruction::AccountMeta, pubkey::Pubkey}; use solana_program_test::*; diff --git a/governance/program/tests/program_test/mod.rs b/governance/program/tests/program_test/mod.rs index 2cc270f2d47..f1d0bbecd51 100644 --- a/governance/program/tests/program_test/mod.rs +++ b/governance/program/tests/program_test/mod.rs @@ -130,7 +130,7 @@ impl GovernanceProgramTest { // We only ensure the addin mock program is built but it doesn't detect changes // If the addin is changed then it needs to be manually rebuilt // Note: The crate of the mock is built when spl-governance is built but we also need spl_governance_addin_mock.so - // And we can't use build.rs script because cargo build-bpf hangs when executed from the script + // And we can't use build.rs script because cargo build-sbf hangs when executed from the script ensure_addin_mock_is_built(); Self::start_impl(use_voter_weight_addin, use_max_voter_weight_addin).await @@ -1333,10 +1333,12 @@ impl GovernanceProgramTest { let path_buf = find_file("solana_bpf_rust_upgradeable.so").unwrap(); let program_data = read_file(path_buf); - let program_buffer_rent = self - .bench - .rent - .minimum_balance(UpgradeableLoaderState::programdata_len(program_data.len()).unwrap()); + let program_buffer_rent = + self.bench + .rent + .minimum_balance(UpgradeableLoaderState::size_of_programdata( + program_data.len(), + )); let mut instructions = bpf_loader_upgradeable::create_buffer( &self.bench.payer.pubkey(), @@ -1361,7 +1363,7 @@ impl GovernanceProgramTest { let program_account_rent = self .bench .rent - .minimum_balance(UpgradeableLoaderState::program_len().unwrap()); + .minimum_balance(UpgradeableLoaderState::size_of_program()); let deploy_ixs = bpf_loader_upgradeable::deploy_with_max_program_len( &self.bench.payer.pubkey(), @@ -2368,10 +2370,12 @@ impl GovernanceProgramTest { let path_buf = find_file("solana_bpf_rust_upgraded.so").unwrap(); let program_data = read_file(path_buf); - let program_buffer_rent = self - .bench - .rent - .minimum_balance(UpgradeableLoaderState::programdata_len(program_data.len()).unwrap()); + let program_buffer_rent = + self.bench + .rent + .minimum_balance(UpgradeableLoaderState::size_of_programdata( + program_data.len(), + )); let mut instructions = bpf_loader_upgradeable::create_buffer( &self.bench.payer.pubkey(), diff --git a/governance/program/tests/setup_realm_with_all_addins.rs b/governance/program/tests/setup_realm_with_all_addins.rs index ba0f18981f5..b6a72bc1a43 100644 --- a/governance/program/tests/setup_realm_with_all_addins.rs +++ b/governance/program/tests/setup_realm_with_all_addins.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/setup_realm_with_max_voter_weight_addin.rs b/governance/program/tests/setup_realm_with_max_voter_weight_addin.rs index 2423ddf2312..7caf4f93f20 100644 --- a/governance/program/tests/setup_realm_with_max_voter_weight_addin.rs +++ b/governance/program/tests/setup_realm_with_max_voter_weight_addin.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/setup_realm_with_voter_weight_addin.rs b/governance/program/tests/setup_realm_with_voter_weight_addin.rs index 7ca44961fbf..6f6c6918ab0 100644 --- a/governance/program/tests/setup_realm_with_voter_weight_addin.rs +++ b/governance/program/tests/setup_realm_with_voter_weight_addin.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/use_proposals_with_multiple_options.rs b/governance/program/tests/use_proposals_with_multiple_options.rs index b8120956a2f..88a5fc20419 100644 --- a/governance/program/tests/use_proposals_with_multiple_options.rs +++ b/governance/program/tests/use_proposals_with_multiple_options.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/use_realm_with_all_addins.rs b/governance/program/tests/use_realm_with_all_addins.rs index ab566a230f6..ba1fad9ffad 100644 --- a/governance/program/tests/use_realm_with_all_addins.rs +++ b/governance/program/tests/use_realm_with_all_addins.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/use_realm_with_max_voter_weight_addin.rs b/governance/program/tests/use_realm_with_max_voter_weight_addin.rs index 75df30e8743..a2a65964546 100644 --- a/governance/program/tests/use_realm_with_max_voter_weight_addin.rs +++ b/governance/program/tests/use_realm_with_max_voter_weight_addin.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; diff --git a/governance/program/tests/use_realm_with_voter_weight_addin.rs b/governance/program/tests/use_realm_with_voter_weight_addin.rs index 08ba5c423e2..aa6fcaf7e7d 100644 --- a/governance/program/tests/use_realm_with_voter_weight_addin.rs +++ b/governance/program/tests/use_realm_with_voter_weight_addin.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::pubkey::Pubkey; use solana_program_test::*; diff --git a/governance/program/tests/use_veto_vote.rs b/governance/program/tests/use_veto_vote.rs index 2b80a3ffb7b..e12e065592a 100644 --- a/governance/program/tests/use_veto_vote.rs +++ b/governance/program/tests/use_veto_vote.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index c3ca4aba608..09560c5b00f 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -16,8 +16,8 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.127" serde_derive = "1.0.103" -solana-program = "1.10.35" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program = "1.11.6" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" diff --git a/governance/test-sdk/src/addins.rs b/governance/test-sdk/src/addins.rs index 88a41a1c7d9..9dc207e0ee4 100644 --- a/governance/test-sdk/src/addins.rs +++ b/governance/test-sdk/src/addins.rs @@ -13,7 +13,7 @@ pub fn ensure_addin_mock_is_built() { if find_file("spl_governance_addin_mock.so").is_none() { assert!(Command::new("cargo") .args(&[ - "build-bpf", + "build-sbf", "--manifest-path", "../addin-mock/program/Cargo.toml", ]) diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index 4ace7fbbcdd..faa5a70d108 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -15,6 +15,6 @@ num-derive = "0.3" num-traits = "0.2" serde = "1.0.127" serde_derive = "1.0.103" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index 42aaa56714a..543711eef00 100644 --- a/libraries/math/Cargo.toml +++ b/libraries/math/Cargo.toml @@ -9,21 +9,21 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] borsh = "0.9" borsh-derive = "0.9.0" num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" thiserror = "1.0" uint = "0.9" [dev-dependencies] proptest = "1.0.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" libm = "0.2.2" [lib] diff --git a/libraries/math/tests/instruction_count.rs b/libraries/math/tests/instruction_count.rs index f5a1370d17b..e2353e6da3b 100644 --- a/libraries/math/tests/instruction_count.rs +++ b/libraries/math/tests/instruction_count.rs @@ -1,5 +1,5 @@ // Mark this test as BPF-only due to current `ProgramTest` limitations when CPIing into the system program -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use { solana_program_test::*, diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml index f876c9840a7..68ed9878969 100644 --- a/memo/program/Cargo.toml +++ b/memo/program/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/memo/program/tests/functional.rs b/memo/program/tests/functional.rs index c5ef6d901b2..befbe56a0f1 100644 --- a/memo/program/tests/functional.rs +++ b/memo/program/tests/functional.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program::{ instruction::{AccountMeta, Instruction, InstructionError}, diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index aa1c6231b02..b88647481c2 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -14,18 +14,18 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] -solana-program = "1.10.35" +solana-program = "1.11.6" num-traits = "0.2" borsh = "0.9.1" num-derive = "0.3.3" thiserror = "1.0.29" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/name-service/program/tests/functional.rs b/name-service/program/tests/functional.rs index 1373cf4bb98..f622cb6478f 100644 --- a/name-service/program/tests/functional.rs +++ b/name-service/program/tests/functional.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use std::str::FromStr; use solana_program::{instruction::Instruction, program_pack::Pack, pubkey::Pubkey}; diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 0a26e3bb8fe..15a9dc76e40 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -9,19 +9,19 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] borsh = "0.9.1" borsh-derive = "0.9.0" num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/record/program/tests/functional.rs b/record/program/tests/functional.rs index 932f0f3b5bf..d194eabfce8 100644 --- a/record/program/tests/functional.rs +++ b/record/program/tests/functional.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use { borsh::BorshSerialize, diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 60883f424c9..948d27daa4c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.59.0" +channel = "1.60.0" diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml index 91ebd1f1e3c..84c6e8c6939 100644 --- a/shared-memory/program/Cargo.toml +++ b/shared-memory/program/Cargo.toml @@ -8,15 +8,15 @@ license = "Apache-2.0" edition = "2018" [features] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" -solana-program = "=1.10.35" +solana-program = "=1.11.6" [dev-dependencies] -solana-program-test = "=1.10.35" -solana-sdk = "=1.10.35" +solana-program-test = "=1.11.6" +solana-sdk = "=1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/shared-memory/program/tests/shared-memory.rs b/shared-memory/program/tests/shared-memory.rs index f1a06f07666..94a4a430c2b 100644 --- a/shared-memory/program/tests/shared-memory.rs +++ b/shared-memory/program/tests/shared-memory.rs @@ -1,5 +1,5 @@ // Program test does not support calling a raw program entrypoint, only `process_instruction` -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use solana_program_test::*; use solana_sdk::{ @@ -19,7 +19,7 @@ async fn assert_instruction_count() { let shared_key = Pubkey::new_unique(); let mut program_test = ProgramTest::new( - "spl_shared_memory", // Run the BPF version with `cargo test-bpf` + "spl_shared_memory", // Run the BPF version with `cargo test-sbf` program_id, None, ); @@ -59,7 +59,7 @@ async fn test_helloworld() { let shared_key = Pubkey::new_unique(); let mut program_test = ProgramTest::new( - "spl_shared_memory", // Run the BPF version with `cargo test-bpf` + "spl_shared_memory", // Run the BPF version with `cargo test-sbf` program_id, None, ); diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml index c6150bcff0b..1984f073fb2 100644 --- a/stake-pool/cli/Cargo.toml +++ b/stake-pool/cli/Cargo.toml @@ -14,15 +14,15 @@ clap = "2.33.3" serde = "1.0.130" serde_derive = "1.0.130" serde_json = "1.0.68" -solana-account-decoder = "=1.10.35" -solana-clap-utils = "=1.10.35" -solana-cli-config = "=1.10.35" -solana-cli-output = "=1.10.35" -solana-client = "=1.10.35" -solana-logger = "=1.10.35" -solana-program = "=1.10.35" -solana-remote-wallet = "=1.10.35" -solana-sdk = "=1.10.35" +solana-account-decoder = "=1.11.6" +solana-clap-utils = "=1.11.6" +solana-cli-config = "=1.11.6" +solana-cli-output = "=1.11.6" +solana-client = "=1.11.6" +solana-logger = "=1.11.6" +solana-program = "=1.11.6" +solana-remote-wallet = "=1.11.6" +solana-sdk = "=1.11.6" spl-associated-token-account = { version = "=1.1.1", path="../../associated-token-account/program", features = [ "no-entrypoint" ] } spl-stake-pool = { version = "=0.7.0", path="../program", features = [ "no-entrypoint" ] } spl-token = { version = "=3.5.0", path="../../token/program", features = [ "no-entrypoint" ] } diff --git a/stake-pool/cli/src/client.rs b/stake-pool/cli/src/client.rs index 005d890896e..039d057cef8 100644 --- a/stake-pool/cli/src/client.rs +++ b/stake-pool/cli/src/client.rs @@ -5,7 +5,7 @@ use { client_error::ClientError, rpc_client::RpcClient, rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}, - rpc_filter::{Memcmp, MemcmpEncodedBytes, MemcmpEncoding, RpcFilterType}, + rpc_filter::{Memcmp, RpcFilterType}, }, solana_program::{borsh::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake}, spl_stake_pool::{ @@ -85,11 +85,11 @@ pub(crate) fn get_stake_pools( .get_program_accounts_with_config( &spl_stake_pool::id(), RpcProgramAccountsConfig { - filters: Some(vec![RpcFilterType::Memcmp(Memcmp { - offset: 0, // 0 is the account type - bytes: MemcmpEncodedBytes::Base58("2".to_string()), - encoding: None, - })]), + // 0 is the account type + filters: Some(vec![RpcFilterType::Memcmp(Memcmp::new_raw_bytes( + 0, + vec![1], + ))]), account_config: RpcAccountInfoConfig { encoding: Some(UiAccountEncoding::Base64), ..RpcAccountInfoConfig::default() @@ -130,11 +130,7 @@ pub(crate) fn get_all_stake( RpcProgramAccountsConfig { filters: Some(vec![ // Filter by `Meta::authorized::staker`, which begins at byte offset 12 - RpcFilterType::Memcmp(Memcmp { - offset: 12, - bytes: MemcmpEncodedBytes::Base58(authorized_staker.to_string()), - encoding: Some(MemcmpEncoding::Binary), - }), + RpcFilterType::Memcmp(Memcmp::new_base58_encoded(12, authorized_staker.as_ref())), ]), account_config: RpcAccountInfoConfig { encoding: Some(solana_account_decoder::UiAccountEncoding::Base64), diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index 8a9973028a6..bf7ce2e96cb 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" @@ -20,7 +20,7 @@ num-traits = "0.2" num_enum = "0.5.4" serde = "1.0.130" serde_derive = "1.0.103" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-math = { version = "0.1", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" @@ -28,9 +28,9 @@ bincode = "1.3.1" [dev-dependencies] proptest = "1.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" -solana-vote-program = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" +solana-vote-program = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/stake-pool/program/tests/create_pool_token_metadata.rs b/stake-pool/program/tests/create_pool_token_metadata.rs index 3068df62524..7d648969c74 100644 --- a/stake-pool/program/tests/create_pool_token_metadata.rs +++ b/stake-pool/program/tests/create_pool_token_metadata.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; use { diff --git a/stake-pool/program/tests/decrease.rs b/stake-pool/program/tests/decrease.rs index 1089fba90dd..a050b407bbc 100644 --- a/stake-pool/program/tests/decrease.rs +++ b/stake-pool/program/tests/decrease.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/deposit.rs b/stake-pool/program/tests/deposit.rs index d38bb63a249..4a586550e6e 100644 --- a/stake-pool/program/tests/deposit.rs +++ b/stake-pool/program/tests/deposit.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/deposit_authority.rs b/stake-pool/program/tests/deposit_authority.rs index afae4c086a1..b78bdc4251a 100644 --- a/stake-pool/program/tests/deposit_authority.rs +++ b/stake-pool/program/tests/deposit_authority.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/deposit_sol.rs b/stake-pool/program/tests/deposit_sol.rs index 72121a0e29f..c38aebed551 100644 --- a/stake-pool/program/tests/deposit_sol.rs +++ b/stake-pool/program/tests/deposit_sol.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/force_destake.rs b/stake-pool/program/tests/force_destake.rs index afc33fb65f3..a68205295b2 100644 --- a/stake-pool/program/tests/force_destake.rs +++ b/stake-pool/program/tests/force_destake.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/huge_pool.rs b/stake-pool/program/tests/huge_pool.rs index d5d7a20d046..b74186b248b 100644 --- a/stake-pool/program/tests/huge_pool.rs +++ b/stake-pool/program/tests/huge_pool.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/increase.rs b/stake-pool/program/tests/increase.rs index 13f55564a4d..5f73615bddc 100644 --- a/stake-pool/program/tests/increase.rs +++ b/stake-pool/program/tests/increase.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/initialize.rs b/stake-pool/program/tests/initialize.rs index 220f621e9fa..fb4cfd0c33d 100644 --- a/stake-pool/program/tests/initialize.rs +++ b/stake-pool/program/tests/initialize.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_deposit_fee.rs b/stake-pool/program/tests/set_deposit_fee.rs index ba7ead8015c..7f7c268bbcb 100644 --- a/stake-pool/program/tests/set_deposit_fee.rs +++ b/stake-pool/program/tests/set_deposit_fee.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_epoch_fee.rs b/stake-pool/program/tests/set_epoch_fee.rs index d63a23a6afa..2df679cbaee 100644 --- a/stake-pool/program/tests/set_epoch_fee.rs +++ b/stake-pool/program/tests/set_epoch_fee.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_funding_authority.rs b/stake-pool/program/tests/set_funding_authority.rs index fb4607daa7e..08e0668e024 100644 --- a/stake-pool/program/tests/set_funding_authority.rs +++ b/stake-pool/program/tests/set_funding_authority.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_manager.rs b/stake-pool/program/tests/set_manager.rs index 64fcdb064f8..987211ce12a 100644 --- a/stake-pool/program/tests/set_manager.rs +++ b/stake-pool/program/tests/set_manager.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_preferred.rs b/stake-pool/program/tests/set_preferred.rs index 10b11a81c0f..83586d60a18 100644 --- a/stake-pool/program/tests/set_preferred.rs +++ b/stake-pool/program/tests/set_preferred.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_referral_fee.rs b/stake-pool/program/tests/set_referral_fee.rs index cdc93fb9d60..a2f6166b08b 100644 --- a/stake-pool/program/tests/set_referral_fee.rs +++ b/stake-pool/program/tests/set_referral_fee.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_staker.rs b/stake-pool/program/tests/set_staker.rs index 49efad607cd..dca486a6048 100644 --- a/stake-pool/program/tests/set_staker.rs +++ b/stake-pool/program/tests/set_staker.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/set_withdrawal_fee.rs b/stake-pool/program/tests/set_withdrawal_fee.rs index 1b2d48ae9ec..00ae0bf5a27 100644 --- a/stake-pool/program/tests/set_withdrawal_fee.rs +++ b/stake-pool/program/tests/set_withdrawal_fee.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/update_pool_token_metadata.rs b/stake-pool/program/tests/update_pool_token_metadata.rs index fd27f806296..1e2d01d3da5 100644 --- a/stake-pool/program/tests/update_pool_token_metadata.rs +++ b/stake-pool/program/tests/update_pool_token_metadata.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; use { diff --git a/stake-pool/program/tests/update_stake_pool_balance.rs b/stake-pool/program/tests/update_stake_pool_balance.rs index 3b415c0a300..099797f91c0 100644 --- a/stake-pool/program/tests/update_stake_pool_balance.rs +++ b/stake-pool/program/tests/update_stake_pool_balance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/update_validator_list_balance.rs b/stake-pool/program/tests/update_validator_list_balance.rs index 21ba0f3df92..75277c0e9ea 100644 --- a/stake-pool/program/tests/update_validator_list_balance.rs +++ b/stake-pool/program/tests/update_validator_list_balance.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/vsa_add.rs b/stake-pool/program/tests/vsa_add.rs index de0c6665ad4..0e640de7eb2 100644 --- a/stake-pool/program/tests/vsa_add.rs +++ b/stake-pool/program/tests/vsa_add.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs index aec2b98323b..209d5193573 100644 --- a/stake-pool/program/tests/vsa_remove.rs +++ b/stake-pool/program/tests/vsa_remove.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/withdraw.rs b/stake-pool/program/tests/withdraw.rs index e3fbc2baf8d..96a899e5fef 100644 --- a/stake-pool/program/tests/withdraw.rs +++ b/stake-pool/program/tests/withdraw.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/program/tests/withdraw_sol.rs b/stake-pool/program/tests/withdraw_sol.rs index 82686de96f1..2abcfc89343 100644 --- a/stake-pool/program/tests/withdraw_sol.rs +++ b/stake-pool/program/tests/withdraw_sol.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/stake-pool/py/tests/test_bot_rebalance.py b/stake-pool/py/tests/test_bot_rebalance.py index 69876e11b04..e9c32e0227a 100644 --- a/stake-pool/py/tests/test_bot_rebalance.py +++ b/stake-pool/py/tests/test_bot_rebalance.py @@ -19,7 +19,10 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak (stake_pool_address, validator_list_address) = stake_pool_addresses resp = await async_client.get_minimum_balance_for_rent_exemption(STAKE_LEN) stake_rent_exemption = resp['result'] - increase_amount = MINIMUM_ACTIVE_STAKE + # With minimum delegation at MINIMUM_DELEGATION + rent-exemption, when + # decreasing, we'll need rent exemption + minimum delegation delegated to + # cover all movements + increase_amount = MINIMUM_ACTIVE_STAKE + stake_rent_exemption deposit_amount = (increase_amount + stake_rent_exemption) * len(validators) resp = await async_client.get_account_info(stake_pool_address, commitment=Confirmed) @@ -28,7 +31,7 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak token_account = get_associated_token_address(payer.public_key, stake_pool.pool_mint) await deposit_sol(async_client, payer, stake_pool_address, token_account, deposit_amount) - # Test case 1: Increase + # Test case 1: Increase everywhere await rebalance(ENDPOINT, stake_pool_address, payer, 0.0) # should only have minimum left @@ -43,7 +46,7 @@ async def test_rebalance_this_is_very_slow(async_client, validators, payer, stak assert validator.active_stake_lamports == 0 assert validator.transient_stake_lamports == increase_amount + stake_rent_exemption - # Test case 2: Decrease + # Test case 2: Decrease everything back to reserve print('Waiting for next epoch') await waiter.wait_for_next_epoch(async_client) await rebalance(ENDPOINT, stake_pool_address, payer, deposit_amount / LAMPORTS_PER_SOL) diff --git a/stake-pool/py/tests/test_stake.py b/stake-pool/py/tests/test_stake.py index fdf016bc297..ab7cc3a4494 100644 --- a/stake-pool/py/tests/test_stake.py +++ b/stake-pool/py/tests/test_stake.py @@ -17,7 +17,7 @@ async def test_create_stake(async_client, payer): async def test_delegate_stake(async_client, validators, payer): validator = validators[0] stake = Keypair() - await create_stake(async_client, payer, stake, payer.public_key, 1) + await create_stake(async_client, payer, stake, payer.public_key, MINIMUM_DELEGATION) await delegate_stake(async_client, payer, payer, stake.public_key, validator) diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index 98fd6fcf2fb..27be0c90ba3 100644 --- a/stateless-asks/program/Cargo.toml +++ b/stateless-asks/program/Cargo.toml @@ -8,19 +8,19 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] borsh = "0.9.1" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = ["no-entrypoint"] } spl-associated-token-account = {version = "1.1", path = "../../associated-token-account/program", features = ["no-entrypoint"]} metaplex-token-metadata = { version = "0.0.1", features = ["no-entrypoint"] } thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-lending/README.md b/token-lending/README.md index 9b03d5cb512..292fd11a774 100644 --- a/token-lending/README.md +++ b/token-lending/README.md @@ -80,7 +80,7 @@ This is optional! You can skip these steps and use the [Token Lending CLI](./cli 1. Build the program binaries: ```shell cargo build - cargo build-bpf + cargo build-sbf ``` 1. Prepare to deploy to devnet: diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml index 781a3d8d558..e1b562d5015 100644 --- a/token-lending/cli/Cargo.toml +++ b/token-lending/cli/Cargo.toml @@ -10,12 +10,12 @@ version = "0.2.0" [dependencies] clap = "2.33.3" -solana-clap-utils = "=1.10.35" -solana-cli-config = "=1.10.35" -solana-client = "=1.10.35" -solana-logger = "=1.10.35" -solana-sdk = "=1.10.35" -solana-program = "=1.10.35" +solana-clap-utils = "=1.11.6" +solana-cli-config = "=1.11.6" +solana-client = "=1.11.6" +solana-logger = "=1.11.6" +solana-sdk = "=1.11.6" +solana-program = "=1.11.6" spl-token-lending = { version = "0.2", path="../program", features = [ "no-entrypoint" ] } spl-token = { version = "3.5", path="../../token/program", features = [ "no-entrypoint" ] } diff --git a/token-lending/flash_loan_receiver/Cargo.toml b/token-lending/flash_loan_receiver/Cargo.toml index 7c47870a8ce..fa1c5c598a9 100644 --- a/token-lending/flash_loan_receiver/Cargo.toml +++ b/token-lending/flash_loan_receiver/Cargo.toml @@ -5,7 +5,7 @@ edition = "2018" [dependencies] arrayref = "0.3.6" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features=["no-entrypoint"] } [lib] diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml index 57ee1e53faa..8620e8cfad4 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -9,14 +9,14 @@ edition = "2018" [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" bytemuck = "1.7.2" num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" @@ -26,8 +26,8 @@ assert_matches = "1.5.0" base64 = "0.13" log = "0.4.14" proptest = "1.0" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" serde = "1.0" serde_yaml = "0.8" diff --git a/token-lending/program/tests/borrow_obligation_liquidity.rs b/token-lending/program/tests/borrow_obligation_liquidity.rs index cf5df6eb411..589c945647b 100644 --- a/token-lending/program/tests/borrow_obligation_liquidity.rs +++ b/token-lending/program/tests/borrow_obligation_liquidity.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/deposit_obligation_collateral.rs b/token-lending/program/tests/deposit_obligation_collateral.rs index 73e30dc08b0..7fdf176509c 100644 --- a/token-lending/program/tests/deposit_obligation_collateral.rs +++ b/token-lending/program/tests/deposit_obligation_collateral.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/deposit_reserve_liquidity.rs b/token-lending/program/tests/deposit_reserve_liquidity.rs index ced4ea614ba..49ab587e7ee 100644 --- a/token-lending/program/tests/deposit_reserve_liquidity.rs +++ b/token-lending/program/tests/deposit_reserve_liquidity.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/flash_loan.rs b/token-lending/program/tests/flash_loan.rs index ff00626e0b2..c9b6b268875 100644 --- a/token-lending/program/tests/flash_loan.rs +++ b/token-lending/program/tests/flash_loan.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/helpers/genesis.rs b/token-lending/program/tests/helpers/genesis.rs index 6eba2f0e8d8..2cdc2ceca42 100644 --- a/token-lending/program/tests/helpers/genesis.rs +++ b/token-lending/program/tests/helpers/genesis.rs @@ -42,7 +42,7 @@ impl GenesisAccounts { let programdata_address = Pubkey::find_program_address(&[program_id.as_ref()], &bpf_loader_upgradeable::id()).0; - let programdata_data_offset = UpgradeableLoaderState::programdata_data_offset().unwrap(); + let programdata_data_offset = UpgradeableLoaderState::size_of_programdata_metadata(); let programdata_space = 2 * program_data.len() + programdata_data_offset; let mut programdata_account = Account::new_data_with_space( u32::MAX as u64, diff --git a/token-lending/program/tests/init_lending_market.rs b/token-lending/program/tests/init_lending_market.rs index ee9e602333c..1a53723b946 100644 --- a/token-lending/program/tests/init_lending_market.rs +++ b/token-lending/program/tests/init_lending_market.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/init_obligation.rs b/token-lending/program/tests/init_obligation.rs index 05f4c50d401..156f2b2da86 100644 --- a/token-lending/program/tests/init_obligation.rs +++ b/token-lending/program/tests/init_obligation.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/init_reserve.rs b/token-lending/program/tests/init_reserve.rs index c2407bec63e..9e4031f3846 100644 --- a/token-lending/program/tests/init_reserve.rs +++ b/token-lending/program/tests/init_reserve.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/liquidate_obligation.rs b/token-lending/program/tests/liquidate_obligation.rs index d052fae6e43..4316e887f45 100644 --- a/token-lending/program/tests/liquidate_obligation.rs +++ b/token-lending/program/tests/liquidate_obligation.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/modify_reserve_config.rs b/token-lending/program/tests/modify_reserve_config.rs index 8986db71313..101a8ab3bda 100644 --- a/token-lending/program/tests/modify_reserve_config.rs +++ b/token-lending/program/tests/modify_reserve_config.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/obligation_end_to_end.rs b/token-lending/program/tests/obligation_end_to_end.rs index 619018887fb..1e86d5af861 100644 --- a/token-lending/program/tests/obligation_end_to_end.rs +++ b/token-lending/program/tests/obligation_end_to_end.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/redeem_reserve_collateral.rs b/token-lending/program/tests/redeem_reserve_collateral.rs index b8b9c342db0..03fe5249267 100644 --- a/token-lending/program/tests/redeem_reserve_collateral.rs +++ b/token-lending/program/tests/redeem_reserve_collateral.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/refresh_obligation.rs b/token-lending/program/tests/refresh_obligation.rs index 07485f4a0ca..fcc58e98cc9 100644 --- a/token-lending/program/tests/refresh_obligation.rs +++ b/token-lending/program/tests/refresh_obligation.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/refresh_reserve.rs b/token-lending/program/tests/refresh_reserve.rs index 131989526e1..6a1ba839ef0 100644 --- a/token-lending/program/tests/refresh_reserve.rs +++ b/token-lending/program/tests/refresh_reserve.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/repay_obligation_liquidity.rs b/token-lending/program/tests/repay_obligation_liquidity.rs index a280e615b7f..6acaf619b5b 100644 --- a/token-lending/program/tests/repay_obligation_liquidity.rs +++ b/token-lending/program/tests/repay_obligation_liquidity.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/set_lending_market_owner.rs b/token-lending/program/tests/set_lending_market_owner.rs index 8fdf9134e30..d9db3f2d723 100644 --- a/token-lending/program/tests/set_lending_market_owner.rs +++ b/token-lending/program/tests/set_lending_market_owner.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-lending/program/tests/withdraw_obligation_collateral.rs b/token-lending/program/tests/withdraw_obligation_collateral.rs index dd8fb191333..7335932b51e 100644 --- a/token-lending/program/tests/withdraw_obligation_collateral.rs +++ b/token-lending/program/tests/withdraw_obligation_collateral.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod helpers; diff --git a/token-swap/README.md b/token-swap/README.md index bf1b9c5661d..a29e19c1fb7 100644 --- a/token-swap/README.md +++ b/token-swap/README.md @@ -12,7 +12,7 @@ To build a development version of the Token Swap program, you can use the normal build command for Solana programs: ```sh -cargo build-bpf +cargo build-sbf ``` ## Building mainnet v2.0.0 @@ -32,7 +32,7 @@ You can build the production version of Token Swap running on devnet, testnet, a mainnet-beta using the following command: ```sh -SWAP_PROGRAM_OWNER_FEE_ADDRESS=HfoTxFR1Tm6kGmWgYWD6J7YHVy1UwqSULUGVLXkJqaKN cargo build-bpf --features=production +SWAP_PROGRAM_OWNER_FEE_ADDRESS=HfoTxFR1Tm6kGmWgYWD6J7YHVy1UwqSULUGVLXkJqaKN cargo build-sbf --features=production ``` ## Testing diff --git a/token-swap/js/package.json b/token-swap/js/package.json index 2d1e7d8337a..959b632effd 100644 --- a/token-swap/js/package.json +++ b/token-swap/js/package.json @@ -35,7 +35,7 @@ "start-with-test-validator": "start-server-and-test 'solana-test-validator --bpf-program SwapsVeCiPHMUAtzQWZw7RjsKjgCjhwU55QGu4U1Szw ../../target/deploy/spl_token_swap.so --reset --quiet' http://localhost:8899/health test", "lint": "npm run pretty && eslint --max-warnings 0 .", "lint:fix": "npm run pretty:fix && eslint . --fix", - "build:program": "cargo build-bpf --manifest-path ../program/Cargo.toml", + "build:program": "cargo build-sbf --manifest-path ../program/Cargo.toml", "pretty": "prettier --check '{,???/**/}*.ts'", "pretty:fix": "prettier --write '{,???/**/}*.ts'" }, diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index a0558f018c0..990a1516b58 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -17,7 +17,7 @@ arrayref = "0.3.6" enum_dispatch = "0.3.7" num-derive = "0.3" num-traits = "0.2" -solana-program = "1.10.35" +solana-program = "1.11.6" spl-math = { version = "0.1", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "3.5", path = "../../token/program", features = [ "no-entrypoint" ] } spl-token-2022 = { version = "0.4", path = "../../token/program-2022", features = [ "no-entrypoint" ] } @@ -29,7 +29,7 @@ roots = { version = "0.0.7", optional = true } proptest = "1.0" roots = "0.0.7" sim = { path = "./sim" } -solana-sdk = "1.10.35" +solana-sdk = "1.11.6" test-case = "2.2" [lib] diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml index 97dcc04097e..e64ea7955e1 100644 --- a/token-swap/program/fuzz/Cargo.toml +++ b/token-swap/program/fuzz/Cargo.toml @@ -11,7 +11,7 @@ publish = false [dependencies] honggfuzz = { version = "0.5.54" } arbitrary = { version = "1.0", features = ["derive"] } -solana-program = "1.10.35" +solana-program = "1.11.6" spl-math = { version = "0.1", path = "../../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "3.5", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-token-swap = { path = "..", features = ["fuzz", "no-entrypoint"] } diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index 856af963c69..3b6c5b845f1 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -18,15 +18,15 @@ indicatif = "0.16.2" serde = "1.0.130" serde_derive = "1.0.103" serde_json = "1.0.68" -solana-account-decoder = "=1.10.35" -solana-clap-utils = "=1.10.35" -solana-cli-config = "=1.10.35" -solana-cli-output = "=1.10.35" -solana-client = "=1.10.35" -solana-logger = "=1.10.35" -solana-remote-wallet = "=1.10.35" -solana-sdk = "=1.10.35" -solana-transaction-status = "=1.10.35" +solana-account-decoder = "=1.11.6" +solana-clap-utils = "=1.11.6" +solana-cli-config = "=1.11.6" +solana-cli-output = "=1.11.6" +solana-client = "=1.11.6" +solana-logger = "=1.11.6" +solana-remote-wallet = "=1.11.6" +solana-sdk = "=1.11.6" +solana-transaction-status = "=1.11.6" spl-token = { version = "3.5", path="../program", features = [ "no-entrypoint" ] } spl-token-2022 = { version = "0.4", path="../program-2022", features = [ "no-entrypoint" ] } spl-token-client = { version = "0.1", path="../client" } @@ -37,7 +37,7 @@ strum_macros = "0.24" tokio = "1.14" [dev-dependencies] -solana-test-validator = "=1.10.35" +solana-test-validator = "=1.11.6" assert_cmd = "2.0.4" serial_test = "0.8.0" tempfile = "3.3.0" diff --git a/token/cli/build.rs b/token/cli/build.rs index 387204a1b33..c07683ecff8 100644 --- a/token/cli/build.rs +++ b/token/cli/build.rs @@ -32,11 +32,11 @@ fn rerun_if_changed(directory: &Path) { fn build_bpf(program_directory: &Path) { let toml_file = program_directory.join("Cargo.toml"); let toml_file = format!("{}", toml_file.display()); - let args = vec!["build-bpf", "--manifest-path", &toml_file]; + let args = vec!["build-sbf", "--manifest-path", &toml_file]; let output = Command::new("cargo") .args(&args) .output() - .expect("Error running cargo build-bpf"); + .expect("Error running cargo build-sbf"); if let Ok(output_str) = std::str::from_utf8(&output.stdout) { let subs = output_str.split('\n'); for sub in subs { diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml index 0367654050d..4ddeda10eac 100644 --- a/token/client/Cargo.toml +++ b/token/client/Cargo.toml @@ -9,9 +9,9 @@ version = "0.1.0" [dependencies] async-trait = "0.1" -solana-client = "=1.10.35" -solana-program-test = "=1.10.35" -solana-sdk = "=1.10.35" +solana-client = "=1.11.6" +solana-program-test = "=1.11.6" +solana-sdk = "=1.11.6" # We never want the entrypoint for ATA, but we want the entrypoint for token when # testing token spl-associated-token-account = { version = "1.1", path = "../../associated-token-account/program", features = ["no-entrypoint"] } diff --git a/token/js/package.json b/token/js/package.json index ba6c851d9b2..bd1f23a7946 100644 --- a/token/js/package.json +++ b/token/js/package.json @@ -33,7 +33,7 @@ "test:e2e-built": "start-server-and-test 'solana-test-validator --bpf-program TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA ../../target/deploy/spl_token.so --reset --quiet' http://localhost:8899/health 'mocha test/e2e'", "test:e2e-2022": "TEST_PROGRAM_ID=TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb start-server-and-test 'solana-test-validator --bpf-program ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL ../../target/deploy/spl_associated_token_account.so --bpf-program TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb ../../target/deploy/spl_token_2022.so --reset --quiet' http://localhost:8899/health 'mocha test/e2e*'", "test:e2e-native": "start-server-and-test 'solana-test-validator --reset --quiet' http://localhost:8899/health 'mocha test/e2e'", - "test:build-programs": "cargo build-bpf --manifest-path ../program/Cargo.toml && cargo build-bpf --manifest-path ../program-2022/Cargo.toml && cargo build-bpf --manifest-path ../../associated-token-account/program/Cargo.toml", + "test:build-programs": "cargo build-sbf --manifest-path ../program/Cargo.toml && cargo build-sbf --manifest-path ../program-2022/Cargo.toml && cargo build-sbf --manifest-path ../../associated-token-account/program/Cargo.toml", "docs": "shx rm -rf docs && NODE_OPTIONS=--max_old_space_size=4096 typedoc && shx cp .nojekyll docs/", "fmt": "prettier --write '{*,**/*}.{js,ts,jsx,tsx,json}'", "lint": "eslint --max-warnings 0 --ext .ts . && prettier --check '{*,**/*}.{js,ts,jsx,tsx,json}'", diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index 3e80174da14..2f4251d91d2 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -8,16 +8,16 @@ repository = "https://github.com/solana-labs/solana-program-library" version = "0.0.1" [features] -test-bpf = [] +test-sbf = [] [build-dependencies] walkdir = "2" [dev-dependencies] async-trait = "0.1" -solana-program = "=1.10.35" -solana-program-test = "=1.10.35" -solana-sdk = "=1.10.35" +solana-program = "=1.11.6" +solana-program-test = "=1.11.6" +solana-sdk = "=1.11.6" spl-associated-token-account = { version = "1.1", path = "../../associated-token-account/program" } spl-memo = { version = "3.0.1", path = "../../memo/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.4", path="../program-2022", features = ["no-entrypoint"] } diff --git a/token/program-2022-test/build.rs b/token/program-2022-test/build.rs index 1668421895d..a166f6661aa 100644 --- a/token/program-2022-test/build.rs +++ b/token/program-2022-test/build.rs @@ -40,11 +40,11 @@ fn main() { let spl_token_2022_toml = spl_token_2022_dir.join("Cargo.toml"); let spl_token_2022_toml = format!("{}", spl_token_2022_toml.display()); - let args = vec!["build-bpf", "--manifest-path", &spl_token_2022_toml]; + let args = vec!["build-sbf", "--manifest-path", &spl_token_2022_toml]; let output = Command::new("cargo") .args(&args) .output() - .expect("Error running cargo build-bpf"); + .expect("Error running cargo build-sbf"); if let Ok(output_str) = std::str::from_utf8(&output.stdout) { let subs = output_str.split('\n'); for sub in subs { diff --git a/token/program-2022-test/tests/burn.rs b/token/program-2022-test/tests/burn.rs index 1b7102dfd09..ac9f7f86a6f 100644 --- a/token/program-2022-test/tests/burn.rs +++ b/token/program-2022-test/tests/burn.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/close_account.rs b/token/program-2022-test/tests/close_account.rs index 1e19d50ee92..2ff7af8d82b 100644 --- a/token/program-2022-test/tests/close_account.rs +++ b/token/program-2022-test/tests/close_account.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/confidential_transfer.rs b/token/program-2022-test/tests/confidential_transfer.rs index 47222c271e8..052073f41ff 100644 --- a/token/program-2022-test/tests/confidential_transfer.rs +++ b/token/program-2022-test/tests/confidential_transfer.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] #![cfg(twoxtx)] mod program_test; diff --git a/token/program-2022-test/tests/default_account_state.rs b/token/program-2022-test/tests/default_account_state.rs index d7b90048c3f..aa84540f7ea 100644 --- a/token/program-2022-test/tests/default_account_state.rs +++ b/token/program-2022-test/tests/default_account_state.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/delegate.rs b/token/program-2022-test/tests/delegate.rs index 1dc4f08d927..20eb3c879a4 100644 --- a/token/program-2022-test/tests/delegate.rs +++ b/token/program-2022-test/tests/delegate.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/freeze.rs b/token/program-2022-test/tests/freeze.rs index d6c3855ee90..e38bf020f95 100644 --- a/token/program-2022-test/tests/freeze.rs +++ b/token/program-2022-test/tests/freeze.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/initialize_account.rs b/token/program-2022-test/tests/initialize_account.rs index 1e96a62f7fa..10e2f34a901 100644 --- a/token/program-2022-test/tests/initialize_account.rs +++ b/token/program-2022-test/tests/initialize_account.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/initialize_mint.rs b/token/program-2022-test/tests/initialize_mint.rs index d5082d96938..86af50f4fd0 100644 --- a/token/program-2022-test/tests/initialize_mint.rs +++ b/token/program-2022-test/tests/initialize_mint.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/interest_bearing_mint.rs b/token/program-2022-test/tests/interest_bearing_mint.rs index 8fc2d116af9..07426face20 100644 --- a/token/program-2022-test/tests/interest_bearing_mint.rs +++ b/token/program-2022-test/tests/interest_bearing_mint.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/memo_transfer.rs b/token/program-2022-test/tests/memo_transfer.rs index dce23f8bb45..cdbdf56e27f 100644 --- a/token/program-2022-test/tests/memo_transfer.rs +++ b/token/program-2022-test/tests/memo_transfer.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/mint_close_authority.rs b/token/program-2022-test/tests/mint_close_authority.rs index e9b02b7957f..9eb5709a80c 100644 --- a/token/program-2022-test/tests/mint_close_authority.rs +++ b/token/program-2022-test/tests/mint_close_authority.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/reallocate.rs b/token/program-2022-test/tests/reallocate.rs index e1783e94391..1358e3e9a9c 100644 --- a/token/program-2022-test/tests/reallocate.rs +++ b/token/program-2022-test/tests/reallocate.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/sync_native.rs b/token/program-2022-test/tests/sync_native.rs index 0b99149c900..02b29da5136 100644 --- a/token/program-2022-test/tests/sync_native.rs +++ b/token/program-2022-test/tests/sync_native.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/transfer.rs b/token/program-2022-test/tests/transfer.rs index 5e52fa01d66..09ee1c720cd 100644 --- a/token/program-2022-test/tests/transfer.rs +++ b/token/program-2022-test/tests/transfer.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022-test/tests/transfer_fee.rs b/token/program-2022-test/tests/transfer_fee.rs index 4ee4a7a87ba..3b386338805 100644 --- a/token/program-2022-test/tests/transfer_fee.rs +++ b/token/program-2022-test/tests/transfer_fee.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod program_test; use { diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index 217b9a6291c..2b40b2ec142 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -10,7 +10,7 @@ exclude = ["js/**"] [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] serde-traits = ["serde", "serde_with"] # Remove these features once the underlying syscalls are released on all networks default = ["zk-ops"] @@ -22,8 +22,8 @@ bytemuck = { version = "1.7.2", features = ["derive"] } num-derive = "0.3" num-traits = "0.2" num_enum = "0.5.4" -solana-program = "1.10.35" -solana-zk-token-sdk = "1.10.35" +solana-program = "1.11.6" +solana-zk-token-sdk = "1.11.6" spl-memo = { version = "3.0.1", path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { version = "3.5", path = "../program", features = ["no-entrypoint"] } thiserror = "1.0" @@ -34,8 +34,8 @@ serde_with = { version = "1.14.0", optional = true } lazy_static = "1.4.0" proptest = "1.0" serial_test = "0.5.1" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" serde_json = "1.0.81" [lib] diff --git a/token/program-2022/tests/assert_instruction_count.rs b/token/program-2022/tests/assert_instruction_count.rs index edfdfa7813e..54624da9668 100644 --- a/token/program-2022/tests/assert_instruction_count.rs +++ b/token/program-2022/tests/assert_instruction_count.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod action; use { diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml index 3978fec7bcf..80543d0a1ee 100644 --- a/token/program/Cargo.toml +++ b/token/program/Cargo.toml @@ -10,7 +10,7 @@ exclude = ["js/**"] [features] no-entrypoint = [] -test-bpf = [] +test-sbf = [] [dependencies] arrayref = "0.3.6" @@ -18,15 +18,15 @@ bytemuck = "1.7.2" num-derive = "0.3" num-traits = "0.2" num_enum = "0.5.4" -solana-program = "1.10.35" +solana-program = "1.11.6" thiserror = "1.0" [dev-dependencies] lazy_static = "1.4.0" proptest = "1.0" serial_test = "0.5.1" -solana-program-test = "1.10.35" -solana-sdk = "1.10.35" +solana-program-test = "1.11.6" +solana-sdk = "1.11.6" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/program/tests/assert_instruction_count.rs b/token/program/tests/assert_instruction_count.rs index d663c549fc8..a6df337092c 100644 --- a/token/program/tests/assert_instruction_count.rs +++ b/token/program/tests/assert_instruction_count.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] mod action; use { diff --git a/token/program/tests/close_account.rs b/token/program/tests/close_account.rs index 195a7aa9d0f..25adda2c29d 100644 --- a/token/program/tests/close_account.rs +++ b/token/program/tests/close_account.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "test-bpf")] +#![cfg(feature = "test-sbf")] use { solana_program_test::{processor, tokio, ProgramTest, ProgramTestContext}, diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml index ef9bca42845..1031d7a2684 100644 --- a/utils/test-client/Cargo.toml +++ b/utils/test-client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" # Used to ensure that SPL programs are buildable by external clients [dependencies] -solana-sdk = "1.10.35" +solana-sdk = "1.11.6" spl-memo = { path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { path = "../../token/program", features = [ "no-entrypoint" ] } spl-token-swap = { path = "../../token-swap/program", features = [ "no-entrypoint" ] }