From cd79bba17331235ab489bae56600043ea853c70b Mon Sep 17 00:00:00 2001 From: Jon Cinque Date: Thu, 21 Sep 2023 10:44:57 +0200 Subject: [PATCH] Bump repo to 1.16.13 (#5324) * Run update script * Update everything to use non-deprecated functions --- Anchor.toml | 2 +- Cargo.lock | 257 +++++++++--------- account-compression/programs/noop/Cargo.toml | 2 +- .../program-test/Cargo.toml | 6 +- associated-token-account/program/Cargo.toml | 2 +- binary-option/program/Cargo.toml | 2 +- binary-oracle-pair/program/Cargo.toml | 6 +- ci/solana-version.sh | 2 +- .../rust/cross-program-invocation/Cargo.toml | 6 +- examples/rust/custom-heap/Cargo.toml | 6 +- examples/rust/logging/Cargo.toml | 6 +- examples/rust/sysvar/Cargo.toml | 6 +- examples/rust/transfer-lamports/Cargo.toml | 6 +- examples/rust/transfer-tokens/Cargo.toml | 6 +- feature-proposal/cli/Cargo.toml | 10 +- feature-proposal/program/Cargo.toml | 6 +- feature-proposal/program/src/instruction.rs | 2 +- feature-proposal/program/src/state.rs | 2 +- governance/addin-api/Cargo.toml | 2 +- governance/addin-mock/program/Cargo.toml | 6 +- governance/chat/program/Cargo.toml | 6 +- governance/program/Cargo.toml | 6 +- governance/program/src/processor/mod.rs | 2 +- governance/program/src/state/realm.rs | 2 +- .../program/src/state/token_owner_record.rs | 2 +- governance/test-sdk/Cargo.toml | 6 +- governance/test-sdk/src/lib.rs | 2 +- governance/tools/Cargo.toml | 2 +- governance/tools/src/account.rs | 2 +- instruction-padding/program/Cargo.toml | 6 +- libraries/discriminator/Cargo.toml | 2 +- libraries/discriminator/syn/Cargo.toml | 2 +- libraries/math/Cargo.toml | 6 +- libraries/pod/Cargo.toml | 4 +- libraries/program-error/Cargo.toml | 4 +- libraries/program-error/derive/Cargo.toml | 2 +- libraries/tlv-account-resolution/Cargo.toml | 6 +- .../type-length-value-derive-test/src/lib.rs | 2 +- libraries/type-length-value/Cargo.toml | 2 +- .../type-length-value/derive/src/builder.rs | 4 +- managed-token/program/Cargo.toml | 6 +- memo/program/Cargo.toml | 6 +- name-service/program/Cargo.toml | 6 +- record/program/Cargo.toml | 6 +- record/program/tests/functional.rs | 2 +- shared-memory/program/Cargo.toml | 6 +- single-pool/cli/Cargo.toml | 22 +- single-pool/cli/src/main.rs | 2 +- single-pool/program/Cargo.toml | 8 +- single-pool/program/src/instruction.rs | 1 + single-pool/program/src/processor.rs | 2 +- single-pool/program/src/state.rs | 4 +- single-pool/program/tests/helpers/token.rs | 2 +- stake-pool/cli/Cargo.toml | 18 +- stake-pool/cli/src/client.rs | 4 +- stake-pool/cli/src/main.rs | 2 +- stake-pool/program/Cargo.toml | 8 +- stake-pool/program/src/instruction.rs | 4 + stake-pool/program/src/processor.rs | 2 +- stake-pool/program/src/state.rs | 4 +- stake-pool/program/tests/deposit.rs | 2 +- stake-pool/program/tests/deposit_authority.rs | 2 +- .../program/tests/deposit_edge_cases.rs | 2 +- stake-pool/program/tests/deposit_sol.rs | 2 +- stake-pool/program/tests/helpers/mod.rs | 4 +- stake-pool/program/tests/huge_pool.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_stake_pool_balance.rs | 2 +- .../tests/update_validator_list_balance.rs | 2 +- .../update_validator_list_balance_hijack.rs | 2 +- stake-pool/program/tests/vsa_add.rs | 5 +- stake-pool/program/tests/vsa_remove.rs | 2 +- stake-pool/program/tests/withdraw.rs | 2 +- .../program/tests/withdraw_edge_cases.rs | 2 +- stake-pool/program/tests/withdraw_sol.rs | 2 +- stake-pool/program/tests/withdraw_with_fee.rs | 2 +- stateless-asks/program/Cargo.toml | 6 +- stateless-asks/program/src/processor.rs | 2 +- token-lending/cli/Cargo.toml | 12 +- token-lending/flash_loan_receiver/Cargo.toml | 2 +- token-lending/program/Cargo.toml | 6 +- token-metadata/example/Cargo.toml | 6 +- token-metadata/example/src/processor.rs | 2 +- token-metadata/example/tests/emit.rs | 2 +- token-metadata/interface/Cargo.toml | 2 +- token-metadata/interface/src/state.rs | 2 +- token-swap/program/Cargo.toml | 4 +- token-swap/program/fuzz/Cargo.toml | 2 +- token-upgrade/cli/Cargo.toml | 14 +- token-upgrade/program/Cargo.toml | 6 +- token-wrap/program/Cargo.toml | 2 +- token/cli/Cargo.toml | 20 +- token/client/Cargo.toml | 12 +- token/client/src/output.rs | 2 +- token/program-2022-test/Cargo.toml | 6 +- .../tests/token_metadata_emit.rs | 2 +- token/program-2022/Cargo.toml | 8 +- token/program/Cargo.toml | 6 +- token/transfer-hook-example/Cargo.toml | 6 +- token/transfer-hook-interface/Cargo.toml | 2 +- utils/test-client/Cargo.toml | 2 +- 109 files changed, 364 insertions(+), 353 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index 33c646f6993..9e942997cd1 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,5 +1,5 @@ anchor_version = "0.28.0" -solana_version = "1.16.3" +solana_version = "1.16.13" [workspace] members = [ diff --git a/Cargo.lock b/Cargo.lock index 5ade2645c3b..0f562af1550 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3871,9 +3871,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" dependencies = [ "bytes", "pin-project-lite", @@ -3889,9 +3889,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", @@ -4848,9 +4848,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63c62ec28eaf2f4ef06f39d549230699068e9b2171a67a8232e11993ecb86dd" +checksum = "b83daa56035885dac1a47f5bd3d4e02379e3fc5915b2c3ce978a9af9eeecf07d" dependencies = [ "Inflector", "base64 0.21.4", @@ -4872,9 +4872,9 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ddbc426b2e0443c2e58c0ab721c93a788f0e97eb4f25340e4e50dd1e6978027" +checksum = "2dd3f3e85d67e559985fbdc6b5b4d5dd9c8462b78e6079c3b465496c1f3c55d6" dependencies = [ "bincode", "bytemuck", @@ -4893,9 +4893,9 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a0c59c2a0bf79a131aa21b1eaf75e3ed024ca8ffb42a7024f75708044bc43d" +checksum = "e7703026aea6e6fc89cdd77e9d7e08e3890bdddc4177efbf971da75284a353c5" dependencies = [ "borsh 0.10.3", "futures 0.3.28", @@ -4910,9 +4910,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2240f8e28bd1afbf381a0da972b673eb36c284b1552517ca68197d293245369d" +checksum = "2cea685028231e10a02c6f021ca6cd1d0446a7ecb199b8c9e939d5cccb57ec9d" dependencies = [ "serde", "solana-sdk", @@ -4921,9 +4921,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "600956a2195241db23abaaa9f4636440d6cc8d4b1c6d95364dc39bebd8e8c735" +checksum = "49a1c4d902adb2c19a65caf025307e76e6bae92415ed8adeb68aaf6b5034b2bc" dependencies = [ "bincode", "crossbeam-channel", @@ -4940,9 +4940,9 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1d256381f5b0f4cc569e2ec36fda1711cbac89ef11149f784952eeb66e0fc4" +checksum = "c3f7ffadcb9166e792e9a9db018e14391692373c439da87a082f0652d28484e1" dependencies = [ "bv", "fnv", @@ -4959,9 +4959,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25355ae2d2a7c6acdc1aaef69fcbd8388a4c5139cc993a581aaf1395a8cadc44" +checksum = "3da230f2ff22007e2ca60507346488a65ec274fbb2486bdd2d10948eef2c03d8" dependencies = [ "bincode", "byteorder", @@ -4978,9 +4978,9 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e89cb1aa8bf12f825e392100c6e68ba044ad394cbb29c6c95a433067acc911c" +checksum = "89e8716aa59039a8eeac13a5d090561ae11a252d674e9b41d97fe382a70545b9" dependencies = [ "bv", "log", @@ -4995,9 +4995,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19777832c5623c5a1b642f35d847acaf7243124e8f4f300dbe9d387b05b4f78" +checksum = "3669a399b8ef60642471e68e1f93d3f3050248a4fa1436341596cfcb2a484e8b" dependencies = [ "chrono", "clap 2.34.0", @@ -5013,9 +5013,9 @@ dependencies = [ [[package]] name = "solana-clap-v3-utils" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5db36c57fcf3c2010a8ab3198acf2a810106f6a1259726ab193edc7b7250786" +checksum = "8661e09e5410c716863256a11dd26e5fce185dddd83146d99e8d92490dc5a03c" dependencies = [ "chrono", "clap 3.2.25", @@ -5032,9 +5032,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb813240859354ccbfe20005f8784d72676a8212937e42a5e33696932d0cc5c5" +checksum = "79b593a0718a12d73fff3c5d9d405981c778a1806c66d327f5bdef0bec23402f" dependencies = [ "dirs-next", "lazy_static", @@ -5048,9 +5048,9 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88eecf5a027d90a37354cc838b54a14f64511316c209fa26e35ce11c13d49567" +checksum = "0518efb44a2586f0aa7bf01fa6f90d3cd4e047a90ccfef799adb6e248bf79773" dependencies = [ "Inflector", "base64 0.21.4", @@ -5075,9 +5075,9 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3458b0fcf87b14560836a9dc1d0270fe1b4d70425235e91b94a74f4a614f0" +checksum = "e96d8a28ca30cd385f7c2c4a7f93edc32c18bc041baa0e8b25bd56cd28c51cbb" dependencies = [ "async-trait", "bincode", @@ -5108,9 +5108,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48026e143aad06e9bafdcb5dbbcd3ac156644699df4da83608a0e157dd2f4aa0" +checksum = "552f79e747bd8bb7baa229007f5ff54971f67ec6f0f9d2a06a95adfaabe3f19c" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5118,9 +5118,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac78caf77ffe8cc8c108b2e424f5e710f640777f3d78faf2ac7535008a39f5a" +checksum = "0a35e4cc9f2996a2ef95aac398443fc4a110ef585521e11a7685b3591648b7cf" dependencies = [ "bincode", "chrono", @@ -5132,9 +5132,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964e4b517d80543e9ff0676bb1700f5011e8588795f4e68fb8ab343c87eefad4" +checksum = "5ecb12464ee1322a02635345522839958d78a2bacff18298991cacf298178f64" dependencies = [ "async-trait", "bincode", @@ -5153,9 +5153,9 @@ dependencies = [ [[package]] name = "solana-core" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7ce3c03b35a1e57710343b1b4ef93a14bf4a4afa5e99a9b3f1bdaff4c19a07" +checksum = "1c61c5ff777cd58a81095abca38f64d3fde90706d7b2a9acce47cf59954dc561" dependencies = [ "base64 0.21.4", "bincode", @@ -5217,9 +5217,9 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97a7607b2ce0b07a8ffc42b2024c51095dba75407b44c485889499c1d13fea2" +checksum = "8b2d9d9d65da6ddd170ed35ff484e08a52ab30260e48602b02979d06afa69c6d" dependencies = [ "bincode", "crossbeam-channel", @@ -5240,9 +5240,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643af1d1859e8135fad8f152c6b1dbb944fba5a5a5488be428baecc4b08cd4b8" +checksum = "fa14ab9f44667719270dd174538d0c0fa869ddfb69a1b2ac1aa2d510e98da009" dependencies = [ "bincode", "byteorder", @@ -5264,9 +5264,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c272bd949536a92f0fc4d9572bf72b35b3545fc1f6ee031e44f9d075809055d" +checksum = "35b9e2169fd13394af838b13f047067c35ce69372aea0fb46e026405b5e931f9" dependencies = [ "ahash 0.8.3", "blake3", @@ -5297,9 +5297,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84be4b6dd2cc4e8ad5baa54a23018c8936ec32322ebcffd88355631700292a" +checksum = "db08ab0af4007dc0954b900aa5febc0c0ae50d9f9f598be27263c3195d90240b" dependencies = [ "proc-macro2 1.0.63", "quote 1.0.29", @@ -5309,9 +5309,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e662a15c9aeef8a20b4224c11f5ac6764d0952709bef38f17bfb58d19197dd7b" +checksum = "c09d7686f1f891dc1788378efd610e2f2c2515210ccafd173e490617a5de23a3" dependencies = [ "log", "solana-sdk", @@ -5321,9 +5321,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-manager" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce196fc9f465fb75bbc3815f4f70be6b4cc5819e0af57e849b23d4769ea656c9" +checksum = "b6ce4dd2e92940054fc9cb075fa224739f20af725f4d67d5e8604a64f475e0df" dependencies = [ "bs58", "crossbeam-channel", @@ -5347,9 +5347,9 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "470c1c9df96dad390cb215008f9b2ee524fadfbd03160545ae98157ab4fe1f2a" +checksum = "3e92adeef5ae855ac396fddd062a89e61e135be82a64a700a9ec56510d3a3b6a" dependencies = [ "bincode", "bv", @@ -5395,9 +5395,9 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcdf3cf853adc636b62b83da3aebcad084e40ef1d86b0862d8b121761a0a71e8" +checksum = "a056ca06d1b224ddc933e81928cd3e0670ee81ad1c1a03641238384a597d1309" dependencies = [ "assert_matches", "bincode", @@ -5456,9 +5456,9 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901008f38ba8f2edae30b67949bff3d7c072f5f503838eea7621a92d20da815a" +checksum = "e84811758fce4dcfd9617a7c3178effe9e59480d43c1e862bb3c8daccfcfd61d" dependencies = [ "log", "rand 0.7.3", @@ -5470,9 +5470,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3cb934e8c9015e86cd9c7382ea3083578d1c0813a351644cfdabe3009591b03" +checksum = "bf8a48e734f78a44399516f7c130c114b455911e351f001abc0d96e7c5694efa" dependencies = [ "env_logger", "lazy_static", @@ -5481,9 +5481,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a038b70fac9cd5529839efc258e6453f0018d34937a414cd030318916d6dba6" +checksum = "d3529d2ff63ceedd3707c51188aacb9e3c142118de3f55447c40584a78223ffd" dependencies = [ "log", "solana-sdk", @@ -5491,9 +5491,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bad21464dbebabc4f0c000bd598a4b3910a62672bf1fa88a1672938014fc5be" +checksum = "d9b8f858f09ad792dbf397ad87e04f8e0ee57c1ce3521a65a5bcdb93ae57b0b6" dependencies = [ "fast-math", "matches", @@ -5502,9 +5502,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca14a16eac701e20bda3e103e3d078074a18e83e126f90d918e141379eade8d" +checksum = "4792f29de5378a13c51be3fa9fdd526a20550b5ffabd7d1a57a4e49468e17d90" dependencies = [ "crossbeam-channel", "gethostname", @@ -5516,9 +5516,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509c3d5bc7fe8dbcc25b3238d7cd4a0994c39207260b7b5271a3110ea0ac5f75" +checksum = "7ed75beb465e211c79d31ae2049cb85974203e5ac21ae89396378d5a2fe71962" dependencies = [ "bincode", "clap 3.2.25", @@ -5538,9 +5538,9 @@ dependencies = [ [[package]] name = "solana-perf" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a65308af752a91eddf06c7b7bb5e5d6296ec8cd8de5a1cbebd61f53f45a808c" +checksum = "9218d9c823b22a465f91c966e8254a5f57b6817e0121ec6d4bf9a5ddc8307f18" dependencies = [ "ahash 0.8.3", "bincode", @@ -5565,9 +5565,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c879b6e7d263f295867452e4b17afe7a75f539567f90b26bdee49fb6739c2a2f" +checksum = "cd1cf00275f3fc5f8520f432af8f1bf667d0f3580e012406a2134e5a67d58099" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5583,9 +5583,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "476510cb86b9602a793582788f5e23a9cca11929d3880b7427a67142b1e4a430" +checksum = "2f17a1fbcf1e94e282db16153d323b446d6386ac99f597f78e76332265829336" dependencies = [ "ark-bn254", "ark-ec", @@ -5597,6 +5597,7 @@ dependencies = [ "bitflags 1.3.2", "blake3", "borsh 0.10.3", + "borsh 0.9.3", "bs58", "bv", "bytemuck", @@ -5637,9 +5638,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8311e581ff6406c84ce8ed5d4f1316cf091f723b4823a1ece3e36be6cfb3d69c" +checksum = "2ff9f0c8043b2e7921e25a3fee88fa253b8cb5dbab1e521a4d83e78e8874c551" dependencies = [ "base64 0.21.4", "bincode", @@ -5665,9 +5666,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0031edae2bf6f1c2c592fb9081d9f84fe44b41f54979ce281e15ac8a82e3bab" +checksum = "ed844e7d13e497e86c853ad19181724119100818673df931f8404a3e280c1828" dependencies = [ "assert_matches", "async-trait", @@ -5692,9 +5693,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5274196946dfef625ec905f7834e7d45b8367364f8eaf99e2c754951da6b972d" +checksum = "6e0659db803f68fb440c87f43a603e2da7adb3dd11d68e119c3209ed3ca02073" dependencies = [ "crossbeam-channel", "futures-util", @@ -5717,9 +5718,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27ad60edef844f182cd7071e653731ec16b3a319524448935a1183f6b99b80" +checksum = "fd4e0689f7b3b2e98e73089bf3aa6b3290cb8a2cbff97fca2ee579cc3ca2717e" dependencies = [ "async-mutex", "async-trait", @@ -5745,9 +5746,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441bde92d8befd3a698e54c35bff63a396f1e3e5e85754d85a5308a8f5d0328a" +checksum = "ab3c3996bd418c45a540ee2c2d23e9796c244d3e5c9f135a86aa8501e1afea19" dependencies = [ "lazy_static", "num_cpus", @@ -5755,9 +5756,9 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b8820ed78c726c9359248a8fb6456657ce6feca2ff31ffac1286f55bee99e8" +checksum = "40927d4df440e354f618cbf9e5eb81e02cf4563ef8360782b5493f395b63f61a" dependencies = [ "console", "dialoguer", @@ -5775,9 +5776,9 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eda7c250321deded6bf4e4e12e5fc255684e8bce0fa8f40f3bf971f3c39f16e" +checksum = "2008d5a0bac57ef4a34c97ff93111aad7ce6849c06f4cc0b9591b0105c3523b2" dependencies = [ "base64 0.21.4", "bincode", @@ -5830,9 +5831,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baeb95820862d14c1391dfda9a3173b0509f1b17ebd1090b3778fac1743ab69" +checksum = "871cf6d60098c556755a3a7dbd1742201718220a13b988d012f0658eddaad674" dependencies = [ "async-trait", "base64 0.21.4", @@ -5856,9 +5857,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29009927e289fc5ccd19cec05780dc8465eb65e52922087cf769e57d72c0b7b5" +checksum = "3214d68e3b661ddfd960271f67eb8042298ac7d90d9bd86d330200c3a5518404" dependencies = [ "base64 0.21.4", "bs58", @@ -5878,9 +5879,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df466014e9768f4741be00acea0067bde11a2ec1162a12ebf896960990a2e6b8" +checksum = "bcf08c480fb3d0d861abe10a0517990edea8151529ccf537c0a833233f1381d8" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -5891,9 +5892,9 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e17ad5baf94776df55d92d0e34fbfebef7ded4c44d91ae87eb87b4a119226e" +checksum = "e63ab2fb3bb128fe84bd43dedfdb5b3e03501a2f4e2121ae22a1b91106d1ca42" dependencies = [ "arrayref", "bincode", @@ -5960,9 +5961,9 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352b70bb14d8968d5484aa73a1aede3acc816f10a0b264c6599108c5dd6b647b" +checksum = "74a01f25b9f4022fc222c21c589ef7943027fb0fa2b9f6ae943fc4a65c2c01a2" dependencies = [ "assert_matches", "base64 0.21.4", @@ -6013,9 +6014,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38a884c027b0759d0969efc1253f3b8798f9d5fbef2eb158cdb70763619d2f3" +checksum = "a75b33716470fa4a65a23ddc2d4abcb8d28532c6e3ae3f04f4fe79b5e1f8c247" dependencies = [ "bs58", "proc-macro2 1.0.63", @@ -6026,9 +6027,9 @@ dependencies = [ [[package]] name = "solana-send-transaction-service" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6afaef0b73b381c6c447016dc5380c23110272e674add3b1aee8a4ee1740dad" +checksum = "dd9b33ec9f7bba86dc7bced3323b31de776984f674b10316fe983c0dcc052f62" dependencies = [ "crossbeam-channel", "log", @@ -6042,9 +6043,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8e4d1cf380c65a652e4c28873cadf0b6a32d2a0ff786eafe50210378316fa2" +checksum = "aa54eeb4f5cd2bcac1e593bb1907c3d0134a367dcbce0daf8c81bdd431b5f8e4" dependencies = [ "bincode", "log", @@ -6057,9 +6058,9 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c0a15534931ad00cf3f6fb3ac080a70ae5ef37ec08a8bf45e1f55556a532039" +checksum = "0ba9edaecb25593bef3b6c01a0da10cec0035403c7eeb87b32e819f1fb4fffdc" dependencies = [ "backoff", "bincode", @@ -6091,9 +6092,9 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f283f233893fd558ab2f3025fee03239c8282d11c6fb84e8dd3105bcec68bf" +checksum = "98331f48a39d7894deb0585ecf7306a699495f501b2ad37b3e5e8b7ad8f9b49d" dependencies = [ "bincode", "bs58", @@ -6108,9 +6109,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b87bd090a462765b6e3196e6c22cc0edebf8942fb4a6de9a807ce3d8d5d436" +checksum = "705ef2b2649c4162061a74aaf12f02b244828ed847ad981581e3e51155279ca5" dependencies = [ "async-channel", "bytes", @@ -6141,9 +6142,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cf8bb735d5eef6b3b42f46c0009db8e017079aab5b681921342ae74aa1783de" +checksum = "554ef3c25bd7c848f42bfa04b7ddfcb4f32796960ba284fd819f132b185b7b01" dependencies = [ "bincode", "log", @@ -6155,9 +6156,9 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f2a549b9de31410e460fdbbc76aa277e9b72c281e12b675792a4278dab67a9" +checksum = "6277ebedeb3a03b66ffe66e2afeec7e152650a17e9c598fa9312582951a4d7ef" dependencies = [ "base64 0.21.4", "bincode", @@ -6186,9 +6187,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8dc82e52a443249c5b1df3ddd7273306c81fde2c8057cc398e0fbd0fae7a47" +checksum = "dc8a9f9c101395d314c4e5e1b19801dd54f4cd501e40b8c2d7d8b896cd2e0980" dependencies = [ "bincode", "log", @@ -6201,9 +6202,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a09c139e796337646ba4f013a849555f50d35ae7278461d685a429c29f6295f" +checksum = "18a8a4d90f74e666cd2a5f7ac9ed230ca186d8f7351a927f061801b3ba4e8f2f" dependencies = [ "async-trait", "bincode", @@ -6226,9 +6227,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284227b302a68b0c384f46cb95e5472d39e7c7094d6079c4e5bd2f133f6920ff" +checksum = "c9266f75afa4163c9a5f29f1066f907e87482858749942380d6538af567b44c7" dependencies = [ "Inflector", "base64 0.21.4", @@ -6252,9 +6253,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23aa72c84646a65727b63ff2988147062a792b569591351f06c0e6014ca52de9" +checksum = "e0f475a0a0faa55f7783084258c1e88be39ed3ea5c4f945bf728b7ca8c7a3262" dependencies = [ "async-trait", "solana-connection-cache", @@ -6267,9 +6268,9 @@ dependencies = [ [[package]] name = "solana-version" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "036b2c0f4b3dfbe48d96c0f5e9be0fadd019bf46327013475bbf3b8ae9870dfe" +checksum = "886a0c01be1e2b3a7ec3bed63f2112cd7f80c4b8182e95fa98b7ab7e37faf90a" dependencies = [ "log", "rustc_version", @@ -6283,9 +6284,9 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85fe8c3382ac0c050c2224037fc8be990f713526e6b136f3a8da9464e2e1a506" +checksum = "01b1102b13ca7c760439545dba83588419d208b500a93eb61f6565be26bef490" dependencies = [ "bincode", "log", @@ -6305,9 +6306,9 @@ dependencies = [ [[package]] name = "solana-zk-token-proof-program" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f478ce5c5bf251b622542fab0558574518ec053776fb2d1459d77599a6a0a92c" +checksum = "d33a2ae4ae1f394fced36c7f1170ecf3e597cf68eb8989877d805a384ce65a9e" dependencies = [ "bytemuck", "getrandom 0.1.16", @@ -6320,9 +6321,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.16.3" +version = "1.16.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a4c38e1cf77cc046a48d0e515ec3fe654d9c3ba49790523f2d8fd28a5e51d3" +checksum = "1669c9d223d850cd96cad69d3ba1a4234bc3e2f83ac837fbdbc0ce774dac7b92" dependencies = [ "aes-gcm-siv", "base64 0.21.4", diff --git a/account-compression/programs/noop/Cargo.toml b/account-compression/programs/noop/Cargo.toml index 4701fb2786b..2ab1b032321 100644 --- a/account-compression/programs/noop/Cargo.toml +++ b/account-compression/programs/noop/Cargo.toml @@ -16,4 +16,4 @@ cpi = ["no-entrypoint"] default = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml index f48a3a31dee..713a1fc6fff 100644 --- a/associated-token-account/program-test/Cargo.toml +++ b/associated-token-account/program-test/Cargo.toml @@ -11,9 +11,9 @@ version = "0.0.1" test-sbf = [] [dev-dependencies] -solana-program = "1.16.3" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program = "1.16.13" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-associated-token-account = { version = "2", path = "../program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 565b740f127..8e9c025d6d4 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -16,7 +16,7 @@ assert_matches = "1.5.0" borsh = "0.10" num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index a9e74c38d52..dbc0cd2abf2 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -9,7 +9,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" thiserror = "1.0" spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]} arrayref = "0.3.7" diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 186f474907f..8f9849255aa 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -13,15 +13,15 @@ test-sbf = [] [dependencies] num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" borsh = "0.10" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/ci/solana-version.sh b/ci/solana-version.sh index c9f2457ddb9..ebd1d1d5e6b 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.16.3 + solana_version=v1.16.13 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 41d202fceee..70660bfa99e 100644 --- a/examples/rust/cross-program-invocation/Cargo.toml +++ b/examples/rust/cross-program-invocation/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml index 82abbd17feb..253dd3c798b 100644 --- a/examples/rust/custom-heap/Cargo.toml +++ b/examples/rust/custom-heap/Cargo.toml @@ -15,11 +15,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml index 538afd5b9fe..5eec29bec2f 100644 --- a/examples/rust/logging/Cargo.toml +++ b/examples/rust/logging/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml index 4c1aa57f2a0..b7ff3a543b0 100644 --- a/examples/rust/sysvar/Cargo.toml +++ b/examples/rust/sysvar/Cargo.toml @@ -13,11 +13,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml index 27b019872d3..d619c9ea813 100644 --- a/examples/rust/transfer-lamports/Cargo.toml +++ b/examples/rust/transfer-lamports/Cargo.toml @@ -12,11 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-tokens/Cargo.toml b/examples/rust/transfer-tokens/Cargo.toml index 081c08f2ea7..02d0714358f 100644 --- a/examples/rust/transfer-tokens/Cargo.toml +++ b/examples/rust/transfer-tokens/Cargo.toml @@ -12,12 +12,12 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint" ] } [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml index 2c8b01f83c6..e0b756d92b2 100644 --- a/feature-proposal/cli/Cargo.toml +++ b/feature-proposal/cli/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] chrono = "0.4.31" clap = "2.33.3" -solana-clap-utils = "1.16.3" -solana-cli-config = "1.16.3" -solana-client = "1.16.3" -solana-logger = "1.16.3" -solana-sdk = "1.16.3" +solana-clap-utils = "1.16.13" +solana-cli-config = "1.16.13" +solana-client = "1.16.13" +solana-logger = "1.16.13" +solana-sdk = "1.16.13" 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 81137db67e4..e015ddf6f4d 100644 --- a/feature-proposal/program/Cargo.toml +++ b/feature-proposal/program/Cargo.toml @@ -13,12 +13,12 @@ test-sbf = [] [dependencies] borsh = "0.10" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-proposal/program/src/instruction.rs b/feature-proposal/program/src/instruction.rs index bb3c6e61f16..b73c0c8c575 100644 --- a/feature-proposal/program/src/instruction.rs +++ b/feature-proposal/program/src/instruction.rs @@ -160,7 +160,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposalInstruction::get_packed_len(), - solana_program::borsh::get_packed_len::() + solana_program::borsh0_10::get_packed_len::() ) } diff --git a/feature-proposal/program/src/state.rs b/feature-proposal/program/src/state.rs index f1c1cd259ee..559d0b12488 100644 --- a/feature-proposal/program/src/state.rs +++ b/feature-proposal/program/src/state.rs @@ -64,7 +64,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposal::get_packed_len(), - solana_program::borsh::get_packed_len::() + solana_program::borsh0_10::get_packed_len::() ); } diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index b99e22d0fe8..e47c34a8f21 100644 --- a/governance/addin-api/Cargo.toml +++ b/governance/addin-api/Cargo.toml @@ -10,4 +10,4 @@ edition = "2021" [dependencies] borsh = "0.10" spl-governance-tools= { version = "0.1.3", path ="../tools"} -solana-program = "1.16.3" +solana-program = "1.16.13" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 88a3cf9b651..32016a13588 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-governance-addin-api= { version = "0.1.3", path ="../../addin-api"} spl-governance-tools= { version = "0.1.3", path ="../../tools"} @@ -29,8 +29,8 @@ thiserror = "1.0" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.2" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-governance-test-sdk = { version = "0.1.3", path ="../../test-sdk"} diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index 24799cb6505..fe9d05951e1 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint", ] } @@ -34,8 +34,8 @@ thiserror = "1.0" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.2" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-governance-test-sdk = { version = "0.1.3", path = "../../test-sdk" } spl-governance-addin-mock = { version = "0.1.3", path = "../../addin-mock/program" } diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index 7d9721f4162..0bccb55c7ed 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -19,7 +19,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } spl-governance-tools= { version = "0.1.3", path ="../tools"} spl-governance-addin-api= { version = "0.1.3", path ="../addin-api"} @@ -29,8 +29,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.21" proptest = "1.2" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-governance-test-sdk = { version = "0.1.3", path ="../test-sdk"} spl-governance-addin-mock = { version = "0.1.3", path ="../addin-mock/program"} diff --git a/governance/program/src/processor/mod.rs b/governance/program/src/processor/mod.rs index f7b0a88a10d..9b8a84b2588 100644 --- a/governance/program/src/processor/mod.rs +++ b/governance/program/src/processor/mod.rs @@ -65,7 +65,7 @@ use process_update_program_metadata::*; use process_withdraw_governing_tokens::*; use solana_program::{ - account_info::AccountInfo, borsh::try_from_slice_unchecked, entrypoint::ProgramResult, msg, + account_info::AccountInfo, borsh0_10::try_from_slice_unchecked, entrypoint::ProgramResult, msg, program_error::ProgramError, pubkey::Pubkey, }; diff --git a/governance/program/src/state/realm.rs b/governance/program/src/state/realm.rs index e2e4aa557ea..3027b770234 100644 --- a/governance/program/src/state/realm.rs +++ b/governance/program/src/state/realm.rs @@ -458,7 +458,7 @@ pub fn assert_valid_realm_config_args( mod test { use crate::instruction::GovernanceInstruction; - use solana_program::borsh::try_from_slice_unchecked; + use solana_program::borsh0_10::try_from_slice_unchecked; use super::*; diff --git a/governance/program/src/state/token_owner_record.rs b/governance/program/src/state/token_owner_record.rs index 700eb31ee24..846dcd9b0bf 100644 --- a/governance/program/src/state/token_owner_record.rs +++ b/governance/program/src/state/token_owner_record.rs @@ -422,7 +422,7 @@ pub fn get_token_owner_record_data_for_proposal_owner( #[cfg(test)] mod test { - use solana_program::{borsh::get_packed_len, stake_history::Epoch}; + use solana_program::{borsh0_10::get_packed_len, stake_history::Epoch}; use super::*; diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index cfb3e23e17b..036070e60f9 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -16,8 +16,8 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program = "1.16.13" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" diff --git a/governance/test-sdk/src/lib.rs b/governance/test-sdk/src/lib.rs index 3cf7a72b554..6d615400c6b 100644 --- a/governance/test-sdk/src/lib.rs +++ b/governance/test-sdk/src/lib.rs @@ -4,7 +4,7 @@ use std::borrow::Borrow; use borsh::{BorshDeserialize, BorshSerialize}; use cookies::{TokenAccountCookie, WalletCookie}; use solana_program::{ - borsh::try_from_slice_unchecked, clock::Clock, instruction::Instruction, + borsh0_10::try_from_slice_unchecked, clock::Clock, instruction::Instruction, program_error::ProgramError, program_pack::Pack, pubkey::Pubkey, rent::Rent, stake_history::Epoch, system_instruction, system_program, sysvar, }; diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index 37caa06a3c6..16e60560066 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -15,6 +15,6 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" diff --git a/governance/tools/src/account.rs b/governance/tools/src/account.rs index c2b504fa324..a5e267b241b 100644 --- a/governance/tools/src/account.rs +++ b/governance/tools/src/account.rs @@ -3,7 +3,7 @@ use borsh::{BorshDeserialize, BorshSerialize}; use solana_program::{ account_info::AccountInfo, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, msg, program::invoke, program::invoke_signed, diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml index bc29201763d..b9c8acfff71 100644 --- a/instruction-padding/program/Cargo.toml +++ b/instruction-padding/program/Cargo.toml @@ -14,11 +14,11 @@ test-sbf = [] [dependencies] num_enum = "0.7.0" -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml index 0e3fa61f09c..bfdfb53ce3c 100644 --- a/libraries/discriminator/Cargo.toml +++ b/libraries/discriminator/Cargo.toml @@ -13,7 +13,7 @@ borsh = ["dep:borsh"] [dependencies] borsh = { version = "0.10", optional = true } bytemuck = { version = "1.14.0", features = ["derive"] } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-discriminator-derive = { version = "0.1.0", path = "./derive" } [lib] diff --git a/libraries/discriminator/syn/Cargo.toml b/libraries/discriminator/syn/Cargo.toml index 8c0297c613f..e1222ced2c0 100644 --- a/libraries/discriminator/syn/Cargo.toml +++ b/libraries/discriminator/syn/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] proc-macro2 = "1.0" quote = "1.0" -solana-program = "1.16.3" +solana-program = "1.16.13" syn = { version = "2.0", features = ["full"] } thiserror = "1.0" diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index e52dcb630a4..6b265240a3e 100644 --- a/libraries/math/Cargo.toml +++ b/libraries/math/Cargo.toml @@ -15,14 +15,14 @@ test-sbf = [] borsh = "0.10" num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" thiserror = "1.0" uint = "0.9" [dev-dependencies] proptest = "1.2.0" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" libm = "0.2.7" [lib] diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index 0449681da16..db4e59056e4 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -16,8 +16,8 @@ base64 = { version = "0.21.4", optional = true } borsh = { version = "0.10", optional = true } bytemuck = { version = "1.14.0" } serde = { version = "1.0.183", optional = true } -solana-program = "1.16.3" -solana-zk-token-sdk = "1.16.3" +solana-program = "1.16.13" +solana-zk-token-sdk = "1.16.13" spl-program-error = { version = "0.3", path = "../program-error" } [dev-dependencies] diff --git a/libraries/program-error/Cargo.toml b/libraries/program-error/Cargo.toml index 9407fd89fa7..6754170b042 100644 --- a/libraries/program-error/Cargo.toml +++ b/libraries/program-error/Cargo.toml @@ -10,14 +10,14 @@ edition = "2021" [dependencies] num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-program-error-derive = { version = "0.3.0", path = "./derive" } thiserror = "1.0" [dev-dependencies] lazy_static = "1.4" serial_test = "2.0" -solana-sdk = "1.16.3" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/program-error/derive/Cargo.toml b/libraries/program-error/derive/Cargo.toml index 27877728007..d44e74874a4 100644 --- a/libraries/program-error/derive/Cargo.toml +++ b/libraries/program-error/derive/Cargo.toml @@ -13,5 +13,5 @@ proc-macro = true [dependencies] proc-macro2 = "1.0" quote = "1.0" -solana-program = "1.16.3" +solana-program = "1.16.13" syn = { version = "2.0", features = ["full"] } diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index 8c0e0f07c8d..cb4e15060d8 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -12,15 +12,15 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.14.0", features = ["derive"] } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-discriminator = { version = "0.1", path = "../discriminator" } spl-program-error = { version = "0.3", path = "../program-error" } spl-type-length-value = { version = "0.3", path = "../type-length-value" } spl-pod = { version = "0.1", path = "../pod" } [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-discriminator = { version = "0.1", path = "../discriminator" } [lib] diff --git a/libraries/type-length-value-derive-test/src/lib.rs b/libraries/type-length-value-derive-test/src/lib.rs index a7f2481cb4a..032d1341a4f 100644 --- a/libraries/type-length-value-derive-test/src/lib.rs +++ b/libraries/type-length-value-derive-test/src/lib.rs @@ -7,7 +7,7 @@ pub mod test { use { borsh::{BorshDeserialize, BorshSerialize}, - solana_program::borsh::{get_instance_packed_len, try_from_slice_unchecked}, + solana_program::borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, spl_discriminator::SplDiscriminate, spl_type_length_value::{variable_len_pack::VariableLenPack, SplBorshVariableLenPack}, }; diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml index 2eb661f271d..6fbc278b78f 100644 --- a/libraries/type-length-value/Cargo.toml +++ b/libraries/type-length-value/Cargo.toml @@ -13,7 +13,7 @@ derive = ["dep:spl-type-length-value-derive"] [dependencies] bytemuck = { version = "1.14.0", features = ["derive"] } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-discriminator = { version = "0.1", path = "../discriminator" } spl-program-error = { version = "0.3", path = "../program-error" } spl-type-length-value-derive = { version = "0.1", path = "./derive", optional = true } diff --git a/libraries/type-length-value/derive/src/builder.rs b/libraries/type-length-value/derive/src/builder.rs index c50d34aa6e7..59254d41ee7 100644 --- a/libraries/type-length-value/derive/src/builder.rs +++ b/libraries/type-length-value/derive/src/builder.rs @@ -79,11 +79,11 @@ impl From<&SplBorshVariableLenPackBuilder> for TokenStream { } fn unpack_from_slice(src: &[u8]) -> Result { - solana_program::borsh::try_from_slice_unchecked(src).map_err(Into::into) + solana_program::borsh0_10::try_from_slice_unchecked(src).map_err(Into::into) } fn get_packed_len(&self) -> Result { - solana_program::borsh::get_instance_packed_len(self).map_err(Into::into) + solana_program::borsh0_10::get_instance_packed_len(self).map_err(Into::into) } } } diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml index b30cea6de4d..44abea2326c 100644 --- a/managed-token/program/Cargo.toml +++ b/managed-token/program/Cargo.toml @@ -24,11 +24,11 @@ test = [] [dependencies] borsh = "0.10" shank = "^0.2.1" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = [ "no-entrypoint", ] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } thiserror = "^1.0.48" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml index a6e79287ba8..01ac6fecb66 100644 --- a/memo/program/Cargo.toml +++ b/memo/program/Cargo.toml @@ -12,11 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index 77280a295da..5172f268601 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -17,15 +17,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" num-traits = "0.2" borsh = "0.10" num-derive = "0.4.0" thiserror = "1.0.48" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index fb329e85730..1737eefd14a 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -15,12 +15,12 @@ test-sbf = [] borsh = "0.10" num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/record/program/tests/functional.rs b/record/program/tests/functional.rs index d194eabfce8..3582d13cbf8 100644 --- a/record/program/tests/functional.rs +++ b/record/program/tests/functional.rs @@ -3,7 +3,7 @@ use { borsh::BorshSerialize, solana_program::{ - borsh::get_packed_len, + borsh0_10::get_packed_len, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, rent::Rent, diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml index bc406bdb1c7..5634a7844eb 100644 --- a/shared-memory/program/Cargo.toml +++ b/shared-memory/program/Cargo.toml @@ -12,11 +12,11 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" -solana-program = "=1.16.3" +solana-program = "=1.16.13" [dev-dependencies] -solana-program-test = "=1.16.3" -solana-sdk = "=1.16.3" +solana-program-test = "=1.16.13" +solana-sdk = "=1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index 6d190ae10f4..66d4d3bc0a5 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -17,23 +17,23 @@ serde = "1.0.188" serde_derive = "1.0.103" serde_json = "1.0.107" serde_with = "3.3.0" -solana-account-decoder = "=1.16.3" -solana-clap-v3-utils = "=1.16.3" -solana-cli-config = "=1.16.3" -solana-cli-output = "=1.16.3" -solana-client = "=1.16.3" -solana-logger = "=1.16.3" -solana-remote-wallet = "=1.16.3" -solana-sdk = "=1.16.3" -solana-transaction-status = "=1.16.3" -solana-vote-program = "=1.16.3" +solana-account-decoder = "=1.16.13" +solana-clap-v3-utils = "=1.16.13" +solana-cli-config = "=1.16.13" +solana-cli-output = "=1.16.13" +solana-client = "=1.16.13" +solana-logger = "=1.16.13" +solana-remote-wallet = "=1.16.13" +solana-sdk = "=1.16.13" +solana-transaction-status = "=1.16.13" +solana-vote-program = "=1.16.13" spl-token = { version = "4.0", path="../../token/program", features = [ "no-entrypoint" ] } spl-token-client = { version = "0.6", path="../../token/client" } spl-associated-token-account = { version = "2.0", path="../../associated-token-account/program", features = [ "no-entrypoint" ] } spl-single-validator-pool = { version = "1.0.0", path="../program", features = [ "no-entrypoint" ] } [dev-dependencies] -solana-test-validator = "=1.16.3" +solana-test-validator = "=1.16.13" serial_test = "2.0.0" test-case = "3.2" tempfile = "3.8.0" diff --git a/single-pool/cli/src/main.rs b/single-pool/cli/src/main.rs index 72dbfefea66..6f23c333e93 100644 --- a/single-pool/cli/src/main.rs +++ b/single-pool/cli/src/main.rs @@ -8,7 +8,7 @@ use { rpc_filter::{Memcmp, RpcFilterType}, }, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, signature::Signature, signature::{Keypair, Signer}, diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index c6f1feeb894..3df3fcaad47 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -17,15 +17,15 @@ borsh = "0.10" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.0" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = [ "no-entrypoint" ] } thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" -solana-vote-program = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" +solana-vote-program = "1.16.13" test-case = "3.2" bincode = "1.3.1" rand = "0.8.5" diff --git a/single-pool/program/src/instruction.rs b/single-pool/program/src/instruction.rs index 9f522e92b19..b25fe5c974b 100644 --- a/single-pool/program/src/instruction.rs +++ b/single-pool/program/src/instruction.rs @@ -163,6 +163,7 @@ pub fn initialize_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> In AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(spl_token::id(), false), diff --git a/single-pool/program/src/processor.rs b/single-pool/program/src/processor.rs index 6cf350dd939..be48dc6909e 100644 --- a/single-pool/program/src/processor.rs +++ b/single-pool/program/src/processor.rs @@ -19,7 +19,7 @@ use { borsh::BorshDeserialize, solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::{get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_packed_len, try_from_slice_unchecked}, entrypoint::ProgramResult, msg, native_token::LAMPORTS_PER_SOL, diff --git a/single-pool/program/src/state.rs b/single-pool/program/src/state.rs index 285ed75fc86..0174263fe63 100644 --- a/single-pool/program/src/state.rs +++ b/single-pool/program/src/state.rs @@ -4,8 +4,8 @@ use { crate::{error::SinglePoolError, find_pool_address}, borsh::{BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ - account_info::AccountInfo, borsh::try_from_slice_unchecked, program_error::ProgramError, - pubkey::Pubkey, + account_info::AccountInfo, borsh0_10::try_from_slice_unchecked, + program_error::ProgramError, pubkey::Pubkey, }, }; diff --git a/single-pool/program/tests/helpers/token.rs b/single-pool/program/tests/helpers/token.rs index d3db254ccd0..1fe2ccd2b80 100644 --- a/single-pool/program/tests/helpers/token.rs +++ b/single-pool/program/tests/helpers/token.rs @@ -4,7 +4,7 @@ use { borsh::BorshDeserialize, solana_program_test::BanksClient, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, program_pack::Pack, pubkey::Pubkey, diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml index 532e956894c..8492beca9d6 100644 --- a/stake-pool/cli/Cargo.toml +++ b/stake-pool/cli/Cargo.toml @@ -14,15 +14,15 @@ clap = "2.33.3" serde = "1.0.188" serde_derive = "1.0.130" serde_json = "1.0.107" -solana-account-decoder = "=1.16.3" -solana-clap-utils = "=1.16.3" -solana-cli-config = "=1.16.3" -solana-cli-output = "=1.16.3" -solana-client = "=1.16.3" -solana-logger = "=1.16.3" -solana-program = "=1.16.3" -solana-remote-wallet = "=1.16.3" -solana-sdk = "=1.16.3" +solana-account-decoder = "=1.16.13" +solana-clap-utils = "=1.16.13" +solana-cli-config = "=1.16.13" +solana-cli-output = "=1.16.13" +solana-client = "=1.16.13" +solana-logger = "=1.16.13" +solana-program = "=1.16.13" +solana-remote-wallet = "=1.16.13" +solana-sdk = "=1.16.13" spl-associated-token-account = { version = "=2.1", path="../../associated-token-account/program", features = [ "no-entrypoint" ] } spl-stake-pool = { version = "=0.7.0", path="../program", features = [ "no-entrypoint" ] } spl-token = { version = "=4.0", path="../../token/program", features = [ "no-entrypoint" ] } diff --git a/stake-pool/cli/src/client.rs b/stake-pool/cli/src/client.rs index 039d057cef8..444e4608274 100644 --- a/stake-pool/cli/src/client.rs +++ b/stake-pool/cli/src/client.rs @@ -7,7 +7,9 @@ use { rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}, rpc_filter::{Memcmp, RpcFilterType}, }, - solana_program::{borsh::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake}, + solana_program::{ + borsh0_10::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake, + }, spl_stake_pool::{ find_withdraw_authority_program_address, state::{StakePool, ValidatorList}, diff --git a/stake-pool/cli/src/main.rs b/stake-pool/cli/src/main.rs index 2ca68ebadad..37c8cb50e7b 100644 --- a/stake-pool/cli/src/main.rs +++ b/stake-pool/cli/src/main.rs @@ -23,7 +23,7 @@ use { solana_cli_output::OutputFormat, solana_client::rpc_client::RpcClient, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len}, + borsh0_10::{get_instance_packed_len, get_packed_len}, instruction::Instruction, program_pack::Pack, pubkey::Pubkey, diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index 90ec865c3cc..f90b0675344 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -20,7 +20,7 @@ num-traits = "0.2" num_enum = "0.7.0" serde = "1.0.188" serde_derive = "1.0.103" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-pod = { version = "0.1", path = "../../libraries/pod", features = ["borsh"] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = [ "no-entrypoint" ] } @@ -29,9 +29,9 @@ bincode = "1.3.1" [dev-dependencies] proptest = "1.2" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" -solana-vote-program = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" +solana-vote-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } test-case = "3.2" diff --git a/stake-pool/program/src/instruction.rs b/stake-pool/program/src/instruction.rs index 6e9c57880b2..46d11255f78 100644 --- a/stake-pool/program/src/instruction.rs +++ b/stake-pool/program/src/instruction.rs @@ -709,6 +709,7 @@ pub fn add_validator_to_pool( AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -859,6 +860,7 @@ pub fn increase_validator_stake( AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -904,6 +906,7 @@ pub fn increase_additional_validator_stake( AccountMeta::new_readonly(*validator, false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -954,6 +957,7 @@ pub fn redelegate( AccountMeta::new_readonly(*validator, false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), diff --git a/stake-pool/program/src/processor.rs b/stake-pool/program/src/processor.rs index 938fcf1799a..17ed181a77a 100644 --- a/stake-pool/program/src/processor.rs +++ b/stake-pool/program/src/processor.rs @@ -24,7 +24,7 @@ use { num_traits::FromPrimitive, solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, clock::{Clock, Epoch}, decode_error::DecodeError, entrypoint::ProgramResult, diff --git a/stake-pool/program/src/state.rs b/stake-pool/program/src/state.rs index 5088322834a..7d12add010a 100644 --- a/stake-pool/program/src/state.rs +++ b/stake-pool/program/src/state.rs @@ -11,7 +11,7 @@ use { num_traits::{FromPrimitive, ToPrimitive}, solana_program::{ account_info::AccountInfo, - borsh::get_instance_packed_len, + borsh0_10::get_instance_packed_len, msg, program_error::ProgramError, program_memory::sol_memcmp, @@ -1035,7 +1035,7 @@ mod test { super::*, proptest::prelude::*, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_packed_len, try_from_slice_unchecked}, clock::{DEFAULT_SLOTS_PER_EPOCH, DEFAULT_S_PER_SLOT, SECONDS_PER_DAY}, native_token::LAMPORTS_PER_SOL, }, diff --git a/stake-pool/program/tests/deposit.rs b/stake-pool/program/tests/deposit.rs index 61c0222d7b2..2bd29b40f42 100644 --- a/stake-pool/program/tests/deposit.rs +++ b/stake-pool/program/tests/deposit.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, stake, sysvar, diff --git a/stake-pool/program/tests/deposit_authority.rs b/stake-pool/program/tests/deposit_authority.rs index c0e4aaee137..55665572cf0 100644 --- a/stake-pool/program/tests/deposit_authority.rs +++ b/stake-pool/program/tests/deposit_authority.rs @@ -8,7 +8,7 @@ use { solana_program::{instruction::InstructionError, stake}, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, signature::{Keypair, Signer}, transaction::TransactionError, }, diff --git a/stake-pool/program/tests/deposit_edge_cases.rs b/stake-pool/program/tests/deposit_edge_cases.rs index df9bd30df35..bd549805645 100644 --- a/stake-pool/program/tests/deposit_edge_cases.rs +++ b/stake-pool/program/tests/deposit_edge_cases.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/deposit_sol.rs b/stake-pool/program/tests/deposit_sol.rs index 90dd6c96369..7fefde709bd 100644 --- a/stake-pool/program/tests/deposit_sol.rs +++ b/stake-pool/program/tests/deposit_sol.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/helpers/mod.rs b/stake-pool/program/tests/helpers/mod.rs index 4dccee90f07..a07eec4030e 100644 --- a/stake-pool/program/tests/helpers/mod.rs +++ b/stake-pool/program/tests/helpers/mod.rs @@ -3,7 +3,7 @@ use { borsh::{BorshDeserialize, BorshSerialize}, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, instruction::Instruction, program_option::COption, @@ -2377,7 +2377,7 @@ pub fn add_validator_stake_account( stake: stake_amount, activation_epoch: FIRST_NORMAL_EPOCH, deactivation_epoch: u64::MAX, - warmup_cooldown_rate: 0.25, // default + ..Default::default() }, credits_observed: 0, }; diff --git a/stake-pool/program/tests/huge_pool.rs b/stake-pool/program/tests/huge_pool.rs index 9990ee3774c..1fd94683ffa 100644 --- a/stake-pool/program/tests/huge_pool.rs +++ b/stake-pool/program/tests/huge_pool.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::{ native_token::LAMPORTS_PER_SOL, diff --git a/stake-pool/program/tests/initialize.rs b/stake-pool/program/tests/initialize.rs index 55e7c2fbfcd..5d0baba6716 100644 --- a/stake-pool/program/tests/initialize.rs +++ b/stake-pool/program/tests/initialize.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, instruction::{AccountMeta, Instruction}, program_pack::Pack, diff --git a/stake-pool/program/tests/set_deposit_fee.rs b/stake-pool/program/tests/set_deposit_fee.rs index 85397ffb4c4..b8cbd286657 100644 --- a/stake-pool/program/tests/set_deposit_fee.rs +++ b/stake-pool/program/tests/set_deposit_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_epoch_fee.rs b/stake-pool/program/tests/set_epoch_fee.rs index d1c5dc944cc..ccdb6b8d06b 100644 --- a/stake-pool/program/tests/set_epoch_fee.rs +++ b/stake-pool/program/tests/set_epoch_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_funding_authority.rs b/stake-pool/program/tests/set_funding_authority.rs index 5fe7b8a959c..6e091562cae 100644 --- a/stake-pool/program/tests/set_funding_authority.rs +++ b/stake-pool/program/tests/set_funding_authority.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_manager.rs b/stake-pool/program/tests/set_manager.rs index 0dff30aa1b9..0e3416e098d 100644 --- a/stake-pool/program/tests/set_manager.rs +++ b/stake-pool/program/tests/set_manager.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_preferred.rs b/stake-pool/program/tests/set_preferred.rs index 04de8196404..fffd9bc26b1 100644 --- a/stake-pool/program/tests/set_preferred.rs +++ b/stake-pool/program/tests/set_preferred.rs @@ -8,7 +8,7 @@ use { solana_program::hash::Hash, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, signature::{Keypair, Signer}, diff --git a/stake-pool/program/tests/set_referral_fee.rs b/stake-pool/program/tests/set_referral_fee.rs index 829a2fb667c..93c225602e6 100644 --- a/stake-pool/program/tests/set_referral_fee.rs +++ b/stake-pool/program/tests/set_referral_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/set_staker.rs b/stake-pool/program/tests/set_staker.rs index bf30fac6bf9..f2a72fe3e6e 100644 --- a/stake-pool/program/tests/set_staker.rs +++ b/stake-pool/program/tests/set_staker.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction}, }, diff --git a/stake-pool/program/tests/set_withdrawal_fee.rs b/stake-pool/program/tests/set_withdrawal_fee.rs index 6f0afe68f7e..1d5106362cc 100644 --- a/stake-pool/program/tests/set_withdrawal_fee.rs +++ b/stake-pool/program/tests/set_withdrawal_fee.rs @@ -7,7 +7,7 @@ use { helpers::*, solana_program_test::*, solana_sdk::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, signature::{Keypair, Signer}, transaction::{Transaction, TransactionError}, diff --git a/stake-pool/program/tests/update_stake_pool_balance.rs b/stake-pool/program/tests/update_stake_pool_balance.rs index 763c7a80a4d..77612bf2c60 100644 --- a/stake-pool/program/tests/update_stake_pool_balance.rs +++ b/stake-pool/program/tests/update_stake_pool_balance.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/update_validator_list_balance.rs b/stake-pool/program/tests/update_validator_list_balance.rs index 9d494b45937..1c6b336916d 100644 --- a/stake-pool/program/tests/update_validator_list_balance.rs +++ b/stake-pool/program/tests/update_validator_list_balance.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey}, + solana_program::{borsh0_10::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey}, solana_program_test::*, solana_sdk::{hash::Hash, signature::Signer, stake::state::StakeState}, spl_stake_pool::{ diff --git a/stake-pool/program/tests/update_validator_list_balance_hijack.rs b/stake-pool/program/tests/update_validator_list_balance_hijack.rs index 6de06cf3dd0..8ef0e59e775 100644 --- a/stake-pool/program/tests/update_validator_list_balance_hijack.rs +++ b/stake-pool/program/tests/update_validator_list_balance_hijack.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::{ hash::Hash, diff --git a/stake-pool/program/tests/vsa_add.rs b/stake-pool/program/tests/vsa_add.rs index 28f40efa223..36eb049049d 100644 --- a/stake-pool/program/tests/vsa_add.rs +++ b/stake-pool/program/tests/vsa_add.rs @@ -8,7 +8,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, @@ -284,6 +284,7 @@ async fn fail_without_signature() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), @@ -339,6 +340,7 @@ async fn fail_with_wrong_stake_program_id() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(wrong_stake_program, false), @@ -392,6 +394,7 @@ async fn fail_with_wrong_system_program_id() { AccountMeta::new_readonly(sysvar::rent::id(), false), AccountMeta::new_readonly(sysvar::clock::id(), false), AccountMeta::new_readonly(sysvar::stake_history::id(), false), + #[allow(deprecated)] AccountMeta::new_readonly(stake::config::id(), false), AccountMeta::new_readonly(wrong_system_program, false), AccountMeta::new_readonly(stake::program::id(), false), diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs index 6b795b84b95..187306377f5 100644 --- a/stake-pool/program/tests/vsa_remove.rs +++ b/stake-pool/program/tests/vsa_remove.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, stake, system_instruction, sysvar, diff --git a/stake-pool/program/tests/withdraw.rs b/stake-pool/program/tests/withdraw.rs index 8b5146c27c1..3fd449624b0 100644 --- a/stake-pool/program/tests/withdraw.rs +++ b/stake-pool/program/tests/withdraw.rs @@ -7,7 +7,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, sysvar, diff --git a/stake-pool/program/tests/withdraw_edge_cases.rs b/stake-pool/program/tests/withdraw_edge_cases.rs index e495fea45f3..90cb5a7abc0 100644 --- a/stake-pool/program/tests/withdraw_edge_cases.rs +++ b/stake-pool/program/tests/withdraw_edge_cases.rs @@ -7,7 +7,7 @@ use { bincode::deserialize, helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{signature::Signer, transaction::TransactionError}, diff --git a/stake-pool/program/tests/withdraw_sol.rs b/stake-pool/program/tests/withdraw_sol.rs index 1d61e95ecb4..75c6594fb98 100644 --- a/stake-pool/program/tests/withdraw_sol.rs +++ b/stake-pool/program/tests/withdraw_sol.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/withdraw_with_fee.rs b/stake-pool/program/tests/withdraw_with_fee.rs index 243e3d4b87a..1a2b0134181 100644 --- a/stake-pool/program/tests/withdraw_with_fee.rs +++ b/stake-pool/program/tests/withdraw_with_fee.rs @@ -6,7 +6,7 @@ mod helpers; use { bincode::deserialize, helpers::*, - solana_program::{borsh::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, solana_program_test::*, solana_sdk::signature::{Keypair, Signer}, spl_stake_pool::{minimum_stake_lamports, state}, diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index fdb8f1435ee..921da9118e5 100644 --- a/stateless-asks/program/Cargo.toml +++ b/stateless-asks/program/Cargo.toml @@ -12,14 +12,14 @@ test-sbf = [] [dependencies] borsh = "0.10" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-associated-token-account = {version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"]} thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/stateless-asks/program/src/processor.rs b/stateless-asks/program/src/processor.rs index 5f0a81e4a09..374a060505c 100644 --- a/stateless-asks/program/src/processor.rs +++ b/stateless-asks/program/src/processor.rs @@ -10,7 +10,7 @@ use { solana_program::{ account_info::next_account_info, account_info::AccountInfo, - borsh::try_from_slice_unchecked, + borsh0_10::try_from_slice_unchecked, entrypoint::ProgramResult, msg, program::{invoke, invoke_signed}, diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml index 3af9cd65fa7..e0cc10eecfb 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.16.3" -solana-cli-config = "=1.16.3" -solana-client = "=1.16.3" -solana-logger = "=1.16.3" -solana-sdk = "=1.16.3" -solana-program = "=1.16.3" +solana-clap-utils = "=1.16.13" +solana-cli-config = "=1.16.13" +solana-client = "=1.16.13" +solana-logger = "=1.16.13" +solana-sdk = "=1.16.13" +solana-program = "=1.16.13" spl-token-lending = { version = "0.2", path="../program", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", 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 16b7fb04294..b8301e4f4e0 100644 --- a/token-lending/flash_loan_receiver/Cargo.toml +++ b/token-lending/flash_loan_receiver/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] arrayref = "0.3.7" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features=["no-entrypoint"] } [lib] diff --git a/token-lending/program/Cargo.toml b/token-lending/program/Cargo.toml index edfd593bb75..3ddb1a52041 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -16,7 +16,7 @@ arrayref = "0.3.7" bytemuck = "1.14.0" num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" @@ -24,8 +24,8 @@ uint = "0.9" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.2" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml index 7027b8c3f38..4982515a2c0 100644 --- a/token-metadata/example/Cargo.toml +++ b/token-metadata/example/Cargo.toml @@ -12,15 +12,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token-2022 = { version = "0.8", path = "../../token/program-2022" } spl-token-metadata-interface = { version = "0.2.0", path = "../interface" } spl-type-length-value = { version = "0.3.0" , path = "../../libraries/type-length-value" } spl-pod = { version = "0.1.0", path = "../../libraries/pod" } [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-token-client = { version = "0.6", path = "../../token/client" } test-case = "3.2" diff --git a/token-metadata/example/src/processor.rs b/token-metadata/example/src/processor.rs index 234ff414d52..1ff45bf12e3 100644 --- a/token-metadata/example/src/processor.rs +++ b/token-metadata/example/src/processor.rs @@ -3,7 +3,7 @@ use { solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh::get_instance_packed_len, + borsh0_10::get_instance_packed_len, entrypoint::ProgramResult, msg, program::set_return_data, diff --git a/token-metadata/example/tests/emit.rs b/token-metadata/example/tests/emit.rs index c311b733cc5..00ef924d527 100644 --- a/token-metadata/example/tests/emit.rs +++ b/token-metadata/example/tests/emit.rs @@ -5,7 +5,7 @@ use { program_test::{setup, setup_metadata, setup_mint}, solana_program_test::tokio, solana_sdk::{ - borsh::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, spl_token_metadata_interface::{ diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index 3acb87a21f5..101095f32d3 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -13,7 +13,7 @@ serde-traits = ["dep:serde", "spl-pod/serde-traits"] [dependencies] borsh = "0.10" serde = { version = "1.0.188", optional = true } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-discriminator = { version = "0.1" , path = "../../libraries/discriminator" } spl-program-error = { version = "0.3" , path = "../../libraries/program-error" } spl-type-length-value = { version = "0.3", path = "../../libraries/type-length-value" } diff --git a/token-metadata/interface/src/state.rs b/token-metadata/interface/src/state.rs index d8b140c9e99..08e54291bbb 100644 --- a/token-metadata/interface/src/state.rs +++ b/token-metadata/interface/src/state.rs @@ -3,7 +3,7 @@ use { borsh::{BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ - borsh::{get_instance_packed_len, try_from_slice_unchecked}, + borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, program_error::ProgramError, pubkey::Pubkey, }, diff --git a/token-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index b2e07d1a282..736f626b9c9 100644 --- a/token-swap/program/Cargo.toml +++ b/token-swap/program/Cargo.toml @@ -17,7 +17,7 @@ arrayref = "0.3.7" enum_dispatch = "0.3.12" num-derive = "0.4" num-traits = "0.2" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = [ "no-entrypoint" ] } @@ -28,7 +28,7 @@ roots = { version = "0.0.8", optional = true } [dev-dependencies] proptest = "1.2" roots = "0.0.8" -solana-sdk = "1.16.3" +solana-sdk = "1.16.13" test-case = "3.2" [lib] diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml index dba9821e27c..17025d54ffe 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.55" } arbitrary = { version = "1.0", features = ["derive"] } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-math = { version = "0.2", path = "../../../libraries/math", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint" ] } spl-token-swap = { path = "..", features = ["fuzz", "no-entrypoint"] } diff --git a/token-upgrade/cli/Cargo.toml b/token-upgrade/cli/Cargo.toml index cf05089e744..3169f7727c5 100644 --- a/token-upgrade/cli/Cargo.toml +++ b/token-upgrade/cli/Cargo.toml @@ -13,12 +13,12 @@ walkdir = "2" [dependencies] clap = { version = "3", features = ["cargo"] } futures-util = "0.3.28" -solana-clap-v3-utils = "1.16.3" -solana-cli-config = "1.16.3" -solana-client = "1.16.3" -solana-logger = "1.16.3" -solana-remote-wallet = "1.16.3" -solana-sdk = "1.16.3" +solana-clap-v3-utils = "1.16.13" +solana-cli-config = "1.16.13" +solana-client = "1.16.13" +solana-logger = "1.16.13" +solana-remote-wallet = "1.16.13" +solana-sdk = "1.16.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = ["no-entrypoint"] } @@ -27,7 +27,7 @@ spl-token-upgrade = { version = "0.1", path = "../program", features = ["no-entr tokio = { version = "1", features = ["full"] } [dev-dependencies] -solana-test-validator = "1.16.3" +solana-test-validator = "1.16.13" [[bin]] name = "spl-token-upgrade" diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml index b23c22a0e71..f63cbcc8af5 100644 --- a/token-upgrade/program/Cargo.toml +++ b/token-upgrade/program/Cargo.toml @@ -15,13 +15,13 @@ test-sbf = [] num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.0" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-client = { version = "0.6", path = "../../token/client" } test-case = "3.2" diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml index 37c722d474b..ee9bbc9c632 100644 --- a/token-wrap/program/Cargo.toml +++ b/token-wrap/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.14.0", features = ["derive"] } num_enum = "0.7" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "0.8", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index ada6a00bd88..9e553511e5a 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -17,15 +17,15 @@ console = "0.15.7" serde = "1.0.188" serde_derive = "1.0.103" serde_json = "1.0.107" -solana-account-decoder = "=1.16.3" -solana-clap-utils = "=1.16.3" -solana-cli-config = "=1.16.3" -solana-cli-output = "=1.16.3" -solana-client = "=1.16.3" -solana-logger = "=1.16.3" -solana-remote-wallet = "=1.16.3" -solana-sdk = "=1.16.3" -solana-transaction-status = "=1.16.3" +solana-account-decoder = "=1.16.13" +solana-clap-utils = "=1.16.13" +solana-cli-config = "=1.16.13" +solana-cli-output = "=1.16.13" +solana-client = "=1.16.13" +solana-logger = "=1.16.13" +solana-remote-wallet = "=1.16.13" +solana-sdk = "=1.16.13" +solana-transaction-status = "=1.16.13" spl-token = { version = "4.0", path="../program", features = [ "no-entrypoint" ] } spl-token-2022 = { version = "0.8", path="../program-2022", features = [ "no-entrypoint" ] } spl-token-client = { version = "0.6", path="../client" } @@ -37,7 +37,7 @@ strum_macros = "0.25" tokio = "1.14" [dev-dependencies] -solana-test-validator = "=1.16.3" +solana-test-validator = "=1.16.13" assert_cmd = "2.0.12" serial_test = "2.0.0" tempfile = "3.8.0" diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml index 1f54fc8bc9b..5ba6d6ca127 100644 --- a/token/client/Cargo.toml +++ b/token/client/Cargo.toml @@ -12,12 +12,12 @@ async-trait = "0.1" curve25519-dalek = "3.2.1" futures = "0.3.28" futures-util = "0.3" -solana-banks-interface = "1.16.3" -solana-cli-output = { version = "1.16.3", optional = true } -solana-program-test = "1.16.3" -solana-rpc-client = "1.16.3" -solana-rpc-client-api = "1.16.3" -solana-sdk = "1.16.3" +solana-banks-interface = "1.16.13" +solana-cli-output = { version = "1.16.13", optional = true } +solana-program-test = "1.16.13" +solana-rpc-client = "1.16.13" +solana-rpc-client-api = "1.16.13" +solana-sdk = "1.16.13" # We never want the entrypoint for ATA, but we want the entrypoint for token when # testing token spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] } diff --git a/token/client/src/output.rs b/token/client/src/output.rs index cc2dfc6ae6c..e3436ca435d 100644 --- a/token/client/src/output.rs +++ b/token/client/src/output.rs @@ -36,7 +36,7 @@ mod tests { #[test] fn display_signature() { let signature_bytes = [202u8; SIGNATURE_BYTES]; - let signature = RpcClientResponse::Signature(Signature::new(&signature_bytes)); + let signature = RpcClientResponse::Signature(Signature::from(signature_bytes)); println!("{}", signature); } diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index 3140a5dcbfd..c3b11a84ce2 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -20,9 +20,9 @@ walkdir = "2" async-trait = "0.1" borsh = "0.10" futures-util = "0.3" -solana-program = "=1.16.3" -solana-program-test = "=1.16.3" -solana-sdk = "=1.16.3" +solana-program = "=1.16.13" +solana-program-test = "=1.16.13" +solana-sdk = "=1.16.13" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program" } spl-memo = { version = "4.0.0", path = "../../memo/program", features = ["no-entrypoint"] } spl-pod = { version = "0.1.0", path = "../../libraries/pod" } diff --git a/token/program-2022-test/tests/token_metadata_emit.rs b/token/program-2022-test/tests/token_metadata_emit.rs index 425a56f59a3..cf5eb9932af 100644 --- a/token/program-2022-test/tests/token_metadata_emit.rs +++ b/token/program-2022-test/tests/token_metadata_emit.rs @@ -5,7 +5,7 @@ use { program_test::TestContext, solana_program_test::{processor, tokio, ProgramTest}, solana_sdk::{ - borsh::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, spl_token_2022::processor::Processor, diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index ce5e190e9ac..2f307b5f773 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -23,8 +23,8 @@ bytemuck = { version = "1.14.0", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.0" -solana-program = "1.16.3" -solana-zk-token-sdk = "1.16.3" +solana-program = "1.16.13" +solana-zk-token-sdk = "1.16.13" spl-memo = { version = "4.0.0", path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", path = "../program", features = ["no-entrypoint"] } spl-token-metadata-interface = { version = "0.2.0", path = "../../token-metadata/interface" } @@ -40,8 +40,8 @@ base64 = { version = "0.21.4", optional = true } lazy_static = "1.4.0" proptest = "1.2" serial_test = "2.0.0" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" serde_json = "1.0.107" [lib] diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml index bdf8061df5d..00542bfac21 100644 --- a/token/program/Cargo.toml +++ b/token/program/Cargo.toml @@ -18,15 +18,15 @@ bytemuck = "1.14.0" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.0" -solana-program = "1.16.3" +solana-program = "1.16.13" thiserror = "1.0" [dev-dependencies] lazy_static = "1.4.0" proptest = "1.2" serial_test = "2.0.0" -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook-example/Cargo.toml b/token/transfer-hook-example/Cargo.toml index 1350b833249..518338a0ff9 100644 --- a/token/transfer-hook-example/Cargo.toml +++ b/token/transfer-hook-example/Cargo.toml @@ -13,15 +13,15 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" -solana-program = "1.16.3" +solana-program = "1.16.13" spl-tlv-account-resolution = { version = "0.3" , path = "../../libraries/tlv-account-resolution" } spl-token-2022 = { version = "0.8", path = "../program-2022", features = ["no-entrypoint"] } spl-transfer-hook-interface = { version = "0.2" , path = "../transfer-hook-interface" } spl-type-length-value = { version = "0.3" , path = "../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = "1.16.3" -solana-sdk = "1.16.3" +solana-program-test = "1.16.13" +solana-sdk = "1.16.13" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook-interface/Cargo.toml b/token/transfer-hook-interface/Cargo.toml index 491df4374b0..ff5e1f47f77 100644 --- a/token/transfer-hook-interface/Cargo.toml +++ b/token/transfer-hook-interface/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayref = "0.3.7" bytemuck = { version = "1.14.0", features = ["derive"] } -solana-program = "1.16.3" +solana-program = "1.16.13" spl-discriminator = { version = "0.1" , path = "../../libraries/discriminator" } spl-program-error = { version = "0.3" , path = "../../libraries/program-error" } spl-tlv-account-resolution = { version = "0.3" , path = "../../libraries/tlv-account-resolution" } diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml index 0bef4ff7e69..2b9b9e2b56b 100644 --- a/utils/test-client/Cargo.toml +++ b/utils/test-client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" # Used to ensure that SPL programs are buildable by external clients [dependencies] -solana-sdk = "1.16.3" +solana-sdk = "1.16.13" 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" ] }