blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to token-2022 0.6.0 (#30353) 

* upgrade spl-token-2022 to 0.6.0

* Add spl_token_2022-0.6.0.so to program-test

* cargo lock

* update account decoder tests to use Pubkey::new_from_array instead of Pubkey::new

* update rpc tests to use Pubkey::new_from_array instead of Pubkey::new

* update token-2022 .so file

* cargo lock

* increase the threshold for allowable rebuilds in ci

* update spl ATA to v1.1.3

* decrement back the threshold for allowable rebuilds

* cargo lock

* increment ci rebuild threshold
This commit is contained in:
samkim-crypto 2023-03-10 10:32:19 +09:00 committed by GitHub
parent 71b6370426
commit 4a94eeee5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 145 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Cargo.lock generated
View File

@ -693,18 +693,18 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
[[package]]
name = "bytemuck"
version = "1.11.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835"
checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.1.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e"
checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
dependencies = [
"proc-macro2 1.0.50",
"quote 1.0.23",
@ -3050,18 +3050,18 @@ dependencies = [
[[package]]
name = "num_enum"
version = "0.5.7"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.5.7"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e"
dependencies = [
"proc-macro-crate 1.1.0",
"proc-macro2 1.0.50",
@ -5457,9 +5457,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "341bba362c91aedad2ad9fc0c28c2e39aaa606e6b9c049e8fbcc9f60675163ff"
checksum = "a76deb99bebc5d74eb06936dcf1d7703786a20fdc1fba456b619607518776894"
dependencies = [
"ahash",
"blake3",
@ -5484,7 +5484,7 @@ dependencies = [
"serde_derive",
"serde_json",
"sha2 0.10.6",
"solana-frozen-abi-macro 1.14.8",
"solana-frozen-abi-macro 1.15.1",
"subtle",
"thiserror",
]
@ -5524,9 +5524,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fae474ab37e2ccc4dfd33edd36a05d7df02b8531fa9870cb244f9491b64fe3"
checksum = "effc8267b2f3aa52562a2b897dffdbfb54ffa8526ad91ab049a8dba3912b40ab"
dependencies = [
"proc-macro2 1.0.50",
"quote 1.0.23",
@ -5859,9 +5859,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ec82f7dedfee58ff2ac102b20a033a195950e7355fb29f1713f46cee629ffda"
checksum = "032ef87bc9957c7a1dcb21968436541b3aa5182ec665ec9118973aa232d46606"
dependencies = [
"env_logger",
"lazy_static",
@ -6035,10 +6035,14 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f480a0a440ea15d8436de1c9ac01501cb15979dae4a0a5fc8e33198949b38681"
checksum = "46ff25d98df385a10351036828588155cbdf74c2a60d630bc08951770b267931"
dependencies = [
"ark-bn254",
"ark-ec",
"ark-ff",
"array-bytes",
"base64 0.13.0",
"bincode",
"bitflags",
@ -6059,7 +6063,8 @@ dependencies = [
"libc",
"libsecp256k1",
"log",
"memoffset 0.6.4",
"memoffset 0.8.0",
"num-bigint 0.4.3",
"num-derive",
"num-traits",
"parking_lot 0.12.1",
@ -6073,9 +6078,9 @@ dependencies = [
"serde_json",
"sha2 0.10.6",
"sha3 0.10.4",
"solana-frozen-abi 1.14.8",
"solana-frozen-abi-macro 1.14.8",
"solana-sdk-macro 1.14.8",
"solana-frozen-abi 1.15.1",
"solana-frozen-abi-macro 1.15.1",
"solana-sdk-macro 1.15.1",
"thiserror",
"tiny-bip39",
"wasm-bindgen",
@ -6492,9 +6497,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65641c3c87a81fbbf7663360a2d8d5e145280021c444220257f9975ff6cddc80"
checksum = "392b1985e7724389575080e68dc5f9688c2bdb0027e2ff3154230c3fcaff427f"
dependencies = [
"assert_matches",
"base64 0.13.0",
@ -6519,6 +6524,7 @@ dependencies = [
"memmap2",
"num-derive",
"num-traits",
"num_enum",
"pbkdf2 0.11.0",
"qstring",
"rand 0.7.3",
@ -6529,13 +6535,14 @@ dependencies = [
"serde_bytes",
"serde_derive",
"serde_json",
"serde_with",
"sha2 0.10.6",
"sha3 0.10.4",
"solana-frozen-abi 1.14.8",
"solana-frozen-abi-macro 1.14.8",
"solana-logger 1.14.8",
"solana-program 1.14.8",
"solana-sdk-macro 1.14.8",
"solana-frozen-abi 1.15.1",
"solana-frozen-abi-macro 1.15.1",
"solana-logger 1.15.1",
"solana-program 1.15.1",
"solana-sdk-macro 1.15.1",
"thiserror",
"uriparse",
"wasm-bindgen",
@ -6599,9 +6606,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "768f16d1a7315fc66ba835eebf9e95a83365ac94222551bc5cdcc6a74cb4a137"
checksum = "6e24125b25a0548bd2fa945e2b3ac05aa782e0396434f105e3a4bb14bee17de8"
dependencies = [
"bs58",
"proc-macro2 1.0.50",
@ -7077,9 +7084,9 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.14.8"
version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac5982ab9d8771b3d9bbef11ece78348c496a9f70a90a96225aee0a70bd13b9d"
checksum = "cfc24bbce1ed998179466f786f0aca6a3232d9bf818821e317f2cc680a8fcd75"
dependencies = [
"aes-gcm-siv",
"arrayref",
@ -7099,8 +7106,8 @@ dependencies = [
"serde",
"serde_json",
"sha3 0.9.1",
"solana-program 1.14.8",
"solana-sdk 1.14.8",
"solana-program 1.15.1",
"solana-sdk 1.15.1",
"subtle",
"thiserror",
"zeroize",
@ -7179,15 +7186,15 @@ dependencies = [
[[package]]
name = "spl-associated-token-account"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6"
checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4"
dependencies = [
"assert_matches",
"borsh",
"num-derive",
"num-traits",
"solana-program 1.14.8",
"solana-program 1.15.1",
"spl-token",
"spl-token-2022",
"thiserror",
@ -7200,7 +7207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c5557ec281a34f7f9053feb6e0d795162ba0c6a52898b21c3d1e899481191d5"
dependencies = [
"num_enum",
"solana-program 1.14.8",
"solana-program 1.15.1",
]
[[package]]
@ -7209,7 +7216,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.14.8",
"solana-program 1.15.1",
]
[[package]]
@ -7223,23 +7230,23 @@ dependencies = [
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.14.8",
"solana-program 1.15.1",
"thiserror",
]
[[package]]
name = "spl-token-2022"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8"
checksum = "67fcd758e8d22c5fce17315015f5ff319604d1a6e57a73c72795639dba898890"
dependencies = [
"arrayref",
"bytemuck",
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.14.8",
"solana-zk-token-sdk 1.14.8",
"solana-program 1.15.1",
"solana-zk-token-sdk 1.15.1",
"spl-memo",
"spl-token",
"thiserror",

4
Cargo.toml
View File

@ -356,11 +356,11 @@ solana-version = { path = "version", version = "=1.16.0" }
solana-vote-program = { path = "programs/vote", version = "=1.16.0" }
solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=1.16.0" }
solana-zk-token-sdk = { path = "zk-token-sdk", version = "=1.16.0" }
spl-associated-token-account = "=1.1.2"
spl-associated-token-account = "=1.1.3"
spl-instruction-padding = "0.1"
spl-memo = "=3.0.1"
spl-token = "=3.5.0"
spl-token-2022 = "=0.5.0"
spl-token-2022 = "=0.6.0"
static_assertions = "1.1.0"
stream-cancel = "0.8.1"
strum = "0.24"

18
account-decoder/src/parse_token.rs
View File

@ -303,8 +303,8 @@ mod test {
#[test]
fn test_parse_token() {
let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
let owner_pubkey = SplTokenPubkey::new(&[3; 32]);
let mint_pubkey = SplTokenPubkey::new_from_array([2; 32]);
let owner_pubkey = SplTokenPubkey::new_from_array([3; 32]);
let mut account_data = vec![0; Account::get_packed_len()];
let mut account = Account::unpack_unchecked(&account_data).unwrap();
account.mint = mint_pubkey;
@ -358,9 +358,9 @@ mod test {
}),
);
let signer1 = SplTokenPubkey::new(&[1; 32]);
let signer2 = SplTokenPubkey::new(&[2; 32]);
let signer3 = SplTokenPubkey::new(&[3; 32]);
let signer1 = SplTokenPubkey::new_from_array([1; 32]);
let signer2 = SplTokenPubkey::new_from_array([2; 32]);
let signer3 = SplTokenPubkey::new_from_array([3; 32]);
let mut multisig_data = vec![0; Multisig::get_packed_len()];
let mut signers = [SplTokenPubkey::default(); 11];
signers[0] = signer1;
@ -393,7 +393,7 @@ mod test {
#[test]
fn test_get_token_account_mint() {
let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
let mint_pubkey = SplTokenPubkey::new_from_array([2; 32]);
let mut account_data = vec![0; Account::get_packed_len()];
let mut account = Account::unpack_unchecked(&account_data).unwrap();
account.mint = mint_pubkey;
@ -495,8 +495,8 @@ mod test {
#[test]
fn test_parse_token_account_with_extensions() {
let mint_pubkey = SplTokenPubkey::new(&[2; 32]);
let owner_pubkey = SplTokenPubkey::new(&[3; 32]);
let mint_pubkey = SplTokenPubkey::new_from_array([2; 32]);
let owner_pubkey = SplTokenPubkey::new_from_array([3; 32]);
let account_base = Account {
mint: mint_pubkey,
@ -586,7 +586,7 @@ mod test {
#[test]
fn test_parse_token_mint_with_extensions() {
let owner_pubkey = SplTokenPubkey::new(&[3; 32]);
let owner_pubkey = SplTokenPubkey::new_from_array([3; 32]);
let mint_size =
ExtensionType::get_account_len::<Mint>(&[ExtensionType::MintCloseAuthority]);
let mint_base = Mint {

29
account-decoder/src/parse_token_extension.rs
View File

@ -4,6 +4,7 @@ use {
spl_token_2022::{
extension::{self, BaseState, BaseStateWithExtensions, ExtensionType, StateWithExtensions},
solana_program::pubkey::Pubkey,
solana_zk_token_sdk::zk_token_elgamal::pod::ElGamalPubkey,
},
};
@ -24,6 +25,7 @@ pub enum UiExtension {
CpiGuard(UiCpiGuard),
PermanentDelegate(UiPermanentDelegate),
UnparseableExtension,
NonTransferableAccount,
}
pub fn parse_extension<S: BaseState>(
@ -74,6 +76,7 @@ pub fn parse_extension<S: BaseState>(
.get_extension::<extension::permanent_delegate::PermanentDelegate>()
.map(|&extension| UiExtension::PermanentDelegate(extension.into()))
.unwrap_or(UiExtension::UnparseableExtension),
ExtensionType::NonTransferableAccount => UiExtension::NonTransferableAccount,
}
}
@ -246,10 +249,10 @@ impl From<extension::permanent_delegate::PermanentDelegate> for UiPermanentDeleg
#[derive(Debug, Serialize, Deserialize, PartialEq, Eq)]
#[serde(rename_all = "camelCase")]
pub struct UiConfidentialTransferMint {
pub authority: String,
pub authority: Option<String>,
pub auto_approve_new_accounts: bool,
pub auditor_encryption_pubkey: String,
pub withdraw_withheld_authority_encryption_pubkey: String,
pub auditor_encryption_pubkey: Option<String>,
pub withdraw_withheld_authority_encryption_pubkey: Option<String>,
pub withheld_amount: String,
}
@ -259,17 +262,19 @@ impl From<extension::confidential_transfer::ConfidentialTransferMint>
fn from(
confidential_transfer_mint: extension::confidential_transfer::ConfidentialTransferMint,
) -> Self {
let authority: Option<Pubkey> = confidential_transfer_mint.authority.into();
let auditor_encryption_pubkey: Option<ElGamalPubkey> =
confidential_transfer_mint.auditor_encryption_pubkey.into();
let withdraw_withheld_authority_encryption_pubkey: Option<ElGamalPubkey> =
confidential_transfer_mint
.withdraw_withheld_authority_encryption_pubkey
.into();
Self {
authority: confidential_transfer_mint.authority.to_string(),
authority: authority.map(|pubkey| pubkey.to_string()),
auto_approve_new_accounts: confidential_transfer_mint.auto_approve_new_accounts.into(),
auditor_encryption_pubkey: format!(
"{}",
confidential_transfer_mint.auditor_encryption_pubkey
),
withdraw_withheld_authority_encryption_pubkey: format!(
"{}",
confidential_transfer_mint.withdraw_withheld_authority_encryption_pubkey
),
auditor_encryption_pubkey: auditor_encryption_pubkey.map(|pubkey| pubkey.to_string()),
withdraw_withheld_authority_encryption_pubkey:
withdraw_withheld_authority_encryption_pubkey.map(|pubkey| pubkey.to_string()),
withheld_amount: format!("{}", confidential_transfer_mint.withheld_amount),
}
}

2
ci/test-stable.sh
View File

@ -119,7 +119,7 @@ test-stable-sbf)
# latest mainbeta release version.
solana_program_count=$(grep -c 'solana-program v' cargo.log)
rm -f cargo.log
if ((solana_program_count > 12)); then
if ((solana_program_count > 13)); then
echo "Regression of build redundancy ${solana_program_count}."
echo "Review dependency features that trigger redundant rebuilds of solana-program."
exit 1

2
fetch-spl.sh
View File

@ -45,7 +45,7 @@ fetch_program() {
}
fetch_program token 3.5.0 TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA BPFLoader2111111111111111111111111111111111
fetch_program token-2022 0.5.0 TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb BPFLoaderUpgradeab1e11111111111111111111111
fetch_program token-2022 0.6.0 TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb BPFLoaderUpgradeab1e11111111111111111111111
fetch_program memo 1.0.0 Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo BPFLoader1111111111111111111111111111111111
fetch_program memo 3.0.0 MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr BPFLoader2111111111111111111111111111111111
fetch_program associated-token-account 1.1.2 ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL BPFLoader2111111111111111111111111111111111

2
program-test/src/programs.rs
View File

@ -30,7 +30,7 @@ static SPL_PROGRAMS: &[(Pubkey, Pubkey, &[u8])] = &[
(
spl_token_2022::ID,
solana_sdk::bpf_loader_upgradeable::ID,
include_bytes!("programs/spl_token_2022-0.5.0.so"),
include_bytes!("programs/spl_token_2022-0.6.0.so"),
),
(
spl_memo_1_0::ID,

BIN
program-test/src/programs/spl_token_2022-0.5.0.so
View File

Binary file not shown.

BIN
program-test/src/programs/spl_token_2022-0.6.0.so Normal file
View File

Binary file not shown.

93
programs/sbf/Cargo.lock generated
View File

@ -646,18 +646,18 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
[[package]]
name = "bytemuck"
version = "1.11.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835"
checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.1.0"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e"
checksum = "1aca418a974d83d40a0c1f0c5cba6ff4bc28d8df099109ca459a2118d40b6322"
dependencies = [
"proc-macro2 1.0.50",
"quote 1.0.23",
@ -2808,18 +2808,18 @@ dependencies = [
[[package]]
name = "num_enum"
version = "0.5.7"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9"
checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b"
dependencies = [
"num_enum_derive",
]
[[package]]
name = "num_enum_derive"
version = "0.5.7"
version = "0.5.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce"
checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e"
dependencies = [
"proc-macro-crate 1.1.3",
"proc-macro2 1.0.50",
@ -4682,9 +4682,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "341bba362c91aedad2ad9fc0c28c2e39aaa606e6b9c049e8fbcc9f60675163ff"
checksum = "48f7051cccdf891ac2603cdd295eb651529fe2b678b6b3af60b82dec9a9b3b06"
dependencies = [
"ahash",
"blake3",
@ -4709,7 +4709,7 @@ dependencies = [
"serde_derive",
"serde_json",
"sha2 0.10.6",
"solana-frozen-abi-macro 1.14.8",
"solana-frozen-abi-macro 1.15.2",
"subtle",
"thiserror",
]
@ -4748,9 +4748,9 @@ dependencies = [
[[package]]
name = "solana-frozen-abi-macro"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fae474ab37e2ccc4dfd33edd36a05d7df02b8531fa9870cb244f9491b64fe3"
checksum = "06395428329810ade1d2518a7e75d8a6f02d01fe548aabb60ff1ba6a2eaebbe5"
dependencies = [
"proc-macro2 1.0.50",
"quote 1.0.23",
@ -4913,9 +4913,9 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ec82f7dedfee58ff2ac102b20a033a195950e7355fb29f1713f46cee629ffda"
checksum = "170714ca3612e4df75f57c2c14c8ab74654b3b66f668986aeed456cedcf24446"
dependencies = [
"env_logger",
"lazy_static",
@ -5024,10 +5024,14 @@ dependencies = [
[[package]]
name = "solana-program"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f480a0a440ea15d8436de1c9ac01501cb15979dae4a0a5fc8e33198949b38681"
checksum = "1ae9f0fa7db3a4e90fa0df2723ac8cbc042e579cf109cd0380bc5a8c88bed924"
dependencies = [
"ark-bn254",
"ark-ec",
"ark-ff",
"array-bytes",
"base64 0.13.0",
"bincode",
"bitflags",
@ -5048,7 +5052,8 @@ dependencies = [
"libc",
"libsecp256k1 0.6.0",
"log",
"memoffset 0.6.4",
"memoffset 0.8.0",
"num-bigint 0.4.3",
"num-derive",
"num-traits",
"parking_lot 0.12.1",
@ -5062,9 +5067,9 @@ dependencies = [
"serde_json",
"sha2 0.10.6",
"sha3 0.10.4",
"solana-frozen-abi 1.14.8",
"solana-frozen-abi-macro 1.14.8",
"solana-sdk-macro 1.14.8",
"solana-frozen-abi 1.15.2",
"solana-frozen-abi-macro 1.15.2",
"solana-sdk-macro 1.15.2",
"thiserror",
"tiny-bip39",
"wasm-bindgen",
@ -5806,9 +5811,9 @@ dependencies = [
[[package]]
name = "solana-sdk"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65641c3c87a81fbbf7663360a2d8d5e145280021c444220257f9975ff6cddc80"
checksum = "bbefda9f9bda78fd9d91ae21c38d9693e94d5979838fb69b70c6addb8dab953f"
dependencies = [
"assert_matches",
"base64 0.13.0",
@ -5833,6 +5838,7 @@ dependencies = [
"memmap2",
"num-derive",
"num-traits",
"num_enum",
"pbkdf2 0.11.0",
"qstring",
"rand 0.7.3",
@ -5843,13 +5849,14 @@ dependencies = [
"serde_bytes",
"serde_derive",
"serde_json",
"serde_with",
"sha2 0.10.6",
"sha3 0.10.4",
"solana-frozen-abi 1.14.8",
"solana-frozen-abi-macro 1.14.8",
"solana-logger 1.14.8",
"solana-program 1.14.8",
"solana-sdk-macro 1.14.8",
"solana-frozen-abi 1.15.2",
"solana-frozen-abi-macro 1.15.2",
"solana-logger 1.15.2",
"solana-program 1.15.2",
"solana-sdk-macro 1.15.2",
"thiserror",
"uriparse",
"wasm-bindgen",
@ -5908,9 +5915,9 @@ dependencies = [
[[package]]
name = "solana-sdk-macro"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "768f16d1a7315fc66ba835eebf9e95a83365ac94222551bc5cdcc6a74cb4a137"
checksum = "f809319358d5da7c3a0ac08ebf4d87b21170d928dbb7260254e8f3061f7f9e0e"
dependencies = [
"bs58",
"proc-macro2 1.0.50",
@ -6258,9 +6265,9 @@ dependencies = [
[[package]]
name = "solana-zk-token-sdk"
version = "1.14.8"
version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac5982ab9d8771b3d9bbef11ece78348c496a9f70a90a96225aee0a70bd13b9d"
checksum = "9a290aa32014e007b03f952d5b784433d95636c65a3fb08d19dc5658a450941c"
dependencies = [
"aes-gcm-siv",
"arrayref",
@ -6280,8 +6287,8 @@ dependencies = [
"serde",
"serde_json",
"sha3 0.9.1",
"solana-program 1.14.8",
"solana-sdk 1.14.8",
"solana-program 1.15.2",
"solana-sdk 1.15.2",
"subtle",
"thiserror",
"zeroize",
@ -6359,15 +6366,15 @@ dependencies = [
[[package]]
name = "spl-associated-token-account"
version = "1.1.2"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc000f0fdf1f12f99d77d398137c1751345b18c88258ce0f99b7872cf6c9bd6"
checksum = "978dba3bcbe88d0c2c58366c254d9ea41c5f73357e72fc0bdee4d6b5fc99c8f4"
dependencies = [
"assert_matches",
"borsh",
"num-derive",
"num-traits",
"solana-program 1.14.8",
"solana-program 1.15.2",
"spl-token",
"spl-token-2022",
"thiserror",
@ -6379,7 +6386,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0dc6f70db6bacea7ff25870b016a65ba1d1b6013536f08e4fd79a8f9005325"
dependencies = [
"solana-program 1.14.8",
"solana-program 1.15.2",
]
[[package]]
@ -6393,23 +6400,23 @@ dependencies = [
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.14.8",
"solana-program 1.15.2",
"thiserror",
]
[[package]]
name = "spl-token-2022"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0edb869dbe159b018f17fb9bfa67118c30f232d7f54a73742bc96794dff77ed8"
checksum = "67fcd758e8d22c5fce17315015f5ff319604d1a6e57a73c72795639dba898890"
dependencies = [
"arrayref",
"bytemuck",
"num-derive",
"num-traits",
"num_enum",
"solana-program 1.14.8",
"solana-zk-token-sdk 1.14.8",
"solana-program 1.15.2",
"solana-zk-token-sdk 1.15.2",
"spl-memo",
"spl-token",
"thiserror",

14
rpc/src/rpc.rs
View File

@ -7386,12 +7386,12 @@ pub mod tests {
let rpc = RpcHandler::start();
let bank = rpc.working_bank();
let RpcHandler { io, meta, .. } = rpc;
let mint = SplTokenPubkey::new(&[2; 32]);
let owner = SplTokenPubkey::new(&[3; 32]);
let delegate = SplTokenPubkey::new(&[4; 32]);
let mint = SplTokenPubkey::new_from_array([2; 32]);
let owner = SplTokenPubkey::new_from_array([3; 32]);
let delegate = SplTokenPubkey::new_from_array([4; 32]);
let token_account_pubkey = solana_sdk::pubkey::new_rand();
let token_with_different_mint_pubkey = solana_sdk::pubkey::new_rand();
let new_mint = SplTokenPubkey::new(&[5; 32]);
let new_mint = SplTokenPubkey::new_from_array([5; 32]);
if program_id == inline_spl_token_2022::id() {
// Add the token account
let account_base = TokenAccount {
@ -7879,9 +7879,9 @@ pub mod tests {
let bank = rpc.working_bank();
let RpcHandler { io, meta, .. } = rpc;
let mint = SplTokenPubkey::new(&[2; 32]);
let owner = SplTokenPubkey::new(&[3; 32]);
let delegate = SplTokenPubkey::new(&[4; 32]);
let mint = SplTokenPubkey::new_from_array([2; 32]);
let owner = SplTokenPubkey::new_from_array([3; 32]);
let delegate = SplTokenPubkey::new_from_array([4; 32]);
let token_account_pubkey = solana_sdk::pubkey::new_rand();
let (program_name, account_size, mint_size) = if program_id
== inline_spl_token_2022::id()

7
transaction-status/src/parse_token.rs
View File

@ -230,7 +230,8 @@ pub fn parse_token(
| AuthorityType::WithheldWithdraw
| AuthorityType::CloseMint
| AuthorityType::InterestRate
| AuthorityType::PermanentDelegate => "mint",
| AuthorityType::PermanentDelegate
| AuthorityType::ConfidentialTransferMint => "mint",
AuthorityType::AccountOwner | AuthorityType::CloseAccount => "account",
};
let mut value = json!({
@ -606,6 +607,7 @@ pub enum UiAuthorityType {
CloseMint,
InterestRate,
PermanentDelegate,
ConfidentialTransferMint,
}
impl From<AuthorityType> for UiAuthorityType {
@ -620,6 +622,7 @@ impl From<AuthorityType> for UiAuthorityType {
AuthorityType::CloseMint => UiAuthorityType::CloseMint,
AuthorityType::InterestRate => UiAuthorityType::InterestRate,
AuthorityType::PermanentDelegate => UiAuthorityType::PermanentDelegate,
AuthorityType::ConfidentialTransferMint => UiAuthorityType::ConfidentialTransferMint,
}
}
}
@ -640,6 +643,7 @@ pub enum UiExtensionType {
InterestBearingConfig,
CpiGuard,
PermanentDelegate,
NonTransferableAccount,
}
impl From<ExtensionType> for UiExtensionType {
@ -660,6 +664,7 @@ impl From<ExtensionType> for UiExtensionType {
ExtensionType::InterestBearingConfig => UiExtensionType::InterestBearingConfig,
ExtensionType::CpiGuard => UiExtensionType::CpiGuard,
ExtensionType::PermanentDelegate => UiExtensionType::PermanentDelegate,
ExtensionType::NonTransferableAccount => UiExtensionType::NonTransferableAccount,
}
}
}

1
transaction-status/src/parse_token/extension/confidential_transfer.rs
View File

@ -65,7 +65,6 @@ pub(in crate::parse_token) fn parse_confidential_transfer_instruction(
let mut value = json!({
"account": account_keys[account_indexes[0] as usize].to_string(),
"mint": account_keys[account_indexes[1] as usize].to_string(),
"encryptionPubkey": format!("{}", configure_account_data.encryption_pubkey),
"decryptableZeroBalance": format!("{}", configure_account_data.decryptable_zero_balance),
"maximumPendingBalanceCreditCounter": maximum_pending_balance_credit_counter,