@wuwei-labs/srsly 3.0.0-beta.26 → 3.0.0-beta.27
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/generated/codama/errors/srsly.js +4 -4
- package/dist/cjs/generated/codama/errors/srsly.js.map +1 -1
- package/dist/cjs/instructions/cancelRental.js +3 -3
- package/dist/cjs/instructions/cancelRental.js.map +1 -1
- package/dist/cjs/instructions/closeContract.js +36 -9
- package/dist/cjs/instructions/closeContract.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/generated/codama/errors/srsly.js +3 -3
- package/dist/esm/generated/codama/errors/srsly.js.map +1 -1
- package/dist/esm/instructions/cancelRental.js +3 -3
- package/dist/esm/instructions/cancelRental.js.map +1 -1
- package/dist/esm/instructions/closeContract.js +40 -13
- package/dist/esm/instructions/closeContract.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +2 -2
- package/dist/types/generated/codama/errors/srsly.d.ts +3 -3
- package/dist/types/generated/codama/errors/srsly.d.ts.map +1 -1
- package/dist/types/instructions/cancelRental.d.ts +2 -2
- package/dist/types/instructions/closeContract.d.ts +3 -0
- package/dist/types/instructions/closeContract.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* @see https://github.com/codama-idl/codama
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
exports.SRSLY_ERROR__INSUFFICIENT_POINTS_TO_RESERVE = exports.SRSLY_ERROR__RESERVATION_STILL_ACTIVE = exports.SRSLY_ERROR__INVALID_CLOSE_TARGET = exports.SRSLY_ERROR__INVALID_NONCE = exports.SRSLY_ERROR__INSUFFICIENT_POINTS_FOR_CLAIM = exports.SRSLY_ERROR__EXCLUSIVE_WINDOW_ACTIVE = exports.SRSLY_ERROR__NOT_RESERVATION_HOLDER = exports.SRSLY_ERROR__CONTRACT_NOT_RENTED = exports.SRSLY_ERROR__INVALID_RESERVATION_HOLDER = exports.SRSLY_ERROR__FLEET_HAS_ACTIVE_RESERVATION = exports.SRSLY_ERROR__INVALID_PERCENTAGE = exports.SRSLY_ERROR__INVALID_CLAIM_SCHEDULE = exports.SRSLY_ERROR__MISSING_THREAD_ACCOUNTS = exports.SRSLY_ERROR__INVALID_OWNER_TOKEN_ACCOUNT = exports.SRSLY_ERROR__INVALID_TOKEN_ACCOUNT = exports.SRSLY_ERROR__NO_CLAIMABLE_BALANCE = exports.SRSLY_ERROR__INVALID_RECIPIENT = exports.SRSLY_ERROR__REFERRER_MISMATCH = exports.SRSLY_ERROR__NO_REFERRER_SET = exports.
|
|
10
|
+
exports.SRSLY_ERROR__INSUFFICIENT_POINTS_TO_RESERVE = exports.SRSLY_ERROR__RESERVATION_STILL_ACTIVE = exports.SRSLY_ERROR__INVALID_CLOSE_TARGET = exports.SRSLY_ERROR__INVALID_NONCE = exports.SRSLY_ERROR__INSUFFICIENT_POINTS_FOR_CLAIM = exports.SRSLY_ERROR__EXCLUSIVE_WINDOW_ACTIVE = exports.SRSLY_ERROR__NOT_RESERVATION_HOLDER = exports.SRSLY_ERROR__CONTRACT_NOT_RENTED = exports.SRSLY_ERROR__INVALID_RESERVATION_HOLDER = exports.SRSLY_ERROR__FLEET_HAS_ACTIVE_RESERVATION = exports.SRSLY_ERROR__INVALID_PERCENTAGE = exports.SRSLY_ERROR__INVALID_CLAIM_SCHEDULE = exports.SRSLY_ERROR__MISSING_THREAD_ACCOUNTS = exports.SRSLY_ERROR__INVALID_OWNER_TOKEN_ACCOUNT = exports.SRSLY_ERROR__INVALID_TOKEN_ACCOUNT = exports.SRSLY_ERROR__NO_CLAIMABLE_BALANCE = exports.SRSLY_ERROR__INVALID_RECIPIENT = exports.SRSLY_ERROR__REFERRER_MISMATCH = exports.SRSLY_ERROR__NO_REFERRER_SET = exports.SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED = exports.SRSLY_ERROR__REFERRER_ALREADY_SET = exports.SRSLY_ERROR__INVALID_SPLIT_CONFIG = exports.SRSLY_ERROR__INVALID_SPLIT_PERCENTAGES = exports.SRSLY_ERROR__INVALID_AUTHORITY = exports.SRSLY_ERROR__INACTIVE_REFERRER = exports.SRSLY_ERROR__INVALID_STARBASE_PLAYER = exports.SRSLY_ERROR__INVALID_STARBASE = exports.SRSLY_ERROR__RENTAL_ALREADY_CANCELLED = exports.SRSLY_ERROR__INVALID_THREAD = exports.SRSLY_ERROR__RENTAL_EXPIRED = exports.SRSLY_ERROR__INVALID_DURATION_MAXIMUM_ALIGNMENT = exports.SRSLY_ERROR__INVALID_DURATION_MINIMUM_ALIGNMENT = exports.SRSLY_ERROR__ACCOUNT_OWNED_BY_WRONG_PROGRAM = exports.SRSLY_ERROR__INVALID_ATLAS_CONVERSION_RATE = exports.SRSLY_ERROR__UNAUTHORIZED_CONFIG_UPDATE = exports.SRSLY_ERROR__INVALID_RENTAL_DURATION = exports.SRSLY_ERROR__INVALID_FEE_RATE = exports.SRSLY_ERROR__RENTAL_STATE_EXISTS = exports.SRSLY_ERROR__RENTAL_IS_ACTIVE = exports.SRSLY_ERROR__INVALID_THREAD_CONTEXT = exports.SRSLY_ERROR__CONTRACT_CLOSED = exports.SRSLY_ERROR__DELAY_EXCEEDS_TIME_REMAINING = exports.SRSLY_ERROR__INSUFFICIENT_CANCELLATION_NOTICE = exports.SRSLY_ERROR__INVALID_PAYMENT_FREQUENCY = exports.SRSLY_ERROR__INVALID_RATE = exports.SRSLY_ERROR__FLEET_ALREADY_RENTED = exports.SRSLY_ERROR__INVALID_RATE_CALCULATION = exports.SRSLY_ERROR__INVALID_DURATION_MAXIMUM = exports.SRSLY_ERROR__INVALID_DURATION_MINIMUM = exports.SRSLY_ERROR__UNAUTHORIZED = void 0;
|
|
11
11
|
exports.SRSLY_ERROR__INSUFFICIENT_BID = exports.SRSLY_ERROR__ATLAS_BID_REQUIRED = exports.SRSLY_ERROR__INVALID_DISCOUNT_CONTEXT = exports.SRSLY_ERROR__INSUFFICIENT_THREAD_FUNDING = exports.SRSLY_ERROR__THREAD_STILL_EXISTS = exports.SRSLY_ERROR__INVALID_REFERRER = exports.SRSLY_ERROR__CONTRACT_PENDING_CLOSE = exports.SRSLY_ERROR__INSUFFICIENT_ATLAS_FOR_REFUND = exports.SRSLY_ERROR__INVALID_VAULT = exports.SRSLY_ERROR__PREVIOUS_RENTAL_ACTIVE = exports.SRSLY_ERROR__RENTAL_NOT_QUEUED = exports.SRSLY_ERROR__INVALID_RENTAL_SLOT = exports.SRSLY_ERROR__INVALID_RENTAL_STATE = exports.SRSLY_ERROR__THREAD_NOT_SCHEDULED = exports.SRSLY_ERROR__NO_ACTIVE_RENTAL = exports.SRSLY_ERROR__ALREADY_SCHEDULED = exports.SRSLY_ERROR__QUEUE_FULL = exports.SRSLY_ERROR__CLAIM_WINDOW_EXPIRED = exports.SRSLY_ERROR__NOT_CROWNED_WINNER = exports.SRSLY_ERROR__FLEET_NOT_RENTED = exports.SRSLY_ERROR__CONTRACT_EXISTS = exports.SRSLY_ERROR__INVALID_ATLAS_AMOUNT = exports.SRSLY_ERROR__ATLAS_RESERVATION_REQUIRES_TOKEN_ACCOUNTS = exports.SRSLY_ERROR__CONTRACT_RESERVATIONS_DISABLED = exports.SRSLY_ERROR__CANCEL_NOT_ALLOWED = exports.SRSLY_ERROR__INSTANT_CANCEL_NOT_ALLOWED = exports.SRSLY_ERROR__CLOSE_RENTAL_BEFORE_CONTRACT = exports.SRSLY_ERROR__CANNOT_RELEASE_ACTIVE_RENTAL = exports.SRSLY_ERROR__ACTIVE_RENTAL_EXIST = exports.SRSLY_ERROR__NO_FEES_TO_CLAIM = exports.SRSLY_ERROR__REFERRAL_NOT_ENABLED = exports.SRSLY_ERROR__INVALID_REFERRAL_RATE = exports.SRSLY_ERROR__INVALID_SPLIT = exports.SRSLY_ERROR__INVALID_DEFENDER = exports.SRSLY_ERROR__INVALID_CONFIG = exports.SRSLY_ERROR__MISSING_REQUIRED_ACCOUNT = exports.SRSLY_ERROR__RESERVATIONS_DISABLED = exports.SRSLY_ERROR__EXCESSIVE_RESERVATION_RATE_MULTIPLIER = exports.SRSLY_ERROR__INVALID_RESERVATION_RATE_MULTIPLIER = void 0;
|
|
12
12
|
exports.getSrslyErrorMessage = getSrslyErrorMessage;
|
|
13
13
|
exports.isSrslyError = isSrslyError;
|
|
@@ -73,8 +73,8 @@ exports.SRSLY_ERROR__INVALID_SPLIT_PERCENTAGES = 0x178b; // 6027
|
|
|
73
73
|
exports.SRSLY_ERROR__INVALID_SPLIT_CONFIG = 0x178c; // 6028
|
|
74
74
|
/** ReferrerAlreadySet: Referrer has already been set and cannot be changed */
|
|
75
75
|
exports.SRSLY_ERROR__REFERRER_ALREADY_SET = 0x178d; // 6029
|
|
76
|
-
/**
|
|
77
|
-
exports.
|
|
76
|
+
/** ExpiredBorrowerStateRequired: Please provide the expired borrower's state */
|
|
77
|
+
exports.SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED = 0x178e; // 6030
|
|
78
78
|
/** NoReferrerSet: Borrower has not set a referrer */
|
|
79
79
|
exports.SRSLY_ERROR__NO_REFERRER_SET = 0x178f; // 6031
|
|
80
80
|
/** ReferrerMismatch: Referrer does not match borrower's chosen referrer */
|
|
@@ -199,7 +199,6 @@ if (process.env.NODE_ENV !== "production") {
|
|
|
199
199
|
[exports.SRSLY_ERROR__ALREADY_SCHEDULED]: `Thread already scheduled for this rental. Cannot schedule again.`,
|
|
200
200
|
[exports.SRSLY_ERROR__ATLAS_BID_REQUIRED]: `ATLAS bid required to knock off an ATLAS reservation`,
|
|
201
201
|
[exports.SRSLY_ERROR__ATLAS_RESERVATION_REQUIRES_TOKEN_ACCOUNTS]: `ATLAS reservation requires token accounts`,
|
|
202
|
-
[exports.SRSLY_ERROR__BORROWER_STATE_REQUIRED]: `Borrower state is required for this operation`,
|
|
203
202
|
[exports.SRSLY_ERROR__CANCEL_NOT_ALLOWED]: `Cancel delay equals time remaining — cancellation would have no effect.`,
|
|
204
203
|
[exports.SRSLY_ERROR__CANNOT_RELEASE_ACTIVE_RENTAL]: `Cannot release an active rental. Either rental state must be closed or contract must show no active rental.`,
|
|
205
204
|
[exports.SRSLY_ERROR__CLAIM_WINDOW_EXPIRED]: `Claim window has expired. Fleet is now available for anyone via rental_accept.`,
|
|
@@ -212,6 +211,7 @@ if (process.env.NODE_ENV !== "production") {
|
|
|
212
211
|
[exports.SRSLY_ERROR__DELAY_EXCEEDS_TIME_REMAINING]: `Cancellation delay exceeds time remaining. cancel_delay must be <= time remaining until rental ends.`,
|
|
213
212
|
[exports.SRSLY_ERROR__EXCESSIVE_RESERVATION_RATE_MULTIPLIER]: `Excessive reservation rate multiplier. Cannot exceed 20000 basis points (200%).`,
|
|
214
213
|
[exports.SRSLY_ERROR__EXCLUSIVE_WINDOW_ACTIVE]: `Exclusive reservation window is active. Cannot process new reservation.`,
|
|
214
|
+
[exports.SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED]: `Please provide the expired borrower's state`,
|
|
215
215
|
[exports.SRSLY_ERROR__FLEET_ALREADY_RENTED]: `Fleet is already rented. Wait for current rental to end or be cancelled.`,
|
|
216
216
|
[exports.SRSLY_ERROR__FLEET_HAS_ACTIVE_RESERVATION]: `Fleet has an active reservation. Must wait for exclusive window to expire or be the reservation holder.`,
|
|
217
217
|
[exports.SRSLY_ERROR__FLEET_NOT_RENTED]: `Fleet is not currently rented (sub_profile is empty).`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AAuXH,oDAMC;AAED,oCAcC;AA3YD,qCAKqB;AACrB,0CAAoD;AAEpD,qGAAqG;AACxF,QAAA,yBAAyB,GAAG,MAAM,CAAC,CAAC,OAAO;AACxD,gIAAgI;AACnH,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,wIAAwI;AAC3H,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,uGAAuG;AAC1F,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,mGAAmG;AACtF,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,uFAAuF;AAC1E,QAAA,yBAAyB,GAAG,MAAM,CAAC,CAAC,OAAO;AACxD,4HAA4H;AAC/G,QAAA,sCAAsC,GAAG,MAAM,CAAC,CAAC,OAAO;AACrE,oIAAoI;AACvH,QAAA,6CAA6C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5E,sIAAsI;AACzH,QAAA,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,sGAAsG;AACzF,QAAA,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,6HAA6H;AAChH,QAAA,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,uGAAuG;AAC1F,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,8GAA8G;AACjG,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,qGAAqG;AACxF,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,kGAAkG;AACrF,QAAA,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,4GAA4G;AAC/F,QAAA,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,6HAA6H;AAChH,QAAA,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,uHAAuH;AAC1G,QAAA,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,mIAAmI;AACtH,QAAA,+CAA+C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9E,mIAAmI;AACtH,QAAA,+CAA+C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9E,6GAA6G;AAChG,QAAA,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,gHAAgH;AACnG,QAAA,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,2FAA2F;AAC9E,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,sFAAsF;AACzE,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,mGAAmG;AACtF,QAAA,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,+CAA+C;AAClC,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,6DAA6D;AAChD,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,0EAA0E;AAC7D,QAAA,sCAAsC,GAAG,MAAM,CAAC,CAAC,OAAO;AACrE,8DAA8D;AACjD,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,8EAA8E;AACjE,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,
|
|
1
|
+
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ const contract_1 = require("../accounts/contract");
|
|
|
35
35
|
*
|
|
36
36
|
* @example
|
|
37
37
|
* ```typescript
|
|
38
|
-
* //
|
|
38
|
+
* // Default cancellation (uses contract's cancelDelayMin)
|
|
39
39
|
* const ix = await cancelRental({
|
|
40
40
|
* borrower: borrowerWallet,
|
|
41
41
|
* contract: contractAddress
|
|
@@ -82,10 +82,10 @@ async function cancelRental(params, config) {
|
|
|
82
82
|
const contractAddress = (0, kit_1.address)(params.contract);
|
|
83
83
|
const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
|
|
84
84
|
// Convert duration to seconds (supports { hours: 1 }, { days: 1 }, etc.)
|
|
85
|
-
// Default to
|
|
85
|
+
// Default to contract's cancelDelayMin if not specified
|
|
86
86
|
const cancelDelay = params.cancelDelay !== undefined
|
|
87
87
|
? BigInt((0, duration_1.convertDuration)(params.cancelDelay))
|
|
88
|
-
:
|
|
88
|
+
: contractAccount.data.cancelDelayMin;
|
|
89
89
|
// Resolve contract thread (system_program::ID means no thread configured)
|
|
90
90
|
const thread = (0, kit_1.address)(contractAccount.data.thread);
|
|
91
91
|
const hasThread = thread !== '11111111111111111111111111111111';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAyFH,oCAiEC;AAxJD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wCAAkD;AAClD,wCAA4D;AAC5D,wDAA4D;AAC5D,iDAAyE;AACzE,+CAAiD;AACjD,mDAAqD;AAuCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;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,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,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,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IAEzC,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAkB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,sDAAsD;IACtD,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,IAAA,oCAA4B,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,yEAAyE;IACzE,
|
|
1
|
+
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAyFH,oCAiEC;AAxJD,qCAAoD;AACpD,mEAAmF;AACnF,4CAA4E;AAC5E,4CAA4E;AAC5E,wCAAkD;AAClD,wCAA4D;AAC5D,wDAA4D;AAC5D,iDAAyE;AACzE,+CAAiD;AACjD,mDAAqD;AAuCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;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,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,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,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAa,EAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IAEzC,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,IAAA,0BAAkB,EAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,sDAAsD;IACtD,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,IAAA,oCAA4B,EAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,yEAAyE;IACzE,wDAAwD;IACxD,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,KAAK,SAAS;QAClD,CAAC,CAAC,MAAM,CAAC,IAAA,0BAAe,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QAC7C,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC;IAExC,0EAA0E;IAC1E,MAAM,MAAM,GAAG,IAAA,aAAO,EAAC,eAAe,CAAC,IAAI,CAAC,MAAiB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,MAAM,KAAK,kCAAkC,CAAC;IAEhE,oCAAoC;IACpC,yFAAyF;IACzF,MAAM,cAAc,GAAG,MAAM,IAAA,8CAA+B,EAC1D;QACE,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,cAAc;QACxB,WAAW;QACX,oBAAoB;QACpB,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,IAAA,aAAO,EAAC,KAAgB,CAAC;QAChC,GAAG,CAAC,SAAS,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;QAC5C,WAAW;KACZ,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"}
|
|
@@ -9,12 +9,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.closeContract = closeContract;
|
|
10
10
|
const kit_1 = require("@solana/kit");
|
|
11
11
|
const instructions_1 = require("../generated/codama/instructions");
|
|
12
|
+
const thread_1 = require("../generated/codama/accounts/thread");
|
|
12
13
|
const config_1 = require("../utils/config");
|
|
13
14
|
const signer_1 = require("../utils/signer");
|
|
14
15
|
const contract_1 = require("../accounts/contract");
|
|
15
16
|
const config_2 = require("../accounts/config");
|
|
16
17
|
const token_1 = require("../pda/token");
|
|
17
18
|
const srsly_1 = require("../pda/srsly");
|
|
19
|
+
const thread_2 = require("../pda/thread");
|
|
20
|
+
const rpc_1 = require("../utils/rpc");
|
|
18
21
|
const instructions_2 = require("../utils/instructions");
|
|
19
22
|
/**
|
|
20
23
|
* Close a rental contract
|
|
@@ -23,6 +26,9 @@ const instructions_2 = require("../utils/instructions");
|
|
|
23
26
|
* accounts don't exist, they will be created temporarily before being closed.
|
|
24
27
|
* This allows recovery from partial failures during previous close attempts.
|
|
25
28
|
*
|
|
29
|
+
* If the contract has an automation thread, the thread close instruction
|
|
30
|
+
* is automatically prepended — no need to call closeContractThread separately.
|
|
31
|
+
*
|
|
26
32
|
* Contract must have no active rentals. Claims all remaining payments
|
|
27
33
|
* from the contract's token account, invalidates the rental in SAGE,
|
|
28
34
|
* and closes the contract account.
|
|
@@ -85,25 +91,45 @@ async function closeContract(params, config) {
|
|
|
85
91
|
}
|
|
86
92
|
else if (params.contract) {
|
|
87
93
|
// Only contract provided - fetch contract to get fleet
|
|
88
|
-
const contract = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
|
|
89
|
-
fleetAddress = contract.data.fleet;
|
|
90
94
|
contractAddress = (0, kit_1.address)(params.contract);
|
|
91
95
|
}
|
|
92
96
|
else {
|
|
93
97
|
// Should never reach here due to validation above
|
|
94
98
|
throw new Error('Either fleet or contract must be provided');
|
|
95
99
|
}
|
|
100
|
+
// Always fetch contract — needed for fleet (if not provided) and thread check
|
|
101
|
+
const contractAccount = await (0, contract_1.fetchContract)(contractAddress, finalConfig.rpcUrl);
|
|
102
|
+
if (!params.fleet) {
|
|
103
|
+
fleetAddress = contractAccount.data.fleet;
|
|
104
|
+
}
|
|
96
105
|
// Get sageProgram from config if not provided
|
|
97
106
|
const sageProgram = params.sageProgram
|
|
98
107
|
? (0, kit_1.address)(params.sageProgram)
|
|
99
108
|
: (0, kit_1.address)(addresses.sage);
|
|
100
109
|
// Derive contract token account (ATA of contract PDA for ATLAS)
|
|
101
|
-
|
|
102
|
-
//
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
110
|
+
const contractTokenAccount = await (0, token_1.deriveAssociatedTokenAccount)(contractAddress, atlasMint);
|
|
111
|
+
// Check if contract has an automation thread that needs closing first
|
|
112
|
+
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
113
|
+
const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
|
|
114
|
+
let threadCloseIx;
|
|
115
|
+
if (hasThread) {
|
|
116
|
+
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
117
|
+
const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
|
|
118
|
+
// Fetch thread to get fiber IDs for remaining accounts
|
|
119
|
+
const rpc = (0, rpc_1.createRpc)((0, config_1.getRpcUrl)(config));
|
|
120
|
+
const threadAccount = await (0, thread_1.fetchThread)(rpc, contractThread);
|
|
121
|
+
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
122
|
+
// Derive fiber PDAs
|
|
123
|
+
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
124
|
+
address: await (0, thread_2.deriveFiber)(contractThread, id),
|
|
125
|
+
role: kit_1.AccountRole.WRITABLE,
|
|
126
|
+
})));
|
|
127
|
+
threadCloseIx = await (0, instructions_1.getCloseContractThreadInstructionAsync)({
|
|
128
|
+
owner: ownerSigner,
|
|
129
|
+
contract: contractAddress,
|
|
130
|
+
thread: contractThread,
|
|
131
|
+
}, { programAddress });
|
|
132
|
+
threadCloseIx.accounts.push(...fiberAccounts);
|
|
107
133
|
}
|
|
108
134
|
// Call Codama-generated instruction
|
|
109
135
|
const kitInstruction = await (0, instructions_1.getCloseContractInstructionAsync)({
|
|
@@ -114,7 +140,8 @@ async function closeContract(params, config) {
|
|
|
114
140
|
contractTokenAccount: contractTokenAccount,
|
|
115
141
|
sageProgram,
|
|
116
142
|
}, { programAddress });
|
|
117
|
-
|
|
143
|
+
const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
|
|
144
|
+
return (0, instructions_2.prepareInstructions)(instructions, {
|
|
118
145
|
computeUnits: params.computeUnits,
|
|
119
146
|
PublicKey: finalConfig.PublicKey
|
|
120
147
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/package.json
CHANGED
package/dist/cjs/version.js
CHANGED
|
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.VERSION = void 0;
|
|
4
4
|
// Auto-generated from package.json - DO NOT EDIT
|
|
5
5
|
// Run "pnpm run generate:version" to update
|
|
6
|
-
exports.VERSION = '3.0.0-beta.
|
|
6
|
+
exports.VERSION = '3.0.0-beta.26';
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
|
@@ -67,8 +67,8 @@ export const SRSLY_ERROR__INVALID_SPLIT_PERCENTAGES = 0x178b; // 6027
|
|
|
67
67
|
export const SRSLY_ERROR__INVALID_SPLIT_CONFIG = 0x178c; // 6028
|
|
68
68
|
/** ReferrerAlreadySet: Referrer has already been set and cannot be changed */
|
|
69
69
|
export const SRSLY_ERROR__REFERRER_ALREADY_SET = 0x178d; // 6029
|
|
70
|
-
/**
|
|
71
|
-
export const
|
|
70
|
+
/** ExpiredBorrowerStateRequired: Please provide the expired borrower's state */
|
|
71
|
+
export const SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED = 0x178e; // 6030
|
|
72
72
|
/** NoReferrerSet: Borrower has not set a referrer */
|
|
73
73
|
export const SRSLY_ERROR__NO_REFERRER_SET = 0x178f; // 6031
|
|
74
74
|
/** ReferrerMismatch: Referrer does not match borrower's chosen referrer */
|
|
@@ -193,7 +193,6 @@ if (process.env.NODE_ENV !== "production") {
|
|
|
193
193
|
[SRSLY_ERROR__ALREADY_SCHEDULED]: `Thread already scheduled for this rental. Cannot schedule again.`,
|
|
194
194
|
[SRSLY_ERROR__ATLAS_BID_REQUIRED]: `ATLAS bid required to knock off an ATLAS reservation`,
|
|
195
195
|
[SRSLY_ERROR__ATLAS_RESERVATION_REQUIRES_TOKEN_ACCOUNTS]: `ATLAS reservation requires token accounts`,
|
|
196
|
-
[SRSLY_ERROR__BORROWER_STATE_REQUIRED]: `Borrower state is required for this operation`,
|
|
197
196
|
[SRSLY_ERROR__CANCEL_NOT_ALLOWED]: `Cancel delay equals time remaining — cancellation would have no effect.`,
|
|
198
197
|
[SRSLY_ERROR__CANNOT_RELEASE_ACTIVE_RENTAL]: `Cannot release an active rental. Either rental state must be closed or contract must show no active rental.`,
|
|
199
198
|
[SRSLY_ERROR__CLAIM_WINDOW_EXPIRED]: `Claim window has expired. Fleet is now available for anyone via rental_accept.`,
|
|
@@ -206,6 +205,7 @@ if (process.env.NODE_ENV !== "production") {
|
|
|
206
205
|
[SRSLY_ERROR__DELAY_EXCEEDS_TIME_REMAINING]: `Cancellation delay exceeds time remaining. cancel_delay must be <= time remaining until rental ends.`,
|
|
207
206
|
[SRSLY_ERROR__EXCESSIVE_RESERVATION_RATE_MULTIPLIER]: `Excessive reservation rate multiplier. Cannot exceed 20000 basis points (200%).`,
|
|
208
207
|
[SRSLY_ERROR__EXCLUSIVE_WINDOW_ACTIVE]: `Exclusive reservation window is active. Cannot process new reservation.`,
|
|
208
|
+
[SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED]: `Please provide the expired borrower's state`,
|
|
209
209
|
[SRSLY_ERROR__FLEET_ALREADY_RENTED]: `Fleet is already rented. Wait for current rental to end or be cancelled.`,
|
|
210
210
|
[SRSLY_ERROR__FLEET_HAS_ACTIVE_RESERVATION]: `Fleet has an active reservation. Must wait for exclusive window to expire or be the reservation holder.`,
|
|
211
211
|
[SRSLY_ERROR__FLEET_NOT_RENTED]: `Fleet is not currently rented (sub_profile is empty).`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,cAAc,GAIf,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEpD,qGAAqG;AACrG,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,CAAC,OAAO;AACxD,gIAAgI;AAChI,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,wIAAwI;AACxI,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,uGAAuG;AACvG,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,mGAAmG;AACnG,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,uFAAuF;AACvF,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,CAAC,OAAO;AACxD,4HAA4H;AAC5H,MAAM,CAAC,MAAM,sCAAsC,GAAG,MAAM,CAAC,CAAC,OAAO;AACrE,oIAAoI;AACpI,MAAM,CAAC,MAAM,6CAA6C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5E,sIAAsI;AACtI,MAAM,CAAC,MAAM,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,sGAAsG;AACtG,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,6HAA6H;AAC7H,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,uGAAuG;AACvG,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,8GAA8G;AAC9G,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,qGAAqG;AACrG,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,kGAAkG;AAClG,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,4GAA4G;AAC5G,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,6HAA6H;AAC7H,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,uHAAuH;AACvH,MAAM,CAAC,MAAM,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,mIAAmI;AACnI,MAAM,CAAC,MAAM,+CAA+C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9E,mIAAmI;AACnI,MAAM,CAAC,MAAM,+CAA+C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9E,6GAA6G;AAC7G,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,gHAAgH;AAChH,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,2FAA2F;AAC3F,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,sFAAsF;AACtF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,mGAAmG;AACnG,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,+CAA+C;AAC/C,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,6DAA6D;AAC7D,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,0EAA0E;AAC1E,MAAM,CAAC,MAAM,sCAAsC,GAAG,MAAM,CAAC,CAAC,OAAO;AACrE,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,gFAAgF;AAChF,MAAM,CAAC,MAAM,4CAA4C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3E,qDAAqD;AACrD,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,2EAA2E;AAC3E,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,oDAAoD;AACpD,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,yDAAyD;AACzD,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,mEAAmE;AACnE,MAAM,CAAC,MAAM,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,8GAA8G;AAC9G,MAAM,CAAC,MAAM,wCAAwC,GAAG,MAAM,CAAC,CAAC,OAAO;AACvE,2EAA2E;AAC3E,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,yFAAyF;AACzF,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,wFAAwF;AACxF,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,yIAAyI;AACzI,MAAM,CAAC,MAAM,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,qEAAqE;AACrE,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,gGAAgG;AAChG,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,+DAA+D;AAC/D,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,qGAAqG;AACrG,MAAM,CAAC,MAAM,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,+EAA+E;AAC/E,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,sDAAsD;AACtD,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,uEAAuE;AACvE,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,iFAAiF;AACjF,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,oFAAoF;AACpF,MAAM,CAAC,MAAM,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,yHAAyH;AACzH,MAAM,CAAC,MAAM,gDAAgD,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/E,0HAA0H;AAC1H,MAAM,CAAC,MAAM,kDAAkD,GAAG,MAAM,CAAC,CAAC,OAAO;AACjF,2DAA2D;AAC3D,MAAM,CAAC,MAAM,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,qEAAqE;AACrE,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,qDAAqD;AACrD,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,oFAAoF;AACpF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,gFAAgF;AAChF,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,+DAA+D;AAC/D,MAAM,CAAC,MAAM,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,mEAAmE;AACnE,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,gDAAgD;AAChD,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,2EAA2E;AAC3E,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6IAA6I;AAC7I,MAAM,CAAC,MAAM,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,0HAA0H;AAC1H,MAAM,CAAC,MAAM,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,2HAA2H;AAC3H,MAAM,CAAC,MAAM,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,gGAAgG;AAChG,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,wHAAwH;AACxH,MAAM,CAAC,MAAM,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,uFAAuF;AACvF,MAAM,CAAC,MAAM,sDAAsD,GAAG,MAAM,CAAC,CAAC,OAAO;AACrF,6EAA6E;AAC7E,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,uGAAuG;AACvG,MAAM,CAAC,MAAM,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,4EAA4E;AAC5E,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,oHAAoH;AACpH,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,yGAAyG;AACzG,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,kGAAkG;AAClG,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,CAAC,OAAO;AACtD,yFAAyF;AACzF,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,0FAA0F;AAC1F,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,uGAAuG;AACvG,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,qGAAqG;AACrG,MAAM,CAAC,MAAM,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,6FAA6F;AAC7F,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6FAA6F;AAC7F,MAAM,CAAC,MAAM,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,kGAAkG;AAClG,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,2EAA2E;AAC3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,wHAAwH;AACxH,MAAM,CAAC,MAAM,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,+FAA+F;AAC/F,MAAM,CAAC,MAAM,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,wFAAwF;AACxF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,8FAA8F;AAC9F,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6HAA6H;AAC7H,MAAM,CAAC,MAAM,wCAAwC,GAAG,MAAM,CAAC,CAAC,OAAO;AACvE,yFAAyF;AACzF,MAAM,CAAC,MAAM,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,6EAA6E;AAC7E,MAAM,CAAC,MAAM,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,gFAAgF;AAChF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AA6F5D,IAAI,kBAA0D,CAAC;AAC/D,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;IAC1C,kBAAkB,GAAG;QACnB,CAAC,2CAA2C,CAAC,EAAE,sFAAsF;QACrI,CAAC,gCAAgC,CAAC,EAAE,mDAAmD;QACvF,CAAC,8BAA8B,CAAC,EAAE,kEAAkE;QACpG,CAAC,+BAA+B,CAAC,EAAE,sDAAsD;QACzF,CAAC,sDAAsD,CAAC,EAAE,2CAA2C;QACrG,CAAC,+BAA+B,CAAC,EAAE,yEAAyE;QAC5G,CAAC,yCAAyC,CAAC,EAAE,6GAA6G;QAC1J,CAAC,iCAAiC,CAAC,EAAE,gFAAgF;QACrH,CAAC,yCAAyC,CAAC,EAAE,0FAA0F;QACvI,CAAC,4BAA4B,CAAC,EAAE,iFAAiF;QACjH,CAAC,4BAA4B,CAAC,EAAE,kFAAkF;QAClH,CAAC,gCAAgC,CAAC,EAAE,wEAAwE;QAC5G,CAAC,mCAAmC,CAAC,EAAE,oEAAoE;QAC3G,CAAC,2CAA2C,CAAC,EAAE,qFAAqF;QACpI,CAAC,yCAAyC,CAAC,EAAE,sGAAsG;QACnJ,CAAC,kDAAkD,CAAC,EAAE,iFAAiF;QACvI,CAAC,oCAAoC,CAAC,EAAE,yEAAyE;QACjH,CAAC,4CAA4C,CAAC,EAAE,6CAA6C;QAC7F,CAAC,iCAAiC,CAAC,EAAE,0EAA0E;QAC/G,CAAC,yCAAyC,CAAC,EAAE,yGAAyG;QACtJ,CAAC,6BAA6B,CAAC,EAAE,uDAAuD;QACxF,CAAC,8BAA8B,CAAC,EAAE,wBAAwB;QAC1D,CAAC,uCAAuC,CAAC,EAAE,6FAA6F;QACxI,CAAC,0CAA0C,CAAC,EAAE,uFAAuF;QACrI,CAAC,6BAA6B,CAAC,EAAE,0DAA0D;QAC3F,CAAC,6CAA6C,CAAC,EAAE,+FAA+F;QAChJ,CAAC,0CAA0C,CAAC,EAAE,8CAA8C;QAC5F,CAAC,2CAA2C,CAAC,EAAE,kDAAkD;QACjG,CAAC,wCAAwC,CAAC,EAAE,6FAA6F;QACzI,CAAC,iCAAiC,CAAC,EAAE,oDAAoD;QACzF,CAAC,0CAA0C,CAAC,EAAE,4FAA4F;QAC1I,CAAC,8BAA8B,CAAC,EAAE,sCAAsC;QACxE,CAAC,mCAAmC,CAAC,EAAE,8DAA8D;QACrG,CAAC,iCAAiC,CAAC,EAAE,8CAA8C;QACnF,CAAC,2BAA2B,CAAC,EAAE,iCAAiC;QAChE,CAAC,6BAA6B,CAAC,EAAE,8DAA8D;QAC/F,CAAC,qCAAqC,CAAC,EAAE,4DAA4D;QACrG,CAAC,qCAAqC,CAAC,EAAE,2GAA2G;QACpJ,CAAC,+CAA+C,CAAC,EAAE,6FAA6F;QAChJ,CAAC,qCAAqC,CAAC,EAAE,mGAAmG;QAC5I,CAAC,+CAA+C,CAAC,EAAE,6FAA6F;QAChJ,CAAC,6BAA6B,CAAC,EAAE,gFAAgF;QACjH,CAAC,0BAA0B,CAAC,EAAE,mCAAmC;QACjE,CAAC,wCAAwC,CAAC,EAAE,+EAA+E;QAC3H,CAAC,sCAAsC,CAAC,EAAE,8FAA8F;QACxI,CAAC,+BAA+B,CAAC,EAAE,gEAAgE;QACnG,CAAC,yBAAyB,CAAC,EAAE,qEAAqE;QAClG,CAAC,qCAAqC,CAAC,EAAE,0EAA0E;QACnH,CAAC,8BAA8B,CAAC,EAAE,6BAA6B;QAC/D,CAAC,kCAAkC,CAAC,EAAE,qCAAqC;QAC3E,CAAC,6BAA6B,CAAC,EAAE,kEAAkE;QACnG,CAAC,oCAAoC,CAAC,EAAE,sEAAsE;QAC9G,CAAC,gCAAgC,CAAC,EAAE,qEAAqE;QACzG,CAAC,iCAAiC,CAAC,EAAE,4EAA4E;QACjH,CAAC,uCAAuC,CAAC,EAAE,sCAAsC;QACjF,CAAC,gDAAgD,CAAC,EAAE,kFAAkF;QACtI,CAAC,0BAA0B,CAAC,EAAE,6DAA6D;QAC3F,CAAC,iCAAiC,CAAC,EAAE,qCAAqC;QAC1E,CAAC,sCAAsC,CAAC,EAAE,4CAA4C;QACtF,CAAC,6BAA6B,CAAC,EAAE,gEAAgE;QACjG,CAAC,oCAAoC,CAAC,EAAE,uEAAuE;QAC/G,CAAC,2BAA2B,CAAC,EAAE,4FAA4F;QAC3H,CAAC,mCAAmC,CAAC,EAAE,kGAAkG;QACzI,CAAC,kCAAkC,CAAC,EAAE,yCAAyC;QAC/E,CAAC,0BAA0B,CAAC,EAAE,wDAAwD;QACtF,CAAC,qCAAqC,CAAC,EAAE,wCAAwC;QACjF,CAAC,oCAAoC,CAAC,EAAE,+CAA+C;QACvF,CAAC,6BAA6B,CAAC,EAAE,qEAAqE;QACtG,CAAC,iCAAiC,CAAC,EAAE,gCAAgC;QACrE,CAAC,6BAA6B,CAAC,EAAE,4BAA4B;QAC7D,CAAC,4BAA4B,CAAC,EAAE,iCAAiC;QACjE,CAAC,+BAA+B,CAAC,EAAE,6FAA6F;QAChI,CAAC,mCAAmC,CAAC,EAAE,oCAAoC;QAC3E,CAAC,mCAAmC,CAAC,EAAE,uEAAuE;QAC9G,CAAC,uBAAuB,CAAC,EAAE,kFAAkF;QAC7G,CAAC,iCAAiC,CAAC,EAAE,0CAA0C;QAC/E,CAAC,iCAAiC,CAAC,EAAE,qDAAqD;QAC1F,CAAC,8BAA8B,CAAC,EAAE,oDAAoD;QACtF,CAAC,qCAAqC,CAAC,EAAE,8DAA8D;QACvG,CAAC,2BAA2B,CAAC,EAAE,yFAAyF;QACxH,CAAC,6BAA6B,CAAC,EAAE,kFAAkF;QACnH,CAAC,8BAA8B,CAAC,EAAE,uEAAuE;QACzG,CAAC,gCAAgC,CAAC,EAAE,sFAAsF;QAC1H,CAAC,kCAAkC,CAAC,EAAE,gCAAgC;QACtE,CAAC,qCAAqC,CAAC,EAAE,oDAAoD;QAC7F,CAAC,iCAAiC,CAAC,EAAE,8EAA8E;QACnH,CAAC,gCAAgC,CAAC,EAAE,sEAAsE;QAC1G,CAAC,yBAAyB,CAAC,EAAE,kFAAkF;QAC/G,CAAC,uCAAuC,CAAC,EAAE,6EAA6E;KACzH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAgB;IACnD,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;QAC1C,OAAQ,kBAAiD,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,oDAAoD,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,KAAc,EACd,kBAEC,EACD,IAAwB;IAGxB,OAAO,cAAc,CACnB,KAAK,EACL,kBAAkB,EAClB,qBAAqB,EACrB,IAAI,CACL,CAAC;AACJ,CAAC"}
|
|
@@ -32,7 +32,7 @@ import { fetchContract } from '../accounts/contract';
|
|
|
32
32
|
*
|
|
33
33
|
* @example
|
|
34
34
|
* ```typescript
|
|
35
|
-
* //
|
|
35
|
+
* // Default cancellation (uses contract's cancelDelayMin)
|
|
36
36
|
* const ix = await cancelRental({
|
|
37
37
|
* borrower: borrowerWallet,
|
|
38
38
|
* contract: contractAddress
|
|
@@ -79,10 +79,10 @@ export async function cancelRental(params, config) {
|
|
|
79
79
|
const contractAddress = address(params.contract);
|
|
80
80
|
const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
|
|
81
81
|
// Convert duration to seconds (supports { hours: 1 }, { days: 1 }, etc.)
|
|
82
|
-
// Default to
|
|
82
|
+
// Default to contract's cancelDelayMin if not specified
|
|
83
83
|
const cancelDelay = params.cancelDelay !== undefined
|
|
84
84
|
? BigInt(convertDuration(params.cancelDelay))
|
|
85
|
-
:
|
|
85
|
+
: contractAccount.data.cancelDelayMin;
|
|
86
86
|
// Resolve contract thread (system_program::ID means no thread configured)
|
|
87
87
|
const thread = address(contractAccount.data.thread);
|
|
88
88
|
const hasThread = thread !== '11111111111111111111111111111111';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAsB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAuCrD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAA0B,EAC1B,MAA2B;IAE3B,eAAe;IACf,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAExC,2BAA2B;IAC3B,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,yCAAyC;IACzC,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE5D,qCAAqC;IACrC,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,OAAO,CAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAE3D,8BAA8B;IAC9B,MAAM,eAAe,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACjF,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC;IAEzC,gDAAgD;IAChD,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAE9D,sDAAsD;IACtD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAC5D,MAAM,oBAAoB,GAAG,MAAM,4BAA4B,CAAC,eAAe,EAAE,SAAS,CAAC,CAAC;IAE5F,yEAAyE;IACzE,
|
|
1
|
+
{"version":3,"file":"cancelRental.js","sourceRoot":"","sources":["../../../src/instructions/cancelRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,17 @@
|
|
|
4
4
|
* Thin convenience wrapper around Codama-generated closeContract instruction.
|
|
5
5
|
* Closes a contract with no active rentals and claims remaining payments.
|
|
6
6
|
*/
|
|
7
|
-
import { address } from '@solana/kit';
|
|
8
|
-
import { getCloseContractInstructionAsync } from '../generated/codama/instructions';
|
|
9
|
-
import {
|
|
7
|
+
import { AccountRole, address } from '@solana/kit';
|
|
8
|
+
import { getCloseContractInstructionAsync, getCloseContractThreadInstructionAsync } from '../generated/codama/instructions';
|
|
9
|
+
import { fetchThread } from '../generated/codama/accounts/thread';
|
|
10
|
+
import { mergeConfig, getAddresses, getRpcUrl } from '../utils/config';
|
|
10
11
|
import { toTransactionSigner } from '../utils/signer';
|
|
11
12
|
import { fetchContract } from '../accounts/contract';
|
|
12
13
|
import { fetchConfig } from '../accounts/config';
|
|
13
14
|
import { deriveAssociatedTokenAccount } from '../pda/token';
|
|
14
|
-
import { deriveContract } from '../pda/srsly';
|
|
15
|
+
import { deriveContract, deriveRentalAuthority } from '../pda/srsly';
|
|
16
|
+
import { deriveContractThread, deriveFiber } from '../pda/thread';
|
|
17
|
+
import { createRpc } from '../utils/rpc';
|
|
15
18
|
import { prepareInstructions } from '../utils/instructions';
|
|
16
19
|
/**
|
|
17
20
|
* Close a rental contract
|
|
@@ -20,6 +23,9 @@ import { prepareInstructions } from '../utils/instructions';
|
|
|
20
23
|
* accounts don't exist, they will be created temporarily before being closed.
|
|
21
24
|
* This allows recovery from partial failures during previous close attempts.
|
|
22
25
|
*
|
|
26
|
+
* If the contract has an automation thread, the thread close instruction
|
|
27
|
+
* is automatically prepended — no need to call closeContractThread separately.
|
|
28
|
+
*
|
|
23
29
|
* Contract must have no active rentals. Claims all remaining payments
|
|
24
30
|
* from the contract's token account, invalidates the rental in SAGE,
|
|
25
31
|
* and closes the contract account.
|
|
@@ -82,25 +88,45 @@ export async function closeContract(params, config) {
|
|
|
82
88
|
}
|
|
83
89
|
else if (params.contract) {
|
|
84
90
|
// Only contract provided - fetch contract to get fleet
|
|
85
|
-
const contract = await fetchContract(params.contract, finalConfig.rpcUrl);
|
|
86
|
-
fleetAddress = contract.data.fleet;
|
|
87
91
|
contractAddress = address(params.contract);
|
|
88
92
|
}
|
|
89
93
|
else {
|
|
90
94
|
// Should never reach here due to validation above
|
|
91
95
|
throw new Error('Either fleet or contract must be provided');
|
|
92
96
|
}
|
|
97
|
+
// Always fetch contract — needed for fleet (if not provided) and thread check
|
|
98
|
+
const contractAccount = await fetchContract(contractAddress, finalConfig.rpcUrl);
|
|
99
|
+
if (!params.fleet) {
|
|
100
|
+
fleetAddress = contractAccount.data.fleet;
|
|
101
|
+
}
|
|
93
102
|
// Get sageProgram from config if not provided
|
|
94
103
|
const sageProgram = params.sageProgram
|
|
95
104
|
? address(params.sageProgram)
|
|
96
105
|
: address(addresses.sage);
|
|
97
106
|
// Derive contract token account (ATA of contract PDA for ATLAS)
|
|
98
|
-
|
|
99
|
-
//
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
107
|
+
const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
|
|
108
|
+
// Check if contract has an automation thread that needs closing first
|
|
109
|
+
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
110
|
+
const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
|
|
111
|
+
let threadCloseIx;
|
|
112
|
+
if (hasThread) {
|
|
113
|
+
const rentalAuthority = await deriveRentalAuthority();
|
|
114
|
+
const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
|
|
115
|
+
// Fetch thread to get fiber IDs for remaining accounts
|
|
116
|
+
const rpc = createRpc(getRpcUrl(config));
|
|
117
|
+
const threadAccount = await fetchThread(rpc, contractThread);
|
|
118
|
+
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
119
|
+
// Derive fiber PDAs
|
|
120
|
+
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
121
|
+
address: await deriveFiber(contractThread, id),
|
|
122
|
+
role: AccountRole.WRITABLE,
|
|
123
|
+
})));
|
|
124
|
+
threadCloseIx = await getCloseContractThreadInstructionAsync({
|
|
125
|
+
owner: ownerSigner,
|
|
126
|
+
contract: contractAddress,
|
|
127
|
+
thread: contractThread,
|
|
128
|
+
}, { programAddress });
|
|
129
|
+
threadCloseIx.accounts.push(...fiberAccounts);
|
|
104
130
|
}
|
|
105
131
|
// Call Codama-generated instruction
|
|
106
132
|
const kitInstruction = await getCloseContractInstructionAsync({
|
|
@@ -111,7 +137,8 @@ export async function closeContract(params, config) {
|
|
|
111
137
|
contractTokenAccount: contractTokenAccount,
|
|
112
138
|
sageProgram,
|
|
113
139
|
}, { programAddress });
|
|
114
|
-
|
|
140
|
+
const instructions = threadCloseIx ? [threadCloseIx, kitInstruction] : kitInstruction;
|
|
141
|
+
return prepareInstructions(instructions, {
|
|
115
142
|
computeUnits: params.computeUnits,
|
|
116
143
|
PublicKey: finalConfig.PublicKey
|
|
117
144
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/package.json
CHANGED
package/dist/esm/version.js
CHANGED
package/dist/idl/srsly.json
CHANGED
|
@@ -4798,8 +4798,8 @@
|
|
|
4798
4798
|
},
|
|
4799
4799
|
{
|
|
4800
4800
|
"code": 6030,
|
|
4801
|
-
"name": "
|
|
4802
|
-
"msg": "
|
|
4801
|
+
"name": "ExpiredBorrowerStateRequired",
|
|
4802
|
+
"msg": "Please provide the expired borrower's state"
|
|
4803
4803
|
},
|
|
4804
4804
|
{
|
|
4805
4805
|
"code": 6031,
|
|
@@ -66,8 +66,8 @@ export declare const SRSLY_ERROR__INVALID_SPLIT_PERCENTAGES = 6027;
|
|
|
66
66
|
export declare const SRSLY_ERROR__INVALID_SPLIT_CONFIG = 6028;
|
|
67
67
|
/** ReferrerAlreadySet: Referrer has already been set and cannot be changed */
|
|
68
68
|
export declare const SRSLY_ERROR__REFERRER_ALREADY_SET = 6029;
|
|
69
|
-
/**
|
|
70
|
-
export declare const
|
|
69
|
+
/** ExpiredBorrowerStateRequired: Please provide the expired borrower's state */
|
|
70
|
+
export declare const SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED = 6030;
|
|
71
71
|
/** NoReferrerSet: Borrower has not set a referrer */
|
|
72
72
|
export declare const SRSLY_ERROR__NO_REFERRER_SET = 6031;
|
|
73
73
|
/** ReferrerMismatch: Referrer does not match borrower's chosen referrer */
|
|
@@ -184,7 +184,7 @@ export declare const SRSLY_ERROR__INVALID_DISCOUNT_CONTEXT = 6086;
|
|
|
184
184
|
export declare const SRSLY_ERROR__ATLAS_BID_REQUIRED = 6087;
|
|
185
185
|
/** InsufficientBid: Bid is insufficient to knock off the current reservation */
|
|
186
186
|
export declare const SRSLY_ERROR__INSUFFICIENT_BID = 6088;
|
|
187
|
-
export type SrslyError = typeof SRSLY_ERROR__ACCOUNT_OWNED_BY_WRONG_PROGRAM | typeof SRSLY_ERROR__ACTIVE_RENTAL_EXIST | typeof SRSLY_ERROR__ALREADY_SCHEDULED | typeof SRSLY_ERROR__ATLAS_BID_REQUIRED | typeof SRSLY_ERROR__ATLAS_RESERVATION_REQUIRES_TOKEN_ACCOUNTS | typeof
|
|
187
|
+
export type SrslyError = typeof SRSLY_ERROR__ACCOUNT_OWNED_BY_WRONG_PROGRAM | typeof SRSLY_ERROR__ACTIVE_RENTAL_EXIST | typeof SRSLY_ERROR__ALREADY_SCHEDULED | typeof SRSLY_ERROR__ATLAS_BID_REQUIRED | typeof SRSLY_ERROR__ATLAS_RESERVATION_REQUIRES_TOKEN_ACCOUNTS | typeof SRSLY_ERROR__CANCEL_NOT_ALLOWED | typeof SRSLY_ERROR__CANNOT_RELEASE_ACTIVE_RENTAL | typeof SRSLY_ERROR__CLAIM_WINDOW_EXPIRED | typeof SRSLY_ERROR__CLOSE_RENTAL_BEFORE_CONTRACT | typeof SRSLY_ERROR__CONTRACT_CLOSED | typeof SRSLY_ERROR__CONTRACT_EXISTS | typeof SRSLY_ERROR__CONTRACT_NOT_RENTED | typeof SRSLY_ERROR__CONTRACT_PENDING_CLOSE | typeof SRSLY_ERROR__CONTRACT_RESERVATIONS_DISABLED | typeof SRSLY_ERROR__DELAY_EXCEEDS_TIME_REMAINING | typeof SRSLY_ERROR__EXCESSIVE_RESERVATION_RATE_MULTIPLIER | typeof SRSLY_ERROR__EXCLUSIVE_WINDOW_ACTIVE | typeof SRSLY_ERROR__EXPIRED_BORROWER_STATE_REQUIRED | typeof SRSLY_ERROR__FLEET_ALREADY_RENTED | typeof SRSLY_ERROR__FLEET_HAS_ACTIVE_RESERVATION | typeof SRSLY_ERROR__FLEET_NOT_RENTED | typeof SRSLY_ERROR__INACTIVE_REFERRER | typeof SRSLY_ERROR__INSTANT_CANCEL_NOT_ALLOWED | typeof SRSLY_ERROR__INSUFFICIENT_ATLAS_FOR_REFUND | typeof SRSLY_ERROR__INSUFFICIENT_BID | typeof SRSLY_ERROR__INSUFFICIENT_CANCELLATION_NOTICE | typeof SRSLY_ERROR__INSUFFICIENT_POINTS_FOR_CLAIM | typeof SRSLY_ERROR__INSUFFICIENT_POINTS_TO_RESERVE | typeof SRSLY_ERROR__INSUFFICIENT_THREAD_FUNDING | typeof SRSLY_ERROR__INVALID_ATLAS_AMOUNT | typeof SRSLY_ERROR__INVALID_ATLAS_CONVERSION_RATE | typeof SRSLY_ERROR__INVALID_AUTHORITY | typeof SRSLY_ERROR__INVALID_CLAIM_SCHEDULE | typeof SRSLY_ERROR__INVALID_CLOSE_TARGET | typeof SRSLY_ERROR__INVALID_CONFIG | typeof SRSLY_ERROR__INVALID_DEFENDER | typeof SRSLY_ERROR__INVALID_DISCOUNT_CONTEXT | typeof SRSLY_ERROR__INVALID_DURATION_MAXIMUM | typeof SRSLY_ERROR__INVALID_DURATION_MAXIMUM_ALIGNMENT | typeof SRSLY_ERROR__INVALID_DURATION_MINIMUM | typeof SRSLY_ERROR__INVALID_DURATION_MINIMUM_ALIGNMENT | typeof SRSLY_ERROR__INVALID_FEE_RATE | typeof SRSLY_ERROR__INVALID_NONCE | typeof SRSLY_ERROR__INVALID_OWNER_TOKEN_ACCOUNT | typeof SRSLY_ERROR__INVALID_PAYMENT_FREQUENCY | typeof SRSLY_ERROR__INVALID_PERCENTAGE | typeof SRSLY_ERROR__INVALID_RATE | typeof SRSLY_ERROR__INVALID_RATE_CALCULATION | typeof SRSLY_ERROR__INVALID_RECIPIENT | typeof SRSLY_ERROR__INVALID_REFERRAL_RATE | typeof SRSLY_ERROR__INVALID_REFERRER | typeof SRSLY_ERROR__INVALID_RENTAL_DURATION | typeof SRSLY_ERROR__INVALID_RENTAL_SLOT | typeof SRSLY_ERROR__INVALID_RENTAL_STATE | typeof SRSLY_ERROR__INVALID_RESERVATION_HOLDER | typeof SRSLY_ERROR__INVALID_RESERVATION_RATE_MULTIPLIER | typeof SRSLY_ERROR__INVALID_SPLIT | typeof SRSLY_ERROR__INVALID_SPLIT_CONFIG | typeof SRSLY_ERROR__INVALID_SPLIT_PERCENTAGES | typeof SRSLY_ERROR__INVALID_STARBASE | typeof SRSLY_ERROR__INVALID_STARBASE_PLAYER | typeof SRSLY_ERROR__INVALID_THREAD | typeof SRSLY_ERROR__INVALID_THREAD_CONTEXT | typeof SRSLY_ERROR__INVALID_TOKEN_ACCOUNT | typeof SRSLY_ERROR__INVALID_VAULT | typeof SRSLY_ERROR__MISSING_REQUIRED_ACCOUNT | typeof SRSLY_ERROR__MISSING_THREAD_ACCOUNTS | typeof SRSLY_ERROR__NO_ACTIVE_RENTAL | typeof SRSLY_ERROR__NO_CLAIMABLE_BALANCE | typeof SRSLY_ERROR__NO_FEES_TO_CLAIM | typeof SRSLY_ERROR__NO_REFERRER_SET | typeof SRSLY_ERROR__NOT_CROWNED_WINNER | typeof SRSLY_ERROR__NOT_RESERVATION_HOLDER | typeof SRSLY_ERROR__PREVIOUS_RENTAL_ACTIVE | typeof SRSLY_ERROR__QUEUE_FULL | typeof SRSLY_ERROR__REFERRAL_NOT_ENABLED | typeof SRSLY_ERROR__REFERRER_ALREADY_SET | typeof SRSLY_ERROR__REFERRER_MISMATCH | typeof SRSLY_ERROR__RENTAL_ALREADY_CANCELLED | typeof SRSLY_ERROR__RENTAL_EXPIRED | typeof SRSLY_ERROR__RENTAL_IS_ACTIVE | typeof SRSLY_ERROR__RENTAL_NOT_QUEUED | typeof SRSLY_ERROR__RENTAL_STATE_EXISTS | typeof SRSLY_ERROR__RESERVATIONS_DISABLED | typeof SRSLY_ERROR__RESERVATION_STILL_ACTIVE | typeof SRSLY_ERROR__THREAD_NOT_SCHEDULED | typeof SRSLY_ERROR__THREAD_STILL_EXISTS | typeof SRSLY_ERROR__UNAUTHORIZED | typeof SRSLY_ERROR__UNAUTHORIZED_CONFIG_UPDATE;
|
|
188
188
|
export declare function getSrslyErrorMessage(code: SrslyError): string;
|
|
189
189
|
export declare function isSrslyError<TProgramErrorCode extends SrslyError>(error: unknown, transactionMessage: {
|
|
190
190
|
instructions: Record<number, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"srsly.d.ts","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,uCAAuC,EAC5C,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAGrB,qGAAqG;AACrG,eAAO,MAAM,yBAAyB,OAAS,CAAC;AAChD,gIAAgI;AAChI,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,wIAAwI;AACxI,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,uGAAuG;AACvG,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,mGAAmG;AACnG,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,uFAAuF;AACvF,eAAO,MAAM,yBAAyB,OAAS,CAAC;AAChD,4HAA4H;AAC5H,eAAO,MAAM,sCAAsC,OAAS,CAAC;AAC7D,oIAAoI;AACpI,eAAO,MAAM,6CAA6C,OAAS,CAAC;AACpE,sIAAsI;AACtI,eAAO,MAAM,yCAAyC,OAAS,CAAC;AAChE,sGAAsG;AACtG,eAAO,MAAM,4BAA4B,OAAS,CAAC;AACnD,6HAA6H;AAC7H,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,uGAAuG;AACvG,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,8GAA8G;AAC9G,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,qGAAqG;AACrG,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,kGAAkG;AAClG,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,4GAA4G;AAC5G,eAAO,MAAM,uCAAuC,OAAS,CAAC;AAC9D,6HAA6H;AAC7H,eAAO,MAAM,0CAA0C,OAAS,CAAC;AACjE,uHAAuH;AACvH,eAAO,MAAM,2CAA2C,OAAS,CAAC;AAClE,mIAAmI;AACnI,eAAO,MAAM,+CAA+C,OAAS,CAAC;AACtE,mIAAmI;AACnI,eAAO,MAAM,+CAA+C,OAAS,CAAC;AACtE,6GAA6G;AAC7G,eAAO,MAAM,2BAA2B,OAAS,CAAC;AAClD,gHAAgH;AAChH,eAAO,MAAM,2BAA2B,OAAS,CAAC;AAClD,2FAA2F;AAC3F,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,sFAAsF;AACtF,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,mGAAmG;AACnG,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,+CAA+C;AAC/C,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,6DAA6D;AAC7D,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,0EAA0E;AAC1E,eAAO,MAAM,sCAAsC,OAAS,CAAC;AAC7D,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,8EAA8E;AAC9E,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,
|
|
1
|
+
{"version":3,"file":"srsly.d.ts","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAEL,KAAK,OAAO,EACZ,KAAK,uCAAuC,EAC5C,KAAK,WAAW,EACjB,MAAM,aAAa,CAAC;AAGrB,qGAAqG;AACrG,eAAO,MAAM,yBAAyB,OAAS,CAAC;AAChD,gIAAgI;AAChI,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,wIAAwI;AACxI,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,uGAAuG;AACvG,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,mGAAmG;AACnG,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,uFAAuF;AACvF,eAAO,MAAM,yBAAyB,OAAS,CAAC;AAChD,4HAA4H;AAC5H,eAAO,MAAM,sCAAsC,OAAS,CAAC;AAC7D,oIAAoI;AACpI,eAAO,MAAM,6CAA6C,OAAS,CAAC;AACpE,sIAAsI;AACtI,eAAO,MAAM,yCAAyC,OAAS,CAAC;AAChE,sGAAsG;AACtG,eAAO,MAAM,4BAA4B,OAAS,CAAC;AACnD,6HAA6H;AAC7H,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,uGAAuG;AACvG,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,8GAA8G;AAC9G,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,qGAAqG;AACrG,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,kGAAkG;AAClG,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,4GAA4G;AAC5G,eAAO,MAAM,uCAAuC,OAAS,CAAC;AAC9D,6HAA6H;AAC7H,eAAO,MAAM,0CAA0C,OAAS,CAAC;AACjE,uHAAuH;AACvH,eAAO,MAAM,2CAA2C,OAAS,CAAC;AAClE,mIAAmI;AACnI,eAAO,MAAM,+CAA+C,OAAS,CAAC;AACtE,mIAAmI;AACnI,eAAO,MAAM,+CAA+C,OAAS,CAAC;AACtE,6GAA6G;AAC7G,eAAO,MAAM,2BAA2B,OAAS,CAAC;AAClD,gHAAgH;AAChH,eAAO,MAAM,2BAA2B,OAAS,CAAC;AAClD,2FAA2F;AAC3F,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,sFAAsF;AACtF,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,mGAAmG;AACnG,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,+CAA+C;AAC/C,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,6DAA6D;AAC7D,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,0EAA0E;AAC1E,eAAO,MAAM,sCAAsC,OAAS,CAAC;AAC7D,8DAA8D;AAC9D,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,8EAA8E;AAC9E,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,gFAAgF;AAChF,eAAO,MAAM,4CAA4C,OAAS,CAAC;AACnE,qDAAqD;AACrD,eAAO,MAAM,4BAA4B,OAAS,CAAC;AACnD,2EAA2E;AAC3E,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,oDAAoD;AACpD,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,yDAAyD;AACzD,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,mEAAmE;AACnE,eAAO,MAAM,kCAAkC,OAAS,CAAC;AACzD,8GAA8G;AAC9G,eAAO,MAAM,wCAAwC,OAAS,CAAC;AAC/D,2EAA2E;AAC3E,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,yFAAyF;AACzF,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,wFAAwF;AACxF,eAAO,MAAM,+BAA+B,OAAS,CAAC;AACtD,yIAAyI;AACzI,eAAO,MAAM,yCAAyC,OAAS,CAAC;AAChE,qEAAqE;AACrE,eAAO,MAAM,uCAAuC,OAAS,CAAC;AAC9D,gGAAgG;AAChG,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,+DAA+D;AAC/D,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,qGAAqG;AACrG,eAAO,MAAM,oCAAoC,OAAS,CAAC;AAC3D,+EAA+E;AAC/E,eAAO,MAAM,0CAA0C,OAAS,CAAC;AACjE,sDAAsD;AACtD,eAAO,MAAM,0BAA0B,OAAS,CAAC;AACjD,uEAAuE;AACvE,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,iFAAiF;AACjF,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,oFAAoF;AACpF,eAAO,MAAM,2CAA2C,OAAS,CAAC;AAClE,yHAAyH;AACzH,eAAO,MAAM,gDAAgD,OAAS,CAAC;AACvE,0HAA0H;AAC1H,eAAO,MAAM,kDAAkD,OAAS,CAAC;AACzE,2DAA2D;AAC3D,eAAO,MAAM,kCAAkC,OAAS,CAAC;AACzD,qEAAqE;AACrE,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,qDAAqD;AACrD,eAAO,MAAM,2BAA2B,OAAS,CAAC;AAClD,oFAAoF;AACpF,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,gFAAgF;AAChF,eAAO,MAAM,0BAA0B,OAAS,CAAC;AACjD,+DAA+D;AAC/D,eAAO,MAAM,kCAAkC,OAAS,CAAC;AACzD,mEAAmE;AACnE,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,gDAAgD;AAChD,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,2EAA2E;AAC3E,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,6IAA6I;AAC7I,eAAO,MAAM,yCAAyC,OAAS,CAAC;AAChE,0HAA0H;AAC1H,eAAO,MAAM,yCAAyC,OAAS,CAAC;AAChE,2HAA2H;AAC3H,eAAO,MAAM,uCAAuC,OAAS,CAAC;AAC9D,gGAAgG;AAChG,eAAO,MAAM,+BAA+B,OAAS,CAAC;AACtD,wHAAwH;AACxH,eAAO,MAAM,2CAA2C,OAAS,CAAC;AAClE,uFAAuF;AACvF,eAAO,MAAM,sDAAsD,OAAS,CAAC;AAC7E,6EAA6E;AAC7E,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,uGAAuG;AACvG,eAAO,MAAM,4BAA4B,OAAS,CAAC;AACnD,4EAA4E;AAC5E,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,oHAAoH;AACpH,eAAO,MAAM,+BAA+B,OAAS,CAAC;AACtD,yGAAyG;AACzG,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,kGAAkG;AAClG,eAAO,MAAM,uBAAuB,OAAS,CAAC;AAC9C,yFAAyF;AACzF,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,0FAA0F;AAC1F,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,uGAAuG;AACvG,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,qGAAqG;AACrG,eAAO,MAAM,iCAAiC,OAAS,CAAC;AACxD,6FAA6F;AAC7F,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,6FAA6F;AAC7F,eAAO,MAAM,8BAA8B,OAAS,CAAC;AACrD,kGAAkG;AAClG,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,2EAA2E;AAC3E,eAAO,MAAM,0BAA0B,OAAS,CAAC;AACjD,wHAAwH;AACxH,eAAO,MAAM,0CAA0C,OAAS,CAAC;AACjE,+FAA+F;AAC/F,eAAO,MAAM,mCAAmC,OAAS,CAAC;AAC1D,wFAAwF;AACxF,eAAO,MAAM,6BAA6B,OAAS,CAAC;AACpD,8FAA8F;AAC9F,eAAO,MAAM,gCAAgC,OAAS,CAAC;AACvD,6HAA6H;AAC7H,eAAO,MAAM,wCAAwC,OAAS,CAAC;AAC/D,yFAAyF;AACzF,eAAO,MAAM,qCAAqC,OAAS,CAAC;AAC5D,6EAA6E;AAC7E,eAAO,MAAM,+BAA+B,OAAS,CAAC;AACtD,gFAAgF;AAChF,eAAO,MAAM,6BAA6B,OAAS,CAAC;AAEpD,MAAM,MAAM,UAAU,GAClB,OAAO,2CAA2C,GAClD,OAAO,gCAAgC,GACvC,OAAO,8BAA8B,GACrC,OAAO,+BAA+B,GACtC,OAAO,sDAAsD,GAC7D,OAAO,+BAA+B,GACtC,OAAO,yCAAyC,GAChD,OAAO,iCAAiC,GACxC,OAAO,yCAAyC,GAChD,OAAO,4BAA4B,GACnC,OAAO,4BAA4B,GACnC,OAAO,gCAAgC,GACvC,OAAO,mCAAmC,GAC1C,OAAO,2CAA2C,GAClD,OAAO,yCAAyC,GAChD,OAAO,kDAAkD,GACzD,OAAO,oCAAoC,GAC3C,OAAO,4CAA4C,GACnD,OAAO,iCAAiC,GACxC,OAAO,yCAAyC,GAChD,OAAO,6BAA6B,GACpC,OAAO,8BAA8B,GACrC,OAAO,uCAAuC,GAC9C,OAAO,0CAA0C,GACjD,OAAO,6BAA6B,GACpC,OAAO,6CAA6C,GACpD,OAAO,0CAA0C,GACjD,OAAO,2CAA2C,GAClD,OAAO,wCAAwC,GAC/C,OAAO,iCAAiC,GACxC,OAAO,0CAA0C,GACjD,OAAO,8BAA8B,GACrC,OAAO,mCAAmC,GAC1C,OAAO,iCAAiC,GACxC,OAAO,2BAA2B,GAClC,OAAO,6BAA6B,GACpC,OAAO,qCAAqC,GAC5C,OAAO,qCAAqC,GAC5C,OAAO,+CAA+C,GACtD,OAAO,qCAAqC,GAC5C,OAAO,+CAA+C,GACtD,OAAO,6BAA6B,GACpC,OAAO,0BAA0B,GACjC,OAAO,wCAAwC,GAC/C,OAAO,sCAAsC,GAC7C,OAAO,+BAA+B,GACtC,OAAO,yBAAyB,GAChC,OAAO,qCAAqC,GAC5C,OAAO,8BAA8B,GACrC,OAAO,kCAAkC,GACzC,OAAO,6BAA6B,GACpC,OAAO,oCAAoC,GAC3C,OAAO,gCAAgC,GACvC,OAAO,iCAAiC,GACxC,OAAO,uCAAuC,GAC9C,OAAO,gDAAgD,GACvD,OAAO,0BAA0B,GACjC,OAAO,iCAAiC,GACxC,OAAO,sCAAsC,GAC7C,OAAO,6BAA6B,GACpC,OAAO,oCAAoC,GAC3C,OAAO,2BAA2B,GAClC,OAAO,mCAAmC,GAC1C,OAAO,kCAAkC,GACzC,OAAO,0BAA0B,GACjC,OAAO,qCAAqC,GAC5C,OAAO,oCAAoC,GAC3C,OAAO,6BAA6B,GACpC,OAAO,iCAAiC,GACxC,OAAO,6BAA6B,GACpC,OAAO,4BAA4B,GACnC,OAAO,+BAA+B,GACtC,OAAO,mCAAmC,GAC1C,OAAO,mCAAmC,GAC1C,OAAO,uBAAuB,GAC9B,OAAO,iCAAiC,GACxC,OAAO,iCAAiC,GACxC,OAAO,8BAA8B,GACrC,OAAO,qCAAqC,GAC5C,OAAO,2BAA2B,GAClC,OAAO,6BAA6B,GACpC,OAAO,8BAA8B,GACrC,OAAO,gCAAgC,GACvC,OAAO,kCAAkC,GACzC,OAAO,qCAAqC,GAC5C,OAAO,iCAAiC,GACxC,OAAO,gCAAgC,GACvC,OAAO,yBAAyB,GAChC,OAAO,uCAAuC,CAAC;AAiGnD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAM7D;AAED,wBAAgB,YAAY,CAAC,iBAAiB,SAAS,UAAU,EAC/D,KAAK,EAAE,OAAO,EACd,kBAAkB,EAAE;IAClB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,cAAc,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC3D,EACD,IAAI,CAAC,EAAE,iBAAiB,GACvB,KAAK,IAAI,WAAW,CAAC,OAAO,uCAAuC,CAAC,GACrE,QAAQ,CAAC;IAAE,OAAO,EAAE,QAAQ,CAAC;QAAE,IAAI,EAAE,iBAAiB,CAAA;KAAE,CAAC,CAAA;CAAE,CAAC,CAO7D"}
|
|
@@ -33,7 +33,7 @@ export interface CancelRentalParams {
|
|
|
33
33
|
* @example { hours: 12 } // Cancel after 12 hours
|
|
34
34
|
* @example { days: 1 } // Cancel after 1 day
|
|
35
35
|
* @example { weeks: 1 } // Cancel after 1 week
|
|
36
|
-
* @default
|
|
36
|
+
* @default contract.cancelDelayMin (fetched on-chain)
|
|
37
37
|
*/
|
|
38
38
|
cancelDelay?: DurationParam;
|
|
39
39
|
/**
|
|
@@ -60,7 +60,7 @@ export interface CancelRentalParams {
|
|
|
60
60
|
*
|
|
61
61
|
* @example
|
|
62
62
|
* ```typescript
|
|
63
|
-
* //
|
|
63
|
+
* // Default cancellation (uses contract's cancelDelayMin)
|
|
64
64
|
* const ix = await cancelRental({
|
|
65
65
|
* borrower: borrowerWallet,
|
|
66
66
|
* contract: contractAddress
|
|
@@ -46,6 +46,9 @@ export interface CloseContractParams {
|
|
|
46
46
|
* accounts don't exist, they will be created temporarily before being closed.
|
|
47
47
|
* This allows recovery from partial failures during previous close attempts.
|
|
48
48
|
*
|
|
49
|
+
* If the contract has an automation thread, the thread close instruction
|
|
50
|
+
* is automatically prepended — no need to call closeContractThread separately.
|
|
51
|
+
*
|
|
49
52
|
* Contract must have no active rentals. Claims all remaining payments
|
|
50
53
|
* from the contract's token account, invalidates the rental in SAGE,
|
|
51
54
|
* and closes the contract account.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.d.ts","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"closeContract.d.ts","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAwB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAGjE,OAAO,EAAwC,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACvF,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAO5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE5B;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE/B;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,EAC3B,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC1B,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CA0GjD"}
|
package/dist/types/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "3.0.0-beta.
|
|
1
|
+
export declare const VERSION = "3.0.0-beta.26";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|