@aephia/atlas-kit 0.6.0-next.17 → 0.6.0-next.170

package/dist/internal/planning/authorization-adapter.js

@@ -1,6 +1,9 @@
-import { AccountRole, } from '@solana/kit';
+import { AccountRole, isAddress, } from '@solana/kit';
 import { InvalidActionInputError } from '../../client/errors.js';
-import { playerProfile, sage } from '../c4/bindings.js';
+import { OrderSide, PLAYER_PROFILE_PROGRAM_ADDRESS, SAGE_PROGRAM_ADDRESS, getAddShipEscrowInstructionDataEncoder, getApplyCombatStimulantInstructionDataEncoder, getAttackFleetInstructionDataEncoder, getAttackStarbaseInstructionDataEncoder, getCancelClaimStakeBuildingDesignInstructionDataEncoder, getCancelCraftingProcessInstructionDataEncoder, getCancelLocalMarketOrdersInstructionDataEncoder, getClaimLoyaltyAtlasInstructionDataEncoder, getClaimStakesRentTopUpInstructionDataEncoder, getCompleteCraftingProcessInstructionDataEncoder, getDeconstructClaimStakeInstanceInstructionDataEncoder, getDepositCargoToGameInstructionDataEncoder, getDockedToIdleInstructionDataEncoder, getFinalizeBuildingChangesInstructionDataEncoder, getIdleToDockedInstructionDataEncoder, getPlaceClaimStakeBuildingsInstructionDataEncoder, getPlaceClaimStakeInstanceWithHubInstructionDataEncoder, getPlaceLocalMarketOrderInstructionDataEncoder, getRecoverClaimStakesFleetTransferInstructionDataEncoder, getDestroyStarbasePlayerInstructionDataEncoder, getRegisterStarbasePlayerInstructionDataEncoder, getRetrieveLootInstructionDataEncoder, getStartClaimStakesFleetTransferInstructionDataEncoder, getStartCraftingProcessInstructionDataEncoder, getStartMiningAsteroidInstructionDataEncoder, getStartSubwarpInstructionDataEncoder, getStopMiningAsteroidInstructionDataEncoder, getStopSubwarpInstructionDataEncoder, getTransferCargoToFleetInstructionDataEncoder, getTransferCargoWithinFleetInstructionDataEncoder, getUnlockResearchNodeInstructionDataEncoder, getWarpLaneInstructionDataEncoder, getWarpToCoordinateInstructionDataEncoder, getWithdrawCargoFromGameInstructionDataEncoder, } from '../c4/runtime-bindings.js';
+import { SYSTEM_PROGRAM } from '../system-program.js';
+import { ORIGINAL_TOKEN_PROGRAM } from './original-token.js';
+import { DISABLED_RENT_HINTS } from './rent-catalog.js';
 const KEY_INDEX_MAX = 65_535;
 /** Validates planning authorization before any instruction encoding or I/O. */
 export function validatePlanAuthorization(authorization) {
@@ -10,6 +13,34 @@ export function validatePlanAuthorization(authorization) {
         throw new InvalidActionInputError('PlanAuthorization.keyIndex', authorization.keyIndex, 'an integer from 0 through 65535', 'Set PlanAuthorization.keyIndex to the selected Profile key index before planning this action.');
     }
 }
