Skip to content

Commit 43cf84f

Browse files
authored
spl: Bump to newest SPL crates for v2.1 release (#3431)
* spl: Bump to newest SPL crates for v2.1 release #### Problem A lot of builds are currently broken due to the incompatibility between v2.0 and v2.1. All of the SPL crates have been bumped to use the Solana v2.1 crates, but it isn't being used in the monorepo. #### Summary of changes Bump the SPL crates to their newest versions, and correctly parse the new token-2022 instructions and account types. The trickiest changes are the confidential transfer / mint / burn instruction parsing, otherwise the changes are straightforward. * Address feedback * Improve parsing logic per discussion * Parse initialize instructions correctly * Add comments for parsing * Improve account labels * Update lockfile from rebase
1 parent 8bf688f commit 43cf84f

File tree

13 files changed

+990
-173
lines changed

13 files changed

+990
-173
lines changed

Cargo.lock

Lines changed: 158 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -564,14 +564,14 @@ solana-zk-sdk = { path = "zk-sdk", version = "=2.2.0" }
564564
solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.2.0" }
565565
solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.2.0" }
566566
solana_rbpf = "=0.8.5"
567-
spl-associated-token-account = "=4.0.0"
568-
spl-instruction-padding = "0.2"
569-
spl-memo = "=5.0.0"
570-
spl-pod = "=0.3.0"
571-
spl-token = "=6.0.0"
572-
spl-token-2022 = "=4.0.0"
573-
spl-token-group-interface = "=0.3.0"
574-
spl-token-metadata-interface = "=0.4.0"
567+
spl-associated-token-account = "=6.0.0"
568+
spl-instruction-padding = "0.3"
569+
spl-memo = "=6.0.0"
570+
spl-pod = "=0.5.0"
571+
spl-token = "=7.0.0"
572+
spl-token-2022 = "=6.0.0"
573+
spl-token-group-interface = "=0.5.0"
574+
spl-token-metadata-interface = "=0.6.0"
575575
static_assertions = "1.1.0"
576576
stream-cancel = "0.8.2"
577577
strum = "0.24"
@@ -647,9 +647,21 @@ crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d
647647
# There is a similar override in `programs/sbf/Cargo.toml`. Please keep both
648648
# comments and the overrides in sync.
649649
solana-curve25519 = { path = "curves/curve25519" }
650+
solana-account-info = { path = "sdk/account-info" }
651+
solana-borsh = { path = "sdk/borsh" }
652+
solana-cpi = { path = "sdk/cpi" }
653+
solana-decode-error = { path = "sdk/decode-error" }
654+
solana-hash = { path = "sdk/hash" }
655+
solana-instruction = { path = "sdk/instruction" }
656+
solana-msg = { path = "sdk/msg" }
650657
solana-program = { path = "sdk/program" }
658+
solana-program-entrypoint = { path = "sdk/program-entrypoint" }
659+
solana-program-error = { path = "sdk/program-error" }
660+
solana-program-option = { path = "sdk/program-option" }
661+
solana-program-pack = { path = "sdk/program-pack" }
662+
solana-pubkey = { path = "sdk/pubkey" }
663+
solana-sha256-hasher = { path = "sdk/sha256-hasher" }
651664
solana-zk-sdk = { path = "zk-sdk" }
652-
solana-zk-token-sdk = { path = "zk-token-sdk" }
653665

654666
# curve25519-dalek uses the simd backend by default in v4 if possible,
655667
# which has very slow performance on some platforms with opt-level 0,

0 commit comments

Comments
 (0)