@wuwei-labs/srsly 2.0.0-beta.13 → 2.0.0-beta.2

package/dist/esm/rental/accept.js

@@ -1,88 +1,49 @@
-import { getNetworkModule, createConfigSelector } from '../utils/config';
-import { getSageGameId, ATLAS_TO_STARDUST } from '../utils/constants';
-import { deriveGameAccounts, } from '../utils';
+import { getAcceptRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS, } from '../codama';
+import { deriveGameAccounts, DEFAULT_GAME_ID, } from '../utils';
 /**
- * Internal function to accept a rental instruction with configuration options
- */
-async function _acceptRental(params, config) {
-    const { borrower, borrowerProfile, borrowerFaction, fleet, contract, gameId, rate, duration, referralTokenAccount, } = params;
-    // Get the actual game ID to use (param override, config override, or network default)
-    const actualGameId = gameId || await getSageGameId(config);
-    // Calculate the total amount from rate and duration
-    // Convert ATLAS to stardust (smallest unit): 1 ATLAS = 100,000,000 stardust
-    const amount = BigInt(rate) * BigInt(duration) * BigInt(ATLAS_TO_STARDUST);
-    // Derive the three accounts we need
-    const { profileFaction, starbase, starbasePlayer } = await deriveGameAccounts(borrowerProfile, borrowerFaction, actualGameId, 0, // starbaseSeqId
-    config);
-    // Let codama derive the rest (rentalThread, rentalState, rentalAuthority, etc.)
-    const input = {
-        borrower,
-        borrowerProfile,
-        borrowerProfileFaction: profileFaction,
-        fleet,
-        contract,
-        gameId: actualGameId,
-        starbase,
-        starbasePlayer,
-        amount,
-        duration,
-        referralTokenAccount,
-    };
-    // Get network-specific codama functions from centralized config
-    const instructionsModule = getNetworkModule('instructions', config?.network);
-    const programsModule = getNetworkModule('programs', config?.network);
-    const { getAcceptRentalInstructionAsync } = instructionsModule;
-    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
-    return getAcceptRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
-/**
- * Creates an instruction to accept a rental with fluent configuration.
+ * Asynchronously creates an instruction to accept a rental with minimal required parameters.
+ * Derives borrowerProfileFaction, starbase, and starbasePlayer automatically.
  *
  * @example
  * ```typescript
- * // Use devnet defaults
+ * // Create the instruction with automatic account derivation
  * const ix = await acceptRental({
  *   borrower: wallet,
  *   borrowerProfile: profileAddress,
  *   borrowerFaction: 1, // 1 = mud, 2 = oni, 3 = ustur
  *   fleet: fleetAddress,
  *   contract: contractAddress,
- *   rate: 1000, // ATLAS tokens
- *   duration: 86400  // 1 day in seconds (total: 1000 * 86400 * 100M stardust)
+ *   amount: 1000,
+ *   duration: 86400  // 1 day in seconds
+ *   // gameId is optional and will default to the standard game ID
  * });
  *
- * // With referral (referrer gets 5% of platform fees)
- * const ix = await acceptRental({
- *   borrower: wallet,
- *   borrowerProfile: profileAddress,
- *   borrowerFaction: 1,
- *   fleet: fleetAddress,
- *   contract: contractAddress,
- *   rate: 1000,
- *   duration: 86400,
- *   referralTokenAccount: referrerTokenAddress
- * });
- *
- * // Use mainnet configuration
- * const ix = await acceptRental(params).set({ network: 'mainnet' });
- *
- * // Override specific constants
- * const ix = await acceptRental(params).set({
- *   network: 'mainnet',
- *   gameId: 'custom-game-id...'
- * });
+ * // Add to transaction and sign
+ * const tx = new Transaction().add(ix);
+ * await sendAndConfirmTransaction(connection, tx, [wallet]);
  * ```
  *
  * @param params The simplified parameters for accepting a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @returns A promise that resolves to the instruction to accept a rental
  */
-export function acceptRental(params) {
-    return createConfigSelector((config) => _acceptRental(params, config));
-}
-export function getAcceptRentalInstructionAsync(input, options) {
-    return createConfigSelector(async (config) => {
-        const instructionsModule = getNetworkModule('instructions', config?.network);
-        return instructionsModule.getAcceptRentalInstructionAsync(input, options);
-    });
+export async function acceptRental(params) {
+    const { borrower, borrowerProfile, borrowerFaction, fleet, contract, gameId = DEFAULT_GAME_ID, amount, duration, } = params;
+    // Derive the three accounts we need
+    const { profileFaction, starbase, starbasePlayer } = await deriveGameAccounts(borrowerProfile, borrowerFaction, gameId);
+    // Let codama derive the rest (rentalThread, rentalState, rentalAuthority, etc.)
+    const input = {
+        borrower,
+        borrowerProfile,
+        borrowerProfileFaction: profileFaction,
+        fleet,
+        contract,
+        gameId,
+        starbase,
+        starbasePlayer,
+        amount,
+        duration,
+    };
+    return getAcceptRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
 }
+export { getAcceptRentalInstructionAsync };
 //# sourceMappingURL=accept.js.map

package/dist/esm/rental/accept.js.map

@@ -1 +1 @@
-{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAMtE,OAAO,EACL,kBAAkB,GACnB,MAAM,UAAU,CAAC;AAuDlB;;GAEG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,eAAe,EACf,KAAK,EACL,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,QAAQ,EACR,oBAAoB,GACrB,GAAG,MAAM,CAAC;IAEX,sFAAsF;IACtF,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;IAE3D,oDAAoD;IACpD,4EAA4E;IAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE3E,oCAAoC;IACpC,MAAM,EACJ,cAAc,EACd,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,kBAAkB,CAC1B,eAAe,EACf,eAAe,EACf,YAA+B,EAC/B,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gFAAgF;IAChF,MAAM,KAAK,GAAoC;QAC7C,QAAQ;QACR,eAAe;QACf,sBAAsB,EAAE,cAAc;QACtC,KAAK;QACL,QAAQ;QACR,MAAM,EAAE,YAAY;QACpB,QAAQ;QACR,cAAc;QACd,MAAM;QACN,QAAQ;QACR,oBAAoB;KACrB,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAY,EACZ,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B;IAE1B,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,kBAAkB,EAClB,eAAe,GAChB,MAAM,UAAU,CAAC;AAiDlB;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B;IAE1B,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,eAAe,EACf,KAAK,EACL,QAAQ,EACR,MAAM,GAAG,eAAkC,EAC3C,MAAM,EACN,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,oCAAoC;IACpC,MAAM,EACJ,cAAc,EACd,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,kBAAkB,CAC1B,eAAe,EACf,eAAe,EACf,MAAM,CACP,CAAC;IAEF,gFAAgF;IAChF,MAAM,KAAK,GAAoC;QAC7C,QAAQ;QACR,eAAe;QACf,sBAAsB,EAAE,cAAc;QACtC,KAAK;QACL,QAAQ;QACR,MAAM;QACN,QAAQ;QACR,cAAc;QACd,MAAM;QACN,QAAQ;KACT,CAAC;IAEF,OAAO,+BAA+B,CACpC,KAAY,EACZ,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}

package/dist/esm/rental/cancel.js

@@ -1,52 +1,33 @@
-import { getNetworkModule, createConfigSelector } from '../utils/config';
+import { getCancelRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS, } from '../codama';
 /**
- * Internal function to cancel a rental instruction with configuration options
- */
-async function _cancelRental(params, config) {
-    const { borrower, contract, } = params;
-    // Let codama derive all the optional accounts
-    const input = {
-        borrower,
-        contract,
-    };
-    // Get network-specific codama functions from centralized config
-    const instructionsModule = getNetworkModule('instructions', config?.network);
-    const programsModule = getNetworkModule('programs', config?.network);
-    const { getCancelRentalInstructionAsync } = instructionsModule;
-    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
-    return getCancelRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
-/**
- * Creates an instruction to cancel a rental with fluent configuration.
+ * Asynchronously creates an instruction to cancel a rental with minimal required parameters.
+ * Derives rentalState, rentalThread, borrowerTokenAccount, rentalTokenAccount and
+ * rentalAuthority automatically if not provided.
  *
  * @example
  * ```typescript
- * // Use devnet defaults
+ * // Create the instruction with minimal parameters - just borrower and contract
  * const ix = await cancelRental({
  *   borrower: wallet,
  *   contract: contractAddress
  * });
  *
- * // Use mainnet configuration
- * const ix = await cancelRental(params).set({ network: 'mainnet' });
- *
- * // Override specific constants
- * const ix = await cancelRental(params).set({
- *   network: 'mainnet',
- *   sageProgramAddress: 'custom...'
- * });
+ * // Add to transaction and sign
+ * const tx = new Transaction().add(ix);
+ * await sendAndConfirmTransaction(connection, tx, [wallet]);
  * ```
  *
  * @param params The simplified parameters for canceling a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @returns A promise that resolves to the instruction to cancel a rental
  */
-export function cancelRental(params) {
-    return createConfigSelector((config) => _cancelRental(params, config));
-}
-export function getCancelRentalInstructionAsync(input, options) {
-    return createConfigSelector(async (config) => {
-        const instructionsModule = getNetworkModule('instructions', config?.network);
-        return instructionsModule.getCancelRentalInstructionAsync(input, options);
-    });
+export async function cancelRental(params) {
+    const { borrower, contract, } = params;
+    // Let codama derive all the optional accounts
+    const input = {
+        borrower,
+        contract,
+    };
+    return getCancelRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
 }
+export { getCancelRentalInstructionAsync };
 //# sourceMappingURL=cancel.js.map

package/dist/esm/rental/cancel.js.map

@@ -1 +1 @@
-{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;AAoBlH;;GAEG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,QAAQ;KACT,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B;IAE1B,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,WAAW,CAAC;AAiBnB;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B;IAE1B,MAAM,EACJ,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,QAAQ;KACT,CAAC;IAEF,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,+BAA+B,EAAE,CAAC"}

package/dist/esm/rental/close.js

@@ -1,54 +1,35 @@
-import { getNetworkModule, createConfigSelector } from '../utils/config';
+import { getCloseRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS, } from '../codama';
 /**
- * Internal function to close a rental instruction with configuration options
- */
-async function _closeRental(params, config) {
-    const { borrower, ownerTokenAccount, contract, } = params;
-    // Let codama derive the optional accounts
-    const input = {
-        borrower,
-        ownerTokenAccount,
-        contract,
-    };
-    // Get network-specific codama functions from centralized config
-    const instructionsModule = getNetworkModule('instructions', config?.network);
-    const programsModule = getNetworkModule('programs', config?.network);
-    const { getCloseRentalInstructionAsync } = instructionsModule;
-    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
-    return getCloseRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
-/**
- * Creates an instruction to close a rental with fluent configuration.
+ * Asynchronously creates an instruction to close a rental with minimal required parameters.
+ * This is called by an owner to close a rental that was previously accepted by a borrower.
+ * Derives rentalState, rentalThread, rentalTokenAccount and rentalAuthority automatically if not provided.
  *
  * @example
  * ```typescript
- * // Use devnet defaults
+ * // Create the instruction with minimal parameters
  * const ix = await closeRental({
  *   borrower: borrowerAddress,
  *   ownerTokenAccount: ownerTokenAccountAddress,
  *   contract: contractAddress
  * });
  *
- * // Use mainnet configuration
- * const ix = await closeRental(params).set({ network: 'mainnet' });
- *
- * // Override specific constants
- * const ix = await closeRental(params).set({
- *   network: 'mainnet',
- *   sageProgramAddress: 'custom...'
- * });
+ * // Add to transaction and sign
+ * const tx = new Transaction().add(ix);
+ * await sendAndConfirmTransaction(connection, tx, [owner]);
  * ```
  *
  * @param params The simplified parameters for closing a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @returns A promise that resolves to the instruction to close a rental
  */
-export function closeRental(params) {
-    return createConfigSelector((config) => _closeRental(params, config));
-}
-export function getCloseRentalInstructionAsync(input, options) {
-    return createConfigSelector(async (config) => {
-        const instructionsModule = getNetworkModule('instructions', config?.network);
-        return instructionsModule.getCloseRentalInstructionAsync(input, options);
-    });
+export async function closeRental(params) {
+    const { borrower, ownerTokenAccount, contract, } = params;
+    // Let codama derive the optional accounts
+    const input = {
+        borrower,
+        ownerTokenAccount,
+        contract,
+    };
+    return getCloseRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
 }
+export { getCloseRentalInstructionAsync };
 //# sourceMappingURL=close.js.map

package/dist/esm/rental/close.js.map

@@ -1 +1 @@
-{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;AAyBlH;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,0CAA0C;IAC1C,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,iBAAiB;QACjB,QAAQ;KACT,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,EAAE,8BAA8B,EAAE,GAAG,kBAAkB,CAAC;IAC9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,WAAW,CACzB,MAAyB;IAEzB,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,kBAAkB,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,WAAW,CAAC;AAsBnB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAyB;IAEzB,MAAM,EACJ,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,0CAA0C;IAC1C,MAAM,KAAK,GAAG;QACZ,QAAQ;QACR,iBAAiB;QACjB,QAAQ;KACT,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,8BAA8B,EAAE,CAAC"}

package/dist/esm/rental/reset.js

@@ -1,38 +1,13 @@
-import { getNetworkModule, createConfigSelector } from '../utils/config';
-import { getSageGameId } from '../utils/constants';
-import { deriveGameAccounts, } from '../utils';
+import { getResetRentalInstructionAsync, SRSLY_PROGRAM_ADDRESS, } from '../codama';
+import { DEFAULT_GAME_ID, deriveGameAccounts, } from '../utils';
 /**
- * Internal function to reset a rental instruction with configuration options
- */
-async function _resetRental(params, config) {
-    const { fleet, contract, rentalState, gameId, faction, ownerProfile, } = params;
-    // Get the actual game ID to use (param override, config override, or network default)
-    const actualGameId = gameId || await getSageGameId(config);
-    // Derive the three accounts we need
-    const { starbase, starbasePlayer } = await deriveGameAccounts(ownerProfile, faction, actualGameId, 0, // starbaseSeqId
-    config);
-    // Get network-specific codama functions from centralized config
-    const instructionsModule = getNetworkModule('instructions', config?.network);
-    const programsModule = getNetworkModule('programs', config?.network);
-    const { getResetRentalInstructionAsync } = instructionsModule;
-    const { SRSLY_PROGRAM_ADDRESS } = programsModule;
-    // Let codama derive the rest (rentalAuthority)
-    const input = {
-        fleet,
-        contract,
-        rentalState,
-        gameId: actualGameId,
-        starbase,
-        starbasePlayer,
-    };
-    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
-}
-/**
- * Creates an instruction to reset a rental with fluent configuration.
+ * Asynchronously creates an instruction to reset a rental with minimal required parameters.
+ * This is used to reset a fleet's rental state after a rental has ended.
+ * Can derive starbase, starbasePlayer, and rentalAuthority automatically.
  *
  * @example
  * ```typescript
- * // Use devnet defaults
+ * // Create the instruction with minimum required parameters and faction
  * const ix = await resetRental({
  *   fleet: fleetAddress,
  *   contract: contractAddress,
@@ -41,27 +16,37 @@ async function _resetRental(params, config) {
  *   ownerProfile: ownerProfileAddress
  * });
  *
- * // Use mainnet configuration
- * const ix = await resetRental(params).set({ network: 'mainnet' });
- *
- * // Override specific constants
- * const ix = await resetRental(params).set({
- *   network: 'mainnet',
- *   gameId: 'custom-game-id...',
- *   sageProgramAddress: 'custom...'
+ * // Or with explicit starbase and starbasePlayer
+ * const ix = await resetRental({
+ *   fleet: fleetAddress,
+ *   contract: contractAddress,
+ *   rentalState: rentalStateAddress,
+ *   starbase: starbaseAddress,
+ *   starbasePlayer: starbasePlayerAddress
  * });
+ *
+ * // Add to transaction and sign
+ * const tx = new Transaction().add(ix);
+ * await sendAndConfirmTransaction(connection, tx, [owner]);
  * ```
  *
  * @param params The simplified parameters for resetting a rental
- * @returns A ConfigSelector that can be configured with .set() or awaited directly
+ * @returns A promise that resolves to the instruction to reset a rental
  */
-export function resetRental(params) {
-    return createConfigSelector((config) => _resetRental(params, config));
-}
-export function getResetRentalInstructionAsync(input, options) {
-    return createConfigSelector(async (config) => {
-        const instructionsModule = getNetworkModule('instructions', config?.network);
-        return instructionsModule.getResetRentalInstructionAsync(input, options);
-    });
+export async function resetRental(params) {
+    const { fleet, contract, rentalState, gameId = DEFAULT_GAME_ID, faction, ownerProfile, } = params;
+    // Derive the three accounts we need
+    const { starbase, starbasePlayer } = await deriveGameAccounts(ownerProfile, faction, gameId);
+    // Let codama derive the rest (rentalAuthority)
+    const input = {
+        fleet,
+        contract,
+        rentalState,
+        gameId,
+        starbase,
+        starbasePlayer,
+    };
+    return getResetRentalInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
 }
+export { getResetRentalInstructionAsync };
 //# sourceMappingURL=reset.js.map

package/dist/esm/rental/reset.js.map

@@ -1 +1 @@
-{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;AAClH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD,OAAO,EACL,kBAAkB,GACnB,MAAM,UAAU,CAAC;AAyClB;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,WAAW,EACX,MAAM,EACN,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,sFAAsF;IACtF,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,aAAa,CAAC,MAAM,CAAC,CAAC;IAE3D,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,kBAAkB,CAC1B,YAAY,EACZ,OAAO,EACP,YAA+B,EAC/B,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAC7E,MAAM,cAAc,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACrE,MAAM,EAAE,8BAA8B,EAAE,GAAG,kBAAkB,CAAC;IAC9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,+CAA+C;IAC/C,MAAM,KAAK,GAAG;QACZ,KAAK;QACL,QAAQ;QACR,WAAW;QACX,MAAM,EAAE,YAAY;QACpB,QAAQ;QACR,cAAc;KACf,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAM,UAAU,WAAW,CACzB,MAAyB;IAEzB,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,kBAAkB,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,eAAe,EACf,kBAAkB,GACnB,MAAM,UAAU,CAAC;AAyClB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,MAAyB;IAEzB,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,WAAW,EACX,MAAM,GAAG,eAAkC,EAC3C,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,kBAAkB,CAC1B,YAAY,EACZ,OAAO,EACP,MAAM,CACP,CAAC;IAEF,+CAA+C;IAC/C,MAAM,KAAK,GAAG;QACZ,KAAK;QACL,QAAQ;QACR,WAAW;QACX,MAAM;QACN,QAAQ;QACR,cAAc;KACf,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,8BAA8B,EAAE,CAAC"}

package/dist/esm/utils/constants.js

@@ -1,53 +1,14 @@
-import { getConfig, resolveProgramAddresses } from './config';
+import { PaymentFrequency, SRSLY_PROGRAM_ADDRESS } from "../codama";
+export const PROGRAM_ID = SRSLY_PROGRAM_ADDRESS;
+// Constants for program IDs
+export const SAGE_PROGRAM_ADDRESS = 'sAgezwJpDb1aHvzNr3o24cKjsETmFEKghBEyJ1askDi';
+export const PROFILE_FACTION_PROGRAM_ADDRESS = 'pFACSRuobDmvfMKq1bAzwj27t6d2GJhSCHb1VcfnRmq';
+export const DEFAULT_GAME_ID = 'GAMEzqJehF8yAnKiTARUuhZMvLvkZVAsCVri5vSfemLr';
 // Seed constants
 export const STARBASE_SEED = 'Starbase';
 export const STARBASE_PLAYER_SEED = 'starbase_player';
 export const SAGE_PLAYER_PROFILE_SEED = 'sage_player_profile';
 export const PROFILE_FACTION_SEED = 'profile_faction';
-// Token conversion constants
-export const ATLAS_TO_STARDUST = 100_000_000; // 1 ATLAS = 100,000,000 stardust
-// PaymentFrequency enum to match the Rust program
-export var PaymentFrequency;
-(function (PaymentFrequency) {
-    PaymentFrequency[PaymentFrequency["Hourly"] = 0] = "Hourly";
-    PaymentFrequency[PaymentFrequency["Daily"] = 1] = "Daily";
-    PaymentFrequency[PaymentFrequency["DailyOld"] = 2] = "DailyOld";
-    PaymentFrequency[PaymentFrequency["Weekly"] = 3] = "Weekly";
-    PaymentFrequency[PaymentFrequency["Monthly"] = 4] = "Monthly";
-    // Development-only frequencies (not available on mainnet)
-    PaymentFrequency[PaymentFrequency["Decasecond"] = 5] = "Decasecond";
-    PaymentFrequency[PaymentFrequency["Minute"] = 6] = "Minute";
-})(PaymentFrequency || (PaymentFrequency = {}));
-// Network constants are now managed in config.ts
-export async function getSrslyProgramAddress(config) {
-    const globalConfig = getConfig();
-    const effectiveConfig = { ...globalConfig, ...config };
-    const resolved = resolveProgramAddresses(effectiveConfig);
-    return resolved.srslyProgramAddress;
-}
-// Export async function to get program ID
-export async function getProgramId() {
-    return await getSrslyProgramAddress();
-}
-// Network-specific constants with configuration support
-export async function getSageProgramAddress(config) {
-    const globalConfig = getConfig();
-    const effectiveConfig = { ...globalConfig, ...config };
-    const resolved = resolveProgramAddresses(effectiveConfig);
-    return resolved.sageProgramAddress;
-}
-export async function getProfileFactionProgramAddress(config) {
-    const globalConfig = getConfig();
-    const effectiveConfig = { ...globalConfig, ...config };
-    const resolved = resolveProgramAddresses(effectiveConfig);
-    return resolved.profileFactionProgramAddress;
-}
-export async function getSageGameId(config) {
-    const globalConfig = getConfig();
-    const effectiveConfig = { ...globalConfig, ...config };
-    const resolved = resolveProgramAddresses(effectiveConfig);
-    return resolved.gameId;
-}
 // Faction-specific CSS coordinates for starbase derivation
 export const FACTION_SPECIFIC_CSS = {
     mud: { x: 0, y: -39 },
@@ -65,4 +26,5 @@ export const FACTION_MAPPING = {
 export function paymentFrequencyToString(freq) {
     return PaymentFrequency[freq].toLowerCase();
 }
+export { PaymentFrequency };
 //# sourceMappingURL=constants.js.map

package/dist/esm/utils/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAGpE,MAAM,CAAC,MAAM,UAAU,GAAY,qBAAqB,CAAC;AAEzD,4BAA4B;AAC5B,MAAM,CAAC,MAAM,oBAAoB,GAAG,6CAA6C,CAAC;AAClF,MAAM,CAAC,MAAM,+BAA+B,GAAG,6CAA6C,CAAC;AAC7F,MAAM,CAAC,MAAM,eAAe,GAAG,8CAA8C,CAAC;AAE9E,iBAAiB;AACjB,MAAM,CAAC,MAAM,aAAa,GAAG,UAAU,CAAC;AACxC,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AACtD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAqB,CAAC;AAC9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD,2DAA2D;AAC3D,MAAM,CAAC,MAAM,oBAAoB,GAA6C;IAC5E,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;IACrB,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;IACtB,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAA2B;IACrD,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,KAAK;IACR,CAAC,EAAE,OAAO;CACX,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAsB;IAC7D,OAAO,gBAAgB,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;AAC9C,CAAC;AACD,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/dist/esm/utils/index.js

@@ -1,4 +1,3 @@
 export * from "./constants";
 export * from "./profiles";
-export * from "./config";
 //# sourceMappingURL=index.js.map

package/dist/esm/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC"}

package/dist/esm/utils/profiles.js

@@ -1,6 +1,5 @@
 import { getBytesEncoder, getAddressEncoder, getProgramDerivedAddress } from '@solana/kit';
-import { FACTION_MAPPING, FACTION_SPECIFIC_CSS, PROFILE_FACTION_SEED, SAGE_PLAYER_PROFILE_SEED, STARBASE_PLAYER_SEED, STARBASE_SEED } from './constants';
-import { getSageGameId, getSageProgramAddress, getProfileFactionProgramAddress } from './constants';
+import { DEFAULT_GAME_ID, FACTION_MAPPING, FACTION_SPECIFIC_CSS, PROFILE_FACTION_PROGRAM_ADDRESS, PROFILE_FACTION_SEED, SAGE_PLAYER_PROFILE_SEED, SAGE_PROGRAM_ADDRESS, STARBASE_PLAYER_SEED, STARBASE_SEED } from './constants';
 /**
  * Helper function to convert a string seed to a Uint8Array
  * This is necessary for @solana/kit's getBytesEncoder().encode()
@@ -15,13 +14,11 @@ function seedToBytes(seed) {
  * Helper function to derive the borrower's profile faction account
  *
  * @param profile The borrower's profile address
- * @param config Optional configuration for network-specific constants
  * @returns Promise that resolves to the derived profile faction address
  */
-export async function deriveProfileFaction(profile, config) {
-    const programAddress = await getProfileFactionProgramAddress(config);
+export async function deriveProfileFaction(profile) {
     const [address] = await getProgramDerivedAddress({
-        programAddress: programAddress,
+        programAddress: PROFILE_FACTION_PROGRAM_ADDRESS,
         seeds: [
             seedToBytes(PROFILE_FACTION_SEED),
             getAddressEncoder().encode(profile)
@@ -33,21 +30,16 @@ export async function deriveProfileFaction(profile, config) {
  * Helper function to derive the sage player profile
  *
  * @param borrowerProfile The borrower's profile address
- * @param gameId The game ID (if not provided, uses network-specific default)
- * @param config Optional configuration for network-specific constants
+ * @param gameId The game ID (defaults to the standard game ID)
  * @returns Promise that resolves to the derived sage player profile address
  */
-export async function deriveSagePlayerProfile(borrowerProfile, gameId, config) {
-    const [programAddress, actualGameId] = await Promise.all([
-        getSageProgramAddress(config),
-        gameId || getSageGameId(config)
-    ]);
+export async function deriveSagePlayerProfile(borrowerProfile, gameId = DEFAULT_GAME_ID) {
     const [address] = await getProgramDerivedAddress({
-        programAddress: programAddress,
+        programAddress: SAGE_PROGRAM_ADDRESS,
         seeds: [
             seedToBytes(SAGE_PLAYER_PROFILE_SEED),
             getAddressEncoder().encode(borrowerProfile),
-            getAddressEncoder().encode(actualGameId)
+            getAddressEncoder().encode(gameId)
         ]
     });
     return address;
@@ -56,11 +48,10 @@ export async function deriveSagePlayerProfile(borrowerProfile, gameId, config) {
  * Helper function to derive the starbase address based on faction
  *
  * @param faction The faction (1/2/3 or 'mud'/'oni'/'ustur')
- * @param gameId The game ID (if not provided, uses network-specific default)
- * @param config Optional configuration for network-specific constants
+ * @param gameId The game ID (defaults to the standard game ID)
  * @returns Promise that resolves to the derived starbase address
  */
-export async function deriveStarbase(faction, gameId, config) {
+export async function deriveStarbase(faction, gameId = DEFAULT_GAME_ID) {
     // Convert faction to string representation if it's a number
     const factionName = typeof faction === 'number'
         ? FACTION_MAPPING[faction]
@@ -71,11 +62,6 @@ export async function deriveStarbase(faction, gameId, config) {
     }
     // Get coordinates for the faction
     const coords = FACTION_SPECIFIC_CSS[factionName];
-    // Get network-specific constants
-    const [programAddress, actualGameId] = await Promise.all([
-        getSageProgramAddress(config),
-        gameId || getSageGameId(config)
-    ]);
     // Convert coordinates to bytes (little-endian, two's complement)
     const xCoord = new DataView(new ArrayBuffer(8));
     const yCoord = new DataView(new ArrayBuffer(8));
@@ -85,10 +71,10 @@ export async function deriveStarbase(faction, gameId, config) {
     const xBytes = new Uint8Array(xCoord.buffer);
     const yBytes = new Uint8Array(yCoord.buffer);
     const [address] = await getProgramDerivedAddress({
-        programAddress: programAddress,
+        programAddress: SAGE_PROGRAM_ADDRESS,
         seeds: [
             seedToBytes(STARBASE_SEED),
-            getAddressEncoder().encode(actualGameId),
+            getAddressEncoder().encode(gameId),
             getBytesEncoder().encode(xBytes),
             getBytesEncoder().encode(yBytes)
         ]
@@ -101,18 +87,15 @@ export async function deriveStarbase(faction, gameId, config) {
  * @param sagePlayerProfile The sage player profile address
  * @param starbase The starbase address
  * @param starbaseSeqId The starbase sequence ID (defaults to 0)
- * @param config Optional configuration for network-specific constants
  * @returns Promise that resolves to the derived starbase player address
  */
-export async function deriveStarbasePlayer(sagePlayerProfile, starbase, starbaseSeqId = 0, config) {
-    // Get network-specific SAGE program address
-    const programAddress = await getSageProgramAddress(config);
+export async function deriveStarbasePlayer(sagePlayerProfile, starbase, starbaseSeqId = 0) {
     // Convert sequence ID to bytes (little-endian uint16)
     const seqIdView = new DataView(new ArrayBuffer(2));
     seqIdView.setUint16(0, starbaseSeqId, true);
     const seqIdBytes = new Uint8Array(seqIdView.buffer);
     const [address] = await getProgramDerivedAddress({
-        programAddress: programAddress,
+        programAddress: SAGE_PROGRAM_ADDRESS,
         seeds: [
             seedToBytes(STARBASE_PLAYER_SEED),
             getAddressEncoder().encode(starbase),
@@ -127,22 +110,19 @@ export async function deriveStarbasePlayer(sagePlayerProfile, starbase, starbase
  *
  * @param profile The borrower's profile address
  * @param faction The faction (1/2/3 or 'mud'/'oni'/'ustur')
- * @param gameId The game ID (if not provided, uses network-specific default)
+ * @param gameId The game ID (defaults to the standard game ID)
  * @param starbaseSeqId The starbase sequence ID (defaults to 0)
- * @param config Optional configuration for network-specific constants
  * @returns Promise that resolves to the three derived addresses
  */
-export async function deriveGameAccounts(profile, faction, gameId, starbaseSeqId = 0, config) {
-    // Get the actual game ID to use
-    const actualGameId = gameId || await getSageGameId(config);
+export async function deriveGameAccounts(profile, faction, gameId = DEFAULT_GAME_ID, starbaseSeqId = 0) {
     // Derive the three accounts in parallel
     const [profileFaction, sagePlayerProfile, starbase] = await Promise.all([
-        deriveProfileFaction(profile, config),
-        deriveSagePlayerProfile(profile, actualGameId, config),
-        deriveStarbase(faction, actualGameId, config)
+        deriveProfileFaction(profile),
+        deriveSagePlayerProfile(profile, gameId),
+        deriveStarbase(faction, gameId)
     ]);
     // Derive starbasePlayer using the results from above
-    const starbasePlayer = await deriveStarbasePlayer(sagePlayerProfile, starbase, starbaseSeqId, config);
+    const starbasePlayer = await deriveStarbasePlayer(sagePlayerProfile, starbase, starbaseSeqId);
     return {
         profileFaction,
         starbase,