+const AUTHORIZATION_FIELDS = ['profile', 'authority', 'keyIndex'];
+/** Reads caller planning authorization before any instruction encoding or I/O:
+ * exactly profile, authority, keyIndex and an optional certificate, with valid
+ * account addresses and a Profile key index. Returns a shallow copy.
+ */
+export function readPlanAuthorization(value) {
+    if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+        throw new InvalidActionInputError('authorization', value, 'a plain object', 'Provide authorization as the documented object before retrying.');
+    }
+    const authorization = value;
+    const missing = AUTHORIZATION_FIELDS.find((key) => !Object.hasOwn(authorization, key));
+    const unexpected = Object.keys(authorization).find((key) => key !== 'certificate' &&
+        !AUTHORIZATION_FIELDS.includes(key));
+    if (missing !== undefined || unexpected !== undefined) {
+        throw new InvalidActionInputError('authorization', missing === undefined ? unexpected : `missing ${missing}`, 'exactly the fields profile, authority, keyIndex, certificate', 'Remove unknown fields and provide every required authorization field before retrying.');
+    }
+    for (const field of ['profile', 'authority', 'certificate']) {
+        const address = authorization[field];
+        if (field === 'certificate' && address === undefined)
+            continue;
+        if (typeof address !== 'string' || !isAddress(address)) {
+            throw new InvalidActionInputError(`authorization.${field}`, address, 'one valid z.ink/Solana account address', `Set authorization.${field} to the documented public account address before retrying.`);
+        }
+    }
+    const copy = { ...authorization };
+    validatePlanAuthorization(copy);
+    return copy;
+}
 function readonlyAccount(address) {
     return Object.freeze({ address, role: AccountRole.READONLY });
 }
@@ -30,8 +61,20 @@ function optionalWritableAccount(address, programAddress) {
         ? readonlyAccount(programAddress)
         : writableAccount(address);
 }
