@wuwei-labs/srsly 3.0.0-beta.3 → 3.0.0-beta.30

package/dist/cjs/instructions/closeRental.js

@@ -12,25 +12,26 @@ const instructions_1 = require("../generated/codama/instructions");
 const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
 const contract_1 = require("../accounts/contract");
+const config_2 = require("../accounts/config");
 const fleet_1 = require("../accounts/fleet");
+const rental_1 = require("../accounts/rental");
+const borrower_1 = require("../accounts/borrower");
 const sage_1 = require("../pda/sage");
 const srsly_1 = require("../pda/srsly");
-const thread_1 = require("../pda/thread");
 const instructions_2 = require("../utils/instructions");
 /**
  * Close a rental
  *
  * Closes a completed rental and transfers the fleet back to the owner.
- * Payments are sent to the owner's token account.
+ * Always targets the active rental PDA.
  *
  * This function automatically:
- * - Fetches contract to get owner, ownerTokenAccount, fleet, gameId
- * - Fetches fleet to get faction for SAGE account derivation
+ * - Fetches contract to get owner, fleet, gameId
+ * - Fetches the active rental to get borrower (if not provided)
+ * - Fetches the borrower's SAGE profile from borrower_state
  * - Derives required SAGE accounts (starbase, starbase player)
- * - Derives rental thread for automated payments
- * - Codama auto-derives contractTokenAccount as ATA
  *
- * @param params - Rental closure parameters (payer, borrower, contract)
+ * @param params - Rental closure parameters (payer, contract)
  * @param config - Optional SDK configuration overrides
  * @returns Kit instruction (or web3.js if PublicKey in config)
  *
@@ -38,7 +39,6 @@ const instructions_2 = require("../utils/instructions");
  * ```typescript
  * const ix = await closeRental({
  *   payer: ownerWallet,
- *   borrower: borrowerAddress,
  *   contract: contractAddress
  * });
  * ```
@@ -50,47 +50,66 @@ async function closeRental(params, config) {
     if (!params.payer) {
         throw new Error('payer is required');
     }
-    if (!params.borrower) {
-        throw new Error('borrower is required');
-    }
     if (!params.contract) {
         throw new Error('contract is required');
     }
     // Fetch contract to get owner, fleet, gameId
     const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
-    const owner = contractAccount.data.owner;
     const fleet = contractAccount.data.fleet;
     const gameId = contractAccount.data.gameId;
     // Convert payer to transaction signer
     const payerSigner = (0, signer_1.toTransactionSigner)(params.payer);
-    // Fetch fleet data to get faction (for SAGE account derivation)
-    const fleetState = await (0, fleet_1.fetchFleet)(fleet, finalConfig.rpcUrl);
-    const faction = fleetState.faction;
-    const ownerProfile = fleetState.ownerProfile;
-    // Derive SAGE game accounts (we need owner's profile for starbase player)
-    const gameAccounts = await (0, sage_1.deriveGameAccounts)(ownerProfile, faction, gameId);
-    // Derive rental and rental authority PDAs
-    const rental = await (0, srsly_1.deriveRental)(params.contract, params.borrower);
-    const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
+    // Derive active rental PDA (no more slot logic)
+    const rentalState = await (0, srsly_1.deriveActiveRental)(params.contract);
+    // Get borrower - use provided value, or fetch from rental state, or fall back to payer
+    let borrower;
+    if (params.borrower) {
+        borrower = (0, kit_1.address)(params.borrower);
+    }
+    else {
+        try {
+            const rental = await (0, rental_1.fetchRental)(rentalState, finalConfig.rpcUrl);
+            borrower = rental.data.borrower;
+        }
+        catch {
+            // Rental state doesn't exist, fall back to payer
+            borrower = payerSigner.address;
+        }
+    }
     // Derive borrower state PDA
-    const borrowerState = await (0, srsly_1.deriveBorrowerState)(params.borrower);
-    // Derive rental thread for automated payments
-    const rentalThread = await (0, thread_1.deriveRentalThread)(rental, rentalAuthority);
-    // Get network-specific addresses
+    const borrowerState = await (0, srsly_1.deriveBorrowerState)(borrower);
+    // Fetch borrower's SAGE profile from borrower_state to derive game accounts
+    let borrowerProfile;
+    let faction;
+    try {
+        const borrowerAccount = await (0, borrower_1.fetchBorrower)(borrower, finalConfig.rpcUrl);
+        borrowerProfile = borrowerAccount.data.borrowerProfile;
+    }
+    catch {
+        // Borrower state doesn't exist, fallback to fleet owner profile
+        const fleetState = await (0, fleet_1.fetchFleet)(fleet, finalConfig.rpcUrl);
+        borrowerProfile = fleetState.ownerProfile;
+        faction = fleetState.faction;
+    }
+    // Get faction from fleet if not set above
+    if (faction === undefined) {
+        const fleetState = await (0, fleet_1.fetchFleet)(fleet, finalConfig.rpcUrl);
+        faction = fleetState.faction;
+    }
+    // Derive SAGE game accounts using borrower's profile
+    const gameAccounts = await (0, sage_1.deriveGameAccounts)(borrowerProfile, faction, gameId);
+    // Get atlasMint from on-chain config
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
     const addresses = (0, config_1.getAddresses)(config);
-    const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const sageProgram = (0, kit_1.address)(addresses.sage);
     const programAddress = (0, kit_1.address)(addresses.srsly);
     // Call Codama-generated instruction
-    // Note: contractTokenAccount is auto-derived by Codama as ATA for contract + mint
     const kitInstruction = await (0, instructions_1.getCloseRentalInstructionAsync)({
         payer: payerSigner,
-        mint: atlasMint,
-        borrower: (0, kit_1.address)(params.borrower),
+        borrower,
         borrowerState,
-        owner: (0, kit_1.address)(owner),
         contract: (0, kit_1.address)(params.contract),
-        rentalThread,
+        rentalState,
         fleet: (0, kit_1.address)(fleet),
         gameId: (0, kit_1.address)(gameId),
         starbase: gameAccounts.starbase,

package/dist/cjs/instructions/closeRental.js.map

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

package/dist/cjs/instructions/createAffiliate.js

@@ -0,0 +1,73 @@
+"use strict";
+/**
+ * @purpose Create a pending affiliate (Affiliate member) for SRSLY vault
+ *
+ * Wraps slyvault's initMember instruction with Affiliate type pre-configured.
+ * Auto-fetches vault and nonce from parent member state.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAffiliate = createAffiliate;
+const kit_1 = require("@solana/kit");
+const slyvault_1 = require("@wuwei-labs/slyvault");
+const config_1 = require("../utils/config");
+/**
+ * Create a pending affiliate (Affiliate member)
+ *
+ * Creates a new Affiliate member state that references a parent Normal member.
+ * The affiliate must be approved by the parent member's authority using approveAffiliate.
+ *
+ * This function auto-fetches the vault address and parent member nonce from the
+ * parent member state, making it easier to use than the underlying initMember.
+ *
+ * @param params - Affiliate creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Prepared instruction(s)
+ *
+ * @example
+ * ```typescript
+ * import { createAffiliate } from '@wuwei-labs/srsly';
+ *
+ * // Create affiliate linked to parent member
+ * const ix = await createAffiliate({
+ *   affiliate: wallet,
+ *   parentMemberState: "PARENT_MEMBER_STATE_PDA",
+ *   discountAuthority: "OPTIONAL_DISCOUNT_SIGNER", // optional, defaults to main authority
+ *   // vault and nonce are auto-fetched from parent state
+ * });
+ * ```
+ */
+async function createAffiliate(params, config) {
+    const finalConfig = (0, config_1.mergeConfig)(config);
+    if (!params.affiliate)
+        throw new Error('affiliate is required');
+    if (!params.parentMemberState)
+        throw new Error('parentMemberState is required');
+    // Fetch parent member state to get vault and nonce
+    const { data: parentState } = await (0, slyvault_1.fetchMember)((0, kit_1.address)(params.parentMemberState), finalConfig.rpcUrl);
+    // Validate parent is Normal type with affiliateEnabled
+    if (parentState.memberType.__kind !== 'Normal') {
+        throw new Error('Parent member is not a Normal member type');
+    }
+    if (!parentState.memberType.affiliateEnabled) {
+        throw new Error('Parent member does not have affiliates enabled');
+    }
+    // Get vault and nonce from parent state
+    const vaultAddress = parentState.vault;
+    const parentNonce = parentState.nonce;
+    // Call slyvault initMember with Affiliate type pre-configured
+    return (0, slyvault_1.initMember)({
+        member: params.affiliate,
+        vault: vaultAddress,
+        nonce: params.nonce,
+        memberType: {
+            __kind: 'Affiliate',
+            parentMemberNonce: parentNonce,
+            percentageBps: 0,
+            claimableBalance: 0n,
+            isActive: false,
+        },
+        discountAuthority: params.discountAuthority,
+        computeUnits: params.computeUnits,
+    });
+}
+//# sourceMappingURL=createAffiliate.js.map

