feat: sage-starbased-decoder local idl.json and patch 06 fixes (#45)

This pull request refactors the account struct definitions and deserialization logic for multiple SAGE Starbased program instructions to expand composite account fields into their individual components. This improves clarity, consistency, and maintainability of the codebase. Additionally, it introduces a new instruction, `LoadingBayToRespawn`. The changes affect several instruction modules and update the crate version.

**Refactoring of Account Structures and Deserialization:**

* Expanded composite account fields (like `game_accounts_fleet_and_owner`, `starbase_and_starbase_player`, etc.) into their individual account fields (e.g., `key`, `owning_profile`, `fleet`, `game_id`, `game_state`, `starbase`, `starbase_player`) across all relevant instruction structs and their deserialization implementations. This affects instructions such as `AddShipToFleet`, `CloseFleetCargoPodTokenAccount`, `ForceDisbandFleet`, `IdleToLoadingBay`, `IdleToRespawn`, `LoadFleetCrew`, `LoadingBayToIdle`, and `MineAsteroidToRespawn`. [[1]](diffhunk://#diff-48dfcd1fc2a6f79a4d1ff8bdbf666ae348869cd04f9c9bf1977c536bf14eb42eL15-R29) [[2]](diffhunk://#diff-48dfcd1fc2a6f79a4d1ff8bdbf666ae348869cd04f9c9bf1977c536bf14eb42eL30-R68) [[3]](diffhunk://#diff-dab6cd136a02fe87bbe40999e3214816507f742b36950bd893019c0a0990c240L15-R22) [[4]](diffhunk://#diff-dab6cd136a02fe87bbe40999e3214816507f742b36950bd893019c0a0990c240L33-R47) [[5]](diffhunk://#diff-dab6cd136a02fe87bbe40999e3214816507f742b36950bd893019c0a0990c240L44-R63) [[6]](diffhunk://#diff-5319e98e32c2712ad9b471de9de4d587d4d40a84784e1a2c56788589a138efecR15-R31) [[7]](diffhunk://#diff-5319e98e32c2712ad9b471de9de4d587d4d40a84784e1a2c56788589a138efecR43-R59) [[8]](diffhunk://#diff-5319e98e32c2712ad9b471de9de4d587d4d40a84784e1a2c56788589a138efecL57-R75) [[9]](diffhunk://#diff-3060f4e7222fce1446658c312fb1668b277a39809a998ad17ff5e3b57969ec10L13-R22) [[10]](diffhunk://#diff-3060f4e7222fce1446658c312fb1668b277a39809a998ad17ff5e3b57969ec10L24-R51) [[11]](diffhunk://#diff-18933dd8a1b2e116507e798dabf67dd85fcd9401f196270053a75c50450e886cL15-R22) [[12]](diffhunk://#diff-18933dd8a1b2e116507e798dabf67dd85fcd9401f196270053a75c50450e886cL28-R53) [[13]](diffhunk://#diff-586e2c6143b4aa510d41fa8099b6753ffc5b69f064af1ad44da50a17a32b9f16L15-R23) [[14]](diffhunk://#diff-586e2c6143b4aa510d41fa8099b6753ffc5b69f064af1ad44da50a17a32b9f16L27-R51) [[15]](diffhunk://#diff-dbb7528ce75a67860b5c4b9bed3c77a049e234ebf40b9fa24fd3847553b0df73L13-R22) [[16]](diffhunk://#diff-dbb7528ce75a67860b5c4b9bed3c77a049e234ebf40b9fa24fd3847553b0df73L24-R51) [[17]](diffhunk://#diff-db8d522002ecb972dfb3062d46b6d3a0bfaaef00fbf849f467d70e3210c8bd95L15-R22)

**New Instruction Implementation:**

* Added a new instruction, `LoadingBayToRespawn`, including its struct definition, account structure, and deserialization logic, following the new expanded account pattern.

**Version Update:**

* Bumped the crate version from `0.10.0` to `0.10.1` in `Cargo.toml` to reflect these changes.

Author: ttdonovan

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "carbon-sage-starbased-decoder"
-version = "0.10.0"
+version = "0.10.1"
 edition = "2024"
 description = "Rust decoder for Star Atlas SAGE Starbased program on Solana"
 license = "Apache-2.0"

carbon-decoders/sage-starbased-decoder/Cargo.toml

@@ -12,11 +12,21 @@ pub struct AddShipToFleet {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct AddShipToFleetInstructionAccounts {
-    pub game_accounts_fleet_and_owner: solana_pubkey::Pubkey,
+    // GameAndGameStateAndFleetAndOwnerMut expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // Direct accounts
     pub funder: solana_pubkey::Pubkey,
     pub fleet_ships: solana_pubkey::Pubkey,
     pub ship: solana_pubkey::Pubkey,
-    pub starbase_and_starbase_player: solana_pubkey::Pubkey,
+    // StarbaseMutAndStarbasePlayer expansion
+    pub starbase: solana_pubkey::Pubkey,
+    pub starbase_player: solana_pubkey::Pubkey,
+    // Direct accounts
     pub system_program: solana_pubkey::Pubkey,
 }
 
@@ -27,19 +37,35 @@ impl carbon_core::deserialize::ArrangeAccounts for AddShipToFleet {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let game_accounts_fleet_and_owner = next_account(&mut iter)?;
+        // GameAndGameStateAndFleetAndOwnerMut expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // Direct accounts
         let funder = next_account(&mut iter)?;
         let fleet_ships = next_account(&mut iter)?;
         let ship = next_account(&mut iter)?;
-        let starbase_and_starbase_player = next_account(&mut iter)?;
+        // StarbaseMutAndStarbasePlayer expansion
+        let starbase = next_account(&mut iter)?;
+        let starbase_player = next_account(&mut iter)?;
+        // Direct accounts
         let system_program = next_account(&mut iter)?;
 
         Some(AddShipToFleetInstructionAccounts {
-            game_accounts_fleet_and_owner,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            game_id,
+            game_state,
             funder,
             fleet_ships,
             ship,
-            starbase_and_starbase_player,
+            starbase,
+            starbase_player,
             system_program,
         })
     }

carbon-decoders/sage-starbased-decoder/src/instructions/add_ship_to_fleet.rs

@@ -12,7 +12,14 @@ pub struct CloseFleetCargoPodTokenAccount {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct CloseFleetCargoPodTokenAccountInstructionAccounts {
-    pub game_accounts_fleet_and_owner: solana_pubkey::Pubkey,
+    // GameAndGameStateAndFleetAndOwnerMut expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // Direct accounts
     pub cargo_pod: solana_pubkey::Pubkey,
     pub cargo_type: solana_pubkey::Pubkey,
     pub cargo_stats_definition: solana_pubkey::Pubkey,
@@ -30,7 +37,14 @@ impl carbon_core::deserialize::ArrangeAccounts for CloseFleetCargoPodTokenAccoun
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let game_accounts_fleet_and_owner = next_account(&mut iter)?;
+        // GameAndGameStateAndFleetAndOwnerMut expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // Direct accounts
         let cargo_pod = next_account(&mut iter)?;
         let cargo_type = next_account(&mut iter)?;
         let cargo_stats_definition = next_account(&mut iter)?;
@@ -41,7 +55,12 @@ impl carbon_core::deserialize::ArrangeAccounts for CloseFleetCargoPodTokenAccoun
         let token_program = next_account(&mut iter)?;
 
         Some(CloseFleetCargoPodTokenAccountInstructionAccounts {
-            game_accounts_fleet_and_owner,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            game_id,
+            game_state,
             cargo_pod,
             cargo_type,
             cargo_stats_definition,

carbon-decoders/sage-starbased-decoder/src/instructions/close_fleet_cargo_pod_token_account.rs

@@ -12,16 +12,23 @@ pub struct ForceDisbandFleet {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct ForceDisbandFleetInstructionAccounts {
+    // Direct accounts
     pub funder: solana_pubkey::Pubkey,
     pub disbanded_fleet: solana_pubkey::Pubkey,
     pub fleet: solana_pubkey::Pubkey,
     pub fleet_ships: solana_pubkey::Pubkey,
     pub cargo_hold: solana_pubkey::Pubkey,
     pub fuel_tank: solana_pubkey::Pubkey,
     pub ammo_bank: solana_pubkey::Pubkey,
-    pub starbase_and_starbase_player: solana_pubkey::Pubkey,
+    // StarbaseMutAndStarbasePlayer expansion
+    pub starbase: solana_pubkey::Pubkey,
+    pub starbase_player: solana_pubkey::Pubkey,
+    // Direct accounts
     pub ship: solana_pubkey::Pubkey,
-    pub game_accounts: solana_pubkey::Pubkey,
+    // GameAndGameState expansion
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // Direct accounts
     pub cargo_program: solana_pubkey::Pubkey,
     pub system_program: solana_pubkey::Pubkey,
 }
@@ -33,16 +40,23 @@ impl carbon_core::deserialize::ArrangeAccounts for ForceDisbandFleet {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
+        // Direct accounts
         let funder = next_account(&mut iter)?;
         let disbanded_fleet = next_account(&mut iter)?;
         let fleet = next_account(&mut iter)?;
         let fleet_ships = next_account(&mut iter)?;
         let cargo_hold = next_account(&mut iter)?;
         let fuel_tank = next_account(&mut iter)?;
         let ammo_bank = next_account(&mut iter)?;
-        let starbase_and_starbase_player = next_account(&mut iter)?;
+        // StarbaseMutAndStarbasePlayer expansion
+        let starbase = next_account(&mut iter)?;
+        let starbase_player = next_account(&mut iter)?;
+        // Direct accounts
         let ship = next_account(&mut iter)?;
-        let game_accounts = next_account(&mut iter)?;
+        // GameAndGameState expansion
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // Direct accounts
         let cargo_program = next_account(&mut iter)?;
         let system_program = next_account(&mut iter)?;
 
@@ -54,9 +68,11 @@ impl carbon_core::deserialize::ArrangeAccounts for ForceDisbandFleet {
             cargo_hold,
             fuel_tank,
             ammo_bank,
-            starbase_and_starbase_player,
+            starbase,
+            starbase_player,
             ship,
-            game_accounts,
+            game_id,
+            game_state,
             cargo_program,
             system_program,
         })

carbon-decoders/sage-starbased-decoder/src/instructions/force_disband_fleet.rs

@@ -10,8 +10,16 @@ pub struct IdleToLoadingBay {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct IdleToLoadingBayInstructionAccounts {
-    pub game_accounts_fleet_and_owner: solana_pubkey::Pubkey,
-    pub starbase_and_starbase_player: solana_pubkey::Pubkey,
+    // GameAndGameStateAndFleetAndOwnerMut expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // StarbaseMutAndStarbasePlayer expansion
+    pub starbase: solana_pubkey::Pubkey,
+    pub starbase_player: solana_pubkey::Pubkey,
 }
 
 impl carbon_core::deserialize::ArrangeAccounts for IdleToLoadingBay {
@@ -21,12 +29,26 @@ impl carbon_core::deserialize::ArrangeAccounts for IdleToLoadingBay {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let game_accounts_fleet_and_owner = next_account(&mut iter)?;
-        let starbase_and_starbase_player = next_account(&mut iter)?;
+        // GameAndGameStateAndFleetAndOwnerMut expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // StarbaseMutAndStarbasePlayer expansion
+        let starbase = next_account(&mut iter)?;
+        let starbase_player = next_account(&mut iter)?;
 
         Some(IdleToLoadingBayInstructionAccounts {
-            game_accounts_fleet_and_owner,
-            starbase_and_starbase_player,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            game_id,
+            game_state,
+            starbase,
+            starbase_player,
         })
     }
 }

carbon-decoders/sage-starbased-decoder/src/instructions/idle_to_loading_bay.rs

@@ -12,7 +12,14 @@ pub struct IdleToRespawn {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct IdleToRespawnInstructionAccounts {
-    pub game_accounts_fleet_and_owner: solana_pubkey::Pubkey,
+    // GameAndGameStateAndFleetAndOwnerMut expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // Direct accounts
     pub atlas_token_from: solana_pubkey::Pubkey,
     pub atlas_token_to: solana_pubkey::Pubkey,
     pub token_program: solana_pubkey::Pubkey,
@@ -25,13 +32,25 @@ impl carbon_core::deserialize::ArrangeAccounts for IdleToRespawn {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let game_accounts_fleet_and_owner = next_account(&mut iter)?;
+        // GameAndGameStateAndFleetAndOwnerMut expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // Direct accounts
         let atlas_token_from = next_account(&mut iter)?;
         let atlas_token_to = next_account(&mut iter)?;
         let token_program = next_account(&mut iter)?;
 
         Some(IdleToRespawnInstructionAccounts {
-            game_accounts_fleet_and_owner,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            game_id,
+            game_state,
             atlas_token_from,
             atlas_token_to,
             token_program,

carbon-decoders/sage-starbased-decoder/src/instructions/idle_to_respawn.rs

@@ -12,8 +12,15 @@ pub struct LoadFleetCrew {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct LoadFleetCrewInstructionAccounts {
-    pub fleet_and_owner: solana_pubkey::Pubkey,
-    pub starbase_and_starbase_player: solana_pubkey::Pubkey,
+    // FleetAndOwner expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    // StarbaseMutAndStarbasePlayer expansion
+    pub starbase: solana_pubkey::Pubkey,
+    pub starbase_player: solana_pubkey::Pubkey,
+    // Direct accounts
     pub game_id: solana_pubkey::Pubkey,
 }
 
@@ -24,13 +31,24 @@ impl carbon_core::deserialize::ArrangeAccounts for LoadFleetCrew {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let fleet_and_owner = next_account(&mut iter)?;
-        let starbase_and_starbase_player = next_account(&mut iter)?;
+        // FleetAndOwner expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        // StarbaseMutAndStarbasePlayer expansion
+        let starbase = next_account(&mut iter)?;
+        let starbase_player = next_account(&mut iter)?;
+        // Direct accounts
         let game_id = next_account(&mut iter)?;
 
         Some(LoadFleetCrewInstructionAccounts {
-            fleet_and_owner,
-            starbase_and_starbase_player,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            starbase,
+            starbase_player,
             game_id,
         })
     }

carbon-decoders/sage-starbased-decoder/src/instructions/load_fleet_crew.rs

@@ -10,8 +10,16 @@ pub struct LoadingBayToIdle {
 
 #[derive(Debug, PartialEq, Eq, Clone, Hash, serde::Serialize, serde::Deserialize)]
 pub struct LoadingBayToIdleInstructionAccounts {
-    pub game_accounts_fleet_and_owner: solana_pubkey::Pubkey,
-    pub starbase_and_starbase_player: solana_pubkey::Pubkey,
+    // GameAndGameStateAndFleetAndOwnerMut expansion
+    pub key: solana_pubkey::Pubkey,
+    pub owning_profile: solana_pubkey::Pubkey,
+    pub owning_profile_faction: solana_pubkey::Pubkey,
+    pub fleet: solana_pubkey::Pubkey,
+    pub game_id: solana_pubkey::Pubkey,
+    pub game_state: solana_pubkey::Pubkey,
+    // StarbaseMutAndStarbasePlayer expansion
+    pub starbase: solana_pubkey::Pubkey,
+    pub starbase_player: solana_pubkey::Pubkey,
 }
 
 impl carbon_core::deserialize::ArrangeAccounts for LoadingBayToIdle {
@@ -21,12 +29,26 @@ impl carbon_core::deserialize::ArrangeAccounts for LoadingBayToIdle {
         accounts: &[solana_instruction::AccountMeta],
     ) -> Option<Self::ArrangedAccounts> {
         let mut iter = accounts.iter();
-        let game_accounts_fleet_and_owner = next_account(&mut iter)?;
-        let starbase_and_starbase_player = next_account(&mut iter)?;
+        // GameAndGameStateAndFleetAndOwnerMut expansion
+        let key = next_account(&mut iter)?;
+        let owning_profile = next_account(&mut iter)?;
+        let owning_profile_faction = next_account(&mut iter)?;
+        let fleet = next_account(&mut iter)?;
+        let game_id = next_account(&mut iter)?;
+        let game_state = next_account(&mut iter)?;
+        // StarbaseMutAndStarbasePlayer expansion
+        let starbase = next_account(&mut iter)?;
+        let starbase_player = next_account(&mut iter)?;
 
         Some(LoadingBayToIdleInstructionAccounts {
-            game_accounts_fleet_and_owner,
-            starbase_and_starbase_player,
+            key,
+            owning_profile,
+            owning_profile_faction,
+            fleet,
+            game_id,
+            game_state,
+            starbase,
+            starbase_player,
         })
     }
 }