Resign -> re-sign

Author: ChewingGlass

solana-transaction-utils/src/queue.rs

@@ -301,7 +301,7 @@ pub async fn create_transaction_queue<T: Send + Clone + 'static + Sync>(
                                 instructions,
                                 tasks,
                                 fee,
-                                resign_count: 0,
+                                re_sign_count: 0,
                             }).await.expect("send to tx sender");
                         }
                     }

solana-transaction-utils/src/sender.rs

@@ -42,7 +42,7 @@ pub struct PackedTransactionWithTasks<T: Send + Clone> {
     pub instructions: Vec<Instruction>,
     pub tasks: Vec<TransactionTask<T>>,
     pub fee: u64,
-    pub resign_count: u32,
+    pub re_sign_count: u32,
 }
 
 #[derive(Debug, Clone)]
@@ -67,7 +67,7 @@ pub struct TransactionSender<T: Send + Clone + Sync> {
     tpu_client: Option<QuicTpuClient>,
     result_tx: Sender<CompletedTransactionTask<T>>,
     payer: Arc<Keypair>,
-    max_resign_count: u32,
+    max_re_sign_count: u32,
 }
 
 pub async fn spawn_background_tasks(
@@ -107,7 +107,7 @@ impl<T: Send + Clone + Sync> TransactionSender<T> {
         ws_url: String,
         payer: Arc<Keypair>,
         result_tx: Sender<CompletedTransactionTask<T>>,
-        max_resign_count: u32,
+        max_re_sign_count: u32,
     ) -> Result<Self, Error> {
         // Initialize blockhash data
         let (blockhash, last_valid_block_height) = rpc_client
@@ -141,7 +141,7 @@ impl<T: Send + Clone + Sync> TransactionSender<T> {
             tpu_client,
             result_tx,
             payer,
-            max_resign_count,
+            max_re_sign_count,
         })
     }
 
@@ -150,7 +150,7 @@ impl<T: Send + Clone + Sync> TransactionSender<T> {
         packed: &PackedTransactionWithTasks<T>,
     ) -> Result<(), Error> {
         // Check if transaction has been resigned too many times
-        if packed.resign_count >= self.max_resign_count {
+        if packed.re_sign_count >= self.max_re_sign_count {
             return Err(Error::StaleTransaction);
         }
 
@@ -265,7 +265,7 @@ impl<T: Send + Clone + Sync> TransactionSender<T> {
 
                 // Create new packed transaction with incremented resign count
                 let mut new_packed = data.packed_tx.clone();
-                new_packed.resign_count += 1;
+                new_packed.re_sign_count += 1;
 
                 if let Err(e) = self.process_packed_tx(&new_packed).await {
                     // Handle processing error by notifying all tasks

tuktuk-crank-turner/src/main.rs

@@ -170,7 +170,7 @@ impl Cli {
             solana_ws_url.clone(),
             payer.clone(),
             handles.result_sender.clone(),
-            settings.sender_max_resign_count,
+            settings.sender_max_re_sign_count,
         )
         .await
         .expect("create sender");

tuktuk-crank-turner/src/settings.rs

@@ -25,11 +25,11 @@ pub struct Settings {
     pub metrics_port: u16,
     #[serde(default = "default_recent_attempts_window")]
     pub recent_attempts_window: usize,
-    #[serde(default = "default_sender_max_resign_count")]
-    pub sender_max_resign_count: u32,
+    #[serde(default = "default_sender_max_re_sign_count")]
+    pub sender_max_re_sign_count: u32,
 }
 
-fn default_sender_max_resign_count() -> u32 {
+fn default_sender_max_re_sign_count() -> u32 {
     2
 }