package/dist/cjs/instructions/createAffiliate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createAffiliate.js","sourceRoot":"","sources":["../../../src/instructions/createAffiliate.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAsEH,0CA0CC;AA9GD,qCAAoD;AACpD,mDAI8B;AAC9B,4CAA8D;AAoC9D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,eAAe,CACnC,MAA6B,EAC7B,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,iBAAiB;QAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAEhF,mDAAmD;IACnD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,IAAA,sBAAW,EAC7C,IAAA,aAAO,EAAC,MAAM,CAAC,iBAAiB,CAAC,EACjC,WAAW,CAAC,MAAM,CACnB,CAAC;IAEF,uDAAuD;IACvD,IAAI,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/C,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;QAC7C,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;IACpE,CAAC;IAED,wCAAwC;IACxC,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,CAAC;IACvC,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC;IAEtC,8DAA8D;IAC9D,OAAO,IAAA,qBAAU,EAAC;QAChB,MAAM,EAAE,MAAM,CAAC,SAAS;QACxB,KAAK,EAAE,YAAY;QACnB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,UAAU,EAAE;YACV,MAAM,EAAE,WAAW;YACnB,iBAAiB,EAAE,WAAW;YAC9B,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,EAAE;YACpB,QAAQ,EAAE,KAAK;SAChB;QACD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/instructions/createBorrower.js

