diff --git a/Cargo.lock b/Cargo.lock index d773ad0bf99..75243e614b2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -575,7 +575,7 @@ name = "binary-option" version = "0.1.0" dependencies = [ "arrayref", - "borsh 0.10.3", + "borsh 1.1.1", "solana-program", "spl-token 4.0.0", "thiserror", @@ -731,6 +731,15 @@ dependencies = [ "hashbrown 0.13.2", ] +[[package]] +name = "borsh" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e3f7359eeed8d454c38bbb25eb89d98b888b1060bbfeed2cda71cb013ff2dc2" +dependencies = [ + "cfg_aliases", +] + [[package]] name = "borsh-derive" version = "0.9.3" @@ -983,6 +992,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" @@ -6522,7 +6537,7 @@ name = "spl-associated-token-account" version = "2.2.0" dependencies = [ "assert_matches", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "solana-program", @@ -6563,7 +6578,7 @@ dependencies = [ name = "spl-binary-oracle-pair" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "solana-program", @@ -6591,7 +6606,7 @@ dependencies = [ name = "spl-discriminator" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "bytemuck", "solana-program", "spl-discriminator-derive 0.1.1", @@ -6722,7 +6737,7 @@ dependencies = [ name = "spl-feature-proposal" version = "1.0.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "solana-program", "solana-program-test", "solana-sdk", @@ -6751,7 +6766,7 @@ dependencies = [ "assert_matches", "base64 0.21.5", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "proptest", @@ -6772,7 +6787,7 @@ dependencies = [ name = "spl-governance-addin-api" version = "0.1.3" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "solana-program", "spl-governance-tools", ] @@ -6784,7 +6799,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "proptest", @@ -6807,7 +6822,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "proptest", @@ -6831,7 +6846,7 @@ version = "0.1.3" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "lazy_static", "num-derive 0.4.1", "num-traits", @@ -6850,7 +6865,7 @@ version = "0.1.3" dependencies = [ "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "serde", @@ -6874,7 +6889,7 @@ dependencies = [ name = "spl-managed-token" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "shank", "solana-program", "solana-program-test", @@ -6888,7 +6903,7 @@ dependencies = [ name = "spl-math" version = "0.2.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "libm", "num-derive 0.4.1", "num-traits", @@ -6930,7 +6945,7 @@ dependencies = [ name = "spl-name-service" version = "0.3.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "solana-program", @@ -6944,7 +6959,7 @@ name = "spl-pod" version = "0.1.0" dependencies = [ "base64 0.21.5", - "borsh 0.10.3", + "borsh 1.1.1", "bytemuck", "serde", "serde_json", @@ -7019,7 +7034,7 @@ dependencies = [ name = "spl-record" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "solana-program", @@ -7045,7 +7060,7 @@ dependencies = [ "approx", "arrayref", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "num-derive 0.4.1", "num-traits", "num_enum 0.7.1", @@ -7065,7 +7080,7 @@ name = "spl-single-pool-cli" version = "1.0.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "clap 3.2.25", "console", "serde", @@ -7100,7 +7115,7 @@ dependencies = [ "arrayref", "assert_matches", "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "bytemuck", "num-derive 0.4.1", "num-traits", @@ -7125,7 +7140,7 @@ name = "spl-stake-pool-cli" version = "0.7.0" dependencies = [ "bincode", - "borsh 0.10.3", + "borsh 1.1.1", "bs58", "clap 2.34.0", "serde", @@ -7265,7 +7280,7 @@ name = "spl-token-2022-test" version = "0.0.1" dependencies = [ "async-trait", - "borsh 0.10.3", + "borsh 1.1.1", "futures-util", "solana-program", "solana-program-test", @@ -7440,7 +7455,7 @@ dependencies = [ name = "spl-token-metadata-interface" version = "0.2.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "serde", "serde_json", "solana-program", @@ -7652,7 +7667,7 @@ dependencies = [ name = "spl-type-length-value-derive-test" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "solana-program", "spl-discriminator 0.1.0", "spl-type-length-value 0.3.0", @@ -7662,7 +7677,7 @@ dependencies = [ name = "stateless-asks" version = "0.1.0" dependencies = [ - "borsh 0.10.3", + "borsh 1.1.1", "solana-program", "solana-program-test", "solana-sdk", diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index ef461ccdc84..58059c93455 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.1" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.2" diff --git a/binary-option/program/Cargo.toml b/binary-option/program/Cargo.toml index b649b5e91ec..a3a15da3532 100644 --- a/binary-option/program/Cargo.toml +++ b/binary-option/program/Cargo.toml @@ -13,7 +13,7 @@ solana-program = "1.17.2" thiserror = "1.0" spl-token = {version = "4.0", path = "../../token/program", features = ["no-entrypoint"]} arrayref = "0.3.7" -borsh = "0.10" +borsh = "1.1" uint = "0.9" [lib] diff --git a/binary-oracle-pair/program/Cargo.toml b/binary-oracle-pair/program/Cargo.toml index bb2f93aeebb..976925fcff5 100644 --- a/binary-oracle-pair/program/Cargo.toml +++ b/binary-oracle-pair/program/Cargo.toml @@ -17,7 +17,7 @@ solana-program = "1.17.2" spl-token = { version = "4.0", path = "../../token/program", features = [ "no-entrypoint" ] } thiserror = "1.0" uint = "0.9" -borsh = "0.10" +borsh = "1.1" [dev-dependencies] solana-program-test = "1.17.2" diff --git a/feature-proposal/program/Cargo.toml b/feature-proposal/program/Cargo.toml index eb278e1d982..7b2da607354 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.1" solana-program = "1.17.2" 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 e86dd8d6679..f6cdd8f615e 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.1" spl-governance-tools= { version = "0.1.3", path ="../tools"} solana-program = "1.17.2" diff --git a/governance/addin-mock/program/Cargo.toml b/governance/addin-mock/program/Cargo.toml index 8e464c3bd67..b0916b9d88a 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.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.190" diff --git a/governance/chat/program/Cargo.toml b/governance/chat/program/Cargo.toml index 4824686b38d..fc3919d2663 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.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.190" diff --git a/governance/program/Cargo.toml b/governance/program/Cargo.toml index d1f0ca4990a..859f537a110 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.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.190" diff --git a/governance/test-sdk/Cargo.toml b/governance/test-sdk/Cargo.toml index 5a20bec2d3b..7ff1efe88bb 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.1" 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 a6085dc2336..6a3b57215d9 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.1" num-derive = "0.4" num-traits = "0.2" serde = "1.0.190" diff --git a/libraries/discriminator/Cargo.toml b/libraries/discriminator/Cargo.toml index 6b4f2bf67dc..ac8efde3b2e 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.1", optional = true } bytemuck = { version = "1.14.0", features = ["derive"] } solana-program = "1.17.2" spl-discriminator-derive = { version = "0.1.0", path = "./derive" } diff --git a/libraries/math/Cargo.toml b/libraries/math/Cargo.toml index 495ac124835..c8a18b9eee0 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.1" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.2" diff --git a/libraries/pod/Cargo.toml b/libraries/pod/Cargo.toml index bedc6e5b08c..f5dae9ccc97 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.1", optional = true } bytemuck = { version = "1.14.0" } serde = { version = "1.0.190", optional = true } solana-program = "1.17.2" diff --git a/libraries/type-length-value-derive-test/Cargo.toml b/libraries/type-length-value-derive-test/Cargo.toml index 85c3a29df7b..1c89e6842c1 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.1" 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 78b1cc06029..49002f52ebf 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.1" shank = "^0.2.1" solana-program = "1.17.2" 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 ca79f45033f..aa6839c426b 100644 --- a/name-service/program/Cargo.toml +++ b/name-service/program/Cargo.toml @@ -19,7 +19,7 @@ test-sbf = [] [dependencies] solana-program = "1.17.2" num-traits = "0.2" -borsh = "0.10" +borsh = "1.1" num-derive = "0.4.1" thiserror = "1.0.50" diff --git a/record/program/Cargo.toml b/record/program/Cargo.toml index 0ef907ea30a..23b09b491a6 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.1" num-derive = "0.4" num-traits = "0.2" solana-program = "1.17.2" diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml index 4f7cf74e980..d3999a28700 100644 --- a/single-pool/cli/Cargo.toml +++ b/single-pool/cli/Cargo.toml @@ -11,7 +11,7 @@ edition = "2021" tokio = "1.14" clap = { version = "3.2.23", features = ["derive"] } console = "0.15.7" -borsh = "0.10" +borsh = "1.1" bincode = "1.3.1" serde = "1.0.190" serde_derive = "1.0.103" diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml index cd43d6aace6..79d4e0fa52b 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.1" 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 c061821f724..85662a77272 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.1" clap = "2.33.3" serde = "1.0.190" serde_derive = "1.0.130" diff --git a/stake-pool/program/Cargo.toml b/stake-pool/program/Cargo.toml index f2bdc7e588d..67b5fd610f4 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.1" 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 f7104df519c..f9896ab1ead 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.1" solana-program = "1.17.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"]} diff --git a/token-metadata/interface/Cargo.toml b/token-metadata/interface/Cargo.toml index af36f2f4e61..f1ecefca4a6 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.1" serde = { version = "1.0.190", optional = true } solana-program = "1.17.2" 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 3ecd10c686c..08bb8a0e46e 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.1" futures-util = "0.3" solana-program = "=1.17.2" solana-program-test = "=1.17.2"