+/** Rent accounts of a Claim Stake design or transfer change while rent is
+ * Disabled: the catalog, the stake's settlement authority and three omitted
+ * source heads that only an Active catalog reads. */
+function disabledRentAccounts(input, programAddress) {
+    return [
+        readonlyAccount(input.rentCatalog),
+        writableAccount(input.rentAuthority),
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+    ];
+}
 function getProgramAddress(config) {
-    return config.programAddress ?? sage.SAGE_PROGRAM_ADDRESS;
+    return config.programAddress ?? SAGE_PROGRAM_ADDRESS;
 }
 function authorizationAccounts(input, programAddress) {
     validatePlanAuthorization(input.authorization);
@@ -39,8 +82,7 @@ function authorizationAccounts(input, programAddress) {
         readonlySignerAddress(input.authorization.authority),
         writableAccount(input.authorization.profile),
         readonlyAccount(input.authorization.certificate ?? programAddress),
-        readonlyAccount(input.profileValidationProgram ??
-            playerProfile.PLAYER_PROFILE_PROGRAM_ADDRESS),
+        readonlyAccount(input.profileValidationProgram ?? PLAYER_PROFILE_PROGRAM_ADDRESS),
     ];
 }
 function createAddressOnlyInstruction(programAddress, accounts, data) {
@@ -59,9 +101,9 @@ export function adaptDockedToIdleInstruction(input, config = {}) {
         readonlyAccount(input.systemAndStarbasePlayerStarbasePlayer),
         readonlyAccount(input.game),
     ];
-    const data = sage
-        .getDockedToIdleInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getDockedToIdleInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 export function adaptIdleToDockedInstruction(input, config = {}) {
@@ -72,10 +114,15 @@ export function adaptIdleToDockedInstruction(input, config = {}) {
         readonlyAccount(input.systemAndStarbasePlayerSystem),
         writableAccount(input.systemAndStarbasePlayerStarbasePlayer),
         readonlyAccount(input.game),
+        readonlyAccount(input.factionRelationTracker),
+        optionalReadonlyAccount(input.factionStanding, programAddress),
+        optionalReadonlyAccount(input.factionConfig, programAddress),
+        readonlyAccount(input.factionOwnership),
+        optionalReadonlyAccount(input.ownerFactionAccount, programAddress),
     ];
-    const data = sage
-        .getIdleToDockedInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getIdleToDockedInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts the generated bidirectional Fleet/Starbase cargo instruction without retaining a signer. */
@@ -89,7 +136,7 @@ export function adaptTransferCargoToFleetInstruction(input, config = {}) {
         readonlyAccount(input.systemAndStarbasePlayerSystem),
         writableAccount(input.systemAndStarbasePlayerStarbasePlayer),
     ];
-    const data = sage.getTransferCargoToFleetInstructionDataEncoder().encode({
+    const data = getTransferCargoToFleetInstructionDataEncoder().encode({
         ammoBank: input.ammoBank,
         cargoHold: input.cargoHold,
         fuelTank: input.fuelTank,
@@ -105,7 +152,7 @@ export function adaptTransferCargoWithinFleetInstruction(input, config = {}) {
         writableAccount(input.fleet),
         readonlyAccount(input.game),
     ];
-    const data = sage.getTransferCargoWithinFleetInstructionDataEncoder().encode({
+    const data = getTransferCargoWithinFleetInstructionDataEncoder().encode({
         amount: input.amount,
         cargoId: input.cargoId,
         cargoPodFrom: input.cargoPodFrom,
@@ -123,7 +170,7 @@ export function adaptClaimLoyaltyAtlasInstruction(input, config = {}) {
         writableAccount(input.character),
         writableAccount(input.bank),
     ];
-    const data = sage.getClaimLoyaltyAtlasInstructionDataEncoder().encode({
+    const data = getClaimLoyaltyAtlasInstructionDataEncoder().encode({
         factionId: input.factionId,
         keyIndex: input.authorization.keyIndex,
     });
@@ -144,10 +191,40 @@ export function adaptRegisterStarbasePlayerInstruction(input, config = {}) {
         optionalReadonlyAccount(input.factionStanding, programAddress),
         optionalReadonlyAccount(input.factionConfig, programAddress),
         readonlyAccount(input.factionOwnership),
+        optionalReadonlyAccount(input.ownerFactionAccount, programAddress),
     ];
-    const data = sage
-        .getRegisterStarbasePlayerInstructionDataEncoder()
-        .encode({});
+    const data = getRegisterStarbasePlayerInstructionDataEncoder().encode({});
+    return createAddressOnlyInstruction(programAddress, accounts, data);
+}
+/** Adapts stale StarbasePlayer recovery with an address-only rent funder. */
+export function adaptDestroyStarbasePlayerInstruction(input, config = {}) {
+    const accounts = [
+        writableAccount(input.profile),
+        readonlyAccount(input.system),
+        writableAccount(input.starbasePlayer),
+        writableSignerAddress(input.funder),
+        readonlyAccount(input.game),
+        // The generated builder omits this, but paying for account growth needs it.
+        readonlyAccount(SYSTEM_PROGRAM),
+    ];
+    const data = getDestroyStarbasePlayerInstructionDataEncoder().encode({});
+    return createAddressOnlyInstruction(getProgramAddress(config), accounts, data);
+}
+/** Adapts a research node unlock with address-only direct Profile authorization. */
+export function adaptUnlockResearchNodeInstruction(input, config = {}) {
+    const programAddress = getProgramAddress(config);
+    const accounts = [
+        ...authorizationAccounts(input, programAddress),
+        writableAccount(input.character),
+        readonlyAccount(input.game),
+        writableAccount(input.starbasePlayer),
+        readonlyAccount(input.system),
+        writableAccount(input.currencyCache),
+    ];
+    const data = getUnlockResearchNodeInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+        nodeId: input.nodeId,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts start-crafting with address-only Profile and new-process signers. */
@@ -165,8 +242,13 @@ export function adaptStartCraftingProcessInstruction(input, config = {}) {
         optionalWritableAccount(input.craftingHabInstance, programAddress),
         optionalWritableAccount(input.currencyCache, programAddress),
         optionalWritableAccount(input.crewBinding, programAddress),
+        readonlyAccount(input.starbaseGovernance),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        readonlyAccount(input.democracyHistoryHistory),
+        optionalReadonlyAccount(input.democracyHistoryPolicy, programAddress),
+        optionalReadonlyAccount(input.democracyHistoryGeneration, programAddress),
     ];
-    const data = sage.getStartCraftingProcessInstructionDataEncoder().encode({
+    const data = getStartCraftingProcessInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         numCrew: input.numCrew,
         quantity: input.quantity,
@@ -186,10 +268,17 @@ export function adaptCompleteCraftingProcessInstruction(input, config = {}) {
         optionalWritableAccount(input.craftingHabInstance, programAddress),
         writableAccount(input.craftingProcess),
         writableAccount(input.currencyCache),
+        optionalWritableAccount(input.starbaseTreasury, programAddress),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        writableAccount(input.democracyHistoryHistory),
+        optionalReadonlyAccount(input.democracyHistoryPolicy, programAddress),
+        optionalWritableAccount(input.democracyHistoryGeneration, programAddress),
     ];
-    const data = sage
-        .getCompleteCraftingProcessInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getCompleteCraftingProcessInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts cancel-crafting with address-only Profile authorization. */
@@ -205,9 +294,9 @@ export function adaptCancelCraftingProcessInstruction(input, config = {}) {
         writableAccount(input.recipe),
         optionalWritableAccount(input.craftingHabInstance, programAddress),
     ];
-    const data = sage
-        .getCancelCraftingProcessInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getCancelCraftingProcessInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts Local Market order placement with address-only Profile authorization. */
@@ -220,8 +309,14 @@ export function adaptPlaceLocalMarketOrderInstruction(input, config = {}) {
         readonlyAccount(input.system),
         writableAccount(input.starbasePlayer),
         writableAccount(input.localMarket),
+        readonlyAccount(input.starbaseGovernance),
+        writableAccount(input.currencyCache),
+        optionalWritableAccount(input.starbaseTreasury, programAddress),
+        writableAccount(input.democracyHistoryHistory),
+        optionalReadonlyAccount(input.democracyHistoryPolicy, programAddress),
+        optionalWritableAccount(input.democracyHistoryGeneration, programAddress),
     ];
-    const data = sage.getPlaceLocalMarketOrderInstructionDataEncoder().encode({
+    const data = getPlaceLocalMarketOrderInstructionDataEncoder().encode({
         args: {
             fillOrKill: false,
             price: input.price,
@@ -242,8 +337,14 @@ export function adaptCancelLocalMarketOrdersInstruction(input, config = {}) {
         readonlyAccount(input.system),
         writableAccount(input.starbasePlayer),
         writableAccount(input.localMarket),
+        readonlyAccount(input.starbaseGovernance),
+        writableAccount(input.currencyCache),
+        optionalWritableAccount(input.starbaseTreasury, programAddress),
+        writableAccount(input.democracyHistoryHistory),
+        optionalReadonlyAccount(input.democracyHistoryPolicy, programAddress),
+        optionalWritableAccount(input.democracyHistoryGeneration, programAddress),
     ];
-    const data = sage.getCancelLocalMarketOrdersInstructionDataEncoder().encode({
+    const data = getCancelLocalMarketOrdersInstructionDataEncoder().encode({
         args: input.args.map(({ orderId, price }) => ({ orderId, price })),
         keyIndex: input.authorization.keyIndex,
     });
@@ -257,7 +358,7 @@ export function adaptApplyCombatStimulantInstruction(input, config = {}) {
         writableAccount(input.fleet),
         readonlyAccount(input.game),
     ];
-    const data = sage.getApplyCombatStimulantInstructionDataEncoder().encode({
+    const data = getApplyCombatStimulantInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         stimCargoId: input.stimCargoId,
     });
@@ -293,8 +394,11 @@ export function adaptAttackFleetInstruction(input, config = {}) {
         readonlyAccount(input.defenderRewardsConfig),
         optionalWritableAccount(input.defenderRewardsEpoch, programAddress),
         optionalWritableAccount(input.defenderRewardsContribution, programAddress),
+        optionalWritableAccount(input.attackerXpBudget, programAddress),
+        optionalWritableAccount(input.defenderXpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
     ];
-    const data = sage.getAttackFleetInstructionDataEncoder().encode({
+    const data = getAttackFleetInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         stance: input.stance,
     });
@@ -325,8 +429,18 @@ export function adaptAttackStarbaseInstruction(input, config = {}) {
         readonlyAccount(input.rewardRegistry),
         readonlyAccount(input.rewardConfig),
         writableAccount(input.kingTracker),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        readonlyAccount(input.rentCatalog),
+        writableAccount(input.rentHead),
+        // Level history pages exist only with the System's rent head.
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+        writableAccount(input.democracyHistoryHistory),
+        optionalReadonlyAccount(input.democracyHistoryPolicy, programAddress),
+        optionalWritableAccount(input.democracyHistoryGeneration, programAddress),
     ];
-    const data = sage.getAttackStarbaseInstructionDataEncoder().encode({
+    const data = getAttackStarbaseInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         stance: input.stance,
     });
@@ -346,7 +460,7 @@ export function adaptRetrieveLootInstruction(input, config = {}) {
         optionalWritableAccount(input.lootCreator, programAddress),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
     ];
-    const data = sage.getRetrieveLootInstructionDataEncoder().encode({
+    const data = getRetrieveLootInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         want: input.want.map(([itemIndex, cargo]) => [
             itemIndex,
@@ -369,10 +483,9 @@ export function adaptPlaceClaimStakeInstruction(input, config = {}) {
         writableAccount(input.character),
         writableAccount(input.currencyCache),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
+        writableAccount(input.rentAuthority),
     ];
-    const data = sage
-        .getPlaceClaimStakeInstanceWithHubInstructionDataEncoder()
-        .encode({
+    const data = getPlaceClaimStakeInstanceWithHubInstructionDataEncoder().encode({
         claimStakeDefinitionId: input.claimStakeDefinitionId,
         hubBuildingId: input.hubBuildingId,
         initialRentAmount: input.initialRentAmount,
@@ -394,10 +507,13 @@ export function adaptClaimStakeBuildingChangesInstruction(input, config = {}) {
         writableAccount(input.currencyCache),
         readonlyAccount(input.factionOwnership),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        ...disabledRentAccounts(input, programAddress),
     ];
-    const data = sage.getPlaceClaimStakeBuildingsInstructionDataEncoder().encode({
+    const data = getPlaceClaimStakeBuildingsInstructionDataEncoder().encode({
         buildingChanges: input.buildingChanges,
         keyIndex: input.authorization.keyIndex,
+        rentHints: [...DISABLED_RENT_HINTS],
         sequenceId: input.sequenceId,
     });
     return createAddressOnlyInstruction(programAddress, accounts, data);
@@ -415,9 +531,14 @@ export function adaptFinalizeClaimStakeBuildingChangesInstruction(input, config
         writableAccount(input.celestialBody),
         writableAccount(input.currencyCache),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        ...disabledRentAccounts(input, programAddress),
     ];
-    const data = sage.getFinalizeBuildingChangesInstructionDataEncoder().encode({
+    const data = getFinalizeBuildingChangesInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
+        rentHints: [...DISABLED_RENT_HINTS],
     });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
@@ -433,10 +554,13 @@ export function adaptCancelClaimStakeBuildingChangesInstruction(input, config =
         writableAccount(input.celestialBody),
         writableAccount(input.currencyCache),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        ...disabledRentAccounts(input, programAddress),
     ];
-    const data = sage
-        .getCancelClaimStakeBuildingDesignInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getCancelClaimStakeBuildingDesignInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+        rentHints: [...DISABLED_RENT_HINTS],
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts Claim Stake deconstruction with address-only Profile authorization. */
@@ -451,13 +575,24 @@ export function adaptDeconstructClaimStakeInstruction(input, config = {}) {
         writableAccount(input.systemAndStarbasePlayerStarbasePlayer),
         writableAccount(input.celestialBody),
         readonlyAccount(input.systemProgram ?? '11111111111111111111111111111111'),
+        readonlyAccount(input.rentCatalog),
+        writableAccount(input.rentAuthority),
+        // An active rent evaluation and its funder exist only after settlement began.
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+        writableAccount(input.currencyCache),
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+        readonlyAccount(programAddress),
+        writableAccount(input.xpAccrual),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
     ];
-    const data = sage
-        .getDeconstructClaimStakeInstanceInstructionDataEncoder()
-        .encode({
+    const data = getDeconstructClaimStakeInstanceInstructionDataEncoder().encode({
         claimStakeIndex: input.claimStakeIndex,
         claimStakeLevel: input.claimStakeLevel,
         keyIndex: input.authorization.keyIndex,
+        rentHints: [...DISABLED_RENT_HINTS],
     });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
@@ -472,8 +607,12 @@ export function adaptTopUpClaimStakeRentInstruction(input, config = {}) {
         readonlyAccount(input.systemAndStarbasePlayerSystem),
         readonlyAccount(input.systemAndStarbasePlayerStarbasePlayer),
         readonlyAccount(input.game),
+        readonlyAccount(input.rentCatalog),
+        writableAccount(input.rentAuthority),
+        // An active rent evaluation exists only after settlement began.
+        readonlyAccount(programAddress),
     ];
-    const data = sage.getClaimStakesRentTopUpInstructionDataEncoder().encode({
+    const data = getClaimStakesRentTopUpInstructionDataEncoder().encode({
         amount: input.amount,
         keyIndex: input.authorization.keyIndex,
     });
@@ -493,11 +632,12 @@ export function adaptStartClaimStakeFleetTransferInstruction(input, config = {})
         readonlyAccount(input.game),
         writableAccount(input.character),
         optionalReadonlyAccount(input.crewBinding, programAddress),
+        optionalWritableAccount(input.xpAccrual, programAddress),
+        ...disabledRentAccounts(input, programAddress),
     ];
-    const data = sage
-        .getStartClaimStakesFleetTransferInstructionDataEncoder()
-        .encode({
+    const data = getStartClaimStakesFleetTransferInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
+        rentHints: [...DISABLED_RENT_HINTS],
         toLoad: [...input.toLoad],
         toUnload: [...input.toUnload],
     });
@@ -512,25 +652,9 @@ export function adaptRecoverClaimStakeFleetTransferInstruction(input, config = {
         readonlyAccount(input.claimStakeInstance),
         readonlyAccount(input.game),
     ];
-    const data = sage
-        .getRecoverClaimStakesFleetTransferInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
-    return createAddressOnlyInstruction(programAddress, accounts, data);
-}
-/** Adapts movement arrival settlement with an address-only rent funder. */
-export function adaptFleetSettleArrivalInstruction(input, config = {}) {
-    const programAddress = getProgramAddress(config);
-    const accounts = [
-        writableSignerAddress(input.funder),
-        writableAccount(input.fleet),
-        readonlyAccount(input.game),
-        optionalReadonlyAccount(undefined, programAddress),
-        optionalWritableAccount(undefined, programAddress),
-        writableAccount(input.character),
-    ];
-    const data = sage
-        .getTheOneFleetStateHandlerInstructionDataEncoder()
-        .encode({});
+    const data = getRecoverClaimStakesFleetTransferInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 export function adaptStartSubwarpInstruction(input, config = {}) {
@@ -542,8 +666,11 @@ export function adaptStartSubwarpInstruction(input, config = {}) {
         readonlyAccount(input.game),
         readonlyAccount(input.regionTracker),
         optionalWritableAccount(input.crewBinding, programAddress),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        readonlyAccount('11111111111111111111111111111111'),
     ];
-    const data = sage.getStartSubwarpInstructionDataEncoder().encode({
+    const data = getStartSubwarpInstructionDataEncoder().encode({
         destRegionId: input.destRegionId,
         keyIndex: input.authorization.keyIndex,
         startRegionId: input.startRegionId,
@@ -559,8 +686,10 @@ export function adaptStopSubwarpInstruction(input, config = {}) {
         writableAccount(input.fleet),
         readonlyAccount(input.game),
         readonlyAccount(input.regionTracker),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
     ];
-    const data = sage.getStopSubwarpInstructionDataEncoder().encode({
+    const data = getStopSubwarpInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
     });
     return createAddressOnlyInstruction(programAddress, accounts, data);
@@ -574,8 +703,11 @@ export function adaptWarpToCoordinateInstruction(input, config = {}) {
         readonlyAccount(input.game),
         readonlyAccount(input.regionTracker),
         optionalWritableAccount(input.crewBinding, programAddress),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        readonlyAccount('11111111111111111111111111111111'),
     ];
-    const data = sage.getWarpToCoordinateInstructionDataEncoder().encode({
+    const data = getWarpToCoordinateInstructionDataEncoder().encode({
         destRegionId: input.destRegionId,
         destination: input.destination,
         keyIndex: input.authorization.keyIndex,
@@ -595,10 +727,13 @@ export function adaptWarpLaneInstruction(input, config = {}) {
         writableAccount(input.currencyCache),
         readonlyAccount(input.factionRelationTracker),
         readonlyAccount(input.regionTracker),
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+        readonlyAccount('11111111111111111111111111111111'),
     ];
-    const data = sage
-        .getWarpLaneInstructionDataEncoder()
-        .encode({ keyIndex: input.authorization.keyIndex });
+    const data = getWarpLaneInstructionDataEncoder().encode({
+        keyIndex: input.authorization.keyIndex,
+    });
     return createAddressOnlyInstruction(programAddress, accounts, data);
 }
 /** Adapts the C4 wallet deposit instruction with separate address-only signer roles. */
@@ -614,9 +749,8 @@ export function adaptDepositCargoToGameInstruction(input, config = {}) {
         readonlyAccount(input.cargoCache),
         writableAccount(input.source),
         writableAccount(input.destination),
-        readonlyAccount(input.tokenProgram ??
-            'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-    ], sage.getDepositCargoToGameInstructionDataEncoder().encode({
+        readonlyAccount(input.tokenProgram ?? ORIGINAL_TOKEN_PROGRAM),
+    ], getDepositCargoToGameInstructionDataEncoder().encode({
         amount: input.amount,
         keyIndex: input.authorization.keyIndex,
     }));
@@ -632,15 +766,15 @@ export function adaptWithdrawCargoFromGameInstruction(input, config = {}) {
         writableAccount(input.cargoCache),
         writableAccount(input.source),
         writableAccount(input.destination),
-        readonlyAccount(input.tokenProgram ??
-            'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
-    ], sage
-        .getWithdrawCargoFromGameInstructionDataEncoder()
-        .encode({ amount: input.amount, keyIndex: input.authorization.keyIndex }));
+        readonlyAccount(input.tokenProgram ?? ORIGINAL_TOKEN_PROGRAM),
+    ], getWithdrawCargoFromGameInstructionDataEncoder().encode({
+        amount: input.amount,
+        keyIndex: input.authorization.keyIndex,
+    }));
 }
 /** Adapts explicit ship escrow import with independent Profile and token-owner signers. */
 export function adaptAddShipEscrowInstruction(input) {
-    const programAddress = sage.SAGE_PROGRAM_ADDRESS;
+    const programAddress = SAGE_PROGRAM_ADDRESS;
     return createAddressOnlyInstruction(programAddress, [
         ...authorizationAccounts(input, programAddress),
         readonlyAccount(input.character),
@@ -651,9 +785,9 @@ export function adaptAddShipEscrowInstruction(input) {
         writableSignerAddress(input.owner),
         readonlyAccount(input.authorization.profile),
         readonlyAccount(input.game),
-        readonlyAccount('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA'),
+        readonlyAccount(ORIGINAL_TOKEN_PROGRAM),
         readonlyAccount('11111111111111111111111111111111'),
-    ], sage.getAddShipEscrowInstructionDataEncoder().encode({
+    ], getAddShipEscrowInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         shipAmount: input.amount,
         id: input.shipId,
@@ -669,7 +803,7 @@ export function adaptStartMiningAsteroidInstruction(input, config = {}) {
         writableAccount(input.regionTracker),
         writableAccount(input.asteroid),
         readonlyAccount(input.game),
-    ], sage.getStartMiningAsteroidInstructionDataEncoder().encode({
+    ], getStartMiningAsteroidInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
         resources: input.resources,
     }));
@@ -684,7 +818,9 @@ export function adaptStopMiningAsteroidInstruction(input, config = {}) {
         writableAccount(input.asteroid),
         optionalWritableAccount(input.crewBinding, programAddress),
         optionalReadonlyAccount(input.regionTracker, programAddress),
-    ], sage.getStopMiningAsteroidInstructionDataEncoder().encode({
+        optionalWritableAccount(input.xpBudget, programAddress),
+        optionalReadonlyAccount(input.xpBudgetConfig, programAddress),
+    ], getStopMiningAsteroidInstructionDataEncoder().encode({
         keyIndex: input.authorization.keyIndex,
     }));
 }