@@ -0,0 +1,64 @@
+"use strict";
+/**
+ * @purpose Simplified createBorrower instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated createBorrower instruction.
+ * Creates a BorrowerState PDA with managed token account for a borrower.
+ * Derives SAGE accounts (profileFaction, starbase, starbasePlayer) from
+ * borrowerProfile + faction automatically.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBorrower = createBorrower;
+const kit_1 = require("@solana/kit");
+const instructions_1 = require("../generated/codama/instructions");
+const config_1 = require("../utils/config");
+const signer_1 = require("../utils/signer");
+const instructions_2 = require("../utils/instructions");
+const config_2 = require("../accounts/config");
+const sage_1 = require("../pda/sage");
+/**
+ * Create a borrower state account
+ *
+ * Creates a BorrowerState PDA and an associated managed token account.
+ * The managed token account holds ATLAS refunds from reservation knockoffs.
+ *
+ * Derives borrowerProfileFaction, starbase, and starbasePlayer PDAs
+ * automatically from the borrowerProfile and faction.
+ *
+ * @param params - Borrower creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+async function createBorrower(params, config) {
+    const finalConfig = (0, config_1.mergeConfig)(config);
+    if (!params.borrower) {
+        throw new Error('borrower is required');
+    }
+    if (!params.borrowerProfile) {
+        throw new Error('borrowerProfile is required');
+    }
+    if (params.faction === undefined || params.faction === null) {
+        throw new Error('faction is required (\'mud\' | \'oni\' | \'ustur\' or 1 | 2 | 3)');
+    }
+    const borrowerSigner = (0, signer_1.toTransactionSigner)(params.borrower);
+    // Get atlasMint from on-chain config and gameId from addresses
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const addresses = (0, config_1.getAddresses)(config);
+    const programAddress = (0, kit_1.address)(addresses.srsly);
+    // Derive all SAGE accounts from profile + faction
+    const gameAccounts = await (0, sage_1.deriveGameAccounts)((0, kit_1.address)(params.borrowerProfile), params.faction, (0, kit_1.address)(addresses.gameId));
+    const kitInstruction = await (0, instructions_1.getCreateBorrowerInstructionAsync)({
+        borrower: borrowerSigner,
+        mint: atlasMint,
+        borrowerProfile: (0, kit_1.address)(params.borrowerProfile),
+        borrowerProfileFaction: gameAccounts.profileFaction,
+        starbase: gameAccounts.starbase,
+        starbasePlayer: gameAccounts.starbasePlayer,
+    }, { programAddress });
+    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=createBorrower.js.map

package/dist/cjs/instructions/createBorrower.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createBorrower.js","sourceRoot":"","sources":["../../../src/instructions/createBorrower.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;AAiDH,wCA+CC;AA9FD,qCAAoD;AACpD,mEAAqF;AACrF,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+CAAiD;AACjD,sCAAiD;AA4BjD;;;;;;;;;;;;GAYG;AACI,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,kEAAkE,CAAC,CAAC;IACtF,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,+DAA+D;IAC/D,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,kDAAkD;IAClD,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAkB,EAC3C,IAAA,aAAO,EAAC,MAAM,CAAC,eAA0B,CAAC,EAC1C,MAAM,CAAC,OAAO,EACd,IAAA,aAAO,EAAC,SAAS,CAAC,MAAiB,CAAC,CACrC,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,IAAA,gDAAiC,EAC5D;QACE,QAAQ,EAAE,cAAc;QACxB,IAAI,EAAE,SAAS;QACf,eAAe,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,eAA0B,CAAC;QAC3D,sBAAsB,EAAE,YAAY,CAAC,cAAc;QACnD,QAAQ,EAAE,YAAY,CAAC,QAAQ;QAC/B,cAAc,EAAE,YAAY,CAAC,cAAc;KAC5C,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/instructions/createConfig.js

@@ -48,10 +48,18 @@ async function createConfig(params, config) {
     if (!params.vaultTokenAccount) {
         throw new Error('vaultTokenAccount is required');
     }
+    if (!params.lookupTable) {
+        throw new Error('lookupTable is required');
+    }
+    if (params.recentSlot === undefined || params.recentSlot === null) {
+        throw new Error('recentSlot is required');
+    }
     // Get network-specific addresses
     const addresses = (0, config_1.getAddresses)(config);
     const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const programAddress = (0, kit_1.address)(addresses.srsly);
+    const sageProgram = (0, kit_1.address)(addresses.sage);
+    const antegenProgram = (0, kit_1.address)(addresses.antegen);
     // Convert authority to TransactionSigner
     // Handles both real signers (CLI/backend) and addresses (browser/wallet)
     const authoritySigner = params.authority
@@ -64,7 +72,11 @@ async function createConfig(params, config) {
         mint: atlasMint,
         vault: (0, kit_1.address)(params.vault),
         vaultTokenAccount: (0, kit_1.address)(params.vaultTokenAccount),
+        lookupTable: (0, kit_1.address)(params.lookupTable),
+        sageProgram,
+        antegenProgram,
         srslyProgram: programAddress,
+        recentSlot: BigInt(params.recentSlot),
     }, { programAddress });
     return (0, instructions_2.prepareInstructions)(kitInstruction, {
         computeUnits: params.computeUnits,

package/dist/cjs/instructions/createConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"createConfig.js","sourceRoot":"","sources":["../../../src/instructions/createConfig.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA+DH,oCA2CC;AAxGD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAE5E,wDAA4D;AA8B5D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,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,iBAAiB,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,yCAAyC;IACzC,yEAAyE;IACzE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS;QACtC,CAAC,CAAC,IAAA,4BAAmB,EAAC,MAAM,CAAC,SAAS,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,oCAAoC;IACpC,8EAA8E;IAC9E,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,SAAS,EAAE,eAAe;QAC1B,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,iBAAiB,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,iBAA4B,CAAC;QAC/D,YAAY,EAAE,cAAc;KAC7B,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"createConfig.js","sourceRoot":"","sources":["../../../src/instructions/createConfig.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA2EH,oCAuDC;AAhID,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAE5E,wDAA4D;AA0C5D;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACI,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,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,iBAAiB,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,OAAkB,CAAC,CAAC;IAE7D,yCAAyC;IACzC,yEAAyE;IACzE,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS;QACtC,CAAC,CAAC,IAAA,4BAAmB,EAAC,MAAM,CAAC,SAAS,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,oCAAoC;IACpC,8EAA8E;IAC9E,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,SAAS,EAAE,eAAe;QAC1B,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,iBAAiB,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,iBAA4B,CAAC;QAC/D,WAAW,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,WAAsB,CAAC;QACnD,WAAW;QACX,cAAc;QACd,YAAY,EAAE,cAAc;QAC5B,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;KACtC,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/instructions/createContract.js

@@ -14,8 +14,13 @@ const signer_1 = require("../utils/signer");
 const amount_1 = require("../params/amount");
 const duration_1 = require("../params/duration");
 const schedule_1 = require("../params/schedule");
+const sol_1 = require("../params/sol");
 const fleet_1 = require("../accounts/fleet");
+const config_2 = require("../accounts/config");
 const instructions_2 = require("../utils/instructions");
+const srsly_1 = require("../pda/srsly");
+const thread_1 = require("../pda/thread");
+const token_1 = require("../pda/token");
 /**
  * Create a rental contract for a Star Atlas fleet
  *
@@ -30,34 +35,9 @@ const instructions_2 = require("../utils/instructions");
  * const ix = await createContract({
  *   owner: wallet,
  *   fleet: fleetAddress,
- *   // ownerProfile and gameId fetched automatically from fleet
  *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
+ *   durationMax: { days: 30 }
  * });
- *
- * // Explicit ownerProfile and gameId (skips fetch)
- * const ix2 = await createContract({
- *   owner: wallet,
- *   fleet: fleetAddress,
- *   ownerProfile: profileAddress,  // Explicitly provided
- *   gameId: gameAddress,             // Explicitly provided
- *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
- * });
- *
- * // With web3.js
- * import { PublicKey } from '@solana/web3.js';
- * setSdkConfig({ network: 'atlasnet', PublicKey });
- * const web3Ix = await createContract({
- *   owner: keypair,
- *   fleet: fleetPubkey,
- *   rate: 100,
- *   durationMax: { days: 30 },
- *   paymentsFreq: '@daily'
- * });
- * // web3Ix.keys[0].pubkey is a PublicKey instance
  * ```
  */
 async function createContract(params, config) {
@@ -76,9 +56,6 @@ async function createContract(params, config) {
     if (!params.durationMax) {
         throw new Error('durationMax is required');
     }
-    if (!params.paymentsFreq) {
-        throw new Error('paymentsFreq is required');
-    }
     // Convert owner to transaction signer
     const ownerSigner = (0, signer_1.toTransactionSigner)(params.owner);
     // Fetch fleet data (source of truth for ownerProfile and gameId)
@@ -97,16 +74,20 @@ async function createContract(params, config) {
         ? (0, duration_1.convertDuration)(params.durationMin)
         : 3600; // Default 1 hour
     const durationMaxSeconds = (0, duration_1.convertDuration)(params.durationMax);
-    const normalizedSchedule = (0, schedule_1.normalizeSchedule)(params.paymentsFreq);
     // Validate duration logic
     if (durationMaxSeconds < durationMinSeconds) {
         throw new Error(`durationMax (${durationMaxSeconds}s) must be >= durationMin (${durationMinSeconds}s)`);
     }
-    // Get network-specific addresses
+    // Get atlasMint from on-chain config
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
     const addresses = (0, config_1.getAddresses)(config);
-    const atlasMint = (0, kit_1.address)(addresses.atlasMint);
     const sageProgram = (0, kit_1.address)(addresses.sage);
     const programAddress = (0, kit_1.address)(addresses.srsly);
+    // Convert cancelDelayMin duration to seconds
+    const cancelDelayMinSeconds = params.cancelDelayMin !== undefined
+        ? BigInt((0, duration_1.convertDuration)(params.cancelDelayMin))
+        : 1n; // Default 1 second (no instant cancel)
     // Call Codama-generated instruction
     const kitInstruction = await (0, instructions_1.getCreateContractInstructionAsync)({
         owner: ownerSigner,
@@ -118,11 +99,41 @@ async function createContract(params, config) {
         rate: rateStardust,
         durationMin: BigInt(durationMinSeconds),
         durationMax: BigInt(durationMaxSeconds),
-        paymentsFeq: normalizedSchedule,
         ownerKeyIndex: params.ownerKeyIndex ?? 0,
-        allowInstantCancel: params.allowInstantCancel ?? false,
-        reservationsDisabled: params.disableReservations ?? false
+        cancelDelayMin: cancelDelayMinSeconds,
+        reservationsDisabled: params.reservationsDisabled ?? true
     }, { programAddress });
+    // Default: bundle thread creation for automation
+    if (params.automated !== false) {
+        const paymentsFreq = (0, schedule_1.normalizeSchedule)(params.paymentsFreq ?? '@daily');
+        // Derive PDAs locally (contract doesn't exist on-chain yet)
+        const contractAddress = await (0, srsly_1.deriveContract)(params.fleet);
+        const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
+        const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
+        const contractThread = await (0, thread_1.deriveContractThread)(contractAddress, rentalAuthority);
+        const fiber0 = await (0, thread_1.deriveFiber)(contractThread, 0);
+        const closeRentalFiber = await (0, thread_1.deriveFiber)(contractThread, 1);
+        const ownerAddress = (0, signer_1.getSignerAddress)(params.owner);
+        const MINIMUM_THREAD_FUNDING = 40000000n;
+        const DEFAULT_EXECUTION_BUDGET = 2190000n; // 1 year daily @ 0.000006 SOL/tick
+        const threadIx = await (0, instructions_1.getCreateContractThreadInstructionAsync)({
+            payer: ownerSigner,
+            mint: atlasMint,
+            contract: contractAddress,
+            contractThread,
+            fiber0,
+            closeRentalFiber,
+            owner: ownerAddress,
+            contractTokenAccount,
+            sageProgram,
+            lamports: MINIMUM_THREAD_FUNDING + (params.threadLamports ? (0, sol_1.convertSol)(params.threadLamports) : DEFAULT_EXECUTION_BUDGET),
+            paymentsFreq,
+        }, { programAddress });
+        return (0, instructions_2.prepareInstructions)([kitInstruction, threadIx], {
+            computeUnits: params.computeUnits,
+            PublicKey: finalConfig.PublicKey
+        });
+    }
     return (0, instructions_2.prepareInstructions)(kitInstruction, {
         computeUnits: params.computeUnits,
         PublicKey: finalConfig.PublicKey

package/dist/cjs/instructions/createContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAuIH,wCAuFC;AA5ND,qCAAoD;AACpD,mEAAqF;AACrF,4CAA4E;AAC5E,4CAA4E;AAE5E,6CAAoF;AACpF,iDAAyE;AACzE,iDAA2E;AAC3E,6CAA+C;AAC/C,wDAA4D;AAgF5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACI,KAAK,UAAU,cAAc,CAClC,MAA4B,EAC5B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,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,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;IAC9C,CAAC;IAED,sCAAsC;IACtC,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtD,iEAAiE;IACjE,MAAM,UAAU,GAAG,MAAM,IAAA,kBAAU,EAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;IAC7C,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAEjC,qBAAqB;IACrB,MAAM,YAAY,GAAG,IAAA,sBAAa,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEhD,yDAAyD;IACzD,MAAM,iBAAiB,GAAG,UAAY,CAAC;IACvC,IAAI,YAAY,GAAG,iBAAiB,EAAE,CAAC;QACrC,MAAM,IAAI,KAAK,CACb,gEAAgE;YAChE,QAAQ,YAAY,cAAc,IAAA,wBAAe,EAAC,YAAY,CAAC,SAAS,CACzE,CAAC;IACJ,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,WAAW;QAC3C,CAAC,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC;QACrC,CAAC,CAAC,IAAI,CAAC,CAAC,iBAAiB;IAC3B,MAAM,kBAAkB,GAAG,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC/D,MAAM,kBAAkB,GAAG,IAAA,4BAAiB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAElE,0BAA0B;IAC1B,IAAI,kBAAkB,GAAG,kBAAkB,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CACb,gBAAgB,kBAAkB,8BAA8B,kBAAkB,IAAI,CACvF,CAAC;IACJ,CAAC;IAED,iCAAiC;IACjC,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,SAAoB,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,IAAe,CAAC,CAAC;IACvD,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,oCAAoC;IACpC,MAAM,cAAc,GAAG,MAAM,IAAA,gDAAiC,EAC5D;QACE,KAAK,EAAE,WAAW;QAClB,KAAK,EAAE,IAAA,aAAO,EAAC,MAAM,CAAC,KAAgB,CAAC;QACvC,YAAY,EAAE,IAAA,aAAO,EAAC,YAAuB,CAAC;QAC9C,MAAM,EAAE,IAAA,aAAO,EAAC,MAAiB,CAAC;QAClC,IAAI,EAAE,SAAS;QACf,WAAW;QACX,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC;QACvC,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC;QACvC,WAAW,EAAE,kBAAkB;QAC/B,aAAa,EAAE,MAAM,CAAC,aAAa,IAAI,CAAC;QACxC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK;QACtD,oBAAoB,EAAE,MAAM,CAAC,mBAAmB,IAAI,KAAK;KAC1D,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":"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"}

package/dist/cjs/instructions/createContractThread.js

@@ -0,0 +1,79 @@
+"use strict";
+/**
+ * @purpose Simplified createContractThread instruction wrapper
+ *
+ * Thin convenience wrapper around Codama-generated createContractThread instruction.
+ * Creates a per-contract automation thread with fiber-based dispatch.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createContractThread = createContractThread;
+const kit_1 = require("@solana/kit");
+const instructions_1 = require("../generated/codama/instructions");
+const config_1 = require("../utils/config");
+const signer_1 = require("../utils/signer");
+const instructions_2 = require("../utils/instructions");
+const config_2 = require("../accounts/config");
+const contract_1 = require("../accounts/contract");
+const thread_1 = require("../pda/thread");
+const srsly_1 = require("../pda/srsly");
+const schedule_1 = require("../params/schedule");
+const sol_1 = require("../params/sol");
+// Minimum: 3 fiber rents (~0.01 each) + thread rent (~0.01) = 0.04 SOL
+const MINIMUM_THREAD_FUNDING = 40000000n;
+const DEFAULT_EXECUTION_BUDGET = 2190000n; // 1 year daily @ 0.000006 SOL/tick
+/**
+ * Create a per-contract automation thread
+ *
+ * Creates an Antegen thread with controller fiber (fiber 0, inline).
+ * Thread starts **paused** by default. Fiber 1 (rental_close) and
+ * fiber 2 (rental_activate) are created lazily when needed by
+ * rental_accept and rental_reserve respectively.
+ *
+ * @param params - Thread creation parameters
+ * @param config - Optional SDK configuration overrides
+ * @returns Kit instruction (or web3.js if PublicKey in config)
+ */
+async function createContractThread(params, config) {
+    const finalConfig = (0, config_1.mergeConfig)(config);
+    if (!params.owner) {
+        throw new Error('owner is required');
+    }
+    if (!params.contract) {
+        throw new Error('contract is required');
+    }
+    const ownerSigner = (0, signer_1.toTransactionSigner)(params.owner);
+    const ownerAddress = (0, signer_1.getSignerAddress)(params.owner);
+    // Get atlasMint and sage program from config
+    const configAccount = await (0, config_2.fetchConfig)(finalConfig.rpcUrl);
+    const atlasMint = configAccount.data.atlasMint;
+    const addresses = (0, config_1.getAddresses)(config);
+    const programAddress = (0, kit_1.address)(addresses.srsly);
+    // Fetch contract to get managed_token_account
+    const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
+    const contractAddress = (0, kit_1.address)(params.contract);
+    // Derive thread and fiber PDAs
+    const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
+    const contractThread = await (0, thread_1.deriveContractThread)(contractAddress, rentalAuthority);
+    const fiber0 = await (0, thread_1.deriveFiber)(contractThread, 0);
+    const closeRentalFiber = await (0, thread_1.deriveFiber)(contractThread, 1);
+    // Normalize schedule to cron string
+    const paymentsFreq = (0, schedule_1.normalizeSchedule)(params.paymentsFreq);
+    const kitInstruction = await (0, instructions_1.getCreateContractThreadInstructionAsync)({
+        payer: ownerSigner,
+        mint: atlasMint,
+        contract: contractAddress,
+        contractThread,
+        fiber0,
+        closeRentalFiber,
+        owner: ownerAddress,
+        contractTokenAccount: contractAccount.data.managedTokenAccount,
+        sageProgram: (0, kit_1.address)(addresses.sage),
+        lamports: MINIMUM_THREAD_FUNDING + (params.lamports ? (0, sol_1.convertSol)(params.lamports) : DEFAULT_EXECUTION_BUDGET),
+        paymentsFreq,
+    }, { programAddress });
+    return (0, instructions_2.prepareInstructions)(kitInstruction, {
+        computeUnits: params.computeUnits,
+        PublicKey: finalConfig.PublicKey
+    });
+}
+//# sourceMappingURL=createContractThread.js.map

package/dist/cjs/instructions/createContractThread.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createContractThread.js","sourceRoot":"","sources":["../../../src/instructions/createContractThread.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA6DH,oDAwDC;AAnHD,qCAAoD;AACpD,mEAA2F;AAC3F,4CAA4E;AAC5E,4CAA8F;AAC9F,wDAA4D;AAC5D,+CAAiD;AACjD,mDAAqD;AACrD,0CAAkE;AAClE,wCAAqD;AACrD,iDAA2E;AAC3E,uCAA0D;AAE1D,uEAAuE;AACvE,MAAM,sBAAsB,GAAG,SAAW,CAAC;AAC3C,MAAM,wBAAwB,GAAG,QAAU,CAAC,CAAC,mCAAmC;AAiChF;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,oBAAoB,CACxC,MAAkC,EAClC,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,IAAA,yBAAgB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpD,6CAA6C;IAC7C,MAAM,aAAa,GAAG,MAAM,IAAA,oBAAW,EAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,8CAA8C;IAC9C,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,+BAA+B;IAC/B,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IACtD,MAAM,cAAc,GAAG,MAAM,IAAA,6BAAoB,EAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IACpF,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,MAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAE9D,oCAAoC;IACpC,MAAM,YAAY,GAAG,IAAA,4BAAiB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAE5D,MAAM,cAAc,GAAG,MAAM,IAAA,sDAAuC,EAClE;QACE,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,eAAe;QACzB,cAAc;QACd,MAAM;QACN,gBAAgB;QAChB,KAAK,EAAE,YAAY;QACnB,oBAAoB,EAAE,eAAe,CAAC,IAAI,CAAC,mBAAmB;QAC9D,WAAW,EAAE,IAAA,aAAO,EAAC,SAAS,CAAC,IAAe,CAAC;QAC/C,QAAQ,EAAE,sBAAsB,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,gBAAU,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC;QAC7G,YAAY;KACb,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/instructions/deleteBorrower.js

@@ -3,8 +3,8 @@
  * @purpose Simplified deleteBorrower instruction wrapper
  *
  * Thin convenience wrapper around Codama-generated deleteBorrower instruction.
- * Allows admin OR borrower to delete borrower state for schema migrations.
- * Returns lamports to the borrower. Next rental will lazy-init fresh state.
+ * Admin-only instruction to delete borrower state for schema migrations.
+ * Uses UncheckedAccount to bypass deserialization for old-format accounts.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteBorrower = deleteBorrower;
@@ -14,10 +14,11 @@ const config_1 = require("../utils/config");
 const signer_1 = require("../utils/signer");
 const instructions_2 = require("../utils/instructions");
 /**
- * Delete borrower state (admin only)
+ * Delete borrower state (admin-only for schema migrations)
  *
- * Used for schema migrations when BorrowerState structure changes.
- * Returns lamports to the borrower. Next rental will lazy-init fresh state.
+ * Used to delete old-format BorrowerState accounts that can't be deserialized
+ * with the current struct layout. Returns lamports to the borrower wallet.
+ * Uses UncheckedAccount to bypass deserialization.
  *
  * @param params - Delete borrower parameters
  * @param config - Optional SDK configuration overrides
@@ -25,32 +26,31 @@ const instructions_2 = require("../utils/instructions");
  *
  * @example
  * ```typescript
- * // Admin deletes borrower state for migration
  * const ix = await deleteBorrower({
  *   admin: adminWallet,
- *   borrower: "BORROWER_WALLET_ADDRESS"
+ *   borrower: "BORROWER_WALLET_ADDRESS",
+ *   borrowerState: "BORROWER_STATE_PDA_ADDRESS"
  * });
  * ```
  */
 async function deleteBorrower(params, config) {
-    // Merge config
     const finalConfig = (0, config_1.mergeConfig)(config);
-    // Validate required params
     if (!params.admin) {
         throw new Error('admin is required');
     }
     if (!params.borrower) {
         throw new Error('borrower is required');
     }
-    // Convert admin to transaction signer
+    if (!params.borrowerState) {
+        throw new Error('borrowerState is required');
+    }
     const adminSigner = (0, signer_1.toTransactionSigner)(params.admin);
-    // Get network-specific addresses
     const addresses = (0, config_1.getAddresses)(config);
     const programAddress = (0, kit_1.address)(addresses.srsly);
-    // Call Codama-generated instruction
     const kitInstruction = await (0, instructions_1.getDeleteBorrowerInstructionAsync)({
         admin: adminSigner,
-        borrower: (0, kit_1.address)(params.borrower)
+        borrower: (0, kit_1.address)(params.borrower),
+        borrowerState: (0, kit_1.address)(params.borrowerState),
     }, { programAddress });
     return (0, instructions_2.prepareInstructions)(kitInstruction, {
         computeUnits: params.computeUnits,