@wuwei-labs/srsly 4.1.4 → 4.2.1

package/dist/esm/generated/codama/types/fleet.js

@@ -5,7 +5,7 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, fixDecoderSize, fixEncoderSize, getAddressDecoder, getAddressEncoder, getBytesDecoder, getBytesEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, getU8Decoder, getU8Encoder, } from "@solana/kit";
+import { combineCodec, fixDecoderSize, fixEncoderSize, getAddressDecoder, getAddressEncoder, getBytesDecoder, getBytesEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU32Decoder, getU32Encoder, getU64Decoder, getU64Encoder, getU8Decoder, getU8Encoder, } from "@solana/kit";
 import { getOptionalNonSystemPubkeyDecoder, getOptionalNonSystemPubkeyEncoder, getShipCountsDecoder, getShipCountsEncoder, getShipStatsDecoder, getShipStatsEncoder, } from ".";
 export function getFleetEncoder() {
     return getStructEncoder([
@@ -24,6 +24,13 @@ export function getFleetEncoder() {
         ["cargoHold", getAddressEncoder()],
         ["fuelTank", getAddressEncoder()],
         ["ammoBank", getAddressEncoder()],
+        ["ap", getU32Encoder()],
+        ["sp", getU32Encoder()],
+        ["hp", getU32Encoder()],
+        ["pendingHp", getU32Encoder()],
+        ["apReloadExpiresAt", getI64Encoder()],
+        ["shieldBreakDelayExpiresAt", getI64Encoder()],
+        ["lastCombatUpdate", getI64Encoder()],
         ["updateId", getU64Encoder()],
         ["bump", getU8Encoder()],
     ]);
@@ -45,6 +52,13 @@ export function getFleetDecoder() {
         ["cargoHold", getAddressDecoder()],
         ["fuelTank", getAddressDecoder()],
         ["ammoBank", getAddressDecoder()],
+        ["ap", getU32Decoder()],
+        ["sp", getU32Decoder()],
+        ["hp", getU32Decoder()],
+        ["pendingHp", getU32Decoder()],
+        ["apReloadExpiresAt", getI64Decoder()],
+        ["shieldBreakDelayExpiresAt", getI64Decoder()],
+        ["lastCombatUpdate", getI64Decoder()],
         ["updateId", getU64Decoder()],
         ["bump", getU8Decoder()],
     ]);

package/dist/esm/generated/codama/types/fleet.js.map

@@ -1 +1 @@
-{"version":3,"file":"fleet.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/fleet.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,YAAY,GAMb,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,GAOpB,MAAM,GAAG,CAAC;AA2CX,MAAM,UAAU,eAAe;IAC7B,OAAO,gBAAgB,CAAC;QACtB,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;QAC/B,CAAC,cAAc,EAAE,iBAAiB,EAAE,CAAC;QACrC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,YAAY,EAAE,iCAAiC,EAAE,CAAC;QACnD,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,CAAC;QAC9C,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,YAAY,EAAE,cAAc,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,uBAAuB,EAAE,aAAa,EAAE,CAAC;QAC1C,CAAC,uBAAuB,EAAE,aAAa,EAAE,CAAC;QAC1C,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;QAChC,CAAC,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAClC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;KACzB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,gBAAgB,CAAC;QACtB,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAC;QAC/B,CAAC,cAAc,EAAE,iBAAiB,EAAE,CAAC;QACrC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,YAAY,EAAE,iCAAiC,EAAE,CAAC;QACnD,CAAC,uBAAuB,EAAE,iBAAiB,EAAE,CAAC;QAC9C,CAAC,SAAS,EAAE,YAAY,EAAE,CAAC;QAC3B,CAAC,YAAY,EAAE,cAAc,CAAC,eAAe,EAAE,EAAE,EAAE,CAAC,CAAC;QACrD,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,uBAAuB,EAAE,aAAa,EAAE,CAAC;QAC1C,CAAC,uBAAuB,EAAE,aAAa,EAAE,CAAC;QAC1C,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;QAChC,CAAC,WAAW,EAAE,iBAAiB,EAAE,CAAC;QAClC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;KACzB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO,YAAY,CAAC,eAAe,EAAE,EAAE,eAAe,EAAE,CAAC,CAAC;AAC5D,CAAC"}
+{"version":3,"file":"fleet.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/fleet.ts"],"names":[],"mappings":"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"}

