Swap spl-pod for solana-zero-copy + solana-nullable (#1069)

* Swap spl-pod for solana-zero-copy + solana-nullable

* simplify MaybeNull conversion

* Move getrandom dep to interface

Author: grod220

Cargo.lock

@@ -35,14 +35,13 @@ solana-transaction-status = "3.0.0"
 solana-zk-sdk = "6.0.1"
 solana-zk-sdk-pod = "0.1.1"
 spl-associated-token-account-interface = { version = "2.0.0" }
-spl-pod = { version = "0.7.3" }
 spl-token-interface = "2.0.0"
 spl-token-2022-interface = { version = "2.0.0", path = "../../interface" }
 spl-token-2022 = { version = "10.0.0", path = "../../program", features = ["no-entrypoint"] }
 spl-token-client = { version = "0.18.0", path = "../rust-legacy" }
 spl-token-confidential-transfer-proof-generation = { version = "0.6.0", path = "../../confidential/proof-generation" }
-spl-token-metadata-interface = { version = "0.8.0" }
-spl-token-group-interface = { version = "0.7.0" }
+spl-token-metadata-interface = "1.0.0"
+spl-token-group-interface = "0.7.2"
 spl-memo-interface = "2.0.0"
 strum = "0.28"
 strum_macros = "0.28"

clients/cli/Cargo.toml

@@ -39,7 +39,6 @@ use {
     },
     solana_zk_sdk_pod::encryption::elgamal::PodElGamalPubkey,
     spl_associated_token_account_interface::address::get_associated_token_address_with_program_id,
-    spl_pod::optional_keys::OptionalNonZeroPubkey,
     spl_token_2022_interface::{
         extension::{
             confidential_transfer::{ConfidentialTransferAccount, ConfidentialTransferMint},
@@ -351,12 +350,9 @@ async fn command_create_token(
     }
 
     if transfer_hook_program_id.is_some() || enable_transfer_hook {
-        let program_id = transfer_hook_program_id
-            .map(OptionalNonZeroPubkey)
-            .unwrap_or_default();
         extensions.push(ExtensionInitializationParams::TransferHook {
             authority: Some(authority),
-            program_id: program_id.into(),
+            program_id: transfer_hook_program_id,
         });
     }
 

clients/cli/src/command.rs

@@ -54,8 +54,8 @@ spl-token-confidential-transfer-proof-extraction = { path = "../../confidential/
 spl-token-confidential-transfer-proof-generation = { path = "../../confidential/proof-generation", version = "0.6.0" }
 spl-token-2022-interface = { version = "2.0.0", path = "../../interface" }
 spl-token-2022 = { version = "10.0.0", path = "../../program", features = ["no-entrypoint"] }
-spl-token-group-interface = { version = "0.7.0" }
-spl-token-metadata-interface = { version = "0.8.0" }
+spl-token-group-interface = "0.7.2"
+spl-token-metadata-interface = "1.0.0"
 spl-transfer-hook-interface = { version = "2.1.0" }
 solana-zk-sdk-pod = "0.1.1"
 solana-zk-elgamal-proof-interface = "0.1.2"
@@ -70,7 +70,6 @@ futures-util = "0.3"
 solana-program-test = { version = "4.0.0-beta.7", features = ["agave-unstable-api"] }
 solana-sdk = "3.0.0"
 solana-sdk-ids = "3.1.0"
-spl-pod = { version = "0.7.3" }
 spl-instruction-padding-interface = "1.0.0"
 spl-tlv-account-resolution = "0.11.0"
 spl-token-client = { path = ".", features = ["dev-context-only-utils"] }

clients/rust-legacy/Cargo.toml

@@ -77,7 +77,10 @@ use {
         transfer_with_fee::TransferWithFeeProofData, withdraw::WithdrawProofData,
     },
     spl_token_group_interface::state::{TokenGroup, TokenGroupMember},
-    spl_token_metadata_interface::state::{Field, TokenMetadata},
+    spl_token_metadata_interface::{
+        solana_nullable::MaybeNull,
+        state::{Field, TokenMetadata},
+    },
     std::{
         fmt, io,
         mem::size_of,
@@ -3963,7 +3966,7 @@ where
                 &self.program_id,
                 &self.pubkey,
                 current_authority,
-                new_authority.try_into()?,
+                MaybeNull::try_from(new_authority).map_err(|_| ProgramError::InvalidArgument)?,
             )],
             signing_keypairs,
         )

clients/rust-legacy/src/token.rs

@@ -1,12 +1,12 @@
 mod program_test;
 use {
+    bytemuck::try_from_bytes,
     program_test::TestContext,
     solana_program_test::{tokio, ProgramTest},
     solana_sdk::{
         instruction::InstructionError, pubkey::Pubkey, signature::Signer, signer::keypair::Keypair,
         transaction::TransactionError, transport::TransportError,
     },
-    spl_pod::bytemuck::pod_from_bytes,
     spl_token_2022_interface::{error::TokenError, extension::BaseStateWithExtensions},
     spl_token_client::token::{ExtensionInitializationParams, TokenError as TokenClientError},
     spl_token_group_interface::{error::TokenGroupError, state::TokenGroup},
@@ -115,7 +115,7 @@ async fn success_initialize() {
     // check that the data is correct
     let mint_info = token_context.token.get_mint_info().await.unwrap();
     let group_bytes = mint_info.get_extension_bytes::<TokenGroup>().unwrap();
-    let fetched_group = pod_from_bytes::<TokenGroup>(group_bytes).unwrap();
+    let fetched_group = try_from_bytes::<TokenGroup>(group_bytes).unwrap();
     assert_eq!(fetched_group, &token_group);
 
     // fail double-init