implement full solana chain signer in rust (transfer and stake) (#1135)

Author: 0xh3rman

Cargo.lock

@@ -23,7 +23,6 @@ chain_integration_tests = [
 integration = []
 
 [dependencies]
-curve25519-dalek = { workspace = true }
 sha2 = { workspace = true }
 bs58 = { workspace = true }
 borsh = { workspace = true }
@@ -40,7 +39,7 @@ gem_client = { path = "../gem_client", optional = true }
 chain_traits = { path = "../chain_traits", optional = true }
 futures = { workspace = true, optional = true }
 settings = { path = "../settings", features = ["testkit"], optional = true }
-solana-primitives = "0.2.3"
+solana-primitives = "0.2.5"
 num-traits = { workspace = true, optional = true }
 
 [dev-dependencies]

crates/gem_solana/Cargo.toml

@@ -1,9 +1,7 @@
-use primitives::Address as AddressTrait;
-
-use crate::pubkey::Pubkey;
+use solana_primitives::Pubkey;
 
 pub fn validate_address(address: &str) -> bool {
-    Pubkey::is_valid(address)
+    Pubkey::from_base58(address).is_ok()
 }
 
 #[cfg(test)]
@@ -13,11 +11,11 @@ mod tests {
     #[test]
     fn test_solana_address() {
         let address = "GvhwZwtV32kYUXUw965CUM3KGPdtBsDwPVpi92brY5R2";
-        let parsed = Pubkey::try_parse(address).unwrap();
+        let parsed = Pubkey::from_base58(address).unwrap();
 
         assert!(validate_address(address));
         assert_eq!(parsed.as_bytes().len(), 32);
-        assert_eq!(parsed.encode(), address);
+        assert_eq!(parsed.to_base58(), address);
         assert!(!validate_address("invalid"));
     }
 }

crates/gem_solana/src/address.rs

@@ -3,7 +3,6 @@ pub mod constants;
 pub mod hash;
 pub mod jsonrpc;
 pub mod metaplex;
-pub mod pubkey;
 pub mod token_account;
 
 #[cfg(any(feature = "rpc", feature = "reqwest"))]
@@ -20,6 +19,7 @@ pub mod signer;
 
 pub use address::validate_address;
 pub use jsonrpc::SolanaRpc;
+pub use solana_primitives::{Pubkey, find_program_address};
 pub use transaction::{decode_transaction, try_decode_transaction};
 
 #[cfg(all(feature = "reqwest", not(feature = "rpc")))]
@@ -58,9 +58,6 @@ pub const SYSTEM_PROGRAMS: &[&str] = &[
 pub const COMMITMENT_CONFIRMED: &str = "confirmed";
 
 use primitives::{AssetId, SolanaTokenProgramId};
-use pubkey::Pubkey;
-use std::str::FromStr;
-
 pub fn get_token_program_by_id(id: SolanaTokenProgramId) -> &'static str {
     match id {
         SolanaTokenProgramId::Token => TOKEN_PROGRAM,
@@ -80,8 +77,8 @@ pub fn get_token_program_id_by_address(address: &str) -> Result<SolanaTokenProgr
 
 pub fn get_pubkey_by_asset(asset_id: &AssetId) -> Option<Pubkey> {
     match &asset_id.token_id {
-        Some(token_id) => <Pubkey as FromStr>::from_str(token_id).ok(),
-        None => <Pubkey as FromStr>::from_str(WSOL_TOKEN_ADDRESS).ok(),
+        Some(token_id) => Pubkey::from_base58(token_id).ok(),
+        None => Pubkey::from_base58(WSOL_TOKEN_ADDRESS).ok(),
     }
 }
 

crates/gem_solana/src/lib.rs

@@ -1,5 +1,5 @@
-use crate::pubkey::Pubkey;
 use borsh::{BorshDeserialize, BorshSerialize};
+use solana_primitives::Pubkey;
 
 #[derive(BorshSerialize, BorshDeserialize, PartialEq, Eq, Debug, Clone)]
 pub struct Collection {

crates/gem_solana/src/metaplex/collection.rs

@@ -1,5 +1,5 @@
-use crate::pubkey::Pubkey;
 use borsh::{BorshDeserialize, BorshSerialize};
+use solana_primitives::Pubkey;
 
 #[derive(BorshSerialize, BorshDeserialize, Default, PartialEq, Eq, Debug, Clone)]
 pub struct Data {

crates/gem_solana/src/metaplex/data.rs

@@ -6,7 +6,7 @@ use crate::metaplex::{
     data::Data,
     uses::Uses,
 };
-use crate::{METAPLEX_PROGRAM, pubkey::Pubkey};
+use crate::{METAPLEX_PROGRAM, Pubkey, find_program_address};
 use borsh::{BorshDeserialize, BorshSerialize};
 
 #[derive(Clone, BorshDeserialize, BorshSerialize, Debug, PartialEq, Eq)]
@@ -45,7 +45,7 @@ pub enum ProgrammableConfig {
 impl Metadata {
     pub fn find_pda(mint: Pubkey) -> Option<(Pubkey, u8)> {
         let mpl_id = Pubkey::from_str(METAPLEX_PROGRAM).unwrap();
-        let seeds = &["metadata".as_bytes(), mpl_id.as_ref(), mint.as_ref()];
-        Pubkey::try_find_program_address(seeds, &mpl_id)
+        let seeds = &["metadata".as_bytes(), mpl_id.as_bytes().as_ref(), mint.as_bytes().as_ref()];
+        find_program_address(&mpl_id, seeds).ok()
     }
 }

crates/gem_solana/src/metaplex/metadata.rs

@@ -46,9 +46,8 @@ pub fn decode_metadata(base64_str: &str) -> Result<Metadata, Box<dyn std::error:
 #[cfg(test)]
 mod tests {
     use crate::{
-        USDC_TOKEN_MINT,
+        Pubkey, USDC_TOKEN_MINT,
         metaplex::{Key, decode_metadata, metadata::Metadata},
-        pubkey::Pubkey,
     };
     use std::str::FromStr;