package/dist/esm/generated/codama/types/index.js

@@ -8,6 +8,7 @@
 export * from "./atlasClaimed";
 export * from "./borrowerInitialized";
 export * from "./cargoStats";
+export * from "./combatStats";
 export * from "./contractClosed";
 export * from "./contractCreated";
 export * from "./contractDelegateSet";
@@ -17,7 +18,6 @@ export * from "./contractThreadClosed";
 export * from "./contractThreadCreated";
 export * from "./contractThreadUpdated";
 export * from "./contractUpdated";
-export * from "./discountAuthorization";
 export * from "./fieldUpdate";
 export * from "./fleet";
 export * from "./miscStats";

package/dist/esm/generated/codama/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}

package/dist/esm/generated/codama/types/rentalClosed.js

@@ -5,13 +5,14 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, getU32Decoder, getU32Encoder, } from "@solana/kit";
+import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, getU32Decoder, getU32Encoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
 export function getRentalClosedEncoder() {
     return getStructEncoder([
         ["rentalState", getAddressEncoder()],
         ["contract", getAddressEncoder()],
         ["borrower", getAddressEncoder()],
         ["pointsAwarded", getU32Encoder()],
+        ["feeFlushed", getU64Encoder()],
     ]);
 }
 export function getRentalClosedDecoder() {
@@ -20,6 +21,7 @@ export function getRentalClosedDecoder() {
         ["contract", getAddressDecoder()],
         ["borrower", getAddressDecoder()],
         ["pointsAwarded", getU32Decoder()],
+        ["feeFlushed", getU64Decoder()],
     ]);
 }
 export function getRentalClosedCodec() {

package/dist/esm/generated/codama/types/rentalClosed.js.map

@@ -1 +1 @@
-{"version":3,"file":"rentalClosed.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalClosed.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAWrB,MAAM,UAAU,sBAAsB;IACpC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB;IAIlC,OAAO,YAAY,CAAC,sBAAsB,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAC1E,CAAC"}
+{"version":3,"file":"rentalClosed.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalClosed.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAkBrB,MAAM,UAAU,sBAAsB;IACpC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;QAClC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;QAClC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;KAChC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB;IAIlC,OAAO,YAAY,CAAC,sBAAsB,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAC;AAC1E,CAAC"}

package/dist/esm/generated/codama/types/reservationCreated.js

@@ -5,7 +5,7 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { combineCodec, getAddressDecoder, getAddressEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU32Decoder, getU32Encoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
+import { combineCodec, getAddressDecoder, getAddressEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU16Decoder, getU16Encoder, getU32Decoder, getU32Encoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
 export function getReservationCreatedEncoder() {
     return getStructEncoder([
         ["contract", getAddressEncoder()],
@@ -14,6 +14,7 @@ export function getReservationCreatedEncoder() {
         ["bidAtlas", getU64Encoder()],
         ["escrowAmount", getU64Encoder()],
         ["serviceFee", getU64Encoder()],
+        ["feeBps", getU16Encoder()],
         ["durationSeconds", getI64Encoder()],
     ]);
 }
@@ -25,6 +26,7 @@ export function getReservationCreatedDecoder() {
         ["bidAtlas", getU64Decoder()],
         ["escrowAmount", getU64Decoder()],
         ["serviceFee", getU64Decoder()],
+        ["feeBps", getU16Decoder()],
         ["durationSeconds", getI64Decoder()],
     ]);
 }

package/dist/esm/generated/codama/types/reservationCreated.js.map

@@ -1 +1 @@
-{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAsBrB,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B;IAIxC,OAAO,YAAY,CACjB,4BAA4B,EAAE,EAC9B,4BAA4B,EAAE,CAC/B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"reservationCreated.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/reservationCreated.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAwBrB,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC3B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,4BAA4B;IAC1C,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QACnC,CAAC,WAAW,EAAE,aAAa,EAAE,CAAC;QAC9B,CAAC,UAAU,EAAE,aAAa,EAAE,CAAC;QAC7B,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;QACjC,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC;QAC/B,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC3B,CAAC,iBAAiB,EAAE,aAAa,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0BAA0B;IAIxC,OAAO,YAAY,CACjB,4BAA4B,EAAE,EAC9B,4BAA4B,EAAE,CAC/B,CAAC;AACJ,CAAC"}

package/dist/esm/generated/codama/types/shipStats.js

@@ -6,11 +6,12 @@
  * @see https://github.com/codama-idl/codama
  */
 import { combineCodec, getStructDecoder, getStructEncoder, } from "@solana/kit";
-import { getCargoStatsDecoder, getCargoStatsEncoder, getMiscStatsDecoder, getMiscStatsEncoder, getMovementStatsDecoder, getMovementStatsEncoder, } from ".";
+import { getCargoStatsDecoder, getCargoStatsEncoder, getCombatStatsDecoder, getCombatStatsEncoder, getMiscStatsDecoder, getMiscStatsEncoder, getMovementStatsDecoder, getMovementStatsEncoder, } from ".";
 export function getShipStatsEncoder() {
     return getStructEncoder([
         ["movementStats", getMovementStatsEncoder()],
         ["cargoStats", getCargoStatsEncoder()],
+        ["combatStats", getCombatStatsEncoder()],
         ["miscStats", getMiscStatsEncoder()],
     ]);
 }
@@ -18,6 +19,7 @@ export function getShipStatsDecoder() {
     return getStructDecoder([
         ["movementStats", getMovementStatsDecoder()],
         ["cargoStats", getCargoStatsDecoder()],
+        ["combatStats", getCombatStatsDecoder()],
         ["miscStats", getMiscStatsDecoder()],
     ]);
 }

package/dist/esm/generated/codama/types/shipStats.js.map

@@ -1 +1 @@
-{"version":3,"file":"shipStats.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/shipStats.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,GAIjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,GAOxB,MAAM,GAAG,CAAC;AAeX,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;QACtB,CAAC,eAAe,EAAE,uBAAuB,EAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,WAAW,EAAE,mBAAmB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;QACtB,CAAC,eAAe,EAAE,uBAAuB,EAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,WAAW,EAAE,mBAAmB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,YAAY,CAAC,mBAAmB,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"shipStats.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/shipStats.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,GAIjB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,GASxB,MAAM,GAAG,CAAC;AAiBX,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;QACtB,CAAC,eAAe,EAAE,uBAAuB,EAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,aAAa,EAAE,qBAAqB,EAAE,CAAC;QACxC,CAAC,WAAW,EAAE,mBAAmB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,mBAAmB;IACjC,OAAO,gBAAgB,CAAC;QACtB,CAAC,eAAe,EAAE,uBAAuB,EAAE,CAAC;QAC5C,CAAC,YAAY,EAAE,oBAAoB,EAAE,CAAC;QACtC,CAAC,aAAa,EAAE,qBAAqB,EAAE,CAAC;QACxC,CAAC,WAAW,EAAE,mBAAmB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,YAAY,CAAC,mBAAmB,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;AACpE,CAAC"}

package/dist/esm/instructions/acceptRental.js

@@ -19,8 +19,8 @@ import { deriveActiveRental, deriveBorrowerState, deriveRentalAuthority } from '
 import { deriveAssociatedTokenAccount } from '../pda/token';
 import { deriveContractThread, deriveFiber } from '../pda/thread';
 import { prepareInstructions } from '../utils/instructions';
-import { deserializeDiscountAuth } from '../utils/discountAuth';
 import { RentalStatus } from '../generated/codama/types';
+import { deserializeDiscountAuth } from '../utils/discountAuth';
 /**
  * Accept a rental contract
  *
@@ -38,9 +38,9 @@ import { RentalStatus } from '../generated/codama/types';
  *
  * @example
  * ```typescript
- * // Accept a 7-day rental (borrowerProfile auto-fetched)
  * const ixs = await acceptRental({
  *   borrower: wallet,
+ *   borrowerProfile: "BORROWER_PROFILE_ADDRESS",
  *   contract: "CONTRACT_ADDRESS",
  *   duration: { days: 7 },
  *   computeUnits: 400_000
@@ -60,11 +60,13 @@ export async function acceptRental(params, config) {
     if (!params.duration) {
         throw new Error('duration is required');
     }
+    if (!params.borrowerProfile) {
+        throw new Error('borrowerProfile is required');
+    }
     // Convert borrower to transaction signer
     const borrowerSigner = toTransactionSigner(params.borrower);
-    // Fetch config to get vault
+    // Fetch config
     const configAccount = await fetchConfig(finalConfig.rpcUrl);
-    const vault = configAccount.data.slyvault;
     // Fetch contract to get fleet, gameId
     const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
     const fleet = contractAccount.data.fleet;
@@ -80,14 +82,7 @@ export async function acceptRental(params, config) {
     // Fetch fleet data for faction (needed to derive SAGE accounts)
     const fleetState = await fetchFleet(fleet, finalConfig.rpcUrl);
     const faction = fleetState.faction;
-    // Use param if provided, fallback to fleet.subProfile (current occupant's profile)
-    let borrowerProfile;
-    if (params.borrowerProfile) {
-        borrowerProfile = address(params.borrowerProfile);
-    }
-    else {
-        borrowerProfile = fleetState.subProfile.key;
-    }
+    const borrowerProfile = address(params.borrowerProfile);
     // Derive all SAGE game accounts (profile faction, starbase, starbase player)
     const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
     // Derive active rental PDA (no more slot logic)
@@ -132,17 +127,13 @@ export async function acceptRental(params, config) {
     const addresses = getAddresses(config);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
-    // Deserialize discount auth if provided
-    let discountAuth = null;
-    if (params.discountAuth) {
-        discountAuth = deserializeDiscountAuth(params.discountAuth);
-    }
     const referrer = params.referrer ? address(params.referrer) : undefined;
-    // Derive vault token account (ATA)
-    const vaultTokenAccount = await deriveAssociatedTokenAccount(vault, atlasMint);
     // Derive contract token account (ATA of contract PDA)
     const contractAddress = address(params.contract);
     const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+    // Derive vault accounts for fee flush
+    const vaultAddress = address(configAccount.data.slyvault);
+    const vaultTokenAccount = await deriveAssociatedTokenAccount(vaultAddress, atlasMint);
     // Derive borrower token account (ATA)
     const borrowerTokenAccount = await deriveAssociatedTokenAccount(borrowerSigner.address, atlasMint);
     // Call Codama-generated acceptRental instruction
@@ -152,16 +143,30 @@ export async function acceptRental(params, config) {
         fleet: address(fleet),
         expiredBorrowerState,
         contract: contractAddress,
-        rentalState,
-        vault: address(vault),
-        vaultTokenAccount,
         contractTokenAccount,
+        vault: vaultAddress,
+        vaultTokenAccount,
         ...(contractThread && { contractThread }),
         ...(closeRentalFiber && { closeRentalFiber }),
         referrer,
         sageProgram,
         duration: BigInt(durationSeconds),
-        discountAuth
+        ...(params.discountAuth
+            ? (() => {
+                const d = deserializeDiscountAuth(params.discountAuth);
+                return {
+                    discountSignature: d.discountSignature,
+                    discountMemberNonce: d.discountMemberNonce,
+                    discountBps: d.discountBps,
+                    discountExpiresAt: d.discountExpiresAt,
+                };
+            })()
+            : {
+                discountSignature: null,
+                discountMemberNonce: null,
+                discountBps: null,
+                discountExpiresAt: null,
+            }),
     }, { programAddress });
     // Append SAGE pass-through accounts as remaining accounts
     const sageRemainingAccounts = [

package/dist/esm/instructions/acceptRental.js.map

@@ -1 +1 @@
-{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}

package/dist/esm/instructions/activateRental.js

@@ -16,7 +16,6 @@ import { fetchRental } from '../accounts/rental';
 import { deriveGameAccounts } from '../pda/sage';
 import { deriveActiveRental, deriveQueuedRental, deriveRentalAuthority } from '../pda/srsly';
 import { deriveContractThread, deriveFiber } from '../pda/thread';
-import { deriveAssociatedTokenAccount } from '../pda/token';
 /**
  * Manually activate a queued rental
  *
@@ -63,22 +62,15 @@ export async function activateRental(params, config) {
     const borrowerProfileAddr = address(params.borrowerProfile);
     const fleetState = await fetchFleet(contractAccount.data.fleet, finalConfig.rpcUrl);
     const gameAccounts = await deriveGameAccounts(borrowerProfileAddr, fleetState.faction, contractAccount.data.gameId);
-    // Get vault from config and derive vault token account
-    const vault = configAccount.data.slyvault;
-    const vaultTokenAccount = await deriveAssociatedTokenAccount(vault, atlasMint);
     const kitInstruction = await getActivateRentalInstructionAsync({
         payer: payerSigner,
         contract: contractAddress,
-        contractTokenAccount: contractAccount.data.managedTokenAccount,
-        mint: atlasMint,
         borrowerProfile: borrowerProfileAddr,
         borrowerProfileFaction: gameAccounts.profileFaction,
         fleet: contractAccount.data.fleet,
         gameId: contractAccount.data.gameId,
         ...(contractThread && { contractThread }),
         ...(closeRentalFiber && { closeRentalFiber }),
-        vault,
-        vaultTokenAccount,
         sageProgram: address(addresses.sage),
     }, { programAddress });
     // Append starbase + starbasePlayer as remaining accounts (for fiber 1 building)

package/dist/esm/instructions/activateRental.js.map

@@ -1 +1 @@
-{"version":3,"file":"activateRental.js","sourceRoot":"","sources":["../../../src/instructions/activateRental.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"activateRental.js","sourceRoot":"","sources":["../../../src/instructions/activateRental.ts"],"names":[],"mappings":"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"}

package/dist/esm/instructions/closeContract.js

@@ -10,9 +10,10 @@ import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
 import { fetchContract } from '../accounts/contract';
 import { fetchConfig } from '../accounts/config';
+import { fetchRental } from '../accounts/rental';
 import { fetchThread } from '../accounts/thread';
 import { deriveAssociatedTokenAccount } from '../pda/token';
-import { deriveContract, deriveRentalAuthority } from '../pda/srsly';
+import { deriveContract, deriveBorrowerState, deriveRentalAuthority } from '../pda/srsly';
 import { deriveContractThread, deriveFiber } from '../pda/thread';
 import { prepareInstructions } from '../utils/instructions';
 /**
@@ -105,51 +106,102 @@ export async function closeContract(params, config) {
         : address(addresses.sage);
     // Derive contract token account (ATA of contract PDA for ATLAS)
     const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
-    // Check if contract has an automation thread that needs closing first
+    // Check contract state
     const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
     const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
-    let hasActiveRental = contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID
-        || contractAccount.data.queuedRental !== SYSTEM_PROGRAM_ID;
-    // If active rental is expired (and no queued), treat as closeable immediately
-    if (hasActiveRental && contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID
-        && contractAccount.data.queuedRental === SYSTEM_PROGRAM_ID) {
-        const { fetchRental } = await import('../accounts/rental');
+    const hasActiveSlot = contractAccount.data.activeRental !== SYSTEM_PROGRAM_ID;
+    const hasQueuedSlot = contractAccount.data.queuedRental !== SYSTEM_PROGRAM_ID;
+    // Check if active rental is expired
+    let activeExpired = false;
+    if (hasActiveSlot) {
         const activeRental = await fetchRental(contractAccount.data.activeRental, finalConfig.rpcUrl);
         const now = Math.floor(Date.now() / 1000);
         if (activeRental.data.endTime <= BigInt(now)) {
-            hasActiveRental = false;
+            activeExpired = true;
         }
     }
-    let threadCloseIx;
-    if (hasThread && !hasActiveRental) {
+    // Resolve queued borrower accounts when a queued rental exists
+    let queuedBorrowerState;
+    let queuedBorrowerTokenAccount;
+    if (hasQueuedSlot) {
+        let queuedBorrower;
+        if (params.queuedBorrower) {
+            queuedBorrower = address(params.queuedBorrower);
+        }
+        else {
+            const queuedRental = await fetchRental(contractAccount.data.queuedRental, finalConfig.rpcUrl);
+            queuedBorrower = queuedRental.data.borrower;
+        }
+        queuedBorrowerState = await deriveBorrowerState(queuedBorrower);
+        queuedBorrowerTokenAccount = await deriveAssociatedTokenAccount(queuedBorrower, atlasMint);
+    }
+    // Helper: build a closeContractThread instruction
+    const buildThreadCloseIx = async () => {
         const rentalAuthority = await deriveRentalAuthority();
         const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
-        // Fetch thread to get fiber IDs for remaining accounts
         const threadAccount = await fetchThread(contractThread, finalConfig.rpcUrl);
         const fiberIds = Array.from(threadAccount.data.fiberIds);
-        // Derive fiber PDAs
         const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
             address: await deriveFiber(contractThread, id),
             role: AccountRole.WRITABLE,
         })));
-        threadCloseIx = await getCloseContractThreadInstructionAsync({
+        const ix = await getCloseContractThreadInstructionAsync({ owner: ownerSigner, contract: contractAddress, thread: contractThread }, { programAddress });
+        ix.accounts.push(...fiberAccounts);
+        return ix;
+    };
+    // Helper: build a closeContract instruction with optional queued borrower accounts
+    const buildCloseContractIx = async (includeQueued) => {
+        return getCloseContractInstructionAsync({
             owner: ownerSigner,
             contract: contractAddress,
-            thread: contractThread,
+            mint: atlasMint,
+            fleet: fleetAddress,
+            contractTokenAccount: contractTokenAccount,
+            sageProgram,
+            ...(includeQueued && queuedBorrowerState && queuedBorrowerTokenAccount
+                ? { queuedBorrowerState, queuedBorrowerTokenAccount }
+                : {}),
         }, { programAddress });
-        threadCloseIx.accounts.push(...fiberAccounts);
+    };
+    // Compose instructions based on scenario
+    const ixs = [];
+    if (activeExpired && hasQueuedSlot) {
+        // Expired active + queued: multi-instruction composition
+        // 1. closeRental — settles expired active
+        const { closeRental } = await import('./closeRental');
+        const closeRentalResult = await closeRental({ payer: params.owner, contract: contractAddress }, config);
+        ixs.push(...closeRentalResult.instructions);
+        // 2. closeContractThread (if thread exists)
+        if (hasThread) {
+            ixs.push(await buildThreadCloseIx());
+        }
+        // 3. closeContract — force-closes queued, sets to_close
+        ixs.push(await buildCloseContractIx(true));
+        // 4. closeContract — final close (no active, no queued, no thread)
+        ixs.push(await buildCloseContractIx(false));
+    }
+    else if (activeExpired && !hasQueuedSlot) {
+        // Expired active only, no queued — settle then close
+        const { closeRental } = await import('./closeRental');
+        const closeRentalResult = await closeRental({ payer: params.owner, contract: contractAddress }, config);
+        ixs.push(...closeRentalResult.instructions);
+        if (hasThread) {
+            ixs.push(await buildThreadCloseIx());
+        }
+        ixs.push(await buildCloseContractIx(false));
+    }
+    else if (!activeExpired && hasQueuedSlot) {
+        // Non-expired active + queued — deferred close with queued borrower accounts
+        ixs.push(await buildCloseContractIx(true));
+    }
+    else {
+        // No active rental (or no rental at all) — simple close
+        if (hasThread) {
+            ixs.push(await buildThreadCloseIx());
+        }
+        ixs.push(await buildCloseContractIx(false));
     }
-    // Call Codama-generated instruction
-    const kitInstruction = await getCloseContractInstructionAsync({
-        owner: ownerSigner,
-        contract: contractAddress,
-        mint: atlasMint,
-        fleet: fleetAddress,
-        contractTokenAccount: contractTokenAccount,
-        sageProgram,
-    }, { programAddress });
-    const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
-    return prepareInstructions(instructions, {
+    return prepareInstructions(ixs, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey
     });

package/dist/esm/instructions/closeContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,gCAAgC,EAAE,sCAAsC,EAAE,MAAM,kCAAkC,CAAC;AAC5H,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAsC5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAA2B,EAC3B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,sCAAsC;IACtC,MAAM,WAAW,GAAG,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,uCAAuC;IACvC,IAAI,YAAqB,CAAC;IAC1B,IAAI,eAAwB,CAAC;IAE7B,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpC,4BAA4B;QAC5B,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC;QAChD,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IACxD,CAAC;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACxB,uDAAuD;QACvD,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,KAAgB,CAAC,CAAC;QAChD,eAAe,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QAC3B,uDAAuD;QACvD,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IACxD,CAAC;SAAM,CAAC;QACN,kDAAkD;QAClD,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IAED,8EAA8E;IAC9E,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,eAAe,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IAC5C,CAAC;IAED,8CAA8C;IAC9C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW;QACpC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,WAAsB,CAAC;QACxC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IAEvC,gEAAgE;IAChE,MAAM,oBAAoB,GAAG,MAAM,4BAA4B,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,sEAAsE;IACtE,MAAM,iBAAiB,GAAG,kCAA6C,CAAC;IACxE,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC;IACpE,IAAI,eAAe,GAAG,eAAe,CAAC,IAAI,CAAC,YAAY,KAAK,iBAAiB;WACxE,eAAe,CAAC,IAAI,CAAC,YAAY,KAAK,iBAAiB,CAAC;IAE7D,8EAA8E;IAC9E,IAAI,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,YAAY,KAAK,iBAAiB;WACzE,eAAe,CAAC,IAAI,CAAC,YAAY,KAAK,iBAAiB,EAAE,CAAC;QAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC3D,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9F,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;QAC1C,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,eAAe,GAAG,KAAK,CAAC;QAC1B,CAAC;IACH,CAAC;IAED,IAAI,aAAa,CAAC;IAClB,IAAI,SAAS,IAAI,CAAC,eAAe,EAAE,CAAC;QAClC,MAAM,eAAe,GAAG,MAAM,qBAAqB,EAAE,CAAC;QACtD,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAEpF,uDAAuD;QACvD,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5E,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAa,CAAC;QAErE,oBAAoB;QACpB,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1B,OAAO,EAAE,MAAM,WAAW,CAAC,cAAc,EAAE,EAAE,CAAC;YAC9C,IAAI,EAAE,WAAW,CAAC,QAAiB;SACpC,CAAC,CAAC,CACJ,CAAC;QAEF,aAAa,GAAG,MAAM,sCAAsC,CAC1D;YACE,KAAK,EAAE,WAAW;YAClB,QAAQ,EAAE,eAAe;YACzB,MAAM,EAAE,cAAc;SACvB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;QACF,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IAChD,CAAC;IAED,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,YAAa;QACpB,oBAAoB,EAAE,oBAAqB;QAC3C,WAAW;KACZ,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;IACtF,OAAO,mBAAmB,CAAC,YAAY,EAAE;QACvC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"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"}

package/dist/esm/instructions/closeRental.js

@@ -5,15 +5,17 @@
  * Closes a completed rental and returns the fleet to the owner.
  */
 import { address } from '@solana/kit';
+import { isOption, unwrapOption } from '@solana/kit';
 import { getCloseRentalInstructionAsync } from '../generated/codama/instructions';
 import { mergeConfig, getAddresses } from '../utils/config';
 import { toTransactionSigner } from '../utils/signer';
-import { fetchContract } from '../accounts/contract';
 import { fetchConfig } from '../accounts/config';
+import { fetchContract } from '../accounts/contract';
 import { fetchFleet } from '../accounts/fleet';
 import { fetchRental } from '../accounts/rental';
 import { deriveGameAccounts } from '../pda/sage';
 import { deriveActiveRental, deriveBorrowerState } from '../pda/srsly';
+import { deriveAssociatedTokenAccount } from '../pda/token';
 import { prepareInstructions } from '../utils/instructions';
 /**
  * Close a rental
@@ -49,7 +51,9 @@ export async function closeRental(params, config) {
     if (!params.contract) {
         throw new Error('contract is required');
     }
-    // Fetch contract to get owner, fleet, gameId
+    // Fetch config and contract
+    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const contractAccount = await fetchContract(params.contract, finalConfig.rpcUrl);
     const fleet = contractAccount.data.fleet;
     const gameId = contractAccount.data.gameId;
@@ -57,21 +61,12 @@ export async function closeRental(params, config) {
     const payerSigner = toTransactionSigner(params.payer);
     // Derive active rental PDA (no more slot logic)
     const rentalState = await deriveActiveRental(params.contract);
-    // Get borrower - use provided value, or fetch from rental state, or fall back to payer
+    // Fetch rental state for borrower, referrer
     let borrower;
-    if (params.borrower) {
-        borrower = address(params.borrower);
-    }
-    else {
-        try {
-            const rental = await fetchRental(rentalState, finalConfig.rpcUrl);
-            borrower = rental.data.borrower;
-        }
-        catch {
-            // Rental state doesn't exist, fall back to payer
-            borrower = payerSigner.address;
-        }
-    }
+    let referrer;
+    const rental = await fetchRental(rentalState, finalConfig.rpcUrl);
+    borrower = params.borrower ? address(params.borrower) : rental.data.borrower;
+    referrer = isOption(rental.data.referrer) ? unwrapOption(rental.data.referrer) ?? undefined : undefined;
     // Derive borrower state PDA
     const borrowerState = await deriveBorrowerState(borrower);
     // Fetch fleet to get faction and derive SAGE accounts
@@ -81,22 +76,37 @@ export async function closeRental(params, config) {
     const faction = fleetState.faction;
     // Derive SAGE game accounts using borrower's profile
     const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
-    // Get atlasMint from on-chain config
-    const configAccount = await fetchConfig(finalConfig.rpcUrl);
+    // Get addresses
     const addresses = getAddresses(config);
     const sageProgram = address(addresses.sage);
     const programAddress = address(addresses.srsly);
+    const contractAddress = address(params.contract);
+    // Derive fee flush accounts
+    const vaultAddress = address(configAccount.data.slyvault);
+    const vaultTokenAccount = await deriveAssociatedTokenAccount(vaultAddress, atlasMint);
+    const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
+    // Borrower's managed ATA for discount refund
+    const borrowerTokenAccount = await deriveAssociatedTokenAccount(borrowerState, atlasMint);
     // Call Codama-generated instruction
     const kitInstruction = await getCloseRentalInstructionAsync({
         payer: payerSigner,
-        borrower,
         borrowerState,
-        contract: address(params.contract),
+        contract: contractAddress,
         rentalState,
         fleet: address(fleet),
         gameId: address(gameId),
         starbase: gameAccounts.starbase,
         starbasePlayer: gameAccounts.starbasePlayer,
+        contractTokenAccount,
+        vault: vaultAddress,
+        vaultTokenAccount,
+        referrer,
+        borrowerTokenAccount,
+        // Don't pass queued accounts — codama auto-derives from seeds which triggers is_queued() constraint
+        // Pass program ID to signal None (Anchor optional account convention)
+        queuedRental: programAddress,
+        queuedBorrowerProfile: programAddress,
+        queuedBorrowerProfileFaction: programAddress,
         sageProgram,
     }, { programAddress });
     return prepareInstructions(kitInstruction, {