From fc67d421559590c2bfe2b7d8a23c066aee4bcd90 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 21 Feb 2024 08:18:41 +0900 Subject: [PATCH 1/6] upgrade to solana 1.18.2 --- Anchor.toml | 2 +- Cargo.lock | 598 ++++++++++++------ .../programs/account-compression/Cargo.toml | 2 +- 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-gate/program/Cargo.toml | 6 +- feature-proposal/cli/Cargo.toml | 10 +- feature-proposal/program/Cargo.toml | 6 +- 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/test-sdk/Cargo.toml | 6 +- governance/tools/Cargo.toml | 2 +- instruction-padding/program/Cargo.toml | 6 +- libraries/discriminator/Cargo.toml | 2 +- libraries/math/Cargo.toml | 6 +- libraries/pod/Cargo.toml | 4 +- libraries/program-error/Cargo.toml | 4 +- libraries/tlv-account-resolution/Cargo.toml | 8 +- libraries/type-length-value/Cargo.toml | 2 +- managed-token/program/Cargo.toml | 6 +- memo/program/Cargo.toml | 6 +- name-service/program/Cargo.toml | 6 +- record/program/Cargo.toml | 6 +- shared-memory/program/Cargo.toml | 6 +- single-pool/cli/Cargo.toml | 22 +- single-pool/program/Cargo.toml | 8 +- stake-pool/cli/Cargo.toml | 18 +- stake-pool/program/Cargo.toml | 8 +- stateless-asks/program/Cargo.toml | 6 +- token-collection/program/Cargo.toml | 6 +- token-group/example/Cargo.toml | 6 +- token-group/interface/Cargo.toml | 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/interface/Cargo.toml | 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/program-2022-test/Cargo.toml | 6 +- token/program-2022/Cargo.toml | 8 +- token/program/Cargo.toml | 6 +- token/transfer-hook/cli/Cargo.toml | 14 +- token/transfer-hook/example/Cargo.toml | 6 +- token/transfer-hook/interface/Cargo.toml | 2 +- utils/test-client/Cargo.toml | 2 +- 63 files changed, 601 insertions(+), 377 deletions(-) diff --git a/Anchor.toml b/Anchor.toml index adf19b79931..06785738274 100644 --- a/Anchor.toml +++ b/Anchor.toml @@ -1,6 +1,6 @@ [toolchain] anchor_version = "0.29.0" -solana_version = "1.17.17" +solana_version = "1.18.2" [workspace] members = [ diff --git a/Cargo.lock b/Cargo.lock index 41bcafa0788..f7ecc8a7c95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,9 +76,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.8.5" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" dependencies = [ "cfg-if 1.0.0", "getrandom 0.2.10", @@ -213,6 +213,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "aquamarine" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" +dependencies = [ + "include_dir", + "itertools", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "arbitrary" version = "1.3.2" @@ -411,7 +425,7 @@ dependencies = [ "anstyle", "bstr 1.6.0", "doc-comment", - "predicates", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -774,6 +788,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive 1.3.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -800,6 +824,20 @@ dependencies = [ "syn 1.0.107", ] +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.46", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -1026,6 +1064,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "cgen" version = "0.1.0" @@ -1473,17 +1517,6 @@ dependencies = [ "syn 2.0.46", ] -[[package]] -name = "dashmap" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" -dependencies = [ - "cfg-if 1.0.0", - "num_cpus", - "rayon", -] - [[package]] name = "dashmap" version = "5.5.3" @@ -1495,6 +1528,7 @@ dependencies = [ "lock_api", "once_cell", "parking_lot_core 0.9.9", + "rayon", ] [[package]] @@ -1684,6 +1718,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "downcast" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" + [[package]] name = "eager" version = "0.1.0" @@ -1927,6 +1967,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "float-cmp" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" +dependencies = [ + "num-traits", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1958,13 +2007,10 @@ dependencies = [ ] [[package]] -name = "fs-err" -version = "2.11.0" +name = "fragile" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" -dependencies = [ - "autocfg", -] +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "fs_extra" @@ -2232,7 +2278,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.5", + "ahash 0.8.9", ] [[package]] @@ -2556,6 +2602,25 @@ dependencies = [ "version_check", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "index_list" version = "0.2.11" @@ -3080,6 +3145,33 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mockall" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" +dependencies = [ + "cfg-if 1.0.0", + "downcast", + "fragile", + "lazy_static", + "mockall_derive", + "predicates 2.1.5", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" +dependencies = [ + "cfg-if 1.0.0", + "proc-macro2", + "quote", + "syn 1.0.107", +] + [[package]] name = "modular-bitfield" version = "0.11.2" @@ -3159,6 +3251,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "num" version = "0.2.1" @@ -3706,6 +3804,20 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +[[package]] +name = "predicates" +version = "2.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" +dependencies = [ + "difflib", + "float-cmp", + "itertools", + "normalize-line-endings", + "predicates-core", + "regex", +] + [[package]] name = "predicates" version = "3.0.3" @@ -3760,6 +3872,12 @@ dependencies = [ "syn 2.0.46", ] +[[package]] +name = "prio-graph" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6492a75ca57066a4479af45efa302bed448680182b0563f96300645d5f896097" + [[package]] name = "proc-macro-crate" version = "0.1.5" @@ -3779,6 +3897,15 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -4516,6 +4643,15 @@ version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" +[[package]] +name = "seqlock" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5c67b6f14ecc5b86c66fa63d76b5092352678545a8a3cdae80aef5128371910" +dependencies = [ + "parking_lot 0.12.0", +] + [[package]] name = "serde" version = "1.0.197" @@ -4639,7 +4775,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d" dependencies = [ - "dashmap 5.5.3", + "dashmap", "futures 0.3.30", "lazy_static", "log", @@ -4913,9 +5049,9 @@ dependencies = [ [[package]] name = "solana-account-decoder" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74a6ad350a6f633fd76e8bd1e77ad7a3ce75e3046d69957cdb042152e84d8957" +checksum = "0bd91a5ca8d11b9a5298afc32ecb857a98ba048a6b1e19e929f272f6bb239651" dependencies = [ "Inflector", "base64 0.21.7", @@ -4938,9 +5074,9 @@ dependencies = [ [[package]] name = "solana-accounts-db" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4fff17148e7b81804cb7997d8dfcad5f36dea61b931fa71494602c6396bc3" +checksum = "365e8660f547397d7fdde7ed4c774570c981f4cd279982b64b2d33c7ee0cf009" dependencies = [ "arrayref", "bincode", @@ -4950,10 +5086,9 @@ dependencies = [ "byteorder", "bzip2", "crossbeam-channel", - "dashmap 4.0.2", + "dashmap", "flate2", "fnv", - "fs-err", "im", "index_list", "itertools", @@ -4962,10 +5097,10 @@ dependencies = [ "lz4", "memmap2", "modular-bitfield", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "num_cpus", - "num_enum 0.6.1", + "num_enum 0.7.2", "ouroboros", "percentage", "qualifier_attr", @@ -4973,14 +5108,17 @@ dependencies = [ "rayon", "regex", "rustc_version", + "seqlock", "serde", "serde_derive", + "smallvec", "solana-bucket-map", "solana-config-program", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-measure", "solana-metrics", + "solana-nohash-hasher", "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", @@ -4997,14 +5135,14 @@ dependencies = [ [[package]] name = "solana-address-lookup-table-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c33e0707e51db8467a61766a0dc382dc0e482c60ae70d4673c0396d62f5c983" +checksum = "369178bac4d96eee3574b99aa90f6c88e79c204e181ed2b7f7d6367276ba4563" dependencies = [ "bincode", "bytemuck", "log", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "rustc_version", "serde", @@ -5018,11 +5156,11 @@ dependencies = [ [[package]] name = "solana-banks-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c05952c43296d7d62b7ced6612c452c6144319548e2cd489e0eefe26923e002" +checksum = "e9f2d9fd34407846e07edf34d3f423f883ea19ed191669ec2af11394df986ead" dependencies = [ - "borsh 0.10.3", + "borsh 1.3.1", "futures 0.3.30", "solana-banks-interface", "solana-program", @@ -5035,9 +5173,9 @@ dependencies = [ [[package]] name = "solana-banks-interface" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79dbaa4098ba2678747fe7255d6543dc3649834f8e37e3fdc3b396d452a823af" +checksum = "d85e13e2abd2fdefb33fdc536f8bbcb970b21c400ef8a1f6873a77a6f0d453ca" dependencies = [ "serde", "solana-sdk", @@ -5046,9 +5184,9 @@ dependencies = [ [[package]] name = "solana-banks-server" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a853100e9e674463b74248b339e68b10ed80e83e40c6e92519dd2201dfbc5568" +checksum = "1531ab78752fae24ad6d1e01ed78ac5aca759887af8d9d6c4a1de3ace599c37f" dependencies = [ "bincode", "crossbeam-channel", @@ -5066,9 +5204,9 @@ dependencies = [ [[package]] name = "solana-bloom" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5546f8084f7576e3180a1d27bc2a14b2bb76ca24a4c54417be90427b3299153" +checksum = "59317fe58d2b4716cdc00b81fa8dd27cdd6305ef230675e0fb09da62565b58d8" dependencies = [ "bv", "fnv", @@ -5085,9 +5223,9 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e6afdc4cc3af5fa2bd2cdf654acae91a24300358a4370c82f4c34f026d52be" +checksum = "68b6219ce9db9db395424e2e8d2517c2984aab05f0620ca0708f569128d56ee3" dependencies = [ "bincode", "byteorder", @@ -5104,16 +5242,16 @@ dependencies = [ [[package]] name = "solana-bucket-map" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acda9b3df626889f88bf2ab8960facf1b131dd27924c6e2bcca41b29cc208305" +checksum = "cb4cfec18f27bcb92c239ec54b2ab78a848db5ba5e21cda3c9419bc208f00efa" dependencies = [ "bv", "bytemuck", "log", "memmap2", "modular-bitfield", - "num_enum 0.6.1", + "num_enum 0.7.2", "rand 0.8.5", "solana-measure", "solana-sdk", @@ -5122,9 +5260,9 @@ dependencies = [ [[package]] name = "solana-clap-utils" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cdf7db331e617e42df7793f40421b8b3ea74d893ec2306f401cde3ab816c5d7" +checksum = "789723b125f742e4d409736d49cb67bf3f87247560e951e5cd2c52d639233a7e" dependencies = [ "chrono", "clap 2.34.0", @@ -5139,9 +5277,9 @@ dependencies = [ [[package]] name = "solana-clap-v3-utils" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92359f5ee5baa5718c33edbb9500e45586665d0281fafbe6f7c4eb1008b45f1d" +checksum = "7d0c58148a629d1ca8e2fd04f6d1d252270e1624e3d9e3e2817b713c02a3a693" dependencies = [ "chrono", "clap 3.2.25", @@ -5157,9 +5295,9 @@ dependencies = [ [[package]] name = "solana-cli-config" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630ed0731474c3e4c1b2d2c1089671a10e82e56c6f65c2d43eceae723fcfa244" +checksum = "432eaa028a4dff57e3c02ab7d6f6a2e84d00acf2aaf1552bfc9acd545d1eeba7" dependencies = [ "dirs-next", "lazy_static", @@ -5173,9 +5311,9 @@ dependencies = [ [[package]] name = "solana-cli-output" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42320a45b29c4d8375be02a71d2df8b8ddd3ce97c4cff7addd1cc8ceaf0d4417" +checksum = "56c66746ad144df9940822e2f12bfd37f9435d559f65b0d0c1d1faf56180fc06" dependencies = [ "Inflector", "base64 0.21.7", @@ -5200,13 +5338,13 @@ dependencies = [ [[package]] name = "solana-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26e6ac6371d264548d314865daad18a0a2fb2ba8b5e1ea9b92de004f9887e42a" +checksum = "669f4ecaff8253fe9d73ce73525fe821e9996bdb176beba3379be755bfbcd492" dependencies = [ "async-trait", "bincode", - "dashmap 4.0.2", + "dashmap", "futures 0.3.30", "futures-util", "indexmap 2.2.1", @@ -5233,9 +5371,9 @@ dependencies = [ [[package]] name = "solana-compute-budget-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4900e0d76d81564c0ea43396c5e9e24f34eba9cc36cab249b6ff6a576973855" +checksum = "c15cd40565e1173935b15000fd1f6fe4d7176193e4d18982f6a9fff3cf737ca8" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -5243,9 +5381,9 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce2f25dbe765208a79af782b79b2d06f382a82b13050890edd52dcab11078b8" +checksum = "39c9dae6fffda9e8cc9d2589a267b0c2a26e7f91144c05be09417196c91a2219" dependencies = [ "bincode", "chrono", @@ -5257,9 +5395,9 @@ dependencies = [ [[package]] name = "solana-connection-cache" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81baf526f3c36c4ae07fdd6d924e352e89444a9c77771baab66fe00c681825d" +checksum = "fec914cc2e0cde1c332a9ffb2b2dd8735916847b0280d2b01f9bc3e38386c062" dependencies = [ "async-trait", "bincode", @@ -5279,9 +5417,9 @@ dependencies = [ [[package]] name = "solana-core" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70c3ec0a2ddcec14c4297dc2e6450abf95262d5644473924a4d2162703137ad1" +checksum = "6997702ed2ccb7fc3336190cd71c4fa02d3470b2bc6e59696134b8b909d69af4" dependencies = [ "base64 0.21.7", "bincode", @@ -5289,7 +5427,7 @@ dependencies = [ "bytes", "chrono", "crossbeam-channel", - "dashmap 4.0.2", + "dashmap", "eager", "etcd-client", "futures 0.3.30", @@ -5299,7 +5437,8 @@ dependencies = [ "log", "lru", "min-max-heap", - "num_enum 0.6.1", + "num_enum 0.7.2", + "prio-graph", "quinn", "rand 0.8.5", "rand_chacha 0.3.1", @@ -5338,9 +5477,11 @@ dependencies = [ "solana-tpu-client", "solana-transaction-status", "solana-turbine", + "solana-unified-scheduler-pool", "solana-version", "solana-vote", "solana-vote-program", + "solana-wen-restart", "strum 0.24.1", "strum_macros 0.24.3", "sys-info", @@ -5353,9 +5494,9 @@ dependencies = [ [[package]] name = "solana-cost-model" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841b749107b994fb14ff14d80f3ffffdb68101b71b57d7d385e5e30a734cea1e" +checksum = "14f143196a2eb798ea44999468603b9aa388deabb84f2c43dda4f91129bcf678" dependencies = [ "lazy_static", "log", @@ -5377,9 +5518,9 @@ dependencies = [ [[package]] name = "solana-entry" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e63abc6b205a9f6897772116a620f847b0d741bba4af5f84f0ee5570f4d9cc2b" +checksum = "dc15e9d6964209dc3a0eb183de2e3cc50348dee389ad73a56b0a64e771e123fd" dependencies = [ "bincode", "crossbeam-channel", @@ -5399,9 +5540,9 @@ dependencies = [ [[package]] name = "solana-faucet" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "220737d8c607e3799b5bf10ba3425b13b347abec9d1a20c1dfdfd04a17c38dcf" +checksum = "04e2f03a9892a8eca08985d6b10737c68a3ccf66208d42a72824b611c8261e1d" dependencies = [ "bincode", "byteorder", @@ -5423,17 +5564,13 @@ dependencies = [ [[package]] name = "solana-frozen-abi" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62311c3a992af13c270d9bf219b6d7534f7ddc30074fa31a5261273e9f7d4b83" +checksum = "1f97bbed79e7fd14e1c48411ce217f305972e7151f14b3124f3956fc13aac76b" dependencies = [ - "ahash 0.8.5", - "blake3", "block-buffer 0.10.4", "bs58", "bv", - "byteorder", - "cc", "either", "generic-array 0.14.7", "im", @@ -5444,7 +5581,6 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", @@ -5453,9 +5589,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9b64778efc635c7cd8cae084fef4b034b7f2b5a0c022d5173179446c56e71f" +checksum = "22b989fb872d2ba530ecb6e504284e3e1244eeb7541056c40fe2d87c7d0bb9d1" dependencies = [ "proc-macro2", "quote", @@ -5465,9 +5601,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-interface" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7aead0927e748bd3f15882dd21cf54b0f7078fa7aeecc6b2589059897e271e" +checksum = "a36728f354dd547bc689c98026ae3c1ba718099a4ba952ba63c7d261d1bc5e45" dependencies = [ "log", "solana-sdk", @@ -5477,9 +5613,9 @@ dependencies = [ [[package]] name = "solana-geyser-plugin-manager" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79fa06aeb056e485708932f8478f453371715e540a435e22ba0a7f40376c719e" +checksum = "3172db9cf8761f2c238610a718ad88ea019aa069eeef0430fe1a3ad938741ff3" dependencies = [ "bs58", "crossbeam-channel", @@ -5504,9 +5640,9 @@ dependencies = [ [[package]] name = "solana-gossip" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f333aeda8206ed3f9d90deb61292fb5b0ae0c2a1c2f1f4f41d4c0a137b44bcda" +checksum = "f95cd1b232191d3f2bf36a31117fc853fd43a0d971dc656abe7ee3a0ad4cfb06" dependencies = [ "assert_matches", "bincode", @@ -5554,9 +5690,9 @@ dependencies = [ [[package]] name = "solana-ledger" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fddcd3d11131039bddf4c1d98fe987c64ee3884626ad8c8f0c023e0ccd9e196" +checksum = "8113a0dafae6bc5c3c4ad061ecfbde896b35d67a342ceffce6efc322e3957d76" dependencies = [ "assert_matches", "bincode", @@ -5565,7 +5701,7 @@ dependencies = [ "chrono", "chrono-humanize", "crossbeam-channel", - "dashmap 4.0.2", + "dashmap", "fs_extra", "futures 0.3.30", "itertools", @@ -5573,8 +5709,9 @@ dependencies = [ "libc", "log", "lru", + "mockall", "num_cpus", - "num_enum 0.6.1", + "num_enum 0.7.2", "prost", "rand 0.8.5", "rand_chacha 0.3.1", @@ -5620,9 +5757,9 @@ dependencies = [ [[package]] name = "solana-loader-v4-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2c53ce07056371bf0998f872cfa4c23d156c9348f18f21e1f34b4bd956c51d" +checksum = "c0be08568bde8c8c8cccb741052ab16e7291dc84bc0dcc8be11950dad3d443cf" dependencies = [ "log", "solana-measure", @@ -5633,9 +5770,9 @@ dependencies = [ [[package]] name = "solana-logger" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6960f7149fb0ec738d04224f5f44b331c467e8fec4ede41c6c702562f0365688" +checksum = "51eacf4e4043d28190ad0c5ff9443fa5fc19f91fabb3ffe72ad22c428231f1a0" dependencies = [ "env_logger", "lazy_static", @@ -5644,9 +5781,9 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d14133e480bd877b8b4174fc7fc8c591b227d451d0fd48c917e5d3af7bac978" +checksum = "3c3723604fb5fd8a6d032597aea2fc677d124a7835022eed5ae41bb3d7017e9f" dependencies = [ "log", "solana-sdk", @@ -5654,9 +5791,9 @@ dependencies = [ [[package]] name = "solana-merkle-tree" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b54c0e9971bae72fd81d6de36ace4f895e83f47b7f454122bae7f7a61b4b5d9" +checksum = "e6d024e3f0e8002409a4b9fd94572db41a7cb4c3889d84d18410bc4548158bfe" dependencies = [ "fast-math", "solana-program", @@ -5664,9 +5801,9 @@ dependencies = [ [[package]] name = "solana-metrics" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf4c91c0dd58c83fa0065b777ebaf16a6977b145ae847937b4e8aa119993d96" +checksum = "89bd1112e5fd71344b1de1bbbffb23b9e28c698bdc8fac3c034e5b84b2179f4e" dependencies = [ "crossbeam-channel", "gethostname", @@ -5679,9 +5816,9 @@ dependencies = [ [[package]] name = "solana-net-utils" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc57096f56badce23b05ca98da2490b2638e14c445be92bf7fdd011e0274aa45" +checksum = "c77d3226d7baa8aa34d28e2b72d2e8c7a426b7195da73e62a5b5b1ff398a49d4" dependencies = [ "bincode", "clap 3.2.25", @@ -5699,13 +5836,19 @@ dependencies = [ "url 2.5.0", ] +[[package]] +name = "solana-nohash-hasher" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" + [[package]] name = "solana-perf" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2bf7a94309c36fe1627a93ecc1001996bec1acc34cce557c0a64b43d32ad618" +checksum = "a60ebbc10fce91bdbe4f970011ac474eba97138bda48416564100c73882ac1d7" dependencies = [ - "ahash 0.8.5", + "ahash 0.8.9", "bincode", "bv", "caps", @@ -5730,9 +5873,9 @@ dependencies = [ [[package]] name = "solana-poh" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89a2919bf1af86537e40c2c5a63143b7411903b31697c30eeb79e0ba2b6f455" +checksum = "cfbf62a17db0d41e0cbcf1d5fd987252d6a26e7862cb2ae759f05f3ccc979359" dependencies = [ "core_affinity", "crossbeam-channel", @@ -5748,9 +5891,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75eabbb12920ffe88155f611450a17d6ae28b754b707ec63f83ada500014c8a" +checksum = "0b5d8a2694dc792ee9ae4af09cf8995e21cc9366846001e8ee1e6f060a837518" dependencies = [ "ark-bn254", "ark-ec", @@ -5762,6 +5905,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", + "borsh 1.3.1", "bs58", "bv", "bytemuck", @@ -5779,7 +5923,7 @@ dependencies = [ "log", "memoffset 0.9.0", "num-bigint 0.4.4", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "parking_lot 0.12.0", "rand 0.8.5", @@ -5802,9 +5946,9 @@ dependencies = [ [[package]] name = "solana-program-runtime" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917a320dca9f88fb3ca4f5549205b0525e47f51b6b98eb34f6728038df484b44" +checksum = "a93561006a60b9c9d3466a2309a35778b5b4ee7d6a7c2f6e5aef3d9cfdf288e8" dependencies = [ "base64 0.21.7", "bincode", @@ -5813,7 +5957,7 @@ dependencies = [ "itertools", "libc", "log", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "percentage", "rand 0.8.5", @@ -5830,9 +5974,9 @@ dependencies = [ [[package]] name = "solana-program-test" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d27d9394f52f9b03c05745767b22a4f8e6c4a897cff7238e3bcc07c8978c75" +checksum = "e2dccc76db8a200a71ffe7aea1e8f5389c113928b791af8a69f85ebe0cfd9618" dependencies = [ "assert_matches", "async-trait", @@ -5860,9 +6004,9 @@ dependencies = [ [[package]] name = "solana-pubsub-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db1ed23c4d7d03e6d8003deb3bdd2dc1b364bcf6a9ca7cd41736a24ac2803d40" +checksum = "1599618f845531fee0463d4bf161cf9ef0f8b305cf4f3763504c7f89db216f37" dependencies = [ "crossbeam-channel", "futures-util", @@ -5885,9 +6029,9 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c94e45645bb116a3519c346112e066950ce5e3701db66b25e7ca968026dacbf" +checksum = "add1050ce19ea95bf304902188c9728c0cb2455b5c812e6256354fd36a0c0fa8" dependencies = [ "async-mutex", "async-trait", @@ -5912,9 +6056,9 @@ dependencies = [ [[package]] name = "solana-rayon-threadlimit" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2163dee2025e0a758c755fe8682ced64f40e81fee0d3641c39486a7c8acf8dc8" +checksum = "af715bdffdb5a6f6206fa9e333b61e5335364e0ecd7a057a8b56e5a330bc03f8" dependencies = [ "lazy_static", "num_cpus", @@ -5922,15 +6066,15 @@ dependencies = [ [[package]] name = "solana-remote-wallet" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352a233e1bc3164559ee03dabe034d4b056d3df30cb20f9813fb1d81290d014c" +checksum = "25328c0b1547e8645548416e84348eb0219458b09da5e1328705f58fe7022c16" dependencies = [ "console", "dialoguer", "hidapi", "log", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "parking_lot 0.12.0", "qstring", @@ -5942,15 +6086,15 @@ dependencies = [ [[package]] name = "solana-rpc" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47448dfd4cced10ba377254bed99f839a64204407a1226084b230ff65191b4d8" +checksum = "4e7e16f04aaac8852c64b8d32c8f1e893d3e9ffeec8f2fe6159854c3710c4ef1" dependencies = [ "base64 0.21.7", "bincode", "bs58", "crossbeam-channel", - "dashmap 4.0.2", + "dashmap", "itertools", "jsonrpc-core", "jsonrpc-core-client", @@ -5999,9 +6143,9 @@ dependencies = [ [[package]] name = "solana-rpc-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89dd52108c0c7fea71f2417daf0310592f108459a4afc223f243e5021a7cea39" +checksum = "f99d307eb6792a6c572378bf37d4bfa77524ab60e93511dc15b3764372bfbd14" dependencies = [ "async-trait", "base64 0.21.7", @@ -6025,9 +6169,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536fac51d733b6c73661da49859585c3e3e1427e8d94871db80c3f9e9b569f68" +checksum = "d5ed446ea327a13a1856f2d521733785131fe726af365616b61fbc011add8c9b" dependencies = [ "base64 0.21.7", "bs58", @@ -6047,9 +6191,9 @@ dependencies = [ [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8381f6604e62058e106c3be4d1693264eaed7d066e5caa375beb51b539d7a579" +checksum = "00f55595decb6f1f5c4c7a8f1fe792594de9fe730b0d0aa97d3d1f8add8fe1a2" dependencies = [ "clap 2.34.0", "solana-clap-utils", @@ -6060,10 +6204,11 @@ dependencies = [ [[package]] name = "solana-runtime" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091b596a19845387cf761b49bb5a4a3334427cd90cb863f242e57e4135fcc46c" +checksum = "21c2c374d808315c659a66365e4c865d4c2861e9ce5e5024d675fa5235725559" dependencies = [ + "aquamarine", "arrayref", "base64 0.21.7", "bincode", @@ -6073,11 +6218,10 @@ dependencies = [ "byteorder", "bzip2", "crossbeam-channel", - "dashmap 4.0.2", + "dashmap", "dir-diff", "flate2", "fnv", - "fs-err", "im", "index_list", "itertools", @@ -6086,11 +6230,12 @@ dependencies = [ "lru", "lz4", "memmap2", + "mockall", "modular-bitfield", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "num_cpus", - "num_enum 0.6.1", + "num_enum 0.7.2", "ouroboros", "percentage", "qualifier_attr", @@ -6101,7 +6246,6 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "siphasher", "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", @@ -6137,15 +6281,15 @@ dependencies = [ [[package]] name = "solana-sdk" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1628655c50328b0a676b1a956bfbdd39e4ee8e1d48f59aaa907da16393c742b" +checksum = "6ca911aefaa0fee2995bdfeb532ece9b35358e48566a41701c0ed33e716d07b3" dependencies = [ "assert_matches", "base64 0.21.7", "bincode", "bitflags 2.4.2", - "borsh 0.10.3", + "borsh 1.3.1", "bs58", "bytemuck", "byteorder", @@ -6162,9 +6306,9 @@ dependencies = [ "libsecp256k1", "log", "memmap2", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", - "num_enum 0.6.1", + "num_enum 0.7.2", "pbkdf2 0.11.0", "qstring", "qualifier_attr", @@ -6179,6 +6323,7 @@ dependencies = [ "serde_with 2.3.3", "sha2 0.10.8", "sha3 0.10.8", + "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", @@ -6191,9 +6336,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17489fa2101a7bfbd19629e53f6801f4428c584a5964acfc861d0151eb9b502" +checksum = "2395961f455e2b2ec9b64d945e3e9db760ccce10716f40a3e947a1e399c7511e" dependencies = [ "bs58", "proc-macro2", @@ -6210,9 +6355,9 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f4da624e3d09cd0bb452290c52b6ca26f6a5470acd6ce26642d699ac2553e1" +checksum = "eac806cc4fcfabe76a8c88c686eac89cf1a738391594c7d354e211621cb86fde" dependencies = [ "crossbeam-channel", "log", @@ -6226,9 +6371,9 @@ dependencies = [ [[package]] name = "solana-stake-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73571d611f591e1bdfbf746bc4b574e9a8036f8f611e623922f3a5c5f458b15b" +checksum = "f967f485d869fe430475ef0cc5ef49b6fb81b80c4880317add2e9ff80c448535" dependencies = [ "bincode", "log", @@ -6241,9 +6386,9 @@ dependencies = [ [[package]] name = "solana-storage-bigtable" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdfb546939ab7dbb65c52f0d5057d576fa3662426a4c79fc44ec072cf741b9a6" +checksum = "27919e9bad20c2fc3b4f8288b9924b3d640630d52e98ac3fefad02e97b486227" dependencies = [ "backoff", "bincode", @@ -6275,9 +6420,9 @@ dependencies = [ [[package]] name = "solana-storage-proto" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab4a4b6e4e4a66174a7abad173c692affe018f4bed31dec7e9943073687be9b" +checksum = "a0589020e88243b6798a88deaec8a620825c10f483646e35eedab6c5f330ec14" dependencies = [ "bincode", "bs58", @@ -6292,9 +6437,9 @@ dependencies = [ [[package]] name = "solana-streamer" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881a1815bccd67fc0a3587e1a753d17a04e55ac3a59820e30c43f8e47faac1f" +checksum = "e232660917f042dd90f9b91d72e650118251b590d45e545102fc66bc4de89ee3" dependencies = [ "async-channel", "bytes", @@ -6324,9 +6469,9 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acb8e57fca3c5115e5c4fc7c71bd4c87e4d3fbfb5f75037579728b9b9d2b98a" +checksum = "f7d60a29d38beb34747a4e005d70988c753628480f223ac4335929cdc20c46a8" dependencies = [ "bincode", "log", @@ -6338,9 +6483,9 @@ dependencies = [ [[package]] name = "solana-test-validator" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e016d65974bd0252137410eb23b1be5d38cac059a0503e23edf3386281446f3" +checksum = "e2ff3757b77e32eabf2d2ece413d2aaecc4cb5462bbe1bacf33fff35840120d4" dependencies = [ "base64 0.21.7", "bincode", @@ -6370,9 +6515,9 @@ dependencies = [ [[package]] name = "solana-thin-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9da32840c38fdbb5867ee8ec4501d48ccb5f6bfbc5d20e506af92fa5b6891c8" +checksum = "c2bbcca3e1eb0967e922db81f04055da00cc6b40a010c7c25474efc3146e6419" dependencies = [ "bincode", "log", @@ -6385,9 +6530,9 @@ dependencies = [ [[package]] name = "solana-tpu-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57763d8c245ccd9b06b7402ddb7bf3979ce0cd3be728a37d7612e15b71f5c86c" +checksum = "2c62e92fee2205af028d4c9915e8d8eacf88fad6a66376975141e81a17da043e" dependencies = [ "async-trait", "bincode", @@ -6409,9 +6554,9 @@ dependencies = [ [[package]] name = "solana-transaction-status" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d374b4db545fe897d8f111d4b0150cd6417a94c7612724a2367fd268ff0d3bb2" +checksum = "24195f4eb0d29463172854a01946b7b3dd9a657cc69e474c8477c29fa98fb932" dependencies = [ "Inflector", "base64 0.21.7", @@ -6434,9 +6579,9 @@ dependencies = [ [[package]] name = "solana-turbine" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2597da1cc662396c63b7e831382611dd9b54112bf98237da620335db748e8512" +checksum = "38e3781af11201ffc18b8bc921856920c96adff0cb4f99730b960f13c242f2ab" dependencies = [ "bincode", "bytes", @@ -6471,9 +6616,9 @@ dependencies = [ [[package]] name = "solana-udp-client" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b4f8e8f987147c994c5b9ab78c0d85aa9d749fb82a01f7fd5d637eb0af8891a" +checksum = "fbb650239ab659864da1066c23d4cc60a9547e1f5c27e5fcae4c429799bb9f3e" dependencies = [ "async-trait", "solana-connection-cache", @@ -6484,11 +6629,31 @@ dependencies = [ "tokio", ] +[[package]] +name = "solana-unified-scheduler-logic" +version = "1.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82cef08c8bf87dad190edc15b6c5f528a1c225dc88d01eb376cf9cb07542acb" + +[[package]] +name = "solana-unified-scheduler-pool" +version = "1.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a63c55cc0bbccbb0951d1e12a92fa0f23498488e7ef03486de04c9ae4f0f1" +dependencies = [ + "solana-ledger", + "solana-program-runtime", + "solana-runtime", + "solana-sdk", + "solana-unified-scheduler-logic", + "solana-vote", +] + [[package]] name = "solana-version" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e712bd25a150e931a4abf20b1116d640b37a646446dd0e336b4431277d8b473" +checksum = "f2070bbdf2292d094a397520128d1aacaef898bbb2ce44cb45f8b66af48c7791" dependencies = [ "log", "rustc_version", @@ -6502,9 +6667,9 @@ dependencies = [ [[package]] name = "solana-vote" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b064b3a81238229ae29cab8866ffb7076067b8fe518d75e22923a7f000b419c" +checksum = "f226dd535bb316cc26a5a06184c51f59093ef3d4bd9030517ae6588eb8a5ee7c" dependencies = [ "crossbeam-channel", "itertools", @@ -6521,13 +6686,13 @@ dependencies = [ [[package]] name = "solana-vote-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca84f0eab3aa693d5af43d062c2c54022fc7ca0ea8792bd74d03e5120b4ea0f6" +checksum = "9feb0404020b99dffa176aea9247a21e536cc1c2d603750076999ebc6770a09d" dependencies = [ "bincode", "log", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "rustc_version", "serde", @@ -6541,14 +6706,35 @@ dependencies = [ "thiserror", ] +[[package]] +name = "solana-wen-restart" +version = "1.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e794248dea3ab5d7e210d584d00ac70285f728f8404c23cdf5a39a32c1a8cc00" +dependencies = [ + "log", + "prost", + "prost-build", + "prost-types", + "protobuf-src", + "rustc_version", + "solana-gossip", + "solana-ledger", + "solana-logger", + "solana-program", + "solana-runtime", + "solana-sdk", + "solana-vote-program", +] + [[package]] name = "solana-zk-token-proof-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc617d1bc29188034a5e2780f9eaa25b8eb844387e09e6b9f1ec1e7e966b004a" +checksum = "a364e360d65c511ae691e4aedfc1d895a59a8cfec9a84979adbcfb5b0513a805" dependencies = [ "bytemuck", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "solana-program-runtime", "solana-sdk", @@ -6557,9 +6743,9 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0800a272fd47a03ec1a322078e7bef1d988c3d3d576c9d79547af55cbe1f8eab" +checksum = "36c59afea5e1d64af06f803ed41733f6e829874daff054ca6add36b320db74e2" dependencies = [ "aes-gcm-siv", "base64 0.21.7", @@ -6571,7 +6757,7 @@ dependencies = [ "itertools", "lazy_static", "merlin", - "num-derive 0.3.3", + "num-derive 0.4.2", "num-traits", "rand 0.7.3", "serde", @@ -7914,6 +8100,18 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.46", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -8349,6 +8547,23 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap 2.2.1", + "toml_datetime", + "winnow", +] + [[package]] name = "tonic" version = "0.9.2" @@ -9022,6 +9237,15 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/account-compression/programs/account-compression/Cargo.toml b/account-compression/programs/account-compression/Cargo.toml index b36bad076be..8230b5eac7c 100644 --- a/account-compression/programs/account-compression/Cargo.toml +++ b/account-compression/programs/account-compression/Cargo.toml @@ -20,7 +20,7 @@ default = [] [dependencies] anchor-lang = "0.29.0" bytemuck = "1.13" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-concurrent-merkle-tree = { version = "0.2.0", path = "../../../libraries/concurrent-merkle-tree", features = [ "sol-log", ] } diff --git a/account-compression/programs/noop/Cargo.toml b/account-compression/programs/noop/Cargo.toml index dc8fbd1cc12..ed9a2459b16 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml index 9c42ce90c6a..8f35039c755 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.17.17,<=2" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" 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 = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 19b25db54e4..0516480a96a 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-2022 = { version = "2.0", 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 4a6679bd11b..e67bb17004c 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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 e0bdf091a16..014ab293b1e 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/ci/solana-version.sh b/ci/solana-version.sh index c7816dc2640..b7cf9b64c98 100755 --- a/ci/solana-version.sh +++ b/ci/solana-version.sh @@ -17,7 +17,7 @@ else # This file is now out of sync with the versions in Cargo.toml. # https://github.com/solana-labs/solana-program-library/pull/6182 # This will require some manual cleanup the next time the version is updated. - solana_version=v1.17.17 + solana_version=v1.18.2 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 39d76428b7d..d4e307e69c8 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/custom-heap/Cargo.toml b/examples/rust/custom-heap/Cargo.toml index f741e28fd59..838d6aea277 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/logging/Cargo.toml b/examples/rust/logging/Cargo.toml index c244bd79827..901eb9cdf22 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/sysvar/Cargo.toml b/examples/rust/sysvar/Cargo.toml index 956122ade94..ea4f1afde02 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-lamports/Cargo.toml b/examples/rust/transfer-lamports/Cargo.toml index 2d55e0f8280..bfc6973f009 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/examples/rust/transfer-tokens/Cargo.toml b/examples/rust/transfer-tokens/Cargo.toml index d702a011e17..5b965c4f27d 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint" ] } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-gate/program/Cargo.toml b/feature-gate/program/Cargo.toml index 1c3db47dc92..eaf2452b274 100644 --- a/feature-gate/program/Cargo.toml +++ b/feature-gate/program/Cargo.toml @@ -13,12 +13,12 @@ test-sbf = [] [dependencies] num_enum = "0.7.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-program-error = { version = "0.3.1", path = "../../libraries/program-error" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/feature-proposal/cli/Cargo.toml b/feature-proposal/cli/Cargo.toml index 3cc53302dc0..99f89695674 100644 --- a/feature-proposal/cli/Cargo.toml +++ b/feature-proposal/cli/Cargo.toml @@ -10,11 +10,11 @@ edition = "2021" [dependencies] chrono = "0.4.34" clap = "2.33.3" -solana-clap-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-clap-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" 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 93488b85503..75a6ea004bc 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index 83cab6a0520..a028112ad2c 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.4", path = "../tools" } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 6e4290feaea..3c9c134f2e7 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.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../../token/program", features = [ "no-entrypoint", ] } @@ -31,8 +31,8 @@ thiserror = "1.0" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.4" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" } diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index f4441386bf2..ce22e8710e8 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.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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.4" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-governance-test-sdk = { version = "0.1.4", path = "../../test-sdk" } spl-governance-addin-mock = { version = "0.1.4", path = "../../addin-mock/program" } diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index 9a45adb10bb..939d3ab1cf0 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.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -31,8 +31,8 @@ thiserror = "1.0" assert_matches = "1.5.0" base64 = "0.21" proptest = "1.4" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-governance-test-sdk = { version = "0.1.4", path = "../test-sdk" } spl-governance-addin-mock = { version = "0.1.4", path = "../addin-mock/program" } diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index be5de2f4d1e..acbb65e2f94 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -16,9 +16,9 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index 9139f4d267a..b2bcb328627 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -15,7 +15,7 @@ num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint", ] } diff --git a/instruction-padding/program/Cargo.toml b/instruction-padding/program/Cargo.toml index aa8f8184d5f..8f385ed1aa6 100644 --- a/instruction-padding/program/Cargo.toml +++ b/instruction-padding/program/Cargo.toml @@ -14,11 +14,11 @@ test-sbf = [] [dependencies] num_enum = "0.7.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml index 8bd32f30ceb..73bf154b1c2 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.3", features = ["derive"] } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-discriminator-derive = { version = "0.1.2", path = "./derive" } [lib] diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index a19c23c6a0a..a3da2194bba 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" thiserror = "1.0" uint = "0.9" [dev-dependencies] proptest = "1.4.0" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" libm = "0.2.8" [lib] diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index ea818e5f5e7..f939dda8041 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -16,8 +16,8 @@ base64 = { version = "0.21.7", optional = true } borsh = { version = "0.10", optional = true } bytemuck = { version = "1.14.3" } serde = { version = "1.0.197", optional = true } -solana-program = ">=1.17.17,<=2" -solana-zk-token-sdk = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" +solana-zk-token-sdk = ">=1.18.2,<=2" 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 1d27fb37d1b..19e7bd24b76 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-program-error-derive = { version = "0.3.2", path = "./derive" } thiserror = "1.0" [dev-dependencies] lazy_static = "1.4" serial_test = "3.0" -solana-sdk = ">=1.17.17,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/libraries/tlv-account-resolution/Cargo.toml b/libraries/tlv-account-resolution/Cargo.toml index e9eeb08fceb..c2bf195a39e 100644 --- a/libraries/tlv-account-resolution/Cargo.toml +++ b/libraries/tlv-account-resolution/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.14.3", features = ["derive"] } serde = { version = "1.0.197", optional = true } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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" } @@ -23,9 +23,9 @@ spl-pod = { version = "0.1", path = "../pod" } [dev-dependencies] futures = "0.3.30" futures-util = "0.3" -solana-client = ">=1.17.17,<=2" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-client = ">=1.18.2,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-discriminator = { version = "0.1", path = "../discriminator" } [lib] diff --git a/libraries/type-length-value/Cargo.toml b/libraries/type-length-value/Cargo.toml index 2dcc41da856..cd5a3c0a5d8 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.3", features = ["derive"] } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml index 55b2ec6d1fe..ab8a676ce91 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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.57" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" diff --git a/memo/program/Cargo.toml b/memo/program/Cargo.toml index 09414653577..6d006f4e0a4 100644 --- a/memo/program/Cargo.toml +++ b/memo/program/Cargo.toml @@ -12,11 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index 0e46a1d98a1..c4b4dd7c721 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" num-traits = "0.2" borsh = "0.10" num-derive = "0.4.2" thiserror = "1.0.57" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 0c06e850dbb..a5e6b7ccddc 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -15,13 +15,13 @@ test-sbf = [] bytemuck = { version = "1.14.3", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" thiserror = "1.0" spl-pod = { version = "0.1", path = "../../libraries/pod" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/shared-memory/program/Cargo.toml b/shared-memory/program/Cargo.toml index e89e142aa93..db737ff40b6 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index a2b671bb5b5..b0cbcb316b6 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -17,16 +17,16 @@ serde = "1.0.197" serde_derive = "1.0.103" serde_json = "1.0.114" serde_with = "3.6.1" -solana-account-decoder = ">=1.17.17,<=2" -solana-clap-v3-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-cli-output = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-remote-wallet = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" -solana-transaction-status = ">=1.17.17,<=2" -solana-vote-program = ">=1.17.17,<=2" +solana-account-decoder = ">=1.18.2,<=2" +solana-clap-v3-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-cli-output = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-remote-wallet = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" +solana-transaction-status = ">=1.18.2,<=2" +solana-vote-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint", ] } @@ -39,7 +39,7 @@ spl-single-pool = { version = "1.0.0", path = "../program", features = [ ] } [dev-dependencies] -solana-test-validator = ">=1.17.17,<=2" +solana-test-validator = ">=1.18.2,<=2" serial_test = "3.0.0" test-case = "3.3" tempfile = "3.10.0" diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index 85edb68cb1c..d3d6a86c8d9 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -17,16 +17,16 @@ borsh = "0.10" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" solana-security-txt = "1.1.1" 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.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" -solana-vote-program = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" +solana-vote-program = ">=1.18.2,<=2" test-case = "3.3" bincode = "1.3.1" rand = "0.8.5" diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml index b62d5a0c89d..53d8bd6714b 100644 --- a/stake-pool/cli/Cargo.toml +++ b/stake-pool/cli/Cargo.toml @@ -14,15 +14,15 @@ clap = "2.33.3" serde = "1.0.197" serde_derive = "1.0.130" serde_json = "1.0.114" -solana-account-decoder = ">=1.17.17,<=2" -solana-clap-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-cli-output = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-program = ">=1.17.17,<=2" -solana-remote-wallet = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-account-decoder = ">=1.18.2,<=2" +solana-clap-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-cli-output = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-program = ">=1.18.2,<=2" +solana-remote-wallet = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-associated-token-account = { version = "=2.3", path = "../../associated-token-account/program", features = [ "no-entrypoint", ] } diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index dd75117cc54..3bd2b5cdc08 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.2" serde = "1.0.197" serde_derive = "1.0.103" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" solana-security-txt = "1.1.1" spl-math = { version = "0.2", path = "../../libraries/math", features = [ "no-entrypoint" ] } spl-pod = { version = "0.1", path = "../../libraries/pod", features = ["borsh"] } @@ -31,9 +31,9 @@ bincode = "1.3.1" [dev-dependencies] assert_matches = "1.5.0" proptest = "1.4" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" -solana-vote-program = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" +solana-vote-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } test-case = "3.3" diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index 1827127cd3a..89612c1b1c4 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-collection/program/Cargo.toml b/token-collection/program/Cargo.toml index 92e27b8382b..3fba0a7dc4d 100644 --- a/token-collection/program/Cargo.toml +++ b/token-collection/program/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-pod = { version = "0.1.1", path = "../../libraries/pod" } spl-program-error = { version = "0.3.1" , path = "../../libraries/program-error" } spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } @@ -22,8 +22,8 @@ spl-token-metadata-interface = { version = "0.2", path = "../../token-metadata/i spl-type-length-value = { version = "0.3.1", path = "../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-discriminator = { version = "0.1.1", path = "../../libraries/discriminator" } spl-token-client = { version = "0.8", path = "../../token/client" } diff --git a/token-group/example/Cargo.toml b/token-group/example/Cargo.toml index 78daa73a85a..d2431ad9674 100644 --- a/token-group/example/Cargo.toml +++ b/token-group/example/Cargo.toml @@ -12,15 +12,15 @@ no-entrypoint = [] test-sbf = [] [dependencies] -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-pod = { version = "0.1.1", path = "../../libraries/pod" } spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.1.1", path = "../interface" } spl-type-length-value = { version = "0.3.1", path = "../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-discriminator = { version = "0.1.1", path = "../../libraries/discriminator" } spl-token-client = { version = "0.8", path = "../../token/client" } spl-token-metadata-interface = { version = "0.2", path = "../../token-metadata/interface" } diff --git a/token-group/interface/Cargo.toml b/token-group/interface/Cargo.toml index 85dd76e1611..4281c65161f 100644 --- a/token-group/interface/Cargo.toml +++ b/token-group/interface/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] bytemuck = "1.14.3" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-discriminator = { version = "0.1.1" , path = "../../libraries/discriminator" } spl-pod = { version = "0.1.1" , path = "../../libraries/pod", features = ["borsh"] } spl-program-error = { version = "0.3.1" , path = "../../libraries/program-error" } diff --git a/token-lending/cli/Cargo.toml b/token-lending/cli/Cargo.toml index bc2fa565c96..986ea07ae7e 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.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" -solana-program = ">=1.17.17,<=2" +solana-clap-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" +solana-program = ">=1.18.2,<=2" 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 145cfdb1938..f07b69cfb8e 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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 ae8ae6da74b..4e814e90b44 100644 --- a/token-lending/program/Cargo.toml +++ b/token-lending/program/Cargo.toml @@ -16,7 +16,7 @@ arrayref = "0.3.7" bytemuck = "1.14.3" num-derive = "0.4" num-traits = "0.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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.4" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/token-metadata/example/Cargo.toml b/token-metadata/example/Cargo.toml index 9aa30213616..51cc111dd98 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } spl-token-metadata-interface = { version = "0.2.1", path = "../interface" } spl-type-length-value = { version = "0.3.1" , path = "../../libraries/type-length-value" } spl-pod = { version = "0.1.1", path = "../../libraries/pod" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-token-client = { version = "0.8", path = "../../token/client" } test-case = "3.3" diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index 3807af48e02..3558b829cfa 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.197", optional = true } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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-swap/program/Cargo.toml b/token-swap/program/Cargo.toml index bd502c8a596..fc013f366e2 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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 = "2.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } @@ -28,7 +28,7 @@ roots = { version = "0.0.8", optional = true } [dev-dependencies] proptest = "1.4" roots = "0.0.8" -solana-sdk = ">=1.17.17,<=2" +solana-sdk = ">=1.18.2,<=2" test-case = "3.3" [lib] diff --git a/token-swap/program/fuzz/Cargo.toml b/token-swap/program/fuzz/Cargo.toml index b8d64f139e6..0a516321d45 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.3", features = ["derive"] } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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 09d74a79ca2..76642c2c830 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.30" -solana-clap-v3-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-remote-wallet = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-clap-v3-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-remote-wallet = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" 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 = "2.0", 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.17.17,<=2" +solana-test-validator = ">=1.18.2,<=2" [[bin]] name = "spl-token-upgrade" diff --git a/token-upgrade/program/Cargo.toml b/token-upgrade/program/Cargo.toml index 747e1e16e3f..9d55b17e7e1 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.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } spl-token-client = { version = "0.8", path = "../../token/client" } test-case = "3.3" diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml index 081b731b3c5..0dc7c810133 100644 --- a/token-wrap/program/Cargo.toml +++ b/token-wrap/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] bytemuck = { version = "1.14.3", features = ["derive"] } num_enum = "0.7" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" 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 = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml index 1e07e0b964a..e1606a270c0 100644 --- a/token/cli/Cargo.toml +++ b/token/cli/Cargo.toml @@ -19,15 +19,15 @@ futures = "0.3" serde = "1.0.197" serde_derive = "1.0.103" serde_json = "1.0.114" -solana-account-decoder = ">=1.17.17,<=2" -solana-clap-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-cli-output = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-remote-wallet = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" -solana-transaction-status = ">=1.17.17,<=2" +solana-account-decoder = ">=1.18.2,<=2" +solana-clap-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-cli-output = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-remote-wallet = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" +solana-transaction-status = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../program", features = [ "no-entrypoint", ] } @@ -48,7 +48,7 @@ strum_macros = "0.26" tokio = "1.36" [dev-dependencies] -solana-test-validator = ">=1.17.17,<=2" +solana-test-validator = ">=1.18.2,<=2" assert_cmd = "2.0.14" libtest-mimic = "0.7" serial_test = "3.0.0" diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml index ba668470c11..4ef7d318bc3 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.30" futures-util = "0.3" -solana-banks-interface = ">=1.17.17,<=2" -solana-cli-output = { version = ">=1.17.17,<=2", optional = true } -solana-program-test = ">=1.17.17,<=2" -solana-rpc-client = ">=1.17.17,<=2" -solana-rpc-client-api = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-banks-interface = ">=1.18.2,<=2" +solana-cli-output = { version = ">=1.18.2,<=2", optional = true } +solana-program-test = ">=1.18.2,<=2" +solana-rpc-client = ">=1.18.2,<=2" +solana-rpc-client-api = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" # 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 = [ diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index b2dc692f412..4dcc2418126 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -19,9 +19,9 @@ walkdir = "2" async-trait = "0.1" borsh = "0.10" futures-util = "0.3" -solana-program = ">=1.17.17,<=2" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program" } spl-memo = { version = "4.0.1", path = "../../memo/program", features = ["no-entrypoint"] } spl-pod = { version = "0.1.1", path = "../../libraries/pod" } diff --git a/token/program-2022/Cargo.toml b/token/program-2022/Cargo.toml index 25f1e3868b7..cae4e44c040 100644 --- a/token/program-2022/Cargo.toml +++ b/token/program-2022/Cargo.toml @@ -26,9 +26,9 @@ bytemuck = { version = "1.14.3", features = ["derive"] } num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" solana-security-txt = "1.1.1" -solana-zk-token-sdk = ">=1.17.17,<=2" +solana-zk-token-sdk = ">=1.18.2,<=2" spl-memo = { version = "4.0", path = "../../memo/program", features = [ "no-entrypoint" ] } spl-token = { version = "4.0", path = "../program", features = ["no-entrypoint"] } spl-token-group-interface = { version = "0.1", path = "../../token-group/interface" } @@ -45,8 +45,8 @@ base64 = { version = "0.21.7", optional = true } lazy_static = "1.4.0" proptest = "1.4" serial_test = "3.0.0" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-tlv-account-resolution = { version = "0.5.2", path = "../../libraries/tlv-account-resolution" } serde_json = "1.0.114" diff --git a/token/program/Cargo.toml b/token/program/Cargo.toml index 4636f5c7ab8..8f9a0598cb6 100644 --- a/token/program/Cargo.toml +++ b/token/program/Cargo.toml @@ -18,15 +18,15 @@ bytemuck = "1.14.3" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" thiserror = "1.0" [dev-dependencies] lazy_static = "1.4.0" proptest = "1.4" serial_test = "3.0.0" -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook/cli/Cargo.toml b/token/transfer-hook/cli/Cargo.toml index 4ff3c80d6cc..05fbda87c0b 100644 --- a/token/transfer-hook/cli/Cargo.toml +++ b/token/transfer-hook/cli/Cargo.toml @@ -11,12 +11,12 @@ version = "0.1.1" [dependencies] clap = { version = "3", features = ["cargo"] } futures-util = "0.3.30" -solana-clap-v3-utils = ">=1.17.17,<=2" -solana-cli-config = ">=1.17.17,<=2" -solana-client = ">=1.17.17,<=2" -solana-logger = ">=1.17.17,<=2" -solana-remote-wallet = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-clap-v3-utils = ">=1.18.2,<=2" +solana-cli-config = ">=1.18.2,<=2" +solana-client = ">=1.18.2,<=2" +solana-logger = ">=1.18.2,<=2" +solana-remote-wallet = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" spl-transfer-hook-interface = { version = "0.5", path = "../interface" } spl-tlv-account-resolution = { version = "0.5.2" , path = "../../../libraries/tlv-account-resolution", features = ["serde-traits"] } strum = "0.26" @@ -27,7 +27,7 @@ serde_json = "1.0.114" serde_yaml = "0.9.32" [dev-dependencies] -solana-test-validator = ">=1.17.17,<=2" +solana-test-validator = ">=1.18.2,<=2" spl-token-2022 = { version = "2.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-token-client = { version = "0.8", path = "../../client" } diff --git a/token/transfer-hook/example/Cargo.toml b/token/transfer-hook/example/Cargo.toml index 7bdc67875d3..da79a924a35 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.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-tlv-account-resolution = { version = "0.5" , path = "../../../libraries/tlv-account-resolution" } spl-token-2022 = { version = "2.0", path = "../../program-2022", features = ["no-entrypoint"] } spl-transfer-hook-interface = { version = "0.5" , path = "../interface" } spl-type-length-value = { version = "0.3" , path = "../../../libraries/type-length-value" } [dev-dependencies] -solana-program-test = ">=1.17.17,<=2" -solana-sdk = ">=1.17.17,<=2" +solana-program-test = ">=1.18.2,<=2" +solana-sdk = ">=1.18.2,<=2" [lib] crate-type = ["cdylib", "lib"] diff --git a/token/transfer-hook/interface/Cargo.toml b/token/transfer-hook/interface/Cargo.toml index c926ec3b70d..90b80d7f5c6 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.3", features = ["derive"] } -solana-program = ">=1.17.17,<=2" +solana-program = ">=1.18.2,<=2" spl-discriminator = { version = "0.1" , path = "../../../libraries/discriminator" } spl-program-error = { version = "0.3" , path = "../../../libraries/program-error" } spl-tlv-account-resolution = { version = "0.5" , path = "../../../libraries/tlv-account-resolution" } diff --git a/utils/test-client/Cargo.toml b/utils/test-client/Cargo.toml index 8e3f4b2a71e..a8364ec965e 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.17.17,<=2" +solana-sdk = ">=1.18.2,<=2" 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" ] } From 5877a51f43d1fba96f1f141d55a7f1645a2416f2 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 21 Feb 2024 08:21:21 +0900 Subject: [PATCH 2/6] upgrade rust version to 1.76.0 --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 8142c301269..624eb0ea639 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.73.0" +channel = "1.76.0" From 19f53aed5c003dae85c92ec7da78d0cc5c7c0ec5 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 21 Feb 2024 11:22:44 +0900 Subject: [PATCH 3/6] update borsh to 1.2.1 --- Cargo.lock | 70 ++++---- account-compression/Cargo.lock | 169 +++++++++++++++--- associated-token-account/program/Cargo.toml | 10 +- binary-option/program/Cargo.toml | 6 +- binary-oracle-pair/program/Cargo.toml | 6 +- 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 | 4 +- governance/chat/program/Cargo.toml | 6 +- governance/program/Cargo.toml | 4 +- 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 | 4 +- governance/test-sdk/src/lib.rs | 2 +- governance/tools/Cargo.toml | 4 +- governance/tools/src/account.rs | 2 +- libraries/math/Cargo.toml | 2 +- libraries/pod/Cargo.toml | 2 +- .../type-length-value-derive-test/Cargo.toml | 6 +- .../type-length-value-derive-test/src/lib.rs | 2 +- .../type-length-value/derive/src/builder.rs | 4 +- managed-token/program/Cargo.toml | 10 +- name-service/program/Cargo.toml | 4 +- single-pool/cli/Cargo.toml | 2 +- single-pool/cli/src/main.rs | 2 +- single-pool/program/Cargo.toml | 10 +- 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 | 2 +- stake-pool/cli/src/client.rs | 4 +- stake-pool/cli/src/main.rs | 2 +- stake-pool/program/Cargo.toml | 18 +- 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/force_destake.rs | 2 +- stake-pool/program/tests/helpers/mod.rs | 2 +- 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 | 2 +- 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 +- stateless-asks/program/Cargo.toml | 10 +- stateless-asks/program/src/processor.rs | 2 +- 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/program-2022-test/Cargo.toml | 20 ++- .../tests/token_metadata_emit.rs | 2 +- 70 files changed, 320 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f7ecc8a7c95..86600cc532e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -632,7 +632,7 @@ name = "binary-option" version = "0.1.0" dependencies = [ "arrayref", - "borsh 0.10.3", + "borsh 1.2.1", "solana-program", "spl-token 4.0.1", "thiserror", @@ -790,11 +790,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.3.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +checksum = "9897ef0f1bd2362169de6d7e436ea2237dc1085d7d1e4db75f4be34d86f309d1" dependencies = [ - "borsh-derive 1.3.1", + "borsh-derive 1.2.1", "cfg_aliases", ] @@ -826,12 +826,12 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.3.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +checksum = "478b41ff04256c5c8330f3dfdaaae2a5cc976a8e75088bafa4625b0d0208de8c" dependencies = [ "once_cell", - "proc-macro-crate 3.1.0", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 2.0.46", @@ -3899,9 +3899,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ "toml_edit", ] @@ -5160,7 +5160,7 @@ version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f2d9fd34407846e07edf34d3f423f883ea19ed191669ec2af11394df986ead" dependencies = [ - "borsh 1.3.1", + "borsh 1.2.1", "futures 0.3.30", "solana-banks-interface", "solana-program", @@ -5905,7 +5905,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", - "borsh 1.3.1", + "borsh 1.2.1", "bs58", "bv", "bytemuck", @@ -6289,7 +6289,7 @@ dependencies = [ "base64 0.21.7", "bincode", "bitflags 2.4.2", - "borsh 1.3.1", + "borsh 1.2.1", "bs58", "bytemuck", "byteorder", @@ -6832,7 +6832,7 @@ name = "spl-associated-token-account" version = "2.3.1" dependencies = [ "assert_matches", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "solana-program", @@ -6857,7 +6857,7 @@ dependencies = [ name = "spl-binary-oracle-pair" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "solana-program", @@ -7016,7 +7016,7 @@ dependencies = [ name = "spl-feature-proposal" version = "1.0.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "solana-program", "solana-program-test", "solana-sdk", @@ -7045,7 +7045,7 @@ dependencies = [ "assert_matches", "base64 0.21.7", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "proptest", @@ -7066,7 +7066,7 @@ dependencies = [ name = "spl-governance-addin-api" version = "0.1.4" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "solana-program", "spl-governance-tools", ] @@ -7078,7 +7078,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "proptest", @@ -7101,7 +7101,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "proptest", @@ -7125,7 +7125,7 @@ version = "0.1.4" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "lazy_static", "num-derive 0.4.2", "num-traits", @@ -7144,7 +7144,7 @@ version = "0.1.4" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "serde", @@ -7168,7 +7168,7 @@ dependencies = [ name = "spl-managed-token" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "shank", "solana-program", "solana-program-test", @@ -7182,7 +7182,7 @@ dependencies = [ name = "spl-math" version = "0.2.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "libm", "num-derive 0.4.2", "num-traits", @@ -7224,7 +7224,7 @@ dependencies = [ name = "spl-name-service" version = "0.3.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "solana-program", @@ -7251,7 +7251,7 @@ name = "spl-pod" version = "0.1.1" dependencies = [ "base64 0.21.7", - "borsh 0.10.3", + "borsh 1.2.1", "bytemuck", "serde", "serde_json", @@ -7340,7 +7340,7 @@ dependencies = [ "approx", "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "num-derive 0.4.2", "num-traits", "num_enum 0.7.2", @@ -7361,7 +7361,7 @@ name = "spl-single-pool-cli" version = "1.0.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "clap 3.2.25", "console", "serde", @@ -7396,7 +7396,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "bytemuck", "num-derive 0.4.2", "num-traits", @@ -7422,7 +7422,7 @@ name = "spl-stake-pool-cli" version = "1.0.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.2.1", "bs58", "clap 2.34.0", "serde", @@ -7568,7 +7568,7 @@ name = "spl-token-2022-test" version = "0.0.1" dependencies = [ "async-trait", - "borsh 0.10.3", + "borsh 1.2.1", "futures-util", "solana-program", "solana-program-test", @@ -7775,7 +7775,7 @@ dependencies = [ name = "spl-token-metadata-interface" version = "0.2.1" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "serde", "serde_json", "solana-program", @@ -7977,7 +7977,7 @@ dependencies = [ name = "spl-type-length-value-derive-test" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "solana-program", "spl-discriminator 0.1.1", "spl-type-length-value 0.3.1", @@ -7987,7 +7987,7 @@ dependencies = [ name = "stateless-asks" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.1", "solana-program", "solana-program-test", "solana-sdk", @@ -8555,9 +8555,9 @@ checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.2.1", "toml_datetime", diff --git a/account-compression/Cargo.lock b/account-compression/Cargo.lock index a5ddc853f9f..592543ceb10 100644 --- a/account-compression/Cargo.lock +++ b/account-compression/Cargo.lock @@ -20,7 +20,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d" dependencies = [ "cfg-if", - "getrandom 0.2.10", "once_cell", "version_check", "zerocopy", @@ -418,6 +417,16 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" +dependencies = [ + "borsh-derive 1.3.1", + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -426,7 +435,7 @@ checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" dependencies = [ "borsh-derive-internal 0.9.3", "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.108", ] @@ -439,11 +448,25 @@ checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" dependencies = [ "borsh-derive-internal 0.10.3", "borsh-schema-derive-internal 0.10.3", - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.108", ] +[[package]] +name = "borsh-derive" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" +dependencies = [ + "once_cell", + "proc-macro-crate 3.1.0", + "proc-macro2", + "quote", + "syn 2.0.48", + "syn_derive", +] + [[package]] name = "borsh-derive-internal" version = "0.9.3" @@ -561,6 +584,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -718,6 +747,12 @@ version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "feature-probe" version = "0.1.1" @@ -779,6 +814,12 @@ dependencies = [ "ahash 0.8.5", ] +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + [[package]] name = "heck" version = "0.3.3" @@ -834,6 +875,16 @@ dependencies = [ "version_check", ] +[[package]] +name = "indexmap" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + [[package]] name = "itertools" version = "0.10.5" @@ -964,6 +1015,12 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + [[package]] name = "memmap2" version = "0.5.10" @@ -1004,13 +1061,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 1.0.108", + "syn 2.0.48", ] [[package]] @@ -1107,6 +1164,38 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + [[package]] name = "proc-macro2" version = "1.0.78" @@ -1369,17 +1458,13 @@ checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "solana-frozen-abi" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62311c3a992af13c270d9bf219b6d7534f7ddc30074fa31a5261273e9f7d4b83" +checksum = "1f97bbed79e7fd14e1c48411ce217f305972e7151f14b3124f3956fc13aac76b" dependencies = [ - "ahash 0.8.5", - "blake3", "block-buffer 0.10.4", "bs58 0.4.0", "bv", - "byteorder", - "cc", "either", "generic-array", "im", @@ -1390,7 +1475,6 @@ dependencies = [ "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", @@ -1399,9 +1483,9 @@ dependencies = [ [[package]] name = "solana-frozen-abi-macro" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9b64778efc635c7cd8cae084fef4b034b7f2b5a0c022d5173179446c56e71f" +checksum = "22b989fb872d2ba530ecb6e504284e3e1244eeb7541056c40fe2d87c7d0bb9d1" dependencies = [ "proc-macro2", "quote", @@ -1411,9 +1495,9 @@ dependencies = [ [[package]] name = "solana-program" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75eabbb12920ffe88155f611450a17d6ae28b754b707ec63f83ada500014c8a" +checksum = "0b5d8a2694dc792ee9ae4af09cf8995e21cc9366846001e8ee1e6f060a837518" dependencies = [ "ark-bn254", "ark-ec", @@ -1425,6 +1509,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", + "borsh 1.3.1", "bs58 0.4.0", "bv", "bytemuck", @@ -1465,9 +1550,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "1.17.17" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17489fa2101a7bfbd19629e53f6801f4428c584a5964acfc861d0151eb9b502" +checksum = "2395961f455e2b2ec9b64d945e3e9db760ccce10716f40a3e947a1e399c7511e" dependencies = [ "bs58 0.4.0", "proc-macro2", @@ -1531,20 +1616,32 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", @@ -1594,6 +1691,23 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow", +] + [[package]] name = "typenum" version = "1.15.0" @@ -1746,6 +1860,15 @@ version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + [[package]] name = "zerocopy" version = "0.7.32" diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 0516480a96a..eb10ec91933 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -13,12 +13,16 @@ test-sbf = [] [dependencies] assert_matches = "1.5.0" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" solana-program = ">=1.18.2,<=2" -spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } -spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = ["no-entrypoint"] } +spl-token = { version = "4.0", path = "../../token/program", features = [ + "no-entrypoint", +] } +spl-token-2022 = { version = "2.0", path = "../../token/program-2022", features = [ + "no-entrypoint", +] } thiserror = "1.0" [lib] diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index e67bb17004c..afc775b2b92 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -11,9 +11,11 @@ test-sbf = [] [dependencies] solana-program = ">=1.18.2,<=2" thiserror = "1.0" -spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]} +spl-token = { version = "4.0", path = "../../token/program", features = [ + "no-entrypoint", +] } arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.2.1" uint = "0.9" [lib] diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 014ab293b1e..0c28f717e2d 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -14,10 +14,12 @@ test-sbf = [] num-derive = "0.4" num-traits = "0.2" solana-program = ">=1.18.2,<=2" -spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } +spl-token = { version = "4.0", path = "../../token/program", features = [ + "no-entrypoint", +] } thiserror = "1.0" uint = "0.9" -borsh = "0.10" +borsh = "1.2.1" [dev-dependencies] solana-program-test = ">=1.18.2,<=2" diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml index 75a6ea004bc..a79b7388638 100644 --- a/feature-proposal/program/Cargo.toml +++ b/feature-proposal/program/Cargo.toml @@ -12,9 +12,11 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2.1" solana-program = ">=1.18.2,<=2" -spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } +spl-token = { version = "4.0", path = "../../token/program", features = [ + "no-entrypoint", +] } [dev-dependencies] solana-program-test = ">=1.18.2,<=2" diff --git a/feature-proposal/program/src/instruction.rs b/feature-proposal/program/src/instruction.rs index 0b05f1bf399..fa2da6424d8 100644 --- a/feature-proposal/program/src/instruction.rs +++ b/feature-proposal/program/src/instruction.rs @@ -170,7 +170,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposalInstruction::get_packed_len(), - solana_program::borsh0_10::get_packed_len::() + solana_program::borsh1::get_packed_len::() ) } diff --git a/feature-proposal/program/src/state.rs b/feature-proposal/program/src/state.rs index 082e4fcd3f3..613ad3427d9 100644 --- a/feature-proposal/program/src/state.rs +++ b/feature-proposal/program/src/state.rs @@ -69,7 +69,7 @@ mod tests { fn test_get_packed_len() { assert_eq!( FeatureProposal::get_packed_len(), - solana_program::borsh0_10::get_packed_len::() + solana_program::borsh1::get_packed_len::() ); } diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index a028112ad2c..793693f349f 100644 --- a/governance/addin-api/Cargo.toml +++ b/governance/addin-api/Cargo.toml @@ -8,6 +8,6 @@ license = "Apache-2.0" edition = "2021" [dependencies] -borsh = "0.10" +borsh = "1.2.1" spl-governance-tools = { version = "0.1.4", path = "../tools" } solana-program = ">=1.18.2,<=2" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 3c9c134f2e7..e865fe7893e 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -14,14 +14,14 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../../token/program", features = [ - "no-entrypoint", + "no-entrypoint", ] } spl-governance-addin-api = { version = "0.1.4", path = "../../addin-api" } spl-governance-tools = { version = "0.1.4", path = "../../tools" } diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index ce22e8710e8..d1f3d248b3c 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -14,17 +14,17 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../../token/program", features = [ - "no-entrypoint", + "no-entrypoint", ] } spl-governance = { version = "4.0.0", path = "../../program", features = [ - "no-entrypoint", + "no-entrypoint", ] } spl-governance-tools = { version = "0.1.4", path = "../../tools" } spl-governance-addin-api = { version = "0.1.4", path = "../../addin-api" } diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index 939d3ab1cf0..966332c498a 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -14,14 +14,14 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ - "no-entrypoint", + "no-entrypoint", ] } spl-governance-tools = { version = "0.1.4", path = "../tools" } spl-governance-addin-api = { version = "0.1.4", path = "../addin-api" } diff --git a/governance/program/src/processor/mod.rs b/governance/program/src/processor/mod.rs index c41e884a674..c7a6c2403b8 100644 --- a/governance/program/src/processor/mod.rs +++ b/governance/program/src/processor/mod.rs @@ -64,7 +64,7 @@ use { process_update_program_metadata::*, process_withdraw_governing_tokens::*, solana_program::{ - account_info::AccountInfo, borsh0_10::try_from_slice_unchecked, entrypoint::ProgramResult, + account_info::AccountInfo, borsh1::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 bcef081c88c..acbc1cb7765 100644 --- a/governance/program/src/state/realm.rs +++ b/governance/program/src/state/realm.rs @@ -480,7 +480,7 @@ mod test { use { super::*, crate::instruction::GovernanceInstruction, - solana_program::borsh0_10::try_from_slice_unchecked, + solana_program::borsh1::try_from_slice_unchecked, }; #[test] diff --git a/governance/program/src/state/token_owner_record.rs b/governance/program/src/state/token_owner_record.rs index 5dbc1509d39..e246fbe5c7f 100644 --- a/governance/program/src/state/token_owner_record.rs +++ b/governance/program/src/state/token_owner_record.rs @@ -452,7 +452,7 @@ pub fn get_token_owner_record_data_for_proposal_owner( mod test { use { super::*, - solana_program::{borsh0_10::get_packed_len, stake_history::Epoch}, + solana_program::{borsh1::get_packed_len, stake_history::Epoch}, }; fn create_test_token_owner_record() -> TokenOwnerRecordV2 { diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index acbb65e2f94..26d9a8d9634 100644 --- a/governance/test-sdk/Cargo.toml +++ b/governance/test-sdk/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2.1" lazy_static = "1.4.0" num-derive = "0.4" num-traits = "0.2" @@ -20,6 +20,6 @@ solana-program = ">=1.18.2,<=2" solana-program-test = ">=1.18.2,<=2" solana-sdk = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ - "no-entrypoint", + "no-entrypoint", ] } thiserror = "1.0" diff --git a/governance/test-sdk/src/lib.rs b/governance/test-sdk/src/lib.rs index b6ab51498bc..f4717a45ddf 100644 --- a/governance/test-sdk/src/lib.rs +++ b/governance/test-sdk/src/lib.rs @@ -5,7 +5,7 @@ use { borsh::{BorshDeserialize, BorshSerialize}, cookies::{TokenAccountCookie, WalletCookie}, solana_program::{ - borsh0_10::try_from_slice_unchecked, clock::Clock, instruction::Instruction, + borsh1::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 b2bcb328627..d504e0639dc 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -10,13 +10,13 @@ edition = "2021" [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.197" serde_derive = "1.0.103" solana-program = ">=1.18.2,<=2" spl-token = { version = "4.0", path = "../../token/program", features = [ - "no-entrypoint", + "no-entrypoint", ] } thiserror = "1.0" diff --git a/governance/tools/src/account.rs b/governance/tools/src/account.rs index 192060ea95c..00351e51347 100644 --- a/governance/tools/src/account.rs +++ b/governance/tools/src/account.rs @@ -5,7 +5,7 @@ use { borsh::{BorshDeserialize, BorshSerialize}, solana_program::{ account_info::AccountInfo, - borsh0_10::try_from_slice_unchecked, + borsh1::try_from_slice_unchecked, msg, program::{invoke, invoke_signed}, program_error::ProgramError, diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index a3da2194bba..6aad957f878 100644 --- a/libraries/math/Cargo.toml +++ b/libraries/math/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" solana-program = ">=1.18.2,<=2" diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index f939dda8041..99eef32da8d 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -13,7 +13,7 @@ borsh = ["dep:borsh"] [dependencies] base64 = { version = "0.21.7", optional = true } -borsh = { version = "0.10", optional = true } +borsh = { version = "1.2.1", optional = true } bytemuck = { version = "1.14.3" } serde = { version = "1.0.197", optional = true } solana-program = ">=1.18.2,<=2" diff --git a/libraries/type-length-value-derive-test/Cargo.toml b/libraries/type-length-value-derive-test/Cargo.toml index 43af4c78bc7..b97ad062a36 100644 --- a/libraries/type-length-value-derive-test/Cargo.toml +++ b/libraries/type-length-value-derive-test/Cargo.toml @@ -8,7 +8,9 @@ license = "Apache-2.0" edition = "2021" [dev-dependencies] -borsh = "0.10" +borsh = "1.2.1" solana-program = "1.16" spl-discriminator = { version = "0.1.1", path = "../discriminator" } -spl-type-length-value = { version = "0.3.1", path = "../type-length-value", features = ["derive"] } +spl-type-length-value = { version = "0.3.1", path = "../type-length-value", features = [ + "derive", +] } diff --git a/libraries/type-length-value-derive-test/src/lib.rs b/libraries/type-length-value-derive-test/src/lib.rs index 032d1341a4f..2d0310383ca 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::borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, + solana_program::borsh1::{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/derive/src/builder.rs b/libraries/type-length-value/derive/src/builder.rs index 59254d41ee7..a11c5b6b109 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::borsh0_10::try_from_slice_unchecked(src).map_err(Into::into) + solana_program::borsh1::try_from_slice_unchecked(src).map_err(Into::into) } fn get_packed_len(&self) -> Result { - solana_program::borsh0_10::get_instance_packed_len(self).map_err(Into::into) + solana_program::borsh1::get_instance_packed_len(self).map_err(Into::into) } } } diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml index ab8a676ce91..d654df628d0 100644 --- a/managed-token/program/Cargo.toml +++ b/managed-token/program/Cargo.toml @@ -22,11 +22,15 @@ default = [] test = [] [dependencies] -borsh = "0.10" +borsh = "1.2.1" shank = "^0.2.1" solana-program = ">=1.18.2,<=2" -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-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.57" [dev-dependencies] diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index c4b4dd7c721..db7e701fd65 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -5,7 +5,7 @@ version = "0.3.0" repository = "https://github.com/solana-labs/solana-program-library" authors = [ "lcchy ", - "Solana Labs Maintainers " + "Solana Labs Maintainers ", ] license = "Apache-2.0" edition = "2021" @@ -19,7 +19,7 @@ test-sbf = [] [dependencies] solana-program = ">=1.18.2,<=2" num-traits = "0.2" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4.2" thiserror = "1.0.57" diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index b0cbcb316b6..52668775579 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" tokio = "1.36" clap = { version = "3.2.23", features = ["derive"] } console = "0.15.8" -borsh = "0.10" +borsh = "1.2.1" bincode = "1.3.1" serde = "1.0.197" serde_derive = "1.0.103" diff --git a/single-pool/cli/src/main.rs b/single-pool/cli/src/main.rs index 585dedad3bd..8af38f1594f 100644 --- a/single-pool/cli/src/main.rs +++ b/single-pool/cli/src/main.rs @@ -9,7 +9,7 @@ use { rpc_filter::{Memcmp, RpcFilterType}, }, solana_sdk::{ - borsh0_10::try_from_slice_unchecked, + borsh1::try_from_slice_unchecked, pubkey::Pubkey, signature::{Keypair, Signature, Signer}, stake, diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index d3d6a86c8d9..6dd3f01b5aa 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -13,14 +13,18 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.2.1" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.2" solana-program = ">=1.18.2,<=2" solana-security-txt = "1.1.1" -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" ] } +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] diff --git a/single-pool/program/src/processor.rs b/single-pool/program/src/processor.rs index 38766199638..55379d637d4 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}, - borsh0_10::{get_packed_len, try_from_slice_unchecked}, + borsh1::{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 d13ada20991..1ad95305c79 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, borsh0_10::try_from_slice_unchecked, - program_error::ProgramError, pubkey::Pubkey, + account_info::AccountInfo, borsh1::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 dec49bca27e..582bd7ab6cd 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 53d8bd6714b..e7dd84f07e2 100644 --- a/stake-pool/cli/Cargo.toml +++ b/stake-pool/cli/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/solana-labs/solana-program-library" version = "1.0.0" [dependencies] -borsh = "0.10" +borsh = "1.2.1" clap = "2.33.3" serde = "1.0.197" serde_derive = "1.0.130" diff --git a/stake-pool/cli/src/client.rs b/stake-pool/cli/src/client.rs index 9deae1a807c..62916d5d62b 100644 --- a/stake-pool/cli/src/client.rs +++ b/stake-pool/cli/src/client.rs @@ -7,9 +7,7 @@ use { rpc_config::{RpcAccountInfoConfig, RpcProgramAccountsConfig}, rpc_filter::{Memcmp, RpcFilterType}, }, - solana_program::{ - borsh0_10::try_from_slice_unchecked, program_pack::Pack, pubkey::Pubkey, stake, - }, + solana_program::{borsh1::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 bb20ffde8ed..c764dc9d3d6 100644 --- a/stake-pool/cli/src/main.rs +++ b/stake-pool/cli/src/main.rs @@ -26,7 +26,7 @@ use { solana_cli_output::OutputFormat, solana_client::rpc_client::RpcClient, solana_program::{ - borsh0_10::{get_instance_packed_len, get_packed_len}, + borsh1::{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 3bd2b5cdc08..cf9a13fe7fd 100644 --- a/stake-pool/program/Cargo.toml +++ b/stake-pool/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.2.1" bytemuck = "1.14" num-derive = "0.4" num-traits = "0.2" @@ -22,9 +22,15 @@ serde = "1.0.197" serde_derive = "1.0.103" solana-program = ">=1.18.2,<=2" solana-security-txt = "1.1.1" -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 = "2.0", path = "../../token/program-2022", features = [ "no-entrypoint" ] } +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 = "2.0", path = "../../token/program-2022", features = [ + "no-entrypoint", +] } thiserror = "1.0" bincode = "1.3.1" @@ -34,7 +40,9 @@ proptest = "1.4" solana-program-test = ">=1.18.2,<=2" solana-sdk = ">=1.18.2,<=2" solana-vote-program = ">=1.18.2,<=2" -spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } +spl-token = { version = "4.0", path = "../../token/program", features = [ + "no-entrypoint", +] } test-case = "3.3" [lib] diff --git a/stake-pool/program/src/processor.rs b/stake-pool/program/src/processor.rs index 6f5ef75feaf..893346ebce8 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}, - borsh0_10::try_from_slice_unchecked, + borsh1::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 b453b1b5a30..135639b39cd 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, - borsh0_10::get_instance_packed_len, + borsh1::get_instance_packed_len, msg, program_error::ProgramError, program_memory::sol_memcmp, @@ -1056,7 +1056,7 @@ mod test { super::*, proptest::prelude::*, solana_program::{ - borsh0_10::{get_packed_len, try_from_slice_unchecked}, + borsh1::{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 23bb69dc9cc..716f3fbec75 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 9d64f6da046..e5e46a7ea12 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 c893e0ce540..510e2f94d52 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::{ - borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh1::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 bc983520700..fa7ef355966 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::{ - borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, + borsh1::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, }, solana_program_test::*, solana_sdk::{ diff --git a/stake-pool/program/tests/force_destake.rs b/stake-pool/program/tests/force_destake.rs index 0b86a91f5ca..bab4003ad44 100644 --- a/stake-pool/program/tests/force_destake.rs +++ b/stake-pool/program/tests/force_destake.rs @@ -6,7 +6,7 @@ mod helpers; use { helpers::*, solana_program::{ - borsh0_10::try_from_slice_unchecked, + borsh1::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake::{ diff --git a/stake-pool/program/tests/helpers/mod.rs b/stake-pool/program/tests/helpers/mod.rs index 23f146578ea..e87d153c63c 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::{ - borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh1::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, instruction::Instruction, program_option::COption, diff --git a/stake-pool/program/tests/huge_pool.rs b/stake-pool/program/tests/huge_pool.rs index f9c44b5341c..52662095bed 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::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh1::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 109d52737bc..6b15631aaf4 100644 --- a/stake-pool/program/tests/initialize.rs +++ b/stake-pool/program/tests/initialize.rs @@ -8,7 +8,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh0_10::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, + borsh1::{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 6cd6f63decf..ba62838421b 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 533cad884a9..c510a81314c 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 e8729691bf3..eb24a10397c 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 e0163e84202..9ce2b6387c8 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 13a93ace967..1a1e3c0f1cb 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 45d3ced9167..7221e978d3f 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 30d3d4919cf..9d382e30521 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 a88a9ecc638..b36ac69352c 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 92dd797e49a..f242e14382f 100644 --- a/stake-pool/program/tests/update_stake_pool_balance.rs +++ b/stake-pool/program/tests/update_stake_pool_balance.rs @@ -5,7 +5,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh0_10::try_from_slice_unchecked, instruction::InstructionError}, + solana_program::{borsh1::try_from_slice_unchecked, instruction::InstructionError}, solana_program_test::*, solana_sdk::{ hash::Hash, diff --git a/stake-pool/program/tests/update_validator_list_balance.rs b/stake-pool/program/tests/update_validator_list_balance.rs index 31b4e484ba1..7d5d431a16c 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::{borsh0_10::try_from_slice_unchecked, program_pack::Pack}, + solana_program::{borsh1::try_from_slice_unchecked, program_pack::Pack}, solana_program_test::*, solana_sdk::{hash::Hash, signature::Signer, stake::state::StakeStateV2}, 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 973dc59c45f..66a2ab36d40 100644 --- a/stake-pool/program/tests/update_validator_list_balance_hijack.rs +++ b/stake-pool/program/tests/update_validator_list_balance_hijack.rs @@ -7,7 +7,7 @@ mod helpers; use { helpers::*, - solana_program::{borsh0_10::try_from_slice_unchecked, pubkey::Pubkey, stake}, + solana_program::{borsh1::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 e32a762309d..ded392063cb 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::try_from_slice_unchecked, hash::Hash, instruction::{AccountMeta, Instruction, InstructionError}, pubkey::Pubkey, diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs index 0a90f34496a..ea9f7cc9ba7 100644 --- a/stake-pool/program/tests/vsa_remove.rs +++ b/stake-pool/program/tests/vsa_remove.rs @@ -8,7 +8,7 @@ use { borsh::BorshSerialize, helpers::*, solana_program::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 c0154cbd311..1718eba0fb7 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::{ - borsh0_10::try_from_slice_unchecked, + borsh1::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 919d210777a..8abdc2f87a3 100644 --- a/stake-pool/program/tests/withdraw_edge_cases.rs +++ b/stake-pool/program/tests/withdraw_edge_cases.rs @@ -8,7 +8,7 @@ use { bincode::deserialize, helpers::*, solana_program::{ - borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh1::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 e8eb2423a68..623aa82cf0a 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::{ - borsh0_10::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, + borsh1::try_from_slice_unchecked, instruction::InstructionError, pubkey::Pubkey, stake, }, solana_program_test::*, solana_sdk::{ diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index 89612c1b1c4..58407c3d246 100644 --- a/stateless-asks/program/Cargo.toml +++ b/stateless-asks/program/Cargo.toml @@ -11,10 +11,14 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2.1" solana-program = ">=1.18.2,<=2" -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"]} +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] diff --git a/stateless-asks/program/src/processor.rs b/stateless-asks/program/src/processor.rs index eb9896494ae..3b399c246d8 100644 --- a/stateless-asks/program/src/processor.rs +++ b/stateless-asks/program/src/processor.rs @@ -9,7 +9,7 @@ use { borsh::BorshDeserialize, solana_program::{ account_info::{next_account_info, AccountInfo}, - borsh0_10::try_from_slice_unchecked, + borsh1::try_from_slice_unchecked, entrypoint::ProgramResult, msg, program::{invoke, invoke_signed}, diff --git a/token-metadata/example/src/processor.rs b/token-metadata/example/src/processor.rs index 073a633d817..fe686e5e0da 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}, - borsh0_10::get_instance_packed_len, + borsh1::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 c34412a070d..b016a8dbd9d 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::{ - borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh1::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 3558b829cfa..c88f3fa1f5b 100644 --- a/token-metadata/interface/Cargo.toml +++ b/token-metadata/interface/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" serde-traits = ["dep:serde", "spl-pod/serde-traits"] [dependencies] -borsh = "0.10" +borsh = "1.2.1" serde = { version = "1.0.197", optional = true } solana-program = ">=1.18.2,<=2" spl-discriminator = { version = "0.1", path = "../../libraries/discriminator" } diff --git a/token-metadata/interface/src/state.rs b/token-metadata/interface/src/state.rs index 6f5fe54d3fc..1b94dee7feb 100644 --- a/token-metadata/interface/src/state.rs +++ b/token-metadata/interface/src/state.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use { borsh::{BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ - borsh0_10::{get_instance_packed_len, try_from_slice_unchecked}, + borsh1::{get_instance_packed_len, try_from_slice_unchecked}, program_error::ProgramError, pubkey::Pubkey, }, diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index 4dcc2418126..4d908c7f612 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -17,20 +17,28 @@ walkdir = "2" [dev-dependencies] async-trait = "0.1" -borsh = "0.10" +borsh = "1.2.1" futures-util = "0.3" solana-program = ">=1.18.2,<=2" solana-program-test = ">=1.18.2,<=2" solana-sdk = ">=1.18.2,<=2" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program" } -spl-memo = { version = "4.0.1", path = "../../memo/program", features = ["no-entrypoint"] } +spl-memo = { version = "4.0.1", path = "../../memo/program", features = [ + "no-entrypoint", +] } spl-pod = { version = "0.1.1", path = "../../libraries/pod" } -spl-token-2022 = { version = "2.0", path="../program-2022", features = ["no-entrypoint"] } -spl-instruction-padding = { version = "0.1.1", path="../../instruction-padding/program", features = ["no-entrypoint"] } +spl-token-2022 = { version = "2.0", path = "../program-2022", features = [ + "no-entrypoint", +] } +spl-instruction-padding = { version = "0.1.1", path = "../../instruction-padding/program", features = [ + "no-entrypoint", +] } spl-tlv-account-resolution = { version = "0.5.2", path = "../../libraries/tlv-account-resolution" } spl-token-client = { version = "0.8", path = "../client" } spl-token-group-interface = { version = "0.1", path = "../../token-group/interface" } spl-token-metadata-interface = { version = "0.2", path = "../../token-metadata/interface" } -spl-transfer-hook-example = { version = "0.5", path="../transfer-hook/example", features = ["no-entrypoint"] } -spl-transfer-hook-interface = { version = "0.5", path="../transfer-hook/interface" } +spl-transfer-hook-example = { version = "0.5", path = "../transfer-hook/example", features = [ + "no-entrypoint", +] } +spl-transfer-hook-interface = { version = "0.5", path = "../transfer-hook/interface" } test-case = "3.3" diff --git a/token/program-2022-test/tests/token_metadata_emit.rs b/token/program-2022-test/tests/token_metadata_emit.rs index ccf14c5214b..0812a225a01 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::{ - borsh0_10::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, + borsh1::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, spl_token_2022::processor::Processor, From e5b54316ff0a6d43a308a81cf397ec91cc409589 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Wed, 21 Feb 2024 16:43:12 +0900 Subject: [PATCH 4/6] replace deprecated `try_to_vec` with `borsh::to_vec` --- .../program/src/instruction.rs | 4 +- binary-option/program/src/instruction.rs | 16 ++- binary-oracle-pair/program/src/instruction.rs | 8 +- binary-oracle-pair/program/src/state.rs | 2 +- feature-proposal/program/src/instruction.rs | 9 +- feature-proposal/program/src/state.rs | 9 +- .../addin-mock/program/src/instruction.rs | 4 +- governance/chat/program/src/instruction.rs | 2 +- governance/chat/program/src/state.rs | 2 +- governance/program/src/instruction.rs | 60 ++++----- governance/program/src/state/governance.rs | 6 +- .../program/src/state/program_metadata.rs | 2 +- governance/program/src/state/proposal.rs | 6 +- .../program/src/state/proposal_deposit.rs | 2 +- .../program/src/state/proposal_transaction.rs | 8 +- governance/program/src/state/realm.rs | 4 +- governance/program/src/state/realm_config.rs | 2 +- .../program/src/state/signatory_record.rs | 2 +- .../program/src/state/token_owner_record.rs | 4 +- governance/program/src/state/vote_record.rs | 2 +- .../program/tests/process_add_signatory.rs | 6 +- governance/tools/src/account.rs | 4 +- libraries/math/src/instruction.rs | 96 +++++---------- libraries/math/src/processor.rs | 4 +- managed-token/program/src/instruction.rs | 18 +-- name-service/program/src/instruction.rs | 10 +- single-pool/cli/src/main.rs | 5 +- single-pool/program/src/instruction.rs | 22 ++-- .../program/src/inline_mpl_token_metadata.rs | 10 +- stake-pool/program/src/instruction.rs | 116 +++++++----------- stake-pool/program/src/state.rs | 4 +- stake-pool/program/tests/deposit.rs | 5 +- stake-pool/program/tests/helpers/mod.rs | 8 +- stake-pool/program/tests/initialize.rs | 3 +- .../program/tests/set_funding_authority.rs | 8 +- stake-pool/program/tests/set_manager.rs | 9 +- stake-pool/program/tests/set_staker.rs | 5 +- stake-pool/program/tests/vsa_add.rs | 16 +-- stake-pool/program/tests/vsa_remove.rs | 9 +- stake-pool/program/tests/withdraw.rs | 8 +- stateless-asks/program/src/instruction.rs | 4 +- token-metadata/example/tests/emit.rs | 6 +- token-metadata/interface/src/instruction.rs | 12 +- .../tests/token_metadata_emit.rs | 6 +- 44 files changed, 222 insertions(+), 326 deletions(-) diff --git a/associated-token-account/program/src/instruction.rs b/associated-token-account/program/src/instruction.rs index efacd97dd97..728d2abcf3a 100644 --- a/associated-token-account/program/src/instruction.rs +++ b/associated-token-account/program/src/instruction.rs @@ -84,7 +84,7 @@ fn build_associated_token_account_instruction( AccountMeta::new_readonly(solana_program::system_program::id(), false), AccountMeta::new_readonly(*token_program_id, false), ], - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -156,6 +156,6 @@ pub fn recover_nested( AccountMeta::new(*wallet_address, true), AccountMeta::new_readonly(*token_program_id, false), ], - data: instruction_data.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction_data).unwrap(), } } diff --git a/binary-option/program/src/instruction.rs b/binary-option/program/src/instruction.rs index 8596c264e78..485386d6d31 100644 --- a/binary-option/program/src/instruction.rs +++ b/binary-option/program/src/instruction.rs @@ -60,10 +60,9 @@ pub fn initialize_binary_option( AccountMeta::new_readonly(solana_program::system_program::id(), false), AccountMeta::new_readonly(sysvar::rent::id(), false), ], - data: BinaryOptionInstruction::InitializeBinaryOption(InitializeBinaryOptionArgs { - decimals, - }) - .try_to_vec() + data: borsh::to_vec(&BinaryOptionInstruction::InitializeBinaryOption( + InitializeBinaryOptionArgs { decimals }, + )) .unwrap(), } } @@ -107,12 +106,11 @@ pub fn trade( AccountMeta::new_readonly(escrow_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: BinaryOptionInstruction::Trade(TradeArgs { + data: borsh::to_vec(&BinaryOptionInstruction::Trade(TradeArgs { size, buy_price, sell_price, - }) - .try_to_vec() + })) .unwrap(), } } @@ -131,7 +129,7 @@ pub fn settle( AccountMeta::new_readonly(winning_mint, false), AccountMeta::new_readonly(pool_authority, true), ], - data: BinaryOptionInstruction::Settle.try_to_vec().unwrap(), + data: borsh::to_vec(&BinaryOptionInstruction::Settle).unwrap(), } } @@ -167,6 +165,6 @@ pub fn collect( AccountMeta::new_readonly(solana_program::system_program::id(), false), AccountMeta::new_readonly(sysvar::rent::id(), false), ], - data: BinaryOptionInstruction::Collect.try_to_vec().unwrap(), + data: borsh::to_vec(&BinaryOptionInstruction::Collect).unwrap(), } } diff --git a/binary-oracle-pair/program/src/instruction.rs b/binary-oracle-pair/program/src/instruction.rs index 969dd34ec8d..b524010cb03 100644 --- a/binary-oracle-pair/program/src/instruction.rs +++ b/binary-oracle-pair/program/src/instruction.rs @@ -102,7 +102,7 @@ pub fn init_pool( init_args: InitArgs, ) -> Result { let init_data = PoolInstruction::InitPool(init_args); - let data = init_data.try_to_vec()?; + let data = borsh::to_vec(&init_data)?; let accounts = vec![ AccountMeta::new(*pool, false), AccountMeta::new_readonly(*authority, false), @@ -138,7 +138,7 @@ pub fn deposit( amount: u64, ) -> Result { let init_data = PoolInstruction::Deposit(amount); - let data = init_data.try_to_vec()?; + let data = borsh::to_vec(&init_data)?; let accounts = vec![ AccountMeta::new_readonly(*pool, false), @@ -180,7 +180,7 @@ pub fn withdraw( amount: u64, ) -> Result { let init_data = PoolInstruction::Withdraw(amount); - let data = init_data.try_to_vec()?; + let data = borsh::to_vec(&init_data)?; let accounts = vec![ AccountMeta::new_readonly(*pool, false), AccountMeta::new_readonly(*authority, false), @@ -212,7 +212,7 @@ pub fn decide( decision: bool, ) -> Result { let init_data = PoolInstruction::Decide(decision); - let data = init_data.try_to_vec()?; + let data = borsh::to_vec(&init_data)?; let accounts = vec![ AccountMeta::new(*pool, false), AccountMeta::new_readonly(*decider, true), diff --git a/binary-oracle-pair/program/src/state.rs b/binary-oracle-pair/program/src/state.rs index c17910c583f..da3ac37abd7 100644 --- a/binary-oracle-pair/program/src/state.rs +++ b/binary-oracle-pair/program/src/state.rs @@ -85,7 +85,7 @@ mod test { decision: Decision::Fail, }; - let packed = p.try_to_vec().unwrap(); + let packed = borsh::to_vec(&p).unwrap(); let unpacked = Pool::try_from_slice(packed.as_slice()).unwrap(); diff --git a/feature-proposal/program/src/instruction.rs b/feature-proposal/program/src/instruction.rs index fa2da6424d8..ea8238e4149 100644 --- a/feature-proposal/program/src/instruction.rs +++ b/feature-proposal/program/src/instruction.rs @@ -107,7 +107,7 @@ impl Pack for FeatureProposalInstruction { impl FeatureProposalInstruction { fn pack_into_vec(&self) -> Vec { - self.try_to_vec().expect("try_to_vec") + borsh::to_vec(self).expect("try_to_vec") } } @@ -177,19 +177,18 @@ mod tests { #[test] fn test_serialize_bytes() { assert_eq!( - FeatureProposalInstruction::Tally.try_to_vec().unwrap(), + borsh::to_vec(&FeatureProposalInstruction::Tally).unwrap(), vec![1] ); assert_eq!( - FeatureProposalInstruction::Propose { + borsh::to_vec(&FeatureProposalInstruction::Propose { tokens_to_mint: 42, acceptance_criteria: AcceptanceCriteria { tokens_required: 0xdeadbeefdeadbeef, deadline: -1, } - } - .try_to_vec() + }) .unwrap(), vec![ 0, 42, 0, 0, 0, 0, 0, 0, 0, 239, 190, 173, 222, 239, 190, 173, 222, 255, 255, 255, diff --git a/feature-proposal/program/src/state.rs b/feature-proposal/program/src/state.rs index 613ad3427d9..81d86f2da7a 100644 --- a/feature-proposal/program/src/state.rs +++ b/feature-proposal/program/src/state.rs @@ -45,7 +45,7 @@ impl Pack for FeatureProposal { const LEN: usize = 17; // see `test_get_packed_len()` for justification of "18" fn pack_into_slice(&self, dst: &mut [u8]) { - let data = self.try_to_vec().unwrap(); + let data = borsh::to_vec(self).unwrap(); dst[..data.len()].copy_from_slice(&data); } @@ -75,14 +75,13 @@ mod tests { #[test] fn test_serialize_bytes() { - assert_eq!(FeatureProposal::Expired.try_to_vec().unwrap(), vec![3]); + assert_eq!(borsh::to_vec(&FeatureProposal::Expired).unwrap(), vec![3]); assert_eq!( - FeatureProposal::Pending(AcceptanceCriteria { + borsh::to_vec(&FeatureProposal::Pending(AcceptanceCriteria { tokens_required: 0xdeadbeefdeadbeef, deadline: -1, - }) - .try_to_vec() + })) .unwrap(), vec![1, 239, 190, 173, 222, 239, 190, 173, 222, 255, 255, 255, 255, 255, 255, 255, 255], ); diff --git a/governance/addin-mock/program/src/instruction.rs b/governance/addin-mock/program/src/instruction.rs index 676909a138c..65bc2d331fc 100644 --- a/governance/addin-mock/program/src/instruction.rs +++ b/governance/addin-mock/program/src/instruction.rs @@ -96,7 +96,7 @@ pub fn setup_voter_weight_record( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -129,6 +129,6 @@ pub fn setup_max_voter_weight_record( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } diff --git a/governance/chat/program/src/instruction.rs b/governance/chat/program/src/instruction.rs index c95c78c5f06..9dda2c36f20 100644 --- a/governance/chat/program/src/instruction.rs +++ b/governance/chat/program/src/instruction.rs @@ -90,6 +90,6 @@ pub fn post_message( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } diff --git a/governance/chat/program/src/state.rs b/governance/chat/program/src/state.rs index b995e5bf252..10db01c95a8 100644 --- a/governance/chat/program/src/state.rs +++ b/governance/chat/program/src/state.rs @@ -92,7 +92,7 @@ mod test { reply_to: Some(Pubkey::new_unique()), body: MessageBody::Text("message".to_string()), }; - let size = message.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&message).unwrap().len(); assert_eq!(message.get_max_size(), Some(size)); } diff --git a/governance/program/src/instruction.rs b/governance/program/src/instruction.rs index 911111618ad..240627b8f87 100644 --- a/governance/program/src/instruction.rs +++ b/governance/program/src/instruction.rs @@ -731,7 +731,7 @@ pub fn create_realm( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -779,7 +779,7 @@ pub fn deposit_governing_tokens( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -820,7 +820,7 @@ pub fn withdraw_governing_tokens( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -854,7 +854,7 @@ pub fn set_governance_delegate( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -899,7 +899,7 @@ pub fn create_governance( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -946,7 +946,7 @@ pub fn create_program_governance( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -990,7 +990,7 @@ pub fn create_mint_governance( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1034,7 +1034,7 @@ pub fn create_token_governance( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1093,7 +1093,7 @@ pub fn create_proposal( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1141,7 +1141,7 @@ pub fn add_signatory( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1191,7 +1191,7 @@ pub fn sign_off_proposal( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1242,7 +1242,7 @@ pub fn cast_vote( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1278,7 +1278,7 @@ pub fn finalize_vote( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1316,7 +1316,7 @@ pub fn relinquish_vote( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1343,7 +1343,7 @@ pub fn cancel_proposal( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1391,7 +1391,7 @@ pub fn insert_transaction( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1418,7 +1418,7 @@ pub fn remove_transaction( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1446,7 +1446,7 @@ pub fn execute_transaction( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1465,7 +1465,7 @@ pub fn set_governance_config( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1490,7 +1490,7 @@ pub fn flag_transaction_error( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1524,7 +1524,7 @@ pub fn set_realm_authority( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1589,7 +1589,7 @@ pub fn set_realm_config( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1651,7 +1651,7 @@ pub fn create_token_owner_record( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1674,7 +1674,7 @@ pub fn upgrade_program_metadata( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1699,7 +1699,7 @@ pub fn create_native_treasury( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1742,7 +1742,7 @@ pub fn revoke_governing_tokens( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1772,7 +1772,7 @@ pub fn add_required_signatory( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1798,7 +1798,7 @@ pub fn remove_required_signatory( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1856,7 +1856,7 @@ pub fn refund_proposal_deposit( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } @@ -1880,6 +1880,6 @@ pub fn complete_proposal( Instruction { program_id: *program_id, accounts, - data: instruction.try_to_vec().unwrap(), + data: borsh::to_vec(&instruction).unwrap(), } } diff --git a/governance/program/src/state/governance.rs b/governance/program/src/state/governance.rs index 1e343462106..ad2bd6532eb 100644 --- a/governance/program/src/state/governance.rs +++ b/governance/program/src/state/governance.rs @@ -10,7 +10,7 @@ use { }, tools::structs::Reserved119, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::AccountInfo, program_error::ProgramError, program_pack::IsInitialized, pubkey::Pubkey, rent::Rent, @@ -722,7 +722,7 @@ mod test { let governance_data = create_test_governance(); // Act - let size = governance_data.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&governance_data).unwrap().len(); // Assert assert_eq!(governance_data.get_max_size(), Some(size)); @@ -734,7 +734,7 @@ mod test { let governance = create_test_v1_governance(); // Act - let size = governance.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&governance).unwrap().len(); // Assert assert_eq!(108, size); diff --git a/governance/program/src/state/program_metadata.rs b/governance/program/src/state/program_metadata.rs index 1034c6544bd..7c0f7f51423 100644 --- a/governance/program/src/state/program_metadata.rs +++ b/governance/program/src/state/program_metadata.rs @@ -72,7 +72,7 @@ mod test { version: "111.122.155".to_string(), }; - let size = program_metadata_data.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&program_metadata_data).unwrap().len(); assert_eq!(program_metadata_data.get_max_size(), Some(size)); } diff --git a/governance/program/src/state/proposal.rs b/governance/program/src/state/proposal.rs index 30ae07ff95a..8b28f88b7a3 100644 --- a/governance/program/src/state/proposal.rs +++ b/governance/program/src/state/proposal.rs @@ -22,7 +22,7 @@ use { tools::spl_token::get_spl_token_mint_supply, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::{next_account_info, AccountInfo}, clock::{Slot, UnixTimestamp}, @@ -1395,7 +1395,7 @@ mod test { max_winning_options: 1, }; - let size = proposal.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&proposal).unwrap().len(); assert_eq!(proposal.get_max_size(), Some(size)); } @@ -1410,7 +1410,7 @@ mod test { max_winning_options: 3, }; - let size = proposal.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&proposal).unwrap().len(); assert_eq!(proposal.get_max_size(), Some(size)); } diff --git a/governance/program/src/state/proposal_deposit.rs b/governance/program/src/state/proposal_deposit.rs index 76126ff639a..e07c54a2003 100644 --- a/governance/program/src/state/proposal_deposit.rs +++ b/governance/program/src/state/proposal_deposit.rs @@ -111,7 +111,7 @@ mod test { }; // Act - let size = proposal_deposit_data.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&proposal_deposit_data).unwrap().len(); // Assert assert_eq!(proposal_deposit_data.get_max_size(), Some(size)); diff --git a/governance/program/src/state/proposal_transaction.rs b/governance/program/src/state/proposal_transaction.rs index f2ae26ecb67..2ab96ce7211 100644 --- a/governance/program/src/state/proposal_transaction.rs +++ b/governance/program/src/state/proposal_transaction.rs @@ -9,7 +9,7 @@ use { }, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, core::panic, solana_program::{ account_info::AccountInfo, @@ -298,7 +298,7 @@ mod test { #[test] fn test_account_meta_data_size() { let account_meta_data = create_test_account_meta_data(); - let size = account_meta_data.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&account_meta_data).unwrap().len(); assert_eq!(34, size); } @@ -307,7 +307,7 @@ mod test { fn test_proposal_transaction_max_size() { // Arrange let proposal_transaction = create_test_proposal_transaction(); - let size = proposal_transaction.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&proposal_transaction).unwrap().len(); // Act, Assert assert_eq!(proposal_transaction.get_max_size(), Some(size)); @@ -320,7 +320,7 @@ mod test { proposal_transaction.instructions[0].data = vec![]; proposal_transaction.instructions[0].accounts = vec![]; - let size = proposal_transaction.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&proposal_transaction).unwrap().len(); // Act, Assert assert_eq!(proposal_transaction.get_max_size(), Some(size)); diff --git a/governance/program/src/state/realm.rs b/governance/program/src/state/realm.rs index acbc1cb7765..e43609d0531 100644 --- a/governance/program/src/state/realm.rs +++ b/governance/program/src/state/realm.rs @@ -12,7 +12,7 @@ use { }, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::{next_account_info, AccountInfo}, program_error::ProgramError, @@ -505,7 +505,7 @@ mod test { reserved_v2: [0; 128], }; - let size = realm.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&realm).unwrap().len(); assert_eq!(realm.get_max_size(), Some(size)); } diff --git a/governance/program/src/state/realm_config.rs b/governance/program/src/state/realm_config.rs index d334c338166..d252aa05e35 100644 --- a/governance/program/src/state/realm_config.rs +++ b/governance/program/src/state/realm_config.rs @@ -326,7 +326,7 @@ mod test { reserved: Reserved110::default(), }; - let size = realm_config.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&realm_config).unwrap().len(); assert_eq!(realm_config.get_max_size(), Some(size)); } diff --git a/governance/program/src/state/signatory_record.rs b/governance/program/src/state/signatory_record.rs index 5c3a5a1cfea..c20a8abd4a1 100644 --- a/governance/program/src/state/signatory_record.rs +++ b/governance/program/src/state/signatory_record.rs @@ -6,7 +6,7 @@ use { state::{enums::GovernanceAccountType, legacy::SignatoryRecordV1}, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::AccountInfo, program_error::ProgramError, program_pack::IsInitialized, pubkey::Pubkey, diff --git a/governance/program/src/state/token_owner_record.rs b/governance/program/src/state/token_owner_record.rs index e246fbe5c7f..996e38ceec8 100644 --- a/governance/program/src/state/token_owner_record.rs +++ b/governance/program/src/state/token_owner_record.rs @@ -12,7 +12,7 @@ use { }, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::{next_account_info, AccountInfo}, program_error::ProgramError, @@ -504,7 +504,7 @@ mod test { let governance = create_test_program_v1_token_owner_record(); // Act - let size = governance.try_to_vec().unwrap().len(); + let size = borsh::to_vec(&governance).unwrap().len(); // Assert assert_eq!(154, size); diff --git a/governance/program/src/state/vote_record.rs b/governance/program/src/state/vote_record.rs index 050f8fd9c3d..8606ba02075 100644 --- a/governance/program/src/state/vote_record.rs +++ b/governance/program/src/state/vote_record.rs @@ -12,7 +12,7 @@ use { }, PROGRAM_AUTHORITY_SEED, }, - borsh::{maybestd::io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, + borsh::{io::Write, BorshDeserialize, BorshSchema, BorshSerialize}, solana_program::{ account_info::AccountInfo, program_error::ProgramError, program_pack::IsInitialized, pubkey::Pubkey, diff --git a/governance/program/tests/process_add_signatory.rs b/governance/program/tests/process_add_signatory.rs index 7c9b15507bb..cc80679611f 100644 --- a/governance/program/tests/process_add_signatory.rs +++ b/governance/program/tests/process_add_signatory.rs @@ -3,7 +3,6 @@ mod program_test; use { - borsh::BorshSerialize, program_test::*, solana_program::program_error::ProgramError, solana_program_test::tokio, @@ -453,10 +452,9 @@ pub async fn test_add_non_matching_required_signatory_to_proposal_err() { &signatory.pubkey(), ); - create_signatory_record_ix.data = GovernanceInstruction::AddSignatory { + create_signatory_record_ix.data = borsh::to_vec(&GovernanceInstruction::AddSignatory { signatory: Pubkey::new_unique(), - } - .try_to_vec() + }) .unwrap(); // Act diff --git a/governance/tools/src/account.rs b/governance/tools/src/account.rs index 00351e51347..b3183b00c03 100644 --- a/governance/tools/src/account.rs +++ b/governance/tools/src/account.rs @@ -44,7 +44,7 @@ pub fn create_and_serialize_account<'a, T: BorshSerialize + AccountMaxSize>( let (serialized_data, account_size) = if let Some(max_size) = account_data.get_max_size() { (None, max_size) } else { - let serialized_data = account_data.try_to_vec()?; + let serialized_data = borsh::to_vec(account_data)?; let account_size = serialized_data.len(); (Some(serialized_data), account_size) }; @@ -139,7 +139,7 @@ pub fn create_and_serialize_account_with_owner_signed<'a, T: BorshSerialize + Ac let (serialized_data, account_size) = if let Some(max_size) = account_data.get_max_size() { (None, max_size) } else { - let serialized_data = account_data.try_to_vec()?; + let serialized_data = borsh::to_vec(&account_data)?; let account_size = serialized_data.len(); (Some(serialized_data), account_size) }; diff --git a/libraries/math/src/instruction.rs b/libraries/math/src/instruction.rs index dd45073cb99..5fd4dc6c4e4 100644 --- a/libraries/math/src/instruction.rs +++ b/libraries/math/src/instruction.rs @@ -118,9 +118,7 @@ pub fn precise_sqrt(radicand: u64) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::PreciseSquareRoot { radicand } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::PreciseSquareRoot { radicand }).unwrap(), } } @@ -129,9 +127,7 @@ pub fn sqrt_u64(radicand: u64) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::SquareRootU64 { radicand } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::SquareRootU64 { radicand }).unwrap(), } } @@ -140,9 +136,7 @@ pub fn sqrt_u128(radicand: u128) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::SquareRootU128 { radicand } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::SquareRootU128 { radicand }).unwrap(), } } @@ -151,11 +145,10 @@ pub fn u64_multiply(multiplicand: u64, multiplier: u64) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::U64Multiply { + data: borsh::to_vec(&MathInstruction::U64Multiply { multiplicand, multiplier, - } - .try_to_vec() + }) .unwrap(), } } @@ -165,9 +158,7 @@ pub fn u64_divide(dividend: u64, divisor: u64) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::U64Divide { dividend, divisor } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::U64Divide { dividend, divisor }).unwrap(), } } @@ -176,11 +167,10 @@ pub fn f32_multiply(multiplicand: f32, multiplier: f32) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F32Multiply { + data: borsh::to_vec(&MathInstruction::F32Multiply { multiplicand, multiplier, - } - .try_to_vec() + }) .unwrap(), } } @@ -190,9 +180,7 @@ pub fn f32_divide(dividend: f32, divisor: f32) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F32Divide { dividend, divisor } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::F32Divide { dividend, divisor }).unwrap(), } } @@ -201,9 +189,7 @@ pub fn f32_exponentiate(base: f32, exponent: f32) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F32Exponentiate { base, exponent } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::F32Exponentiate { base, exponent }).unwrap(), } } @@ -212,9 +198,7 @@ pub fn f32_natural_log(argument: f32) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F32NaturalLog { argument } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::F32NaturalLog { argument }).unwrap(), } } @@ -223,9 +207,7 @@ pub fn f32_normal_cdf(argument: f32) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F32NormalCDF { argument } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::F32NormalCDF { argument }).unwrap(), } } @@ -234,9 +216,7 @@ pub fn f64_pow(base: f64, exponent: f64) -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::F64Pow { base, exponent } - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&MathInstruction::F64Pow { base, exponent }).unwrap(), } } @@ -245,7 +225,7 @@ pub fn noop() -> Instruction { Instruction { program_id: id(), accounts: vec![], - data: MathInstruction::Noop.try_to_vec().unwrap(), + data: borsh::to_vec(&MathInstruction::Noop).unwrap(), } } @@ -259,9 +239,7 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::PreciseSquareRoot { radicand: u64::MAX } - .try_to_vec() - .unwrap() + borsh::to_vec(&MathInstruction::PreciseSquareRoot { radicand: u64::MAX }).unwrap() ); assert_eq!(instruction.program_id, crate::id()); } @@ -272,9 +250,7 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::SquareRootU64 { radicand: u64::MAX } - .try_to_vec() - .unwrap() + borsh::to_vec(&MathInstruction::SquareRootU64 { radicand: u64::MAX }).unwrap() ); assert_eq!(instruction.program_id, crate::id()); } @@ -285,10 +261,9 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::SquareRootU128 { + borsh::to_vec(&MathInstruction::SquareRootU128 { radicand: u128::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()); @@ -300,11 +275,10 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::U64Multiply { + borsh::to_vec(&MathInstruction::U64Multiply { multiplicand: u64::MAX, multiplier: u64::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()); @@ -316,11 +290,10 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::U64Divide { + borsh::to_vec(&MathInstruction::U64Divide { dividend: u64::MAX, divisor: u64::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()); @@ -332,11 +305,10 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::F32Multiply { + borsh::to_vec(&MathInstruction::F32Multiply { multiplicand: f32::MAX, multiplier: f32::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()); @@ -348,11 +320,10 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::F32Divide { + borsh::to_vec(&MathInstruction::F32Divide { dividend: f32::MAX, divisor: f32::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()); @@ -364,11 +335,10 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::F32Exponentiate { + borsh::to_vec(&MathInstruction::F32Exponentiate { base: f32::MAX, exponent: f32::MAX - } - .try_to_vec() + }) .unwrap() ); assert_eq!(instruction.program_id, crate::id()) @@ -380,9 +350,7 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::F32NaturalLog { argument: f32::MAX } - .try_to_vec() - .unwrap() + borsh::to_vec(&MathInstruction::F32NaturalLog { argument: f32::MAX }).unwrap() ); assert_eq!(instruction.program_id, crate::id()) } @@ -393,9 +361,7 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::F32NormalCDF { argument: f32::MAX } - .try_to_vec() - .unwrap() + borsh::to_vec(&MathInstruction::F32NormalCDF { argument: f32::MAX }).unwrap() ); assert_eq!(instruction.program_id, crate::id()) } @@ -406,7 +372,7 @@ mod tests { assert_eq!(0, instruction.accounts.len()); assert_eq!( instruction.data, - MathInstruction::Noop.try_to_vec().unwrap() + borsh::to_vec(&MathInstruction::Noop).unwrap() ); assert_eq!(instruction.program_id, crate::id()); } diff --git a/libraries/math/src/processor.rs b/libraries/math/src/processor.rs index 45c1cbd26d7..fff69dd9703 100644 --- a/libraries/math/src/processor.rs +++ b/libraries/math/src/processor.rs @@ -167,7 +167,7 @@ pub fn process_instruction( #[cfg(test)] mod tests { - use {super::*, crate::instruction::MathInstruction, borsh::BorshSerialize}; + use {super::*, crate::instruction::MathInstruction}; #[test] fn test_u64_multiply() { @@ -245,7 +245,7 @@ mod tests { }, MathInstruction::Noop, ] { - let input = math_instruction.try_to_vec().unwrap(); + let input = borsh::to_vec(math_instruction).unwrap(); process_instruction(&program_id, &[], &input).unwrap(); } } diff --git a/managed-token/program/src/instruction.rs b/managed-token/program/src/instruction.rs index c3801690aa0..d6dd8e46e76 100644 --- a/managed-token/program/src/instruction.rs +++ b/managed-token/program/src/instruction.rs @@ -105,7 +105,7 @@ pub fn create_initialize_mint_instruction( AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::InitializeMint { decimals }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::InitializeMint { decimals })?, }) } @@ -130,7 +130,7 @@ pub fn create_initialize_account_instruction( AccountMeta::new_readonly(spl_associated_token_account::id(), false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::InitializeAccount.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::InitializeAccount)?, }) } @@ -151,7 +151,7 @@ pub fn create_mint_to_instruction( AccountMeta::new_readonly(authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::MintTo { amount }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::MintTo { amount })?, }) } @@ -176,7 +176,7 @@ pub fn create_transfer_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::Transfer { amount }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::Transfer { amount })?, }) } @@ -202,7 +202,7 @@ pub fn create_transfer_with_delegate_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::Transfer { amount }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::Transfer { amount })?, }) } @@ -224,7 +224,7 @@ pub fn create_burn_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::Burn { amount }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::Burn { amount })?, }) } @@ -246,7 +246,7 @@ pub fn create_close_account_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::CloseAccount.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::CloseAccount)?, }) } @@ -270,7 +270,7 @@ pub fn create_approve_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::Approve { amount }.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::Approve { amount })?, }) } @@ -291,6 +291,6 @@ pub fn create_revoke_instruction( AccountMeta::new_readonly(freeze_authority, false), AccountMeta::new_readonly(spl_token::id(), false), ], - data: ManagedTokenInstruction::Revoke.try_to_vec()?, + data: borsh::to_vec(&ManagedTokenInstruction::Revoke)?, }) } diff --git a/name-service/program/src/instruction.rs b/name-service/program/src/instruction.rs index 4ed949f1271..7f722284b3e 100644 --- a/name-service/program/src/instruction.rs +++ b/name-service/program/src/instruction.rs @@ -125,7 +125,7 @@ pub fn create( name_parent_opt: Option, name_parent_owner_opt: Option, ) -> Result { - let data = instruction_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&instruction_data).unwrap(); let mut accounts = vec![ AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new(payer_key, true), @@ -162,7 +162,7 @@ pub fn update( name_parent: Option, ) -> Result { let instruction_data = NameRegistryInstruction::Update { offset, data }; - let data = instruction_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&instruction_data).unwrap(); let mut accounts = vec![ AccountMeta::new(name_account_key, false), AccountMeta::new_readonly(name_update_signer, true), @@ -187,7 +187,7 @@ pub fn transfer( name_class_opt: Option, ) -> Result { let instruction_data = NameRegistryInstruction::Transfer { new_owner }; - let data = instruction_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&instruction_data).unwrap(); let mut accounts = vec![ AccountMeta::new(name_account_key, false), AccountMeta::new_readonly(name_owner_key, true), @@ -211,7 +211,7 @@ pub fn delete( refund_target: Pubkey, ) -> Result { let instruction_data = NameRegistryInstruction::Delete; - let data = instruction_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&instruction_data).unwrap(); let accounts = vec![ AccountMeta::new(name_account_key, false), AccountMeta::new_readonly(name_owner_key, true), @@ -233,7 +233,7 @@ pub fn realloc( space: u32, ) -> Result { let instruction_data = NameRegistryInstruction::Realloc { space }; - let data = instruction_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&instruction_data).unwrap(); let accounts = vec![ AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new(payer_key, true), diff --git a/single-pool/cli/src/main.rs b/single-pool/cli/src/main.rs index 8af38f1594f..952d057c732 100644 --- a/single-pool/cli/src/main.rs +++ b/single-pool/cli/src/main.rs @@ -1,7 +1,6 @@ #![allow(clippy::arithmetic_side_effects)] use { - borsh::BorshSerialize, clap::{CommandFactory, Parser}, solana_clap_v3_utils::input_parsers::Amount, solana_client::{ @@ -133,9 +132,7 @@ async fn command_initialize(config: &Config, command_config: InitializeCli) -> C if command_config.skip_metadata { assert_eq!( instructions.last().unwrap().data, - SinglePoolInstruction::CreateTokenMetadata - .try_to_vec() - .unwrap() + borsh::to_vec(&SinglePoolInstruction::CreateTokenMetadata).unwrap() ); instructions.pop(); diff --git a/single-pool/program/src/instruction.rs b/single-pool/program/src/instruction.rs index daa034cc02d..fda54691a3c 100644 --- a/single-pool/program/src/instruction.rs +++ b/single-pool/program/src/instruction.rs @@ -164,7 +164,7 @@ pub fn initialize_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> In let pool_address = find_pool_address(program_id, vote_account_address); let mint_address = find_pool_mint_address(program_id, &pool_address); - let data = SinglePoolInstruction::InitializePool.try_to_vec().unwrap(); + let data = borsh::to_vec(&SinglePoolInstruction::InitializePool).unwrap(); let accounts = vec![ AccountMeta::new_readonly(*vote_account_address, false), AccountMeta::new(pool_address, false), @@ -199,9 +199,7 @@ pub fn initialize_pool(program_id: &Pubkey, vote_account_address: &Pubkey) -> In pub fn reactivate_pool_stake(program_id: &Pubkey, vote_account_address: &Pubkey) -> Instruction { let pool_address = find_pool_address(program_id, vote_account_address); - let data = SinglePoolInstruction::ReactivatePoolStake - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&SinglePoolInstruction::ReactivatePoolStake).unwrap(); let accounts = vec![ AccountMeta::new_readonly(*vote_account_address, false), AccountMeta::new_readonly(pool_address, false), @@ -268,7 +266,7 @@ pub fn deposit_stake( user_token_account: &Pubkey, user_lamport_account: &Pubkey, ) -> Instruction { - let data = SinglePoolInstruction::DepositStake.try_to_vec().unwrap(); + let data = borsh::to_vec(&SinglePoolInstruction::DepositStake).unwrap(); let accounts = vec![ AccountMeta::new_readonly(*pool_address, false), @@ -342,11 +340,10 @@ pub fn withdraw_stake( user_token_account: &Pubkey, token_amount: u64, ) -> Instruction { - let data = SinglePoolInstruction::WithdrawStake { + let data = borsh::to_vec(&SinglePoolInstruction::WithdrawStake { user_stake_authority: *user_stake_authority, token_amount, - } - .try_to_vec() + }) .unwrap(); let accounts = vec![ @@ -415,9 +412,7 @@ pub fn create_token_metadata( ) -> Instruction { let pool_mint = find_pool_mint_address(program_id, pool_address); let (token_metadata, _) = find_metadata_account(&pool_mint); - let data = SinglePoolInstruction::CreateTokenMetadata - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&SinglePoolInstruction::CreateTokenMetadata).unwrap(); let accounts = vec![ AccountMeta::new_readonly(*pool_address, false), @@ -455,9 +450,8 @@ pub fn update_token_metadata( let pool_address = find_pool_address(program_id, vote_account_address); let pool_mint = find_pool_mint_address(program_id, &pool_address); let (token_metadata, _) = find_metadata_account(&pool_mint); - let data = SinglePoolInstruction::UpdateTokenMetadata { name, symbol, uri } - .try_to_vec() - .unwrap(); + let data = + borsh::to_vec(&SinglePoolInstruction::UpdateTokenMetadata { name, symbol, uri }).unwrap(); let accounts = vec![ AccountMeta::new_readonly(*vote_account_address, false), diff --git a/stake-pool/program/src/inline_mpl_token_metadata.rs b/stake-pool/program/src/inline_mpl_token_metadata.rs index b7697a29419..a5d0836b3dd 100644 --- a/stake-pool/program/src/inline_mpl_token_metadata.rs +++ b/stake-pool/program/src/inline_mpl_token_metadata.rs @@ -38,7 +38,7 @@ pub(crate) mod instruction { ) -> Instruction { let mut data = vec![33]; // CreateMetadataAccountV3 data.append( - &mut CreateMetadataAccountArgsV3 { + &mut borsh::to_vec(&CreateMetadataAccountArgsV3 { data: DataV2 { name, symbol, @@ -50,8 +50,7 @@ pub(crate) mod instruction { }, is_mutable: true, collection_details: None, - } - .try_to_vec() + }) .unwrap(), ); Instruction { @@ -86,13 +85,12 @@ pub(crate) mod instruction { ) -> Instruction { let mut data = vec![15]; // UpdateMetadataAccountV2 data.append( - &mut UpdateMetadataAccountArgsV2 { + &mut borsh::to_vec(&UpdateMetadataAccountArgsV2 { data: metadata, update_authority: new_update_authority, primary_sale_happened, is_mutable, - } - .try_to_vec() + }) .unwrap(), ); Instruction { diff --git a/stake-pool/program/src/instruction.rs b/stake-pool/program/src/instruction.rs index 4b8afd8e17b..313afd93015 100644 --- a/stake-pool/program/src/instruction.rs +++ b/stake-pool/program/src/instruction.rs @@ -750,7 +750,7 @@ pub fn initialize( referral_fee, max_validators, }; - let data = init_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&init_data).unwrap(); let mut accounts = vec![ AccountMeta::new(*stake_pool, false), AccountMeta::new_readonly(*manager, true), @@ -801,9 +801,10 @@ pub fn add_validator_to_pool( AccountMeta::new_readonly(system_program::id(), false), AccountMeta::new_readonly(stake::program::id(), false), ]; - let data = StakePoolInstruction::AddValidatorToPool(seed.map(|s| s.get()).unwrap_or(0)) - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&StakePoolInstruction::AddValidatorToPool( + seed.map(|s| s.get()).unwrap_or(0), + )) + .unwrap(); Instruction { program_id: *program_id, accounts, @@ -835,9 +836,7 @@ pub fn remove_validator_from_pool( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::RemoveValidatorFromPool - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::RemoveValidatorFromPool).unwrap(), } } @@ -873,11 +872,10 @@ pub fn decrease_validator_stake( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DecreaseValidatorStake { + data: borsh::to_vec(&StakePoolInstruction::DecreaseValidatorStake { lamports, transient_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -915,12 +913,11 @@ pub fn decrease_additional_validator_stake( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DecreaseAdditionalValidatorStake { + data: borsh::to_vec(&StakePoolInstruction::DecreaseAdditionalValidatorStake { lamports, transient_stake_seed, ephemeral_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -955,11 +952,10 @@ pub fn decrease_validator_stake_with_reserve( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DecreaseValidatorStakeWithReserve { + data: borsh::to_vec(&StakePoolInstruction::DecreaseValidatorStakeWithReserve { lamports, transient_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -999,11 +995,10 @@ pub fn increase_validator_stake( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::IncreaseValidatorStake { + data: borsh::to_vec(&StakePoolInstruction::IncreaseValidatorStake { lamports, transient_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -1045,12 +1040,11 @@ pub fn increase_additional_validator_stake( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::IncreaseAdditionalValidatorStake { + data: borsh::to_vec(&StakePoolInstruction::IncreaseAdditionalValidatorStake { lamports, transient_stake_seed, ephemeral_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -1097,13 +1091,12 @@ pub fn redelegate( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::Redelegate { + data: borsh::to_vec(&StakePoolInstruction::Redelegate { lamports, source_transient_stake_seed, ephemeral_stake_seed, destination_transient_stake_seed, - } - .try_to_vec() + }) .unwrap(), } } @@ -1124,11 +1117,10 @@ pub fn set_preferred_validator( AccountMeta::new_readonly(*staker, true), AccountMeta::new_readonly(*validator_list_address, false), ], - data: StakePoolInstruction::SetPreferredValidator { + data: borsh::to_vec(&StakePoolInstruction::SetPreferredValidator { validator_type, validator_vote_address, - } - .try_to_vec() + }) .unwrap(), } } @@ -1421,11 +1413,10 @@ pub fn update_validator_list_balance( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::UpdateValidatorListBalance { + data: borsh::to_vec(&StakePoolInstruction::UpdateValidatorListBalance { start_index, no_merge, - } - .try_to_vec() + }) .unwrap(), } } @@ -1489,11 +1480,10 @@ pub fn update_validator_list_balance_chunk( Ok(Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::UpdateValidatorListBalance { + data: borsh::to_vec(&StakePoolInstruction::UpdateValidatorListBalance { start_index: start_index.try_into().unwrap(), no_merge, - } - .try_to_vec() + }) .unwrap(), }) } @@ -1563,9 +1553,7 @@ pub fn update_stake_pool_balance( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::UpdateStakePoolBalance - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::UpdateStakePoolBalance).unwrap(), } } @@ -1583,9 +1571,7 @@ pub fn cleanup_removed_validator_entries( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::CleanupRemovedValidatorEntries - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::CleanupRemovedValidatorEntries).unwrap(), } } @@ -1788,17 +1774,16 @@ fn deposit_stake_internal( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DepositStakeWithSlippage { + data: borsh::to_vec(&StakePoolInstruction::DepositStakeWithSlippage { minimum_pool_tokens_out, - } - .try_to_vec() + }) .unwrap(), } } else { Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DepositStake.try_to_vec().unwrap(), + data: borsh::to_vec(&StakePoolInstruction::DepositStake).unwrap(), } }, ); @@ -1990,20 +1975,17 @@ fn deposit_sol_internal( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DepositSolWithSlippage { + data: borsh::to_vec(&StakePoolInstruction::DepositSolWithSlippage { lamports_in, minimum_pool_tokens_out, - } - .try_to_vec() + }) .unwrap(), } } else { Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::DepositSol(lamports_in) - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::DepositSol(lamports_in)).unwrap(), } } } @@ -2175,20 +2157,17 @@ fn withdraw_stake_internal( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::WithdrawStakeWithSlippage { + data: borsh::to_vec(&StakePoolInstruction::WithdrawStakeWithSlippage { pool_tokens_in, minimum_lamports_out, - } - .try_to_vec() + }) .unwrap(), } } else { Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::WithdrawStake(pool_tokens_in) - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::WithdrawStake(pool_tokens_in)).unwrap(), } } } @@ -2298,20 +2277,17 @@ fn withdraw_sol_internal( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::WithdrawSolWithSlippage { + data: borsh::to_vec(&StakePoolInstruction::WithdrawSolWithSlippage { pool_tokens_in, minimum_lamports_out, - } - .try_to_vec() + }) .unwrap(), } } else { Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::WithdrawSol(pool_tokens_in) - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::WithdrawSol(pool_tokens_in)).unwrap(), } } } @@ -2467,7 +2443,7 @@ pub fn set_manager( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::SetManager.try_to_vec().unwrap(), + data: borsh::to_vec(&StakePoolInstruction::SetManager).unwrap(), } } @@ -2485,7 +2461,7 @@ pub fn set_fee( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::SetFee { fee }.try_to_vec().unwrap(), + data: borsh::to_vec(&StakePoolInstruction::SetFee { fee }).unwrap(), } } @@ -2504,7 +2480,7 @@ pub fn set_staker( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::SetStaker.try_to_vec().unwrap(), + data: borsh::to_vec(&StakePoolInstruction::SetStaker).unwrap(), } } @@ -2526,9 +2502,7 @@ pub fn set_funding_authority( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::SetFundingAuthority(funding_type) - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&StakePoolInstruction::SetFundingAuthority(funding_type)).unwrap(), } } @@ -2558,8 +2532,7 @@ pub fn update_token_metadata( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::UpdateTokenMetadata { name, symbol, uri } - .try_to_vec() + data: borsh::to_vec(&StakePoolInstruction::UpdateTokenMetadata { name, symbol, uri }) .unwrap(), } } @@ -2594,8 +2567,7 @@ pub fn create_token_metadata( Instruction { program_id: *program_id, accounts, - data: StakePoolInstruction::CreateTokenMetadata { name, symbol, uri } - .try_to_vec() + data: borsh::to_vec(&StakePoolInstruction::CreateTokenMetadata { name, symbol, uri }) .unwrap(), } } diff --git a/stake-pool/program/src/state.rs b/stake-pool/program/src/state.rs index 135639b39cd..e2b79d535db 100644 --- a/stake-pool/program/src/state.rs +++ b/stake-pool/program/src/state.rs @@ -1162,7 +1162,7 @@ mod test { fn validator_list_deserialize_mut_slice() { let max_validators = 10; let stake_list = test_validator_list(max_validators); - let mut serialized = stake_list.try_to_vec().unwrap(); + let mut serialized = borsh::to_vec(&stake_list).unwrap(); let (header, mut big_vec) = ValidatorListHeader::deserialize_vec(&mut serialized).unwrap(); let list = ValidatorListHeader::deserialize_mut_slice( &mut big_vec, @@ -1207,7 +1207,7 @@ mod test { fn validator_list_iter() { let max_validators = 10; let stake_list = test_validator_list(max_validators); - let mut serialized = stake_list.try_to_vec().unwrap(); + let mut serialized = borsh::to_vec(&stake_list).unwrap(); let (_, big_vec) = ValidatorListHeader::deserialize_vec(&mut serialized).unwrap(); for (a, b) in big_vec .deserialize_slice::(0, big_vec.len() as usize) diff --git a/stake-pool/program/tests/deposit.rs b/stake-pool/program/tests/deposit.rs index 716f3fbec75..0b333e47cfc 100644 --- a/stake-pool/program/tests/deposit.rs +++ b/stake-pool/program/tests/deposit.rs @@ -4,7 +4,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -498,9 +497,7 @@ async fn fail_with_wrong_stake_program_id() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::DepositStake - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&instruction::StakePoolInstruction::DepositStake).unwrap(), }; let mut transaction = diff --git a/stake-pool/program/tests/helpers/mod.rs b/stake-pool/program/tests/helpers/mod.rs index e87d153c63c..b68d7c8c78c 100644 --- a/stake-pool/program/tests/helpers/mod.rs +++ b/stake-pool/program/tests/helpers/mod.rs @@ -1,7 +1,7 @@ #![allow(dead_code)] use { - borsh::{BorshDeserialize, BorshSerialize}, + borsh::BorshDeserialize, solana_program::{ borsh1::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, hash::Hash, @@ -2539,7 +2539,7 @@ pub fn add_stake_pool_account( stake_pool_pubkey: &Pubkey, stake_pool: &state::StakePool, ) { - let mut stake_pool_bytes = stake_pool.try_to_vec().unwrap(); + let mut stake_pool_bytes = borsh::to_vec(&stake_pool).unwrap(); // more room for optionals stake_pool_bytes.extend_from_slice(Pubkey::default().as_ref()); stake_pool_bytes.extend_from_slice(Pubkey::default().as_ref()); @@ -2559,11 +2559,11 @@ pub fn add_validator_list_account( validator_list: &state::ValidatorList, max_validators: u32, ) { - let mut validator_list_bytes = validator_list.try_to_vec().unwrap(); + let mut validator_list_bytes = borsh::to_vec(&validator_list).unwrap(); // add extra room if needed for _ in validator_list.validators.len()..max_validators as usize { validator_list_bytes - .append(&mut state::ValidatorStakeInfo::default().try_to_vec().unwrap()); + .append(&mut borsh::to_vec(&state::ValidatorStakeInfo::default()).unwrap()); } let validator_list_account = SolanaAccount::create( ACCOUNT_RENT_EXEMPTION, diff --git a/stake-pool/program/tests/initialize.rs b/stake-pool/program/tests/initialize.rs index 6b15631aaf4..fa65c709908 100644 --- a/stake-pool/program/tests/initialize.rs +++ b/stake-pool/program/tests/initialize.rs @@ -5,7 +5,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::{get_instance_packed_len, get_packed_len, try_from_slice_unchecked}, @@ -1200,7 +1199,7 @@ async fn fail_without_manager_signature() { referral_fee: stake_pool_accounts.referral_fee, max_validators: stake_pool_accounts.max_validators, }; - let data = init_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&init_data).unwrap(); let accounts = vec![ AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), true), AccountMeta::new_readonly(stake_pool_accounts.manager.pubkey(), false), diff --git a/stake-pool/program/tests/set_funding_authority.rs b/stake-pool/program/tests/set_funding_authority.rs index eb24a10397c..ee2722d81d6 100644 --- a/stake-pool/program/tests/set_funding_authority.rs +++ b/stake-pool/program/tests/set_funding_authority.rs @@ -4,7 +4,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -136,9 +135,10 @@ async fn fail_without_signature() { let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_authority) = setup().await; - let data = instruction::StakePoolInstruction::SetFundingAuthority(FundingType::StakeDeposit) - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&instruction::StakePoolInstruction::SetFundingAuthority( + FundingType::StakeDeposit, + )) + .unwrap(); let accounts = vec![ AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), false), AccountMeta::new_readonly(stake_pool_accounts.manager.pubkey(), false), diff --git a/stake-pool/program/tests/set_manager.rs b/stake-pool/program/tests/set_manager.rs index 9ce2b6387c8..3172d3bf3ee 100644 --- a/stake-pool/program/tests/set_manager.rs +++ b/stake-pool/program/tests/set_manager.rs @@ -4,7 +4,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -134,9 +133,7 @@ async fn test_set_manager_without_existing_signature() { let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) = setup().await; - let data = instruction::StakePoolInstruction::SetManager - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&instruction::StakePoolInstruction::SetManager).unwrap(); let accounts = vec![ AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), false), AccountMeta::new_readonly(stake_pool_accounts.manager.pubkey(), false), @@ -177,9 +174,7 @@ async fn test_set_manager_without_new_signature() { let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_pool_fee, new_manager) = setup().await; - let data = instruction::StakePoolInstruction::SetManager - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&instruction::StakePoolInstruction::SetManager).unwrap(); let accounts = vec![ AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), false), AccountMeta::new_readonly(stake_pool_accounts.manager.pubkey(), true), diff --git a/stake-pool/program/tests/set_staker.rs b/stake-pool/program/tests/set_staker.rs index 9d382e30521..bef7c8837d1 100644 --- a/stake-pool/program/tests/set_staker.rs +++ b/stake-pool/program/tests/set_staker.rs @@ -4,7 +4,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -150,9 +149,7 @@ async fn fail_set_staker_without_signature() { let (mut banks_client, payer, recent_blockhash, stake_pool_accounts, new_staker) = setup().await; - let data = instruction::StakePoolInstruction::SetStaker - .try_to_vec() - .unwrap(); + let data = borsh::to_vec(&instruction::StakePoolInstruction::SetStaker).unwrap(); let accounts = vec![ AccountMeta::new(stake_pool_accounts.stake_pool.pubkey(), false), AccountMeta::new_readonly(stake_pool_accounts.manager.pubkey(), false), diff --git a/stake-pool/program/tests/vsa_add.rs b/stake-pool/program/tests/vsa_add.rs index ded392063cb..3016a28d8b9 100644 --- a/stake-pool/program/tests/vsa_add.rs +++ b/stake-pool/program/tests/vsa_add.rs @@ -5,7 +5,6 @@ mod helpers; use { bincode::deserialize, - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -292,13 +291,12 @@ async fn fail_without_signature() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::AddValidatorToPool( + data: borsh::to_vec(&instruction::StakePoolInstruction::AddValidatorToPool( validator_stake .validator_stake_seed .map(|s| s.get()) .unwrap_or(0), - ) - .try_to_vec() + )) .unwrap(), }; @@ -348,13 +346,12 @@ async fn fail_with_wrong_stake_program_id() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::AddValidatorToPool( + data: borsh::to_vec(&instruction::StakePoolInstruction::AddValidatorToPool( validator_stake .validator_stake_seed .map(|s| s.get()) .unwrap_or(0), - ) - .try_to_vec() + )) .unwrap(), }; let mut transaction = Transaction::new_with_payer(&[instruction], Some(&payer.pubkey())); @@ -402,13 +399,12 @@ async fn fail_with_wrong_system_program_id() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::AddValidatorToPool( + data: borsh::to_vec(&instruction::StakePoolInstruction::AddValidatorToPool( validator_stake .validator_stake_seed .map(|s| s.get()) .unwrap_or(0), - ) - .try_to_vec() + )) .unwrap(), }; let mut transaction = Transaction::new_with_payer(&[instruction], Some(&payer.pubkey())); diff --git a/stake-pool/program/tests/vsa_remove.rs b/stake-pool/program/tests/vsa_remove.rs index ea9f7cc9ba7..46571865b2b 100644 --- a/stake-pool/program/tests/vsa_remove.rs +++ b/stake-pool/program/tests/vsa_remove.rs @@ -5,7 +5,6 @@ mod helpers; use { bincode::deserialize, - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -139,9 +138,7 @@ async fn fail_with_wrong_stake_program_id() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::RemoveValidatorFromPool - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&instruction::StakePoolInstruction::RemoveValidatorFromPool).unwrap(), }; let mut transaction = @@ -356,9 +353,7 @@ async fn fail_no_signature() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::RemoveValidatorFromPool - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&instruction::StakePoolInstruction::RemoveValidatorFromPool).unwrap(), }; let transaction = Transaction::new_signed_with_payer( diff --git a/stake-pool/program/tests/withdraw.rs b/stake-pool/program/tests/withdraw.rs index 1718eba0fb7..84401a1e91c 100644 --- a/stake-pool/program/tests/withdraw.rs +++ b/stake-pool/program/tests/withdraw.rs @@ -4,7 +4,6 @@ mod helpers; use { - borsh::BorshSerialize, helpers::*, solana_program::{ borsh1::try_from_slice_unchecked, @@ -291,9 +290,10 @@ async fn fail_with_wrong_stake_program() { let instruction = Instruction { program_id: id(), accounts, - data: instruction::StakePoolInstruction::WithdrawStake(tokens_to_burn) - .try_to_vec() - .unwrap(), + data: borsh::to_vec(&instruction::StakePoolInstruction::WithdrawStake( + tokens_to_burn, + )) + .unwrap(), }; let transaction = Transaction::new_signed_with_payer( diff --git a/stateless-asks/program/src/instruction.rs b/stateless-asks/program/src/instruction.rs index 71fef665f72..07e79af4536 100644 --- a/stateless-asks/program/src/instruction.rs +++ b/stateless-asks/program/src/instruction.rs @@ -63,7 +63,7 @@ pub fn accept_offer( taker_size, bump_seed, }; - let data = init_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&init_data).unwrap(); let mut accounts = vec![ AccountMeta::new_readonly(*maker_wallet, false), AccountMeta::new_readonly(*taker_wallet, true), @@ -113,7 +113,7 @@ pub fn accept_offer_with_metadata( taker_size, bump_seed, }; - let data = init_data.try_to_vec().unwrap(); + let data = borsh::to_vec(&init_data).unwrap(); let mut accounts = vec![ AccountMeta::new_readonly(*maker_wallet, false), AccountMeta::new_readonly(*taker_wallet, true), diff --git a/token-metadata/example/tests/emit.rs b/token-metadata/example/tests/emit.rs index b016a8dbd9d..bfac603451b 100644 --- a/token-metadata/example/tests/emit.rs +++ b/token-metadata/example/tests/emit.rs @@ -8,9 +8,7 @@ use { borsh1::try_from_slice_unchecked, program::MAX_RETURN_DATA, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair, transaction::Transaction, }, - spl_token_metadata_interface::{ - borsh::BorshSerialize, instruction::emit, state::TokenMetadata, - }, + spl_token_metadata_interface::{borsh, instruction::emit, state::TokenMetadata}, test_case::test_case, }; @@ -79,7 +77,7 @@ async fn success(start: Option, end: Option) { .await .unwrap(); - let metadata_buffer = token_metadata.try_to_vec().unwrap(); + let metadata_buffer = borsh::to_vec(&token_metadata).unwrap(); if let Some(check_buffer) = TokenMetadata::get_slice(&metadata_buffer, start, end) { if !check_buffer.is_empty() { // pad the data if necessary diff --git a/token-metadata/interface/src/instruction.rs b/token-metadata/interface/src/instruction.rs index 6be22fc47dc..bcb606b3a8b 100644 --- a/token-metadata/interface/src/instruction.rs +++ b/token-metadata/interface/src/instruction.rs @@ -201,23 +201,23 @@ impl TokenMetadataInstruction { match self { Self::Initialize(data) => { buf.extend_from_slice(Initialize::SPL_DISCRIMINATOR_SLICE); - buf.append(&mut data.try_to_vec().unwrap()); + buf.append(&mut borsh::to_vec(data).unwrap()); } Self::UpdateField(data) => { buf.extend_from_slice(UpdateField::SPL_DISCRIMINATOR_SLICE); - buf.append(&mut data.try_to_vec().unwrap()); + buf.append(&mut borsh::to_vec(data).unwrap()); } Self::RemoveKey(data) => { buf.extend_from_slice(RemoveKey::SPL_DISCRIMINATOR_SLICE); - buf.append(&mut data.try_to_vec().unwrap()); + buf.append(&mut borsh::to_vec(data).unwrap()); } Self::UpdateAuthority(data) => { buf.extend_from_slice(UpdateAuthority::SPL_DISCRIMINATOR_SLICE); - buf.append(&mut data.try_to_vec().unwrap()); + buf.append(&mut borsh::to_vec(data).unwrap()); } Self::Emit(data) => { buf.extend_from_slice(Emit::SPL_DISCRIMINATOR_SLICE); - buf.append(&mut data.try_to_vec().unwrap()); + buf.append(&mut borsh::to_vec(data).unwrap()); } }; buf @@ -333,7 +333,7 @@ mod test { ) { let mut expect = vec![]; expect.extend_from_slice(discriminator.as_ref()); - expect.append(&mut data.try_to_vec().unwrap()); + expect.append(&mut borsh::to_vec(&data).unwrap()); let packed = instruction.pack(); assert_eq!(packed, expect); let unpacked = TokenMetadataInstruction::unpack(&expect).unwrap(); diff --git a/token/program-2022-test/tests/token_metadata_emit.rs b/token/program-2022-test/tests/token_metadata_emit.rs index 0812a225a01..9de6a5e37f8 100644 --- a/token/program-2022-test/tests/token_metadata_emit.rs +++ b/token/program-2022-test/tests/token_metadata_emit.rs @@ -10,9 +10,7 @@ use { }, spl_token_2022::processor::Processor, spl_token_client::token::ExtensionInitializationParams, - spl_token_metadata_interface::{ - borsh::BorshSerialize, instruction::emit, state::TokenMetadata, - }, + spl_token_metadata_interface::{instruction::emit, state::TokenMetadata}, std::{convert::TryInto, sync::Arc}, test_case::test_case, }; @@ -113,7 +111,7 @@ async fn success(start: Option, end: Option) { .await .unwrap(); - let metadata_buffer = token_metadata.try_to_vec().unwrap(); + let metadata_buffer = borsh::to_vec(&token_metadata).unwrap(); if let Some(check_buffer) = TokenMetadata::get_slice(&metadata_buffer, start, end) { if !check_buffer.is_empty() { // pad the data if necessary From c5e7e427c9dd2e2a85dc60126ed304a59da1ef95 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Thu, 22 Feb 2024 18:33:20 +0900 Subject: [PATCH 5/6] temporarily allow deprecated functions in cli that uses clap-v3 --- single-pool/cli/src/main.rs | 1 + token-upgrade/cli/src/main.rs | 2 ++ token/transfer-hook/cli/src/main.rs | 2 ++ 3 files changed, 5 insertions(+) diff --git a/single-pool/cli/src/main.rs b/single-pool/cli/src/main.rs index 952d057c732..4d2693d3008 100644 --- a/single-pool/cli/src/main.rs +++ b/single-pool/cli/src/main.rs @@ -1,4 +1,5 @@ #![allow(clippy::arithmetic_side_effects)] +#![allow(deprecated)] use { clap::{CommandFactory, Parser}, diff --git a/token-upgrade/cli/src/main.rs b/token-upgrade/cli/src/main.rs index 24527f778ba..5d710a61f42 100644 --- a/token-upgrade/cli/src/main.rs +++ b/token-upgrade/cli/src/main.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + use { clap::{crate_description, crate_name, crate_version, Arg, Command}, solana_clap_v3_utils::{ diff --git a/token/transfer-hook/cli/src/main.rs b/token/transfer-hook/cli/src/main.rs index 010bf710547..237b47e2ac2 100644 --- a/token/transfer-hook/cli/src/main.rs +++ b/token/transfer-hook/cli/src/main.rs @@ -1,3 +1,5 @@ +#![allow(deprecated)] + pub mod meta; use { From 92f3a8239c87727cc013229e45a5ee4b311c8560 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Thu, 29 Feb 2024 09:01:57 +0900 Subject: [PATCH 6/6] use `repr(u32)` for enums in token lending --- token-lending/program/src/pyth.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/token-lending/program/src/pyth.rs b/token-lending/program/src/pyth.rs index cf8c5a474e8..67e88188cb9 100644 --- a/token-lending/program/src/pyth.rs +++ b/token-lending/program/src/pyth.rs @@ -21,7 +21,7 @@ pub struct AccKey { } #[derive(PartialEq, Copy, Clone)] -#[repr(C)] +#[repr(u32)] pub enum AccountType { Unknown, Mapping, @@ -30,7 +30,7 @@ pub enum AccountType { } #[derive(PartialEq, Copy, Clone)] -#[repr(C)] +#[repr(u32)] pub enum PriceStatus { Unknown, Trading, @@ -39,7 +39,7 @@ pub enum PriceStatus { } #[derive(PartialEq, Copy, Clone)] -#[repr(C)] +#[repr(u32)] pub enum CorpAction { NoCorpAct, } @@ -63,7 +63,7 @@ pub struct PriceComp { } #[derive(PartialEq, Copy, Clone)] -#[repr(C)] +#[repr(u32)] pub enum PriceType { Unknown, Price,