From 0aed5cb801ee17a492a2f8e234bdc3f097bedf08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 09:21:14 +0000 Subject: [PATCH] Bump borsh-derive from 0.9.3 to 1.5.1 Bumps [borsh-derive](https://github.com/nearprotocol/borsh) from 0.9.3 to 1.5.1. - [Commits](https://github.com/nearprotocol/borsh/commits) --- updated-dependencies: - dependency-name: borsh-derive dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 197 +++++++++++++----- basics/account-data/native/program/Cargo.toml | 2 +- .../close-account/native/program/Cargo.toml | 2 +- .../pda-rent-payer/native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- basics/realloc/native/program/Cargo.toml | 2 +- basics/rent/native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- basics/transfer-sol/native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../native/program/Cargo.toml | 2 +- .../transfer-fee/native/program/Cargo.toml | 2 +- 15 files changed, 155 insertions(+), 70 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f54b45b7b..75fddf909 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,8 +14,8 @@ name = "account-data-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -219,7 +219,7 @@ dependencies = [ "borsh 0.10.3", "bytemuck", "getrandom 0.2.15", - "solana-program", + "solana-program 1.18.17", "thiserror", ] @@ -451,6 +451,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bincode" version = "1.3.3" @@ -738,7 +744,7 @@ dependencies = [ name = "checking-accounts-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -764,8 +770,8 @@ name = "close-account-native-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -807,7 +813,7 @@ version = "0.1.0" dependencies = [ "borsh 0.9.3", "shank", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -815,7 +821,7 @@ name = "counter-solana-native" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -838,7 +844,7 @@ dependencies = [ name = "create-account-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1154,7 +1160,7 @@ dependencies = [ name = "hello-solana-program" version = "0.1.0" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -1570,8 +1576,8 @@ name = "pda-rent-payer-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -1673,8 +1679,8 @@ name = "processing-instructions-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -1682,8 +1688,8 @@ name = "program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -1691,8 +1697,8 @@ name = "program-derived-addresses-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -1829,8 +1835,8 @@ name = "realloc-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -1883,8 +1889,8 @@ name = "repository-layout-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] @@ -2202,13 +2208,59 @@ dependencies = [ "sha3 0.10.8", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-sdk-macro", + "solana-sdk-macro 1.18.17", "thiserror", "tiny-bip39", "wasm-bindgen", "zeroize", ] +[[package]] +name = "solana-program" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2625a23c3813b620141ee447819b08d1b9a5f1c69a309754834e3f35798a21fb" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "base64 0.22.1", + "bincode", + "bitflags", + "blake3", + "borsh 0.10.3", + "borsh 1.5.1", + "bs58 0.5.1", + "bv", + "bytemuck", + "bytemuck_derive", + "console_error_panic_hook", + "console_log", + "curve25519-dalek", + "getrandom 0.2.15", + "js-sys", + "lazy_static", + "libsecp256k1", + "log", + "memoffset", + "num-bigint", + "num-derive 0.4.2", + "num-traits", + "parking_lot", + "rand 0.8.5", + "rustc_version", + "rustversion", + "serde", + "serde_bytes", + "serde_derive", + "sha2 0.10.8", + "sha3 0.10.8", + "solana-sdk-macro 2.0.14", + "thiserror", + "wasm-bindgen", +] + [[package]] name = "solana-sdk" version = "1.18.17" @@ -2257,8 +2309,8 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-logger", - "solana-program", - "solana-sdk-macro", + "solana-program 1.18.17", + "solana-sdk-macro 1.18.17", "thiserror", "uriparse", "wasm-bindgen", @@ -2277,6 +2329,19 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "solana-sdk-macro" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93a5a1eabc890415d326707afe62cd7a2009236e8d899c1519566fc8f7e3977b" +dependencies = [ + "bs58 0.5.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.72", +] + [[package]] name = "solana-security-txt" version = "1.1.1" @@ -2305,7 +2370,7 @@ dependencies = [ "serde", "serde_json", "sha3 0.9.1", - "solana-program", + "solana-program 1.18.17", "solana-sdk", "subtle", "thiserror", @@ -2322,7 +2387,7 @@ dependencies = [ "borsh 0.10.3", "num-derive 0.4.2", "num-traits", - "solana-program", + "solana-program 1.18.17", "spl-token", "spl-token-2022 1.0.0", "thiserror", @@ -2335,7 +2400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator-derive", ] @@ -2369,7 +2434,7 @@ version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -2378,7 +2443,7 @@ version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a49f49f95f2d02111ded31696ab38a081fab623d4c76bd4cb074286db4560836" dependencies = [ - "solana-program", + "solana-program 1.18.17", ] [[package]] @@ -2389,7 +2454,7 @@ checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" dependencies = [ "borsh 0.10.3", "bytemuck", - "solana-program", + "solana-program 1.18.17", "solana-zk-token-sdk", "spl-program-error 0.3.0", ] @@ -2402,7 +2467,7 @@ checksum = "af92f74cd3b0fdfda59fef4b571a92123e4df0f67cc43f73163975d31118ef82" dependencies = [ "num-derive 0.3.3", "num-traits", - "solana-program", + "solana-program 1.18.17", "spl-program-error-derive 0.2.0", "thiserror", ] @@ -2415,7 +2480,7 @@ checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" dependencies = [ "num-derive 0.4.2", "num-traits", - "solana-program", + "solana-program 1.18.17", "spl-program-error-derive 0.3.2", "thiserror", ] @@ -2450,7 +2515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82149a5a06b5f158d03904066375eaf0c8a2422557cc3d5a25d277260d9a3b16" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-program-error 0.2.0", "spl-type-length-value 0.2.0", @@ -2463,7 +2528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", "spl-program-error 0.3.0", @@ -2481,7 +2546,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.3", - "solana-program", + "solana-program 1.18.17", "thiserror", ] @@ -2496,7 +2561,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program", + "solana-program 1.18.17", "solana-zk-token-sdk", "spl-memo 3.0.1", "spl-token", @@ -2515,7 +2580,7 @@ dependencies = [ "num-derive 0.4.2", "num-traits", "num_enum 0.7.3", - "solana-program", + "solana-program 1.18.17", "solana-security-txt", "solana-zk-token-sdk", "spl-memo 4.0.4", @@ -2535,7 +2600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", "spl-program-error 0.3.0", @@ -2548,7 +2613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" dependencies = [ "borsh 0.10.3", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", "spl-program-error 0.3.0", @@ -2566,7 +2631,7 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "num_enum 0.6.1", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-tlv-account-resolution 0.2.0", "spl-type-length-value 0.2.0", @@ -2581,7 +2646,7 @@ checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" dependencies = [ "arrayref", "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", "spl-program-error 0.3.0", @@ -2596,7 +2661,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1d085f426b33b8365fb98383d1b8b3925e21bdfe579c851ceaa7f511dbec191" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-program-error 0.2.0", ] @@ -2608,12 +2673,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" dependencies = [ "bytemuck", - "solana-program", + "solana-program 1.18.17", "spl-discriminator", "spl-pod", "spl-program-error 0.3.0", ] +[[package]] +name = "steel" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d88c610ca9fd5e4e51bdb6e9964114133a42f006713fe38aff37266fac91e1be" +dependencies = [ + "bytemuck", + "num_enum 0.7.3", + "solana-program 1.18.17", + "thiserror", +] + +[[package]] +name = "steel-hello-solana" +version = "0.1.0" +dependencies = [ + "solana-program 2.0.14", + "steel", +] + [[package]] name = "strsim" version = "0.11.1" @@ -2728,8 +2813,8 @@ name = "token-2022-default-account-state-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2739,8 +2824,8 @@ name = "token-2022-mint-close-authority-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2750,8 +2835,8 @@ name = "token-2022-multiple-extensions-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2761,8 +2846,8 @@ name = "token-2022-non-transferable-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2772,8 +2857,8 @@ name = "token-2022-transfer-fees-program" version = "0.1.0" dependencies = [ "borsh 0.10.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", "spl-associated-token-account", "spl-token-2022 0.7.0", ] @@ -2855,8 +2940,8 @@ name = "transfer-sol-program" version = "0.1.0" dependencies = [ "borsh 0.9.3", - "borsh-derive 0.9.3", - "solana-program", + "borsh-derive 1.5.1", + "solana-program 1.18.17", ] [[package]] diff --git a/basics/account-data/native/program/Cargo.toml b/basics/account-data/native/program/Cargo.toml index cfc0d193c..b76ea79a8 100644 --- a/basics/account-data/native/program/Cargo.toml +++ b/basics/account-data/native/program/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] solana-program = "=1.18.17" borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/close-account/native/program/Cargo.toml b/basics/close-account/native/program/Cargo.toml index 40fbc7c21..6dd262225 100644 --- a/basics/close-account/native/program/Cargo.toml +++ b/basics/close-account/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/basics/pda-rent-payer/native/program/Cargo.toml b/basics/pda-rent-payer/native/program/Cargo.toml index cfcae94de..a1de7241e 100644 --- a/basics/pda-rent-payer/native/program/Cargo.toml +++ b/basics/pda-rent-payer/native/program/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] solana-program = "=1.18.17" borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/processing-instructions/native/program/Cargo.toml b/basics/processing-instructions/native/program/Cargo.toml index 8c692c2bd..076d05406 100644 --- a/basics/processing-instructions/native/program/Cargo.toml +++ b/basics/processing-instructions/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/basics/program-derived-addresses/native/program/Cargo.toml b/basics/program-derived-addresses/native/program/Cargo.toml index e77d37e47..30fdc1865 100644 --- a/basics/program-derived-addresses/native/program/Cargo.toml +++ b/basics/program-derived-addresses/native/program/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" [dependencies] solana-program = "=1.18.17" borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/basics/realloc/native/program/Cargo.toml b/basics/realloc/native/program/Cargo.toml index 02f008153..e5a03c273 100644 --- a/basics/realloc/native/program/Cargo.toml +++ b/basics/realloc/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/basics/rent/native/program/Cargo.toml b/basics/rent/native/program/Cargo.toml index b34b898df..e4e4c40c2 100644 --- a/basics/rent/native/program/Cargo.toml +++ b/basics/rent/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/basics/repository-layout/native/program/Cargo.toml b/basics/repository-layout/native/program/Cargo.toml index 3274e5568..be25d6ac3 100644 --- a/basics/repository-layout/native/program/Cargo.toml +++ b/basics/repository-layout/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/basics/transfer-sol/native/program/Cargo.toml b/basics/transfer-sol/native/program/Cargo.toml index dff1138bb..f9187905c 100644 --- a/basics/transfer-sol/native/program/Cargo.toml +++ b/basics/transfer-sol/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" [lib] diff --git a/tokens/token-2022/default-account-state/native/program/Cargo.toml b/tokens/token-2022/default-account-state/native/program/Cargo.toml index 8608a9fdc..afa7e0ef2 100644 --- a/tokens/token-2022/default-account-state/native/program/Cargo.toml +++ b/tokens/token-2022/default-account-state/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } diff --git a/tokens/token-2022/mint-close-authority/native/program/Cargo.toml b/tokens/token-2022/mint-close-authority/native/program/Cargo.toml index 58360f9d8..23bc7dab8 100644 --- a/tokens/token-2022/mint-close-authority/native/program/Cargo.toml +++ b/tokens/token-2022/mint-close-authority/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "1.16.10" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } diff --git a/tokens/token-2022/multiple-extensions/native/program/Cargo.toml b/tokens/token-2022/multiple-extensions/native/program/Cargo.toml index f0f41d285..dbf3d8ac1 100644 --- a/tokens/token-2022/multiple-extensions/native/program/Cargo.toml +++ b/tokens/token-2022/multiple-extensions/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } diff --git a/tokens/token-2022/non-transferable/native/program/Cargo.toml b/tokens/token-2022/non-transferable/native/program/Cargo.toml index d03cd5d4c..83e6397dc 100644 --- a/tokens/token-2022/non-transferable/native/program/Cargo.toml +++ b/tokens/token-2022/non-transferable/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.9.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] } diff --git a/tokens/token-2022/transfer-fee/native/program/Cargo.toml b/tokens/token-2022/transfer-fee/native/program/Cargo.toml index f1c31c8f0..0c0929d73 100644 --- a/tokens/token-2022/transfer-fee/native/program/Cargo.toml +++ b/tokens/token-2022/transfer-fee/native/program/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] borsh = "0.10.3" -borsh-derive = "0.9.1" +borsh-derive = "1.5.1" solana-program = "=1.18.17" spl-associated-token-account = { version="2.0.0", features = [ "no-entrypoint" ] } spl-token-2022 = {version = "0.7.0", features = [ "no-entrypoint" ] }