Upgrade Solana to 1.16.0 (#2512)

.github/workflows/no-caching-tests.yaml

@@ -11,7 +11,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: false
-      solana_cli_version: 1.14.16
+      solana_cli_version: 1.16.0
       node_version: 17.0.1
       cargo_profile: release
       anchor_binary_name: anchor-binary-no-caching

.github/workflows/reusable-tests.yaml

@@ -332,33 +332,34 @@ jobs:
   #     - run: cd tests/misc && chmod +x ci.sh && ./ci.sh
   #     - run: cd tests/misc && anchor test --skip-lint
 
-  test-anchor-init:
-    needs: setup-anchor-cli
-    name: Test Anchor Init
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v3
-      - uses: ./.github/actions/setup/
-      - uses: ./.github/actions/setup-ts/
-      - uses: ./.github/actions/setup-solana/
+  # TODO: Re-enable after releasing `0.28.0`. See https://github.com/coral-xyz/anchor/pull/2512
+  # test-anchor-init:
+  #   needs: setup-anchor-cli
+  #   name: Test Anchor Init
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 30
+  #   steps:
+  #     - uses: actions/checkout@v3
+  #     - uses: ./.github/actions/setup/
+  #     - uses: ./.github/actions/setup-ts/
+  #     - uses: ./.github/actions/setup-solana/
 
-      - uses: actions/cache@v3
-        if: ${{ env.CACHE != 'false' }}
-        name: Cache Cargo registry + index
-        id: cache-anchor
-        with:
-          path: ${{ env.CARGO_CACHE_PATH }}
-          key: cargo-${{ runner.os }}-${{ env.CARGO_PROFILE }}-anchor-${{ hashFiles('**/Cargo.lock') }}
+  #     - uses: actions/cache@v3
+  #       if: ${{ env.CACHE != 'false' }}
+  #       name: Cache Cargo registry + index
+  #       id: cache-anchor
+  #       with:
+  #         path: ${{ env.CARGO_CACHE_PATH }}
+  #         key: cargo-${{ runner.os }}-${{ env.CARGO_PROFILE }}-anchor-${{ hashFiles('**/Cargo.lock') }}
 
-      - uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.ANCHOR_BINARY_NAME }}
-          path: ~/.cargo/bin/
-      - run: chmod +x ~/.cargo/bin/anchor
+  #     - uses: actions/download-artifact@v3
+  #       with:
+  #         name: ${{ env.ANCHOR_BINARY_NAME }}
+  #         path: ~/.cargo/bin/
+  #     - run: chmod +x ~/.cargo/bin/anchor
 
-      - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @coral-xyz/anchor && yarn && anchor test && yarn lint:fix
-      - uses: ./.github/actions/git-diff/
+  #     - run: cd "$(mktemp -d)" && anchor init hello-anchor && cd hello-anchor && yarn link @coral-xyz/anchor && yarn && anchor test && yarn lint:fix
+  #     - uses: ./.github/actions/git-diff/
 
   test-programs:
     needs: setup-anchor-cli
@@ -383,7 +384,9 @@ jobs:
             path: tests/multisig
           # - cmd: cd tests/lockup && anchor test --skip-lint
           #   path: tests/lockup
-          - cmd: cd tests/swap/deps/openbook-dex/dex && cargo build-bpf -- --locked && cd ../../../ && anchor test --skip-lint
+          # TODO: Remove `1.14.18` installation if/when https://github.com/solana-labs/solana/issues/31960 is solved
+          # `swap` tests don't work with Solana `1.16.0`, downgrade to `1.14.18`
+          - cmd: cd tests/swap/deps/openbook-dex/dex && solana-install init 1.14.18 && cargo build-bpf -- --locked && cd ../../../ && solana-install init $SOLANA_CLI_VERSION && anchor test --skip-lint
             path: tests/swap
           - cmd: cd tests/escrow && anchor test --skip-lint && npx tsc --noEmit
             path: tests/escrow
