feat: Eip155OrSolanaAddressKind

crates/yttrium/src/chain_abstraction/api/prepare.rs

@@ -77,6 +77,14 @@ pub enum Eip155OrSolanaAddress {
     Solana(crate::chain_abstraction::solana::SolanaPubkey),
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum Eip155OrSolanaAddressKind {
+    #[cfg(feature = "eip155")]
+    Eip155,
+    #[cfg(feature = "solana")]
+    Solana,
+}
+
 impl fmt::Display for Eip155OrSolanaAddress {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
@@ -107,6 +115,19 @@ impl Eip155OrSolanaAddress {
             Self::Solana(_) => None,
         }
     }
+
+    pub fn kind(&self) -> Eip155OrSolanaAddressKind {
+        match self {
+            #[cfg(feature = "eip155")]
+            Self::Eip155(_) => Eip155OrSolanaAddressKind::Eip155,
+            #[cfg(feature = "solana")]
+            Self::Solana(_) => Eip155OrSolanaAddressKind::Solana,
+        }
+    }
+
+    pub fn same_kind_as(&self, other: &Self) -> bool {
+        self.kind() == other.kind()
+    }
 }
 
 #[derive(Debug, Clone, thiserror::Error)]

crates/yttrium/src/chain_abstraction/client.rs

@@ -675,6 +675,7 @@ impl Client {
                 }
                 #[cfg(feature = "solana")]
                 (Route::Solana(txn), RouteSig::Solana(sig)) => {
+                    // TODO use Blockchain API
                     let sol_rpc = "https://api.mainnet-beta.solana.com";
                     let solana_rpc_client =
                         solana::SolanaRpcClient::new_with_commitment(
@@ -702,6 +703,7 @@ impl Client {
                                 signature
                             ),
                             Err(e) => {
+                                // TODO handle error without panic
                                 panic!("Error sending transaction: {}", e)
                             }
                         }

crates/yttrium/src/chain_abstraction/solana/tests.rs

@@ -332,7 +332,7 @@ async fn solana_happy_path() {
         "minimum_balance_for_rent_exemption: {}",
         minimum_balance_for_rent_exemption
     );
-    let next_txn_fee = 100_000;
+    let next_txn_fee = 200_000; // TODO use actual estimated gas fee
     let min_balance = minimum_balance_for_rent_exemption + next_txn_fee;
 
     if account_sol_sol_balance < min_balance {
@@ -344,6 +344,7 @@ async fn solana_happy_path() {
         println!("funding from faucet: {}", faucet_solana.pubkey());
 
         let faucet_amount = (min_balance - account_sol_sol_balance) * 2;
+        // TODO use actual estimated gas fee + minimum balance for rent instead of arbitrary 0.001 SOL
         #[allow(clippy::zero_prefixed_literal)]
         if faucet_sol_sol_balance - faucet_amount < 0_001_000_000 {
             // 0.001 SOL = ~$0.15