sdk: Limited Borsh 0.9 support (Pubkey and helpers) (#32511)

* sdk: Implement Borsh 0.9 traits on Pubkey * Alphabetize cargo.toml * Add backwards-compatible borsh file * Add borsh0_10.rs for more clarity * Deprecate `borsh` utils, use borsh0_10 everywhere * Mark borsh 0.9 helpers as deprecated * Add macros for deriving helper impls * Add borsh 0.9 tests * Refactor tests into macro (cherry picked from commit 8c14886) # Conflicts: # sdk/src/lib.rs
solana-labs · Aug 2, 2023 · 8763141 · 8763141
1 parent 79c8bac
commit 8763141
Show file tree

Hide file tree

Showing 12 changed files with 359 additions and 256 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/program-runtime/src/compute_budget.rs b/program-runtime/src/compute_budget.rs
@@ -1,7 +1,7 @@
 use {
     crate::prioritization_fee::{PrioritizationFeeDetails, PrioritizationFeeType},
     solana_sdk::{
-        borsh::try_from_slice_unchecked,
+        borsh0_10::try_from_slice_unchecked,
         compute_budget::{self, ComputeBudgetInstruction},
         entrypoint::HEAP_LENGTH as MIN_HEAP_FRAME_BYTES,
         instruction::{CompiledInstruction, InstructionError},

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/runtime/src/cost_model.rs b/runtime/src/cost_model.rs
@@ -12,7 +12,7 @@ use {
         ComputeBudget, DEFAULT_INSTRUCTION_COMPUTE_UNIT_LIMIT, MAX_COMPUTE_UNIT_LIMIT,
     },
     solana_sdk::{
-        borsh::try_from_slice_unchecked,
+        borsh0_10::try_from_slice_unchecked,
         compute_budget::{self, ComputeBudgetInstruction},
         feature_set::{
             add_set_tx_loaded_accounts_data_size_instruction, remove_deprecated_request_unit_ix,

diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -15,6 +15,7 @@ rust-version = "1.68.0" # solana platform-tools rust version
 bincode = { workspace = true }
 blake3 = { workspace = true, features = ["digest", "traits-preview"] }
 borsh = { workspace = true }
+borsh0-9 = { package = "borsh", version = "0.9.3" }
 bs58 = { workspace = true }
 bv = { workspace = true, features = ["serde"] }
 bytemuck = { workspace = true, features = ["derive"] }