Separate send and confirm rpc calls into their own retry blocks

consumer/src/solana.rs

@@ -25,15 +25,18 @@
     },
     state::{Creator, DataV2, EDITION, PREFIX},
 };
-use solana_client::rpc_client::RpcClient as SolanaRpcClient;
+use solana_client::{
+    client_error::{ClientError, ClientErrorKind},
+    rpc_client::RpcClient as SolanaRpcClient,
+};
 use solana_program::{
     instruction::Instruction, program_pack::Pack, pubkey::Pubkey,
     system_instruction::create_account, system_program,
 };
 use solana_sdk::{
     signature::Signature,
     signer::{keypair::Keypair, Signer},
-    transaction::Transaction,
+    transaction::{Transaction, TransactionError},
 };
 use solana_transaction_status::{UiInnerInstructions, UiInstruction, UiTransactionEncoding};
 use spl_account_compression::{
@@ -68,6 +71,9 @@
                     .with_min_delay(Duration::from_millis(30))
                     .with_max_times(10),
             )
+            .notify(|err: &ClientError, dur: Duration| {
+                error!("retrying error {:?} in {:?}", err, dur);
+            })
             .call()
     }};
 }
@@ -247,10 +253,7 @@
         let signatures = transaction
             .signed_message_signatures
             .iter()
-            .map(|s| {
-                Signature::from_str(s)
-                    .map_err(|e| anyhow!(format!("failed to parse signature: {e}")))
-            })
+            .map(|s| Signature::from_str(s).context("failed to parse signature"))
             .collect::<Result<Vec<Signature>>>()?;
 
         let message = bincode::deserialize(
@@ -265,13 +268,40 @@
             message,
         };
 
-        call_with_retry!(self.rpc().send_and_confirm_transaction(&transaction))
-            .map(|s| s.to_string())
-            .map_err(|e| {
-                let msg = format!("failed to submit transaction: {e}");
+        let signature =
+            call_with_retry!(self.rpc().send_transaction(&transaction)).map_err(|e| {
+                let msg = format!("failed to send transaction: {e}");
                 error!(msg);
                 anyhow!(msg)
-            })
+            })?;
+
+        (|| {
+            let status = self
+                .rpc()
+                .get_signature_status(&signature)
+                .map_err(|e| e.kind)?;
+
+            match status {
+                Some(result) => result.map_err(ClientErrorKind::TransactionError),
+                None => Err(TransactionError::BlockhashNotFound.into()),
+            }
+        })
+        .retry(
+            &ExponentialBuilder::default()
+                .with_jitter()
+                .with_min_delay(Duration::from_millis(10))
+                .with_max_times(15),
+        )
+        .when(|e| {
+            e.get_transaction_error() == Some(TransactionError::BlockhashNotFound)
+                || e.get_transaction_error().is_none()
+        })
+        .notify(|err: &ClientErrorKind, dur: Duration| {
+            error!("retrying error {:?} in {:?}", err, dur);
+        })
+        .call()?;
+
+        Ok(signature.to_string())
     }
 }
 
@@ -376,7 +406,7 @@
                 true,
                 None,
                 None,
                 Some(mpl_token_metadata::state::CollectionDetails::V1 { size: 0 }),
             );
         let create_master_edition_ins = mpl_token_metadata::instruction::create_master_edition_v3(
             mpl_token_metadata::ID,