@@ -411,7 +414,9 @@ jobs:
             path: tests/ido-pool
           # - cmd: cd tests/cfo && anchor run test-with-build && cd deps/stake && git checkout Cargo.lock && cd ../swap && git checkout Cargo.lock
           #   path: tests/cfo
-          - cmd: cd tests/auction-house && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
+          # TODO: Remove `1.14.18` installation if/when https://github.com/solana-labs/solana/issues/31960 is solved
+          # `auction-house` tests don't work with Solana `1.16.0`, downgrade to `1.14.18`
+          - cmd: cd tests/auction-house && solana-install init 1.14.18 && yarn --frozen-lockfile && anchor test --skip-lint && git checkout Cargo.lock
             path: tests/auction-house
           - cmd: cd tests/floats && yarn --frozen-lockfile && anchor test --skip-lint && npx tsc --noEmit
             path: tests/floats

.github/workflows/tests.yaml

@@ -14,7 +14,7 @@ jobs:
     uses: ./.github/workflows/reusable-tests.yaml
     with:
       cache: true
-      solana_cli_version: 1.14.16
+      solana_cli_version: 1.16.0
       node_version: 17.0.1
       cargo_profile: debug
       anchor_binary_name: anchor-binary

CHANGELOG.md

@@ -26,6 +26,7 @@ The minor version will be incremented upon a breaking change and the patch versi
 - lang: Fix inability to use identifiers `program_id`, `accounts`, `ix_data`, `remaining_accounts` in instruction arguments ([#2464](https://github.com/coral-xyz/anchor/pull/2464))
 - cli: Fix incorrect `metadata.address` generation in IDL after deploying with a custom keypair ([#2485](https://github.com/coral-xyz/anchor/pull/2485))
 - cli: IDL commands no longer hang when the payer doesn't have funds to pay for the transaction fee ([#2492](https://github.com/coral-xyz/anchor/pull/2492))
+- cli, client, lang, spl: Update Solana toolchain and dependencies to `1.16.0` and specify maximum version of `<1.17.0` ([#2512](https://github.com/coral-xyz/anchor/pull/2512)).
 
 ### Breaking
 

bench/COMPUTE_UNITS.md

@@ -11,95 +11,95 @@ The programs and their tests are located in [/tests/bench](https://github.com/co
 
 ## [Unreleased]
 
-| Instruction                 | Compute Units | +/- |
-| --------------------------- | ------------- | --- |
-| accountInfo1                | 954           | -   |
-| accountInfo2                | 1567          | -   |
-| accountInfo4                | 2059          | -   |
-| accountInfo8                | 3856          | -   |
-| accountEmptyInit1           | 5958          | -   |
-| accountEmpty1               | 1090          | -   |
-| accountEmptyInit2           | 10583         | -   |
-| accountEmpty2               | 1852          | -   |
-| accountEmptyInit4           | 19557         | -   |
-| accountEmpty4               | 2646          | -   |
-| accountEmptyInit8           | 37541         | -   |
-| accountEmpty8               | 5043          | -   |
-| accountSizedInit1           | 6063          | -   |
-| accountSized1               | 1135          | -   |
-| accountSizedInit2           | 10783         | -   |
-| accountSized2               | 1966          | -   |
-| accountSizedInit4           | 19975         | -   |
-| accountSized4               | 2787          | -   |
-| accountSizedInit8           | 38381         | -   |
-| accountSized8               | 5359          | -   |
-| accountUnsizedInit1         | 6193          | -   |
-| accountUnsized1             | 1243          | -   |
-| accountUnsizedInit2         | 11042         | -   |
-| accountUnsized2             | 1893          | -   |
-| accountUnsizedInit4         | 20495         | -   |
-| accountUnsized4             | 3104          | -   |
-| accountUnsizedInit8         | 39419         | -   |
-| accountUnsized8             | 6051          | -   |
-| boxedAccountEmptyInit1      | 6160          | -   |
-| boxedAccountEmpty1          | 976           | -   |
-| boxedAccountEmptyInit2      | 10784         | -   |
-| boxedAccountEmpty2          | 1499          | -   |
-| boxedAccountEmptyInit4      | 19500         | -   |
-| boxedAccountEmpty4          | 2530          | -   |
-| boxedAccountEmptyInit8      | 37415         | -   |
-| boxedAccountEmpty8          | 4780          | -   |
-| boxedAccountSizedInit1      | 6256          | -   |
-| boxedAccountSized1          | 1003          | -   |
-| boxedAccountSizedInit2      | 10975         | -   |
-| boxedAccountSized2          | 1554          | -   |
-| boxedAccountSizedInit4      | 19884         | -   |
-| boxedAccountSized4          | 2642          | -   |
-| boxedAccountSizedInit8      | 38182         | -   |
-| boxedAccountSized8          | 5003          | -   |
-| boxedAccountUnsizedInit1    | 6374          | -   |
-| boxedAccountUnsized1        | 1069          | -   |
-| boxedAccountUnsizedInit2    | 11211         | -   |
-| boxedAccountUnsized2        | 1679          | -   |
-| boxedAccountUnsizedInit4    | 20351         | -   |
-| boxedAccountUnsized4        | 2899          | -   |
-| boxedAccountUnsizedInit8    | 39118         | -   |
-| boxedAccountUnsized8        | 5517          | -   |
-| boxedInterfaceAccountMint1  | 2299          | -   |
-| boxedInterfaceAccountMint2  | 4053          | -   |
-| boxedInterfaceAccountMint4  | 7538          | -   |
-| boxedInterfaceAccountMint8  | 14699         | -   |
-| boxedInterfaceAccountToken1 | 1737          | -   |
-| boxedInterfaceAccountToken2 | 2928          | -   |
-| boxedInterfaceAccountToken4 | 5291          | -   |
-| boxedInterfaceAccountToken8 | 10205         | -   |
-| interfaceAccountMint1       | 2530          | -   |
-| interfaceAccountMint2       | 4726          | -   |
-| interfaceAccountMint4       | 9431          | -   |
-| interfaceAccountMint8       | 17709         | -   |
-| interfaceAccountToken1      | 1755          | -   |
-| interfaceAccountToken2      | 3211          | -   |
-| interfaceAccountToken4      | 6006          | -   |
-| interface1                  | 999           | -   |
-| interface2                  | 1574          | -   |
-| interface4                  | 1996          | -   |
-| interface8                  | 3651          | -   |
-| program1                    | 999           | -   |
-| program2                    | 1573          | -   |
-| program4                    | 1998          | -   |
-| program8                    | 3651          | -   |
-| signer1                     | 958           | -   |
-| signer2                     | 1576          | -   |
-| signer4                     | 2079          | -   |
-| signer8                     | 3895          | -   |
-| systemAccount1              | 1013          | -   |
-| systemAccount2              | 1686          | -   |
-| systemAccount4              | 2298          | -   |
-| systemAccount8              | 4336          | -   |
-| uncheckedAccount1           | 953           | -   |
-| uncheckedAccount2           | 1567          | -   |
-| uncheckedAccount4           | 2060          | -   |
-| uncheckedAccount8           | 3855          | -   |
+| Instruction                 | Compute Units | +/-            |
+| --------------------------- | ------------- | -------------- |
+| accountInfo1                | 1015          | 🔴 **+6.39%**  |
+| accountInfo2                | 1475          | 🟢 **-5.87%**  |
+| accountInfo4                | 1964          | 🟢 **-4.61%**  |
+| accountInfo8                | 3856          | -              |
+| accountEmptyInit1           | 5817          | 🟢 **-2.37%**  |
+| accountEmpty1               | 1149          | 🔴 **+5.41%**  |
+| accountEmptyInit2           | 10402         | 🟢 **-1.63%**  |
+| accountEmpty2               | 1754          | 🟢 **-5.29%**  |
+| accountEmptyInit4           | 19557         | -              |
+| accountEmpty4               | 2540          | 🟢 **-4.01%**  |
+| accountEmptyInit8           | 37541         | -              |
+| accountEmpty8               | 5043          | -              |
+| accountSizedInit1           | 5924          | 🟢 **-2.29%**  |
+| accountSized1               | 1214          | 🔴 **+6.96%**  |
+| accountSizedInit2           | 10783         | -              |
+| accountSized2               | 1873          | 🟢 **-4.73%**  |
+| accountSizedInit4           | 19975         | -              |
+| accountSized4               | 2787          | -              |
+| accountSizedInit8           | 38381         | -              |
+| accountSized8               | 5359          | -              |
+| accountUnsizedInit1         | 6052          | 🟢 **-2.28%**  |
+| accountUnsized1             | 1338          | 🔴 **+7.64%**  |
+| accountUnsizedInit2         | 10929         | 🟢 **-1.02%**  |
+| accountUnsized2             | 1778          | 🟢 **-6.08%**  |
+| accountUnsizedInit4         | 20495         | -              |
+| accountUnsized4             | 3136          | 🔴 **+1.03%**  |
+| accountUnsizedInit8         | 39419         | -              |
+| accountUnsized8             | 5952          | 🟢 **-1.64%**  |
+| boxedAccountEmptyInit1      | 6034          | 🟢 **-2.05%**  |
+| boxedAccountEmpty1          | 888           | 🟢 **-9.02%**  |
+| boxedAccountEmptyInit2      | 10633         | 🟢 **-1.40%**  |
+| boxedAccountEmpty2          | 1401          | 🟢 **-6.54%**  |
+| boxedAccountEmptyInit4      | 19500         | -              |
+| boxedAccountEmpty4          | 2424          | 🟢 **-4.19%**  |
+| boxedAccountEmptyInit8      | 37415         | -              |
+| boxedAccountEmpty8          | 4659          | 🟢 **-2.53%**  |
+| boxedAccountSizedInit1      | 6130          | 🟢 **-2.01%**  |
+| boxedAccountSized1          | 917           | 🟢 **-8.57%**  |
+| boxedAccountSizedInit2      | 10828         | 🟢 **-1.34%**  |
+| boxedAccountSized2          | 1463          | 🟢 **-5.86%**  |
+| boxedAccountSizedInit4      | 19884         | -              |
+| boxedAccountSized4          | 2543          | 🟢 **-3.75%**  |
+| boxedAccountSizedInit8      | 38182         | -              |
+| boxedAccountSized8          | 4898          | 🟢 **-2.10%**  |
+| boxedAccountUnsizedInit1    | 6240          | 🟢 **-2.10%**  |
+| boxedAccountUnsized1        | 972           | 🟢 **-9.07%**  |
+| boxedAccountUnsizedInit2    | 11048         | 🟢 **-1.45%**  |
+| boxedAccountUnsized2        | 1570          | 🟢 **-6.49%**  |
+| boxedAccountUnsizedInit4    | 20138         | 🟢 **-1.05%**  |
+| boxedAccountUnsized4        | 2768          | 🟢 **-4.52%**  |
+| boxedAccountUnsizedInit8    | 39118         | -              |
+| boxedAccountUnsized8        | 5347          | 🟢 **-3.08%**  |
+| boxedInterfaceAccountMint1  | 2299          | -              |
+| boxedInterfaceAccountMint2  | 4129          | 🔴 **+1.88%**  |
+| boxedInterfaceAccountMint4  | 7783          | 🔴 **+3.25%**  |
+| boxedInterfaceAccountMint8  | 15281         | 🔴 **+3.96%**  |
+| boxedInterfaceAccountToken1 | 2023          | 🔴 **+16.47%** |
+| boxedInterfaceAccountToken2 | 3582          | 🔴 **+22.34%** |
+| boxedInterfaceAccountToken4 | 6692          | 🔴 **+26.48%** |
+| boxedInterfaceAccountToken8 | 13098         | 🔴 **+28.35%** |
+| interfaceAccountMint1       | 2364          | 🟢 **-6.56%**  |
+| interfaceAccountMint2       | 5030          | 🔴 **+6.43%**  |
+| interfaceAccountMint4       | 9803          | 🔴 **+3.94%**  |
+| interfaceAccountMint8       | 18400         | 🔴 **+3.90%**  |
+| interfaceAccountToken1      | 2091          | 🔴 **+19.15%** |
+| interfaceAccountToken2      | 3948          | 🔴 **+22.95%** |
+| interfaceAccountToken4      | 7547          | 🔴 **+25.66%** |
+| interface1                  | 1059          | 🔴 **+6.01%**  |
+| interface2                  | 1479          | 🟢 **-6.04%**  |
+| interface4                  | 1900          | 🟢 **-4.81%**  |
+| interface8                  | 3651          | -              |
+| program1                    | 1053          | 🔴 **+5.41%**  |
+| program2                    | 1467          | 🟢 **-6.74%**  |
+| program4                    | 1878          | 🟢 **-6.01%**  |
+| program8                    | 3598          | 🟢 **-1.45%**  |
+| signer1                     | 1018          | 🔴 **+6.26%**  |
+| signer2                     | 1484          | 🟢 **-5.84%**  |
+| signer4                     | 1984          | 🟢 **-4.57%**  |
+| signer8                     | 3895          | -              |
+| systemAccount1              | 1072          | 🔴 **+5.82%**  |
+| systemAccount2              | 1590          | 🟢 **-5.69%**  |
+| systemAccount4              | 2195          | 🟢 **-4.48%**  |
+| systemAccount8              | 4336          | -              |
+| uncheckedAccount1           | 1014          | 🔴 **+6.40%**  |
+| uncheckedAccount2           | 1475          | 🟢 **-5.87%**  |
+| uncheckedAccount4           | 1965          | 🟢 **-4.61%**  |
+| uncheckedAccount8           | 3855          | -              |
 
 ### Notable changes
 

cli/Cargo.toml

@@ -31,18 +31,18 @@ toml = "0.5.8"
 solang-parser = "=0.2.3"
 semver = "1.0.4"
 serde = { version = "1.0.122", features = ["derive"] }
-solana-sdk = "1.14.16"
-solana-program = "1.14.16"
-solana-client = "1.14.16"
-solana-cli-config = "1.14.16"
-solana-faucet = "1.14.16"
+solana-sdk = "<1.17.0"
+solana-program = "<1.17.0"
+solana-client = "<1.17.0"
+solana-cli-config = "<1.17.0"
+solana-faucet = "<1.17.0"
 dirs = "4.0"
 heck = "0.4.0"
 flate2 = "1.0.19"
 tar = "0.4.35"
 regex = "1.8.3"
 reqwest = { version = "0.11.4", default-features = false, features = ["multipart", "blocking", "rustls-tls"] }
-tokio = "1.24"
+tokio = "~1.14.1"
 pathdiff = "0.2.0"
 cargo_toml = "0.13.0"
 walkdir = "2.3.2"

client/Cargo.toml

@@ -16,7 +16,7 @@ anyhow = "1.0.32"
 regex = "1.4.5"
 serde = { version = "1.0.122", features = ["derive"] }
 solana-client = "1.14.7"
-solana-sdk = "1.14.16"
-solana-account-decoder = "1.14.16"
+solana-sdk = "<1.17.0"
+solana-account-decoder = "<1.17.0"
 thiserror = "1.0.20"
 url = "2.2.2"

client/example/Cargo.toml

@@ -17,4 +17,4 @@ events = { path = "../../tests/events/programs/events", features = ["no-entrypoi
 shellexpand = "2.1.0"
 anyhow = "1.0.32"
 clap = { version = "4.2.4", features = ["derive"] }
-solana-sdk = "1.14.16"
+solana-sdk = "<1.17.0"

lang/Cargo.toml

@@ -30,14 +30,15 @@ anchor-attribute-access-control = { path = "./attribute/access-control", version
 anchor-attribute-account = { path = "./attribute/account", version = "0.27.0" }
 anchor-attribute-constant = { path = "./attribute/constant", version = "0.27.0" }
 anchor-attribute-error = { path = "./attribute/error", version = "0.27.0" }
-anchor-attribute-program = { path = "./attribute/program", version = "0.27.0" }
 anchor-attribute-event = { path = "./attribute/event", version = "0.27.0" }
+anchor-attribute-program = { path = "./attribute/program", version = "0.27.0" }
 anchor-derive-accounts = { path = "./derive/accounts", version = "0.27.0" }
 anchor-derive-space = { path = "./derive/space", version = "0.27.0" }
 arrayref = "0.3.6"
 base64 = "0.13.0"
-borsh = "0.9"
+bincode = "1.3.3"
+borsh = "<0.11.0"
 bytemuck = "1.4.0"
-solana-program = "1.14.16"
+getrandom = { version = "0.2", features = ["custom"] }
+solana-program = "<1.17.0"
 thiserror = "1.0.20"
-bincode = "1.3.3"

lang/tests/generics_test.rs

@@ -47,6 +47,10 @@ impl<const N: usize> BorshDeserialize for WrappedU8Array<N> {
     fn deserialize(_buf: &mut &[u8]) -> borsh::maybestd::io::Result<Self> {
         todo!()
     }
+
+    fn deserialize_reader<R: std::io::Read>(_reader: &mut R) -> std::io::Result<Self> {
+        todo!()
+    }
 }
 impl<const N: usize> Owner for WrappedU8Array<N> {
     fn owner() -> Pubkey {

spl/Cargo.toml

@@ -22,16 +22,10 @@ dex = ["serum_dex"]
 
 [dependencies]
 anchor-lang = { path = "../lang", version = "0.27.0", features = ["derive"] }
-borsh = { version = "^0.9", optional = true }
+borsh = { version = "<0.11.0", optional = true }
 serum_dex = { git = "https://github.com/openbook-dex/program/", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
-solana-program = "1.14.16"
+solana-program = "<1.17.0"
 spl-token = { version = "3.5.0", features = ["no-entrypoint"], optional = true }
 spl-token-2022 = { version = "0.6.1", features = ["no-entrypoint"], optional = true }
 spl-associated-token-account = { version = "1.1.1", features = ["no-entrypoint"], optional = true }
 mpl-token-metadata = { version = "^1.11.0", optional = true, features = ["no-entrypoint"] }
-
-# TODO: Remove after Solana release v1.16
-# Latest solana version(1.14.17) as of 2023-05-01 comes with rustc 1.62.0-dev but MSRV for latest
-# version of this crate is 1.64.0. See https://github.com/solana-labs/solana/pull/31418
-winnow = "=0.4.1"
-toml_datetime = "=0.6.1"

tests/anchor-cli-account/programs/account-command/Cargo.toml

@@ -16,4 +16,4 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "0.27.0"
+anchor-lang = { path = "../../../../lang" }

tests/auction-house

@@ -1 +1 @@
-Subproject commit b73b60e55a87bda1d2770c7c10db920db9cdb06b
+Subproject commit 82c049326c1f99b76ee40dc7dadc1769c56c53c1

tests/bench/bench.json

@@ -92,92 +92,92 @@
   },
   "unreleased": {
     "computeUnits": {
-      "accountInfo1": 954,
-      "accountInfo2": 1567,
-      "accountInfo4": 2059,
+      "accountInfo1": 1015,
+      "accountInfo2": 1475,
+      "accountInfo4": 1964,
       "accountInfo8": 3856,
-      "accountEmptyInit1": 5958,
-      "accountEmpty1": 1090,
-      "accountEmptyInit2": 10583,
-      "accountEmpty2": 1852,
+      "accountEmptyInit1": 5817,
+      "accountEmpty1": 1149,
+      "accountEmptyInit2": 10402,
+      "accountEmpty2": 1754,
       "accountEmptyInit4": 19557,
-      "accountEmpty4": 2646,
+      "accountEmpty4": 2540,
       "accountEmptyInit8": 37541,
       "accountEmpty8": 5043,
-      "accountSizedInit1": 6063,
-      "accountSized1": 1135,
+      "accountSizedInit1": 5924,
+      "accountSized1": 1214,
       "accountSizedInit2": 10783,
-      "accountSized2": 1966,
+      "accountSized2": 1873,
       "accountSizedInit4": 19975,
       "accountSized4": 2787,
       "accountSizedInit8": 38381,
       "accountSized8": 5359,
-      "accountUnsizedInit1": 6193,
-      "accountUnsized1": 1243,
-      "accountUnsizedInit2": 11042,
-      "accountUnsized2": 1893,
+      "accountUnsizedInit1": 6052,
+      "accountUnsized1": 1338,
+      "accountUnsizedInit2": 10929,
+      "accountUnsized2": 1778,
       "accountUnsizedInit4": 20495,
-      "accountUnsized4": 3104,
+      "accountUnsized4": 3136,
       "accountUnsizedInit8": 39419,
-      "accountUnsized8": 6051,
-      "boxedAccountEmptyInit1": 6160,
-      "boxedAccountEmpty1": 976,
-      "boxedAccountEmptyInit2": 10784,
-      "boxedAccountEmpty2": 1499,
+      "accountUnsized8": 5952,
+      "boxedAccountEmptyInit1": 6034,
+      "boxedAccountEmpty1": 888,
+      "boxedAccountEmptyInit2": 10633,
+      "boxedAccountEmpty2": 1401,
       "boxedAccountEmptyInit4": 19500,
-      "boxedAccountEmpty4": 2530,
+      "boxedAccountEmpty4": 2424,
       "boxedAccountEmptyInit8": 37415,
-      "boxedAccountEmpty8": 4780,
-      "boxedAccountSizedInit1": 6256,
-      "boxedAccountSized1": 1003,
-      "boxedAccountSizedInit2": 10975,
-      "boxedAccountSized2": 1554,
+      "boxedAccountEmpty8": 4659,
+      "boxedAccountSizedInit1": 6130,
+      "boxedAccountSized1": 917,
+      "boxedAccountSizedInit2": 10828,
+      "boxedAccountSized2": 1463,
       "boxedAccountSizedInit4": 19884,
-      "boxedAccountSized4": 2642,
+      "boxedAccountSized4": 2543,
       "boxedAccountSizedInit8": 38182,
-      "boxedAccountSized8": 5003,
-      "boxedAccountUnsizedInit1": 6374,
-      "boxedAccountUnsized1": 1069,
-      "boxedAccountUnsizedInit2": 11211,
-      "boxedAccountUnsized2": 1679,
-      "boxedAccountUnsizedInit4": 20351,
-      "boxedAccountUnsized4": 2899,
+      "boxedAccountSized8": 4898,
+      "boxedAccountUnsizedInit1": 6240,
+      "boxedAccountUnsized1": 972,
+      "boxedAccountUnsizedInit2": 11048,
+      "boxedAccountUnsized2": 1570,
+      "boxedAccountUnsizedInit4": 20138,
+      "boxedAccountUnsized4": 2768,
       "boxedAccountUnsizedInit8": 39118,
-      "boxedAccountUnsized8": 5517,
+      "boxedAccountUnsized8": 5347,
       "boxedInterfaceAccountMint1": 2299,
-      "boxedInterfaceAccountMint2": 4053,
-      "boxedInterfaceAccountMint4": 7538,
-      "boxedInterfaceAccountMint8": 14699,
-      "boxedInterfaceAccountToken1": 1737,
-      "boxedInterfaceAccountToken2": 2928,
-      "boxedInterfaceAccountToken4": 5291,
-      "boxedInterfaceAccountToken8": 10205,
-      "interfaceAccountMint1": 2530,
-      "interfaceAccountMint2": 4726,
-      "interfaceAccountMint4": 9431,
-      "interfaceAccountMint8": 17709,
-      "interfaceAccountToken1": 1755,
-      "interfaceAccountToken2": 3211,
-      "interfaceAccountToken4": 6006,
-      "interface1": 999,
-      "interface2": 1574,
-      "interface4": 1996,
+      "boxedInterfaceAccountMint2": 4129,
+      "boxedInterfaceAccountMint4": 7783,
+      "boxedInterfaceAccountMint8": 15281,
+      "boxedInterfaceAccountToken1": 2023,
+      "boxedInterfaceAccountToken2": 3582,
+      "boxedInterfaceAccountToken4": 6692,
+      "boxedInterfaceAccountToken8": 13098,
+      "interfaceAccountMint1": 2364,
+      "interfaceAccountMint2": 5030,
+      "interfaceAccountMint4": 9803,
+      "interfaceAccountMint8": 18400,
+      "interfaceAccountToken1": 2091,
+      "interfaceAccountToken2": 3948,
+      "interfaceAccountToken4": 7547,
+      "interface1": 1059,
+      "interface2": 1479,
+      "interface4": 1900,
       "interface8": 3651,
-      "program1": 999,
-      "program2": 1573,
-      "program4": 1998,
-      "program8": 3651,
-      "signer1": 958,
-      "signer2": 1576,
-      "signer4": 2079,
+      "program1": 1053,
+      "program2": 1467,
+      "program4": 1878,
+      "program8": 3598,
+      "signer1": 1018,
+      "signer2": 1484,
+      "signer4": 1984,
       "signer8": 3895,
-      "systemAccount1": 1013,
-      "systemAccount2": 1686,
-      "systemAccount4": 2298,
+      "systemAccount1": 1072,
+      "systemAccount2": 1590,
+      "systemAccount4": 2195,
       "systemAccount8": 4336,
-      "uncheckedAccount1": 953,
-      "uncheckedAccount2": 1567,
-      "uncheckedAccount4": 2060,
+      "uncheckedAccount1": 1014,
+      "uncheckedAccount2": 1475,
+      "uncheckedAccount4": 1965,
       "uncheckedAccount8": 3855
     }
   }

tests/bench/programs/bench/Cargo.toml

@@ -14,8 +14,3 @@ cpi = ["no-entrypoint"]
 [dependencies]
 anchor-lang = { path = "../../../../lang" }
 anchor-spl = { path = "../../../../spl" }
-
-# TODO: Remove this and store lock files for each version instead.
-# Latest solana version(1.14.17) as of 2023-05-01 comes with rustc 1.62.0-dev but MSRV for latest
-# version of this crate is 1.64.0. See https://github.com/solana-labs/solana/pull/31418
-winnow = "=0.4.1"

tests/zero-copy/programs/zero-copy/Cargo.toml

@@ -22,4 +22,4 @@ bytemuck = {version = "1.4.0", features = ["derive", "min_const_generics"]}
 
 [dev-dependencies]
 anchor-client = { path = "../../../../client", features = ["debug"] }
-solana-program-test = "1.14.16"
+solana-program-test = "<1.17.0"