Fix bug with compute instruction calculation

Author: ChewingGlass

Cargo.lock

@@ -57,7 +57,7 @@ spl-associated-token-account = "6.0.0"
 spl-token = "4.0.0"
 itertools = "0.13"
 tokio-graceful-shutdown = "0.15"
-solana-transaction-utils = { version = "0.4.0", path = "./solana-transaction-utils" }
+solana-transaction-utils = { version = "0.4.1", path = "./solana-transaction-utils" }
 tuktuk-sdk = { version = "0.3.5", path = "./tuktuk-sdk" }
 tuktuk-program = { version = "0.3.2", path = "./tuktuk-program" }
 solana-account-decoder = { version = "2.2.3" }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "solana-transaction-utils"
-version = "0.4.0"
+version = "0.4.1"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true

solana-transaction-utils/Cargo.toml

@@ -175,11 +175,11 @@ pub async fn auto_compute_price<C: AsRef<RpcClient>>(
         compute_price_instruction_for_accounts(client, &accounts).await?;
 
     // Replace or insert compute price instruction
-    if let Some(pos) = instructions
-        .iter()
-        .position(|ix| ix.program_id == solana_sdk::compute_budget::id())
-    {
-        updated_instructions[pos + 1] = compute_price_ix; // Replace existing
+    if let Some(pos) = instructions.iter().position(|ix| {
+        ix.program_id == solana_sdk::compute_budget::id()
+            && ix.data.first() == compute_price_ix.data.first()
+    }) {
+        updated_instructions[pos] = compute_price_ix; // Replace existing
     } else {
         updated_instructions.insert(1, compute_price_ix); // Insert after compute budget
     }
@@ -239,10 +239,10 @@ pub async fn auto_compute_limit_and_price<C: AsRef<RpcClient>>(
     .await?;
 
     // Replace or insert compute budget instruction
-    if let Some(pos) = updated_instructions
-        .iter()
-        .position(|ix| ix.program_id == solana_sdk::compute_budget::id())
-    {
+    if let Some(pos) = updated_instructions.iter().position(|ix| {
+        ix.program_id == solana_sdk::compute_budget::id()
+            && ix.data.first() == compute_budget_ix.data.first()
+    }) {
         updated_instructions[pos] = compute_budget_ix; // Replace existing
     } else {
         updated_instructions.insert(0, compute_budget_ix); // Insert at the beginning

solana-transaction-utils/src/priority_fee.rs

@@ -121,10 +121,10 @@ pub async fn create_transaction_queue<T: Send + Clone + 'static + Sync>(
             let mut updated_instructions = bundle.tx.instructions.clone();
             let compute_budget_ix = compute_budget_instruction(compute_units);
             // Replace or insert compute budget instruction
-            if let Some(pos) = updated_instructions
-                .iter()
-                .position(|ix| ix.program_id == solana_sdk::compute_budget::id())
-            {
+            if let Some(pos) = updated_instructions.iter().position(|ix| {
+                ix.program_id == solana_sdk::compute_budget::id()
+                    && ix.data.first() == compute_budget_ix.data.first()
+            }) {
                 updated_instructions[pos] = compute_budget_ix; // Replace existing
             } else {
                 updated_instructions.insert(0, compute_budget_ix); // Insert at the beginning

solana-transaction-utils/src/queue.rs

@@ -1,6 +1,6 @@
 [package]
 name = "tuktuk-cli"
-version = "0.2.11"
+version = "0.2.12"
 description = "A cli for tuktuk"
 homepage.workspace = true
 repository.workspace = true

tuktuk-cli/Cargo.toml

@@ -180,11 +180,10 @@ impl TaskCmd {
                                 return false;
                             }
                         }
-                        let is_task_active = task.trigger.is_active(now);
-                        if *active != is_task_active {
-                            return false;
-                        }
-                        return true;
+
+                        // If active flag is set, only show tasks that are active
+                        // Otherwise, show all tasks
+                        return !*active || task.trigger.is_active(now);
                     }
                     false
                 });

tuktuk-cli/src/cmd/task.rs

@@ -1,6 +1,6 @@
 [package]
 name = "tuktuk-crank-turner"
-version = "0.2.22"
+version = "0.2.23"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true