feat: disband

mindrunner · Sep 8, 2024 · d62d1d6 · d62d1d6
1 parent 94ae07e
commit d62d1d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/basedbot/lib/sage/act/disband-fleet.ts b/src/main/basedbot/lib/sage/act/disband-fleet.ts
@@ -9,6 +9,7 @@ import { disbandedFleetToEscrowIx } from '../ix/disbanded-fleet-to-escrow'
 import { getFleetShips } from '../state/get-fleet-ships'
 import { getStarbasePlayer } from '../state/starbase-player'
 import { Player } from '../state/user-account'
+import { getName } from '../util'
 
 export const disbandFleet = async (
     player: Player,
@@ -46,15 +47,14 @@ export const disbandFleet = async (
                 starbase,
                 starbasePlayer,
                 programs,
-                shipEscrowIndex,
+                shipEscrowIndex === -1 ? null : shipEscrowIndex,
                 disbandedFleetKey[0],
                 fleet.data.fleetShips,
                 fleetShipInfo.ship,
                 i,
                 fleetShipInfo.amount,
             ),
         )
-        console.log('Pushed disbanded fleet to escrow instruction')
         i += 1
     }
 
@@ -66,6 +66,7 @@ export const disbandFleet = async (
             fleet.data.fleetShips,
         ),
     )
+    console.log(`Added ${ixs.length} ixs for disbanding fleet ${getName(fleet)}`)
 
     await sendAndConfirmInstructions(await ixReturnsToIxs(ixs, player.signer))
 }
diff --git a/src/main/basedbot/lib/sage/ix/disbanded-fleet-to-escrow.ts b/src/main/basedbot/lib/sage/ix/disbanded-fleet-to-escrow.ts
@@ -12,7 +12,7 @@ export const disbandedFleetToEscrowIx = (
     starbase: Starbase,
     starbasePlayer: StarbasePlayer,
     programs: StarAtlasPrograms,
-    shipEscrowIndex: number,
+    shipEscrowIndex: number | null,
     disbandedFleet: PublicKey,
     fleetShips: PublicKey,
     shipKey: PublicKey,