From e7dcabf895f9bed2b9a6d089b95a64b97454359a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 22:00:24 +0000 Subject: [PATCH] build(deps): bump borsh from 0.10.3 to 1.2.0 Bumps [borsh](https://github.com/near/borsh-rs) from 0.10.3 to 1.2.0. - [Release notes](https://github.com/near/borsh-rs/releases) - [Changelog](https://github.com/near/borsh-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/near/borsh-rs/compare/borsh-v0.10.3...borsh-v1.2.0) --- updated-dependencies: - dependency-name: borsh dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 63 ++++++++++++------- associated-token-account/program/Cargo.toml | 2 +- binary-option/program/Cargo.toml | 2 +- binary-oracle-pair/program/Cargo.toml | 2 +- feature-proposal/program/Cargo.toml | 2 +- governance/addin-api/Cargo.toml | 2 +- governance/addin-mock/program/Cargo.toml | 2 +- governance/chat/program/Cargo.toml | 2 +- governance/program/Cargo.toml | 2 +- governance/test-sdk/Cargo.toml | 2 +- governance/tools/Cargo.toml | 2 +- libraries/discriminator/Cargo.toml | 2 +- libraries/math/Cargo.toml | 2 +- libraries/pod/Cargo.toml | 2 +- .../type-length-value-derive-test/Cargo.toml | 2 +- managed-token/program/Cargo.toml | 2 +- name-service/program/Cargo.toml | 2 +- record/program/Cargo.toml | 2 +- single-pool/cli/Cargo.toml | 2 +- single-pool/program/Cargo.toml | 2 +- stake-pool/cli/Cargo.toml | 2 +- stake-pool/program/Cargo.toml | 2 +- stateless-asks/program/Cargo.toml | 2 +- token-metadata/interface/Cargo.toml | 2 +- token/program-2022-test/Cargo.toml | 2 +- 25 files changed, 63 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a00e5d4ea81..5776a07ff75 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -617,7 +617,7 @@ name = "binary-option" version = "0.1.0" dependencies = [ "arrayref", - "borsh 0.10.3", + "borsh 1.2.0", "solana-program", "spl-token 4.0.0", "thiserror", @@ -773,6 +773,15 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +dependencies = [ + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -1025,6 +1034,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" @@ -6625,7 +6640,7 @@ name = "spl-associated-token-account" version = "2.2.0" dependencies = [ "assert_matches", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "solana-program", @@ -6666,7 +6681,7 @@ dependencies = [ name = "spl-binary-oracle-pair" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "solana-program", @@ -6694,7 +6709,7 @@ dependencies = [ name = "spl-discriminator" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "bytemuck", "solana-program", "spl-discriminator-derive 0.1.1", @@ -6825,7 +6840,7 @@ dependencies = [ name = "spl-feature-proposal" version = "1.0.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "solana-program", "solana-program-test", "solana-sdk", @@ -6854,7 +6869,7 @@ dependencies = [ "assert_matches", "base64 0.21.5", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "proptest", @@ -6875,7 +6890,7 @@ dependencies = [ name = "spl-governance-addin-api" version = "0.1.3" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "solana-program", "spl-governance-tools", ] @@ -6887,7 +6902,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "proptest", @@ -6910,7 +6925,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "proptest", @@ -6934,7 +6949,7 @@ version = "0.1.3" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "lazy_static", "num-derive 0.4.1", "num-traits", @@ -6953,7 +6968,7 @@ version = "0.1.3" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "serde", @@ -6977,7 +6992,7 @@ dependencies = [ name = "spl-managed-token" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "shank", "solana-program", "solana-program-test", @@ -6991,7 +7006,7 @@ dependencies = [ name = "spl-math" version = "0.2.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "libm", "num-derive 0.4.1", "num-traits", @@ -7033,7 +7048,7 @@ dependencies = [ name = "spl-name-service" version = "0.3.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "solana-program", @@ -7047,7 +7062,7 @@ name = "spl-pod" version = "0.1.0" dependencies = [ "base64 0.21.5", - "borsh 0.10.3", + "borsh 1.2.0", "bytemuck", "serde", "serde_json", @@ -7122,7 +7137,7 @@ dependencies = [ name = "spl-record" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "solana-program", @@ -7148,7 +7163,7 @@ dependencies = [ "approx", "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "num-derive 0.4.1", "num-traits", "num_enum 0.7.1", @@ -7168,7 +7183,7 @@ name = "spl-single-pool-cli" version = "1.0.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "clap 3.2.25", "console", "serde", @@ -7203,7 +7218,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "bytemuck", "num-derive 0.4.1", "num-traits", @@ -7229,7 +7244,7 @@ name = "spl-stake-pool-cli" version = "0.7.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.2.0", "bs58", "clap 2.34.0", "serde", @@ -7371,7 +7386,7 @@ name = "spl-token-2022-test" version = "0.0.1" dependencies = [ "async-trait", - "borsh 0.10.3", + "borsh 1.2.0", "futures-util", "solana-program", "solana-program-test", @@ -7549,7 +7564,7 @@ dependencies = [ name = "spl-token-metadata-interface" version = "0.2.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "serde", "serde_json", "solana-program", @@ -7761,7 +7776,7 @@ dependencies = [ name = "spl-type-length-value-derive-test" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "solana-program", "spl-discriminator 0.1.0", "spl-type-length-value 0.3.0", @@ -7771,7 +7786,7 @@ dependencies = [ name = "stateless-asks" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.2.0", "solana-program", "solana-program-test", "solana-sdk", diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index 1c4de06615b..9ff9b721326 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] assert_matches = "1.5.0" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.6" diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index fd5ceca88fa..7df05be2838 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -13,7 +13,7 @@ solana-program = "1.17.6" thiserror = "1.0" spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]} arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.2" uint = "0.9" [lib] diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index 995c8b8f1ad..124ae6da5e2 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -17,7 +17,7 @@ solana-program = "1.17.6" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" -borsh = "0.10" +borsh = "1.2" [dev-dependencies] solana-program-test = "1.17.6" diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml index 84f433da2ce..92b714c2f82 100644 --- a/feature-proposal/program/Cargo.toml +++ b/feature-proposal/program/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2" solana-program = "1.17.6" spl-token = { version = "4.0", path = "../../token/program", features = ["no-entrypoint"] } diff --git a/governance/addin-api/Cargo.toml b/governance/addin-api/Cargo.toml index a1b602836c0..79276acb1b0 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" spl-governance-tools= { version = "0.1.3", path ="../tools"} solana-program = "1.17.6" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index c90035d8cfa..edb2563ba93 100644 --- a/governance/addin-mock/program/Cargo.toml +++ b/governance/addin-mock/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" serde = "1.0.193" diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index b5806115ccd..f6bdcdf6f38 100644 --- a/governance/chat/program/Cargo.toml +++ b/governance/chat/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" serde = "1.0.193" diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index 7db087cc733..d9bee561dc3 100644 --- a/governance/program/Cargo.toml +++ b/governance/program/Cargo.toml @@ -14,7 +14,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" serde = "1.0.193" diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index 9833cc1a0e1..7ed6a987315 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" lazy_static = "1.4.0" num-derive = "0.4" num-traits = "0.2" diff --git a/governance/tools/Cargo.toml b/governance/tools/Cargo.toml index 4107cf47250..9105648b0ea 100644 --- a/governance/tools/Cargo.toml +++ b/governance/tools/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] arrayref = "0.3.7" bincode = "1.3.2" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" serde = "1.0.193" diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml index 0845f9af860..0e7817a1a04 100644 --- a/libraries/discriminator/Cargo.toml +++ b/libraries/discriminator/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" borsh = ["dep:borsh"] [dependencies] -borsh = { version = "0.10", optional = true } +borsh = { version = "1.2", optional = true } bytemuck = { version = "1.14.0", features = ["derive"] } solana-program = "1.17.6" spl-discriminator-derive = { version = "0.1.0", path = "./derive" } diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index f4768c0fdd8..c67bd64f9a1 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" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.6" diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index dbeeb1f7884..9c45fdb3f0c 100644 --- a/libraries/pod/Cargo.toml +++ b/libraries/pod/Cargo.toml @@ -13,7 +13,7 @@ borsh = ["dep:borsh"] [dependencies] base64 = { version = "0.21.5", optional = true } -borsh = { version = "0.10", optional = true } +borsh = { version = "1.2", optional = true } bytemuck = { version = "1.14.0" } serde = { version = "1.0.193", optional = true } solana-program = "1.17.6" diff --git a/libraries/type-length-value-derive-test/Cargo.toml b/libraries/type-length-value-derive-test/Cargo.toml index 85c3a29df7b..1a8e1e4d0ef 100644 --- a/libraries/type-length-value-derive-test/Cargo.toml +++ b/libraries/type-length-value-derive-test/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" edition = "2021" [dev-dependencies] -borsh = "0.10" +borsh = "1.2" solana-program = "1.16" spl-discriminator = { version = "0.1.0", path = "../discriminator" } spl-type-length-value = { version = "0.3.0", path = "../type-length-value", features = ["derive"] } diff --git a/managed-token/program/Cargo.toml b/managed-token/program/Cargo.toml index c21e4725ca9..c382ca3dde5 100644 --- a/managed-token/program/Cargo.toml +++ b/managed-token/program/Cargo.toml @@ -22,7 +22,7 @@ default = [] test = [] [dependencies] -borsh = "0.10" +borsh = "1.2" shank = "^0.2.1" solana-program = "1.17.6" spl-associated-token-account = { version = "2.0", path = "../../associated-token-account/program", features = [ "no-entrypoint", ] } diff --git a/name-service/program/Cargo.toml b/name-service/program/Cargo.toml index 715ca840302..7c02812d42c 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -19,7 +19,7 @@ test-sbf = [] [dependencies] solana-program = "1.17.6" num-traits = "0.2" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4.1" thiserror = "1.0.50" diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 4b8c6a0800c..9f8258404f0 100644 --- a/record/program/Cargo.toml +++ b/record/program/Cargo.toml @@ -12,7 +12,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.6" diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index 1506deef0f2..4fe17301844 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" tokio = "1.34" clap = { version = "3.2.23", features = ["derive"] } console = "0.15.7" -borsh = "0.10" +borsh = "1.2" bincode = "1.3.1" serde = "1.0.193" serde_derive = "1.0.103" diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index 7779bc8f1ac..e82d39afa9f 100644 --- a/single-pool/program/Cargo.toml +++ b/single-pool/program/Cargo.toml @@ -13,7 +13,7 @@ test-sbf = [] [dependencies] arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.2" num-derive = "0.4" num-traits = "0.2" num_enum = "0.7.1" diff --git a/stake-pool/cli/Cargo.toml b/stake-pool/cli/Cargo.toml index ab3eae76934..5f22e2aace2 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 = "0.7.0" [dependencies] -borsh = "0.10" +borsh = "1.2" clap = "2.33.3" serde = "1.0.193" serde_derive = "1.0.130" diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index cfa20fdd312..2981db9746c 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" bytemuck = "1.13" num-derive = "0.4" num-traits = "0.2" diff --git a/stateless-asks/program/Cargo.toml b/stateless-asks/program/Cargo.toml index b8721df308b..dab6e4357b4 100644 --- a/stateless-asks/program/Cargo.toml +++ b/stateless-asks/program/Cargo.toml @@ -11,7 +11,7 @@ no-entrypoint = [] test-sbf = [] [dependencies] -borsh = "0.10" +borsh = "1.2" solana-program = "1.17.6" 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"]} diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index f52cf277c73..49002bc62b8 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" serde = { version = "1.0.193", optional = true } solana-program = "1.17.6" spl-discriminator = { version = "0.1" , path = "../../libraries/discriminator" } diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml index f8a17d7c2bb..d547ca89be5 100644 --- a/token/program-2022-test/Cargo.toml +++ b/token/program-2022-test/Cargo.toml @@ -18,7 +18,7 @@ walkdir = "2" [dev-dependencies] async-trait = "0.1" -borsh = "0.10" +borsh = "1.2" futures-util = "0.3" solana-program = "=1.17.6" solana-program-test = "=1.17.6"