@wuwei-labs/srsly 4.2.4 → 4.2.7
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/accounts/thread.js +31 -4
- package/dist/cjs/accounts/thread.js.map +1 -1
- package/dist/cjs/demos.js +3 -3
- package/dist/cjs/generated/codama/errors/srsly.js +4 -1
- package/dist/cjs/generated/codama/errors/srsly.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/reserveRental.js +18 -1
- package/dist/cjs/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/instructions/closeContract.js +1 -1
- package/dist/cjs/instructions/closeContract.js.map +1 -1
- package/dist/cjs/instructions/closeContractThread.js +1 -1
- package/dist/cjs/instructions/closeContractThread.js.map +1 -1
- package/dist/cjs/instructions/closeRental.js +12 -0
- package/dist/cjs/instructions/closeRental.js.map +1 -1
- package/dist/cjs/instructions/deleteContractThread.js +1 -1
- package/dist/cjs/instructions/deleteContractThread.js.map +1 -1
- package/dist/cjs/instructions/reserveRental.js +13 -7
- package/dist/cjs/instructions/reserveRental.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/accounts/thread.js +30 -4
- package/dist/esm/accounts/thread.js.map +1 -1
- package/dist/esm/demos.js +3 -3
- package/dist/esm/generated/codama/errors/srsly.js +3 -0
- package/dist/esm/generated/codama/errors/srsly.js.map +1 -1
- package/dist/esm/generated/codama/instructions/reserveRental.js +18 -1
- package/dist/esm/generated/codama/instructions/reserveRental.js.map +1 -1
- package/dist/esm/instructions/closeContract.js +2 -2
- package/dist/esm/instructions/closeContract.js.map +1 -1
- package/dist/esm/instructions/closeContractThread.js +2 -2
- package/dist/esm/instructions/closeContractThread.js.map +1 -1
- package/dist/esm/instructions/closeRental.js +13 -1
- package/dist/esm/instructions/closeRental.js.map +1 -1
- package/dist/esm/instructions/deleteContractThread.js +2 -2
- package/dist/esm/instructions/deleteContractThread.js.map +1 -1
- package/dist/esm/instructions/reserveRental.js +14 -8
- package/dist/esm/instructions/reserveRental.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +49 -2
- package/dist/types/accounts/thread.d.ts +19 -3
- package/dist/types/accounts/thread.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/rentalState.d.ts +2 -2
- package/dist/types/generated/codama/accounts/rentalState.d.ts.map +1 -1
- package/dist/types/generated/codama/errors/srsly.d.ts +3 -1
- package/dist/types/generated/codama/errors/srsly.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/reserveRental.d.ts +23 -16
- package/dist/types/generated/codama/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/instructions/reserveRental.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
|
@@ -7,22 +7,29 @@
|
|
|
7
7
|
* and decode using the generated codec.
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.fetchThreadByAddress = fetchThreadByAddress;
|
|
10
11
|
exports.fetchThread = fetchThread;
|
|
11
12
|
const kit_1 = require("@solana/kit");
|
|
12
13
|
const thread_1 = require("../generated/codama/types/thread");
|
|
14
|
+
const accounts_1 = require("../generated/codama/accounts");
|
|
13
15
|
const config_1 = require("../utils/config");
|
|
14
16
|
const rpc_1 = require("../utils/rpc");
|
|
15
17
|
/** Anchor discriminator size (8 bytes) */
|
|
16
18
|
const DISCRIMINATOR_SIZE = 8;
|
|
19
|
+
/** System program ID — contract.thread == this means no thread */
|
|
20
|
+
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
17
21
|
/**
|
|
18
|
-
* Fetch and decode
|
|
22
|
+
* Fetch and decode a raw Antegen thread account by its direct address.
|
|
19
23
|
*
|
|
20
|
-
*
|
|
24
|
+
* Used internally by instruction wrappers that already know the thread address.
|
|
25
|
+
*
|
|
26
|
+
* @param threadAddress - Direct address of the thread account
|
|
21
27
|
* @param rpcUrl - Optional RPC URL override
|
|
22
28
|
* @returns Decoded thread data
|
|
23
29
|
*/
|
|
24
|
-
async function
|
|
25
|
-
const
|
|
30
|
+
async function fetchThreadByAddress(threadAddress, rpcUrl) {
|
|
31
|
+
const resolvedRpcUrl = rpcUrl || (0, config_1.getRpcUrl)();
|
|
32
|
+
const rpc = (0, rpc_1.createRpc)(resolvedRpcUrl);
|
|
26
33
|
const addr = threadAddress;
|
|
27
34
|
const acct = await rpc.getAccountInfo(addr, { encoding: 'base64' }).send();
|
|
28
35
|
const rawData = acct.value?.data;
|
|
@@ -34,4 +41,24 @@ async function fetchThread(threadAddress, rpcUrl) {
|
|
|
34
41
|
const data = (0, thread_1.getThreadDecoder)().decode(bytes.subarray(DISCRIMINATOR_SIZE));
|
|
35
42
|
return { address: addr, data };
|
|
36
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Fetch and decode an Antegen thread account by contract address.
|
|
46
|
+
*
|
|
47
|
+
* Looks up the contract's `thread` field, then fetches and decodes the
|
|
48
|
+
* thread account. Returns null if no thread is configured on the contract.
|
|
49
|
+
*
|
|
50
|
+
* @param contractAddress - Address of the rental contract
|
|
51
|
+
* @param rpcUrl - Optional RPC URL override
|
|
52
|
+
* @returns Decoded thread data, or null if no thread configured
|
|
53
|
+
*/
|
|
54
|
+
async function fetchThread(contractAddress, rpcUrl) {
|
|
55
|
+
const resolvedRpcUrl = rpcUrl || (0, config_1.getRpcUrl)();
|
|
56
|
+
const rpc = (0, rpc_1.createRpc)(resolvedRpcUrl);
|
|
57
|
+
const contract = await (0, accounts_1.fetchContractState)(rpc, contractAddress);
|
|
58
|
+
const threadAddr = contract.data.thread;
|
|
59
|
+
if (!threadAddr || threadAddr === SYSTEM_PROGRAM_ID) {
|
|
60
|
+
return null;
|
|
61
|
+
}
|
|
62
|
+
return fetchThreadByAddress(threadAddr, resolvedRpcUrl);
|
|
63
|
+
}
|
|
37
64
|
//# sourceMappingURL=thread.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/accounts/thread.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/accounts/thread.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAuBH,oDAmBC;AAYD,kCAeC;AAnED,qCAA6D;AAC7D,6DAAiF;AACjF,2DAAkE;AAClE,4CAA4C;AAC5C,sCAAyC;AAEzC,0CAA0C;AAC1C,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B,kEAAkE;AAClE,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAE7D;;;;;;;;GAQG;AACI,KAAK,UAAU,oBAAoB,CACxC,aAA+B,EAC/B,MAAe;IAEf,MAAM,cAAc,GAAG,MAAM,IAAI,IAAA,kBAAS,GAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,cAAc,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,aAAwB,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC;IAEjC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,6BAA6B,aAAa,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,sBAAgB,GAAE,CAAC;IACzC,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAA,yBAAgB,GAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACjC,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,WAAW,CAC/B,eAAiC,EACjC,MAAe;IAEf,MAAM,cAAc,GAAG,MAAM,IAAI,IAAA,kBAAS,GAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,IAAA,eAAS,EAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,MAAM,IAAA,6BAAkB,EAAC,GAAG,EAAE,eAA0B,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAgB,CAAC;IAElD,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,iBAAiB,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,oBAAoB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/cjs/demos.js
CHANGED
|
@@ -137,7 +137,7 @@ exports.fetchThreadDemo = {
|
|
|
137
137
|
description: 'Fetch thread state by contract address',
|
|
138
138
|
imports: `import { fetchThread } from '@wuwei-labs/srsly/kit';`,
|
|
139
139
|
legacyImports: `import { fetchThread } from '@wuwei-labs/srsly/legacy';`,
|
|
140
|
-
instruction: `const result = await fetchThread("
|
|
140
|
+
instruction: `const result = await fetchThread("CONTRACT_ADDRESS");
|
|
141
141
|
console.log(result);`,
|
|
142
142
|
isFetchOperation: true,
|
|
143
143
|
};
|
|
@@ -236,7 +236,7 @@ setSdkConfig({ PublicKey });`,
|
|
|
236
236
|
borrowerProfile: "BORROWER_PROFILE_ADDRESS",
|
|
237
237
|
contract: "CONTRACT_ADDRESS",
|
|
238
238
|
duration: { days: 7 },
|
|
239
|
-
computeUnits:
|
|
239
|
+
computeUnits: 300_000
|
|
240
240
|
});`,
|
|
241
241
|
};
|
|
242
242
|
exports.cancelRentalDemo = {
|
|
@@ -297,7 +297,7 @@ setSdkConfig({ PublicKey });`,
|
|
|
297
297
|
// Optional: bid to raise contract weight (points XOR atlas)
|
|
298
298
|
// bidAtlas: { atlas: 5 },
|
|
299
299
|
// bidPoints: 100,
|
|
300
|
-
computeUnits:
|
|
300
|
+
computeUnits: 300_000
|
|
301
301
|
});`,
|
|
302
302
|
};
|
|
303
303
|
exports.invalidateRentalDemo = {
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
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
|
-
exports.SRSLY_ERROR__MISSING_REFERRER = exports.SRSLY_ERROR__DISCOUNT_NOT_LOCKED = exports.SRSLY_ERROR__POINTS_OR_ATLAS_BID_ONLY = exports.SRSLY_ERROR__BID_REQUIRED = 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;
|
|
11
|
+
exports.SRSLY_ERROR__OWNER_CANNOT_RENT = exports.SRSLY_ERROR__MISSING_REFERRER = exports.SRSLY_ERROR__DISCOUNT_NOT_LOCKED = exports.SRSLY_ERROR__POINTS_OR_ATLAS_BID_ONLY = exports.SRSLY_ERROR__BID_REQUIRED = 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;
|
|
14
14
|
const kit_1 = require("@solana/kit");
|
|
@@ -199,6 +199,8 @@ exports.SRSLY_ERROR__POINTS_OR_ATLAS_BID_ONLY = 0x17ca; // 6090
|
|
|
199
199
|
exports.SRSLY_ERROR__DISCOUNT_NOT_LOCKED = 0x17cb; // 6091
|
|
200
200
|
/** MissingReferrer: Referrer account required when discount params are provided */
|
|
201
201
|
exports.SRSLY_ERROR__MISSING_REFERRER = 0x17cc; // 6092
|
|
202
|
+
/** OwnerCannotRent: Owner cannot rent their own fleet */
|
|
203
|
+
exports.SRSLY_ERROR__OWNER_CANNOT_RENT = 0x17cd; // 6093
|
|
202
204
|
let srslyErrorMessages;
|
|
203
205
|
if (process.env.NODE_ENV !== "production") {
|
|
204
206
|
srslyErrorMessages = {
|
|
@@ -278,6 +280,7 @@ if (process.env.NODE_ENV !== "production") {
|
|
|
278
280
|
[exports.SRSLY_ERROR__NO_REFERRER_SET]: `Borrower has not set a referrer`,
|
|
279
281
|
[exports.SRSLY_ERROR__NOT_CROWNED_WINNER]: `Not the crowned winner. Only the winner from reservation can claim during the claim window.`,
|
|
280
282
|
[exports.SRSLY_ERROR__NOT_RESERVATION_HOLDER]: `Not the current reservation holder`,
|
|
283
|
+
[exports.SRSLY_ERROR__OWNER_CANNOT_RENT]: `Owner cannot rent their own fleet`,
|
|
281
284
|
[exports.SRSLY_ERROR__POINTS_OR_ATLAS_BID_ONLY]: `Bid must be either points or ATLAS, not both`,
|
|
282
285
|
[exports.SRSLY_ERROR__PREVIOUS_RENTAL_ACTIVE]: `Previous rental slot is still active. Wait for it to be closed first.`,
|
|
283
286
|
[exports.SRSLY_ERROR__QUEUE_FULL]: `Queue is full. Both rental slots are occupied. Wait for current rental to close.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;
|
|
1
|
+
{"version":3,"file":"srsly.js","sourceRoot":"","sources":["../../../../../src/generated/codama/errors/srsly.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;AA2YH,oDAMC;AAED,oCAcC;AA/ZD,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,gFAAgF;AACnE,QAAA,4CAA4C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3E,qDAAqD;AACxC,QAAA,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,2EAA2E;AAC9D,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,oDAAoD;AACvC,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,yDAAyD;AAC5C,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,mEAAmE;AACtD,QAAA,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,8GAA8G;AACjG,QAAA,wCAAwC,GAAG,MAAM,CAAC,CAAC,OAAO;AACvE,2EAA2E;AAC9D,QAAA,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,yFAAyF;AAC5E,QAAA,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,wFAAwF;AAC3E,QAAA,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,yIAAyI;AAC5H,QAAA,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,qEAAqE;AACxD,QAAA,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,gGAAgG;AACnF,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,+DAA+D;AAClD,QAAA,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,qGAAqG;AACxF,QAAA,oCAAoC,GAAG,MAAM,CAAC,CAAC,OAAO;AACnE,+EAA+E;AAClE,QAAA,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,sDAAsD;AACzC,QAAA,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,uEAAuE;AAC1D,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,iFAAiF;AACpE,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,oFAAoF;AACvE,QAAA,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,yHAAyH;AAC5G,QAAA,gDAAgD,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/E,0HAA0H;AAC7G,QAAA,kDAAkD,GAAG,MAAM,CAAC,CAAC,OAAO;AACjF,2DAA2D;AAC9C,QAAA,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,qEAAqE;AACxD,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,qDAAqD;AACxC,QAAA,2BAA2B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1D,oFAAoF;AACvE,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,gFAAgF;AACnE,QAAA,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,+DAA+D;AAClD,QAAA,kCAAkC,GAAG,MAAM,CAAC,CAAC,OAAO;AACjE,mEAAmE;AACtD,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,gDAAgD;AACnC,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,2EAA2E;AAC9D,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6IAA6I;AAChI,QAAA,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,0HAA0H;AAC7G,QAAA,yCAAyC,GAAG,MAAM,CAAC,CAAC,OAAO;AACxE,2HAA2H;AAC9G,QAAA,uCAAuC,GAAG,MAAM,CAAC,CAAC,OAAO;AACtE,gGAAgG;AACnF,QAAA,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,wHAAwH;AAC3G,QAAA,2CAA2C,GAAG,MAAM,CAAC,CAAC,OAAO;AAC1E,uFAAuF;AAC1E,QAAA,sDAAsD,GAAG,MAAM,CAAC,CAAC,OAAO;AACrF,6EAA6E;AAChE,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,uGAAuG;AAC1F,QAAA,4BAA4B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC3D,4EAA4E;AAC/D,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,oHAAoH;AACvG,QAAA,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,yGAAyG;AAC5F,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,kGAAkG;AACrF,QAAA,uBAAuB,GAAG,MAAM,CAAC,CAAC,OAAO;AACtD,yFAAyF;AAC5E,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,0FAA0F;AAC7E,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,uGAAuG;AAC1F,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,qGAAqG;AACxF,QAAA,iCAAiC,GAAG,MAAM,CAAC,CAAC,OAAO;AAChE,6FAA6F;AAChF,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6FAA6F;AAChF,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC7D,kGAAkG;AACrF,QAAA,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,2EAA2E;AAC9D,QAAA,0BAA0B,GAAG,MAAM,CAAC,CAAC,OAAO;AACzD,wHAAwH;AAC3G,QAAA,0CAA0C,GAAG,MAAM,CAAC,CAAC,OAAO;AACzE,+FAA+F;AAClF,QAAA,mCAAmC,GAAG,MAAM,CAAC,CAAC,OAAO;AAClE,wFAAwF;AAC3E,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,8FAA8F;AACjF,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,6HAA6H;AAChH,QAAA,wCAAwC,GAAG,MAAM,CAAC,CAAC,OAAO;AACvE,qFAAqF;AACxE,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,6EAA6E;AAChE,QAAA,+BAA+B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC9D,gFAAgF;AACnE,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,mFAAmF;AACtE,QAAA,yBAAyB,GAAG,MAAM,CAAC,CAAC,OAAO;AACxD,yEAAyE;AAC5D,QAAA,qCAAqC,GAAG,MAAM,CAAC,CAAC,OAAO;AACpE,qFAAqF;AACxE,QAAA,gCAAgC,GAAG,MAAM,CAAC,CAAC,OAAO;AAC/D,mFAAmF;AACtE,QAAA,6BAA6B,GAAG,MAAM,CAAC,CAAC,OAAO;AAC5D,yDAAyD;AAC5C,QAAA,8BAA8B,GAAG,MAAM,CAAC,CAAC,OAAO;AAkG7D,IAAI,kBAA0D,CAAC;AAC/D,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;IAC1C,kBAAkB,GAAG;QACnB,CAAC,mDAA2C,CAAC,EAAE,sFAAsF;QACrI,CAAC,wCAAgC,CAAC,EAAE,mDAAmD;QACvF,CAAC,sCAA8B,CAAC,EAAE,kEAAkE;QACpG,CAAC,uCAA+B,CAAC,EAAE,sDAAsD;QACzF,CAAC,8DAAsD,CAAC,EAAE,2CAA2C;QACrG,CAAC,iCAAyB,CAAC,EAAE,iEAAiE;QAC9F,CAAC,uCAA+B,CAAC,EAAE,yEAAyE;QAC5G,CAAC,iDAAyC,CAAC,EAAE,6GAA6G;QAC1J,CAAC,yCAAiC,CAAC,EAAE,gFAAgF;QACrH,CAAC,iDAAyC,CAAC,EAAE,0FAA0F;QACvI,CAAC,oCAA4B,CAAC,EAAE,iFAAiF;QACjH,CAAC,oCAA4B,CAAC,EAAE,kFAAkF;QAClH,CAAC,wCAAgC,CAAC,EAAE,wEAAwE;QAC5G,CAAC,2CAAmC,CAAC,EAAE,oEAAoE;QAC3G,CAAC,mDAA2C,CAAC,EAAE,qFAAqF;QACpI,CAAC,iDAAyC,CAAC,EAAE,sGAAsG;QACnJ,CAAC,wCAAgC,CAAC,EAAE,6DAA6D;QACjG,CAAC,0DAAkD,CAAC,EAAE,iFAAiF;QACvI,CAAC,4CAAoC,CAAC,EAAE,yEAAyE;QACjH,CAAC,oDAA4C,CAAC,EAAE,6CAA6C;QAC7F,CAAC,yCAAiC,CAAC,EAAE,0EAA0E;QAC/G,CAAC,iDAAyC,CAAC,EAAE,yGAAyG;QACtJ,CAAC,qCAA6B,CAAC,EAAE,uDAAuD;QACxF,CAAC,sCAA8B,CAAC,EAAE,wBAAwB;QAC1D,CAAC,+CAAuC,CAAC,EAAE,6FAA6F;QACxI,CAAC,kDAA0C,CAAC,EAAE,uFAAuF;QACrI,CAAC,qCAA6B,CAAC,EAAE,0DAA0D;QAC3F,CAAC,qDAA6C,CAAC,EAAE,+FAA+F;QAChJ,CAAC,kDAA0C,CAAC,EAAE,8CAA8C;QAC5F,CAAC,mDAA2C,CAAC,EAAE,kDAAkD;QACjG,CAAC,gDAAwC,CAAC,EAAE,6FAA6F;QACzI,CAAC,yCAAiC,CAAC,EAAE,oDAAoD;QACzF,CAAC,kDAA0C,CAAC,EAAE,4FAA4F;QAC1I,CAAC,sCAA8B,CAAC,EAAE,sCAAsC;QACxE,CAAC,2CAAmC,CAAC,EAAE,8DAA8D;QACrG,CAAC,yCAAiC,CAAC,EAAE,8CAA8C;QACnF,CAAC,mCAA2B,CAAC,EAAE,iCAAiC;QAChE,CAAC,qCAA6B,CAAC,EAAE,8DAA8D;QAC/F,CAAC,6CAAqC,CAAC,EAAE,wDAAwD;QACjG,CAAC,6CAAqC,CAAC,EAAE,2GAA2G;QACpJ,CAAC,uDAA+C,CAAC,EAAE,6FAA6F;QAChJ,CAAC,6CAAqC,CAAC,EAAE,mGAAmG;QAC5I,CAAC,uDAA+C,CAAC,EAAE,6FAA6F;QAChJ,CAAC,qCAA6B,CAAC,EAAE,gFAAgF;QACjH,CAAC,kCAA0B,CAAC,EAAE,mCAAmC;QACjE,CAAC,gDAAwC,CAAC,EAAE,+EAA+E;QAC3H,CAAC,8CAAsC,CAAC,EAAE,8FAA8F;QACxI,CAAC,uCAA+B,CAAC,EAAE,gEAAgE;QACnG,CAAC,iCAAyB,CAAC,EAAE,qEAAqE;QAClG,CAAC,6CAAqC,CAAC,EAAE,0EAA0E;QACnH,CAAC,sCAA8B,CAAC,EAAE,6BAA6B;QAC/D,CAAC,0CAAkC,CAAC,EAAE,qCAAqC;QAC3E,CAAC,qCAA6B,CAAC,EAAE,kEAAkE;QACnG,CAAC,4CAAoC,CAAC,EAAE,sEAAsE;QAC9G,CAAC,wCAAgC,CAAC,EAAE,qEAAqE;QACzG,CAAC,yCAAiC,CAAC,EAAE,4EAA4E;QACjH,CAAC,+CAAuC,CAAC,EAAE,sCAAsC;QACjF,CAAC,wDAAgD,CAAC,EAAE,kFAAkF;QACtI,CAAC,kCAA0B,CAAC,EAAE,6DAA6D;QAC3F,CAAC,yCAAiC,CAAC,EAAE,qCAAqC;QAC1E,CAAC,8CAAsC,CAAC,EAAE,4CAA4C;QACtF,CAAC,qCAA6B,CAAC,EAAE,gEAAgE;QACjG,CAAC,4CAAoC,CAAC,EAAE,uEAAuE;QAC/G,CAAC,mCAA2B,CAAC,EAAE,4FAA4F;QAC3H,CAAC,2CAAmC,CAAC,EAAE,kGAAkG;QACzI,CAAC,0CAAkC,CAAC,EAAE,yCAAyC;QAC/E,CAAC,kCAA0B,CAAC,EAAE,wDAAwD;QACtF,CAAC,qCAA6B,CAAC,EAAE,6DAA6D;QAC9F,CAAC,6CAAqC,CAAC,EAAE,wCAAwC;QACjF,CAAC,4CAAoC,CAAC,EAAE,+CAA+C;QACvF,CAAC,qCAA6B,CAAC,EAAE,qEAAqE;QACtG,CAAC,yCAAiC,CAAC,EAAE,gCAAgC;QACrE,CAAC,qCAA6B,CAAC,EAAE,4BAA4B;QAC7D,CAAC,oCAA4B,CAAC,EAAE,iCAAiC;QACjE,CAAC,uCAA+B,CAAC,EAAE,6FAA6F;QAChI,CAAC,2CAAmC,CAAC,EAAE,oCAAoC;QAC3E,CAAC,sCAA8B,CAAC,EAAE,mCAAmC;QACrE,CAAC,6CAAqC,CAAC,EAAE,8CAA8C;QACvF,CAAC,2CAAmC,CAAC,EAAE,uEAAuE;QAC9G,CAAC,+BAAuB,CAAC,EAAE,kFAAkF;QAC7G,CAAC,yCAAiC,CAAC,EAAE,0CAA0C;QAC/E,CAAC,yCAAiC,CAAC,EAAE,qDAAqD;QAC1F,CAAC,sCAA8B,CAAC,EAAE,oDAAoD;QACtF,CAAC,6CAAqC,CAAC,EAAE,8DAA8D;QACvG,CAAC,mCAA2B,CAAC,EAAE,yFAAyF;QACxH,CAAC,qCAA6B,CAAC,EAAE,kFAAkF;QACnH,CAAC,sCAA8B,CAAC,EAAE,uEAAuE;QACzG,CAAC,wCAAgC,CAAC,EAAE,sFAAsF;QAC1H,CAAC,0CAAkC,CAAC,EAAE,gCAAgC;QACtE,CAAC,6CAAqC,CAAC,EAAE,oDAAoD;QAC7F,CAAC,yCAAiC,CAAC,EAAE,8EAA8E;QACnH,CAAC,wCAAgC,CAAC,EAAE,sEAAsE;QAC1G,CAAC,iCAAyB,CAAC,EAAE,kFAAkF;QAC/G,CAAC,+CAAuC,CAAC,EAAE,6EAA6E;KACzH,CAAC;AACJ,CAAC;AAED,SAAgB,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,SAAgB,YAAY,CAC1B,KAAc,EACd,kBAEC,EACD,IAAwB;IAGxB,OAAO,IAAA,oBAAc,EACnB,KAAK,EACL,kBAAkB,EAClB,gCAAqB,EACrB,IAAI,CACL,CAAC;AACJ,CAAC"}
|
|
@@ -70,6 +70,7 @@ async function getReserveRentalInstructionAsync(input, config) {
|
|
|
70
70
|
value: input.challengerTokenAccount ?? null,
|
|
71
71
|
isWritable: true,
|
|
72
72
|
},
|
|
73
|
+
activeRental: { value: input.activeRental ?? null, isWritable: false },
|
|
73
74
|
rentalState: { value: input.rentalState ?? null, isWritable: true },
|
|
74
75
|
referrer: { value: input.referrer ?? null, isWritable: true },
|
|
75
76
|
rentalAuthority: {
|
|
@@ -109,6 +110,18 @@ async function getReserveRentalInstructionAsync(input, config) {
|
|
|
109
110
|
],
|
|
110
111
|
});
|
|
111
112
|
}
|
|
113
|
+
if (!accounts.activeRental.value) {
|
|
114
|
+
accounts.activeRental.value = await (0, kit_1.getProgramDerivedAddress)({
|
|
115
|
+
programAddress,
|
|
116
|
+
seeds: [
|
|
117
|
+
(0, kit_1.getBytesEncoder)().encode(new Uint8Array([
|
|
118
|
+
114, 101, 110, 116, 97, 108, 95, 115, 116, 97, 116, 101,
|
|
119
|
+
])),
|
|
120
|
+
(0, kit_1.getAddressEncoder)().encode((0, shared_1.expectAddress)(accounts.contract.value)),
|
|
121
|
+
(0, kit_1.getBytesEncoder)().encode(new Uint8Array([97, 99, 116, 105, 118, 101])),
|
|
122
|
+
],
|
|
123
|
+
});
|
|
124
|
+
}
|
|
112
125
|
if (!accounts.rentalState.value) {
|
|
113
126
|
accounts.rentalState.value = await (0, kit_1.getProgramDerivedAddress)({
|
|
114
127
|
programAddress,
|
|
@@ -165,6 +178,7 @@ async function getReserveRentalInstructionAsync(input, config) {
|
|
|
165
178
|
getAccountMeta(accounts.defenderManagedTokenAccount),
|
|
166
179
|
getAccountMeta(accounts.challengerState),
|
|
167
180
|
getAccountMeta(accounts.challengerTokenAccount),
|
|
181
|
+
getAccountMeta(accounts.activeRental),
|
|
168
182
|
getAccountMeta(accounts.rentalState),
|
|
169
183
|
getAccountMeta(accounts.referrer),
|
|
170
184
|
getAccountMeta(accounts.rentalAuthority),
|
|
@@ -206,6 +220,7 @@ function getReserveRentalInstruction(input, config) {
|
|
|
206
220
|
value: input.challengerTokenAccount ?? null,
|
|
207
221
|
isWritable: true,
|
|
208
222
|
},
|
|
223
|
+
activeRental: { value: input.activeRental ?? null, isWritable: false },
|
|
209
224
|
rentalState: { value: input.rentalState ?? null, isWritable: true },
|
|
210
225
|
referrer: { value: input.referrer ?? null, isWritable: true },
|
|
211
226
|
rentalAuthority: {
|
|
@@ -259,6 +274,7 @@ function getReserveRentalInstruction(input, config) {
|
|
|
259
274
|
getAccountMeta(accounts.defenderManagedTokenAccount),
|
|
260
275
|
getAccountMeta(accounts.challengerState),
|
|
261
276
|
getAccountMeta(accounts.challengerTokenAccount),
|
|
277
|
+
getAccountMeta(accounts.activeRental),
|
|
262
278
|
getAccountMeta(accounts.rentalState),
|
|
263
279
|
getAccountMeta(accounts.referrer),
|
|
264
280
|
getAccountMeta(accounts.rentalAuthority),
|
|
@@ -274,7 +290,7 @@ function getReserveRentalInstruction(input, config) {
|
|
|
274
290
|
});
|
|
275
291
|
}
|
|
276
292
|
function parseReserveRentalInstruction(instruction) {
|
|
277
|
-
if (instruction.accounts.length <
|
|
293
|
+
if (instruction.accounts.length < 20) {
|
|
278
294
|
// TODO: Coded error.
|
|
279
295
|
throw new Error("Not enough accounts");
|
|
280
296
|
}
|
|
@@ -303,6 +319,7 @@ function parseReserveRentalInstruction(instruction) {
|
|
|
303
319
|
defenderManagedTokenAccount: getNextOptionalAccount(),
|
|
304
320
|
challengerState: getNextAccount(),
|
|
305
321
|
challengerTokenAccount: getNextAccount(),
|
|
322
|
+
activeRental: getNextAccount(),
|
|
306
323
|
rentalState: getNextAccount(),
|
|
307
324
|
referrer: getNextOptionalAccount(),
|
|
308
325
|
rentalAuthority: getNextAccount(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../../../src/generated/codama/instructions/reserveRental.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../../../src/generated/codama/instructions/reserveRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -175,7 +175,7 @@ async function closeContract(params, config) {
|
|
|
175
175
|
const buildThreadCloseIx = async () => {
|
|
176
176
|
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
177
177
|
const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
|
|
178
|
-
const threadAccount = await (0, thread_1.
|
|
178
|
+
const threadAccount = await (0, thread_1.fetchThreadByAddress)(contractThread, finalConfig.rpcUrl);
|
|
179
179
|
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
180
180
|
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
181
181
|
address: await (0, thread_2.deriveFiber)(contractThread, id),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkGH,sCAmLC;AAnRD,qCAAmF;AACnF,mEAA4H;AAC5H,4CAA4E;AAC5E,4CAA4E;AAC5E,mDAAqD;AACrD,+CAAiD;AACjD,+CAAiD;AACjD,+
|
|
1
|
+
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../src/instructions/closeContract.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ async function closeContractThread(params, config) {
|
|
|
42
42
|
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
43
43
|
const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
|
|
44
44
|
// Fetch thread account to read actual fiber_ids
|
|
45
|
-
const threadAccount = await (0, thread_1.
|
|
45
|
+
const threadAccount = await (0, thread_1.fetchThreadByAddress)(contractThread, finalConfig.rpcUrl);
|
|
46
46
|
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
47
47
|
// Derive fiber PDAs only for fibers that actually exist on the thread
|
|
48
48
|
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContractThread.js","sourceRoot":"","sources":["../../../src/instructions/closeContractThread.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA0CH,kDAkDC;AA1FD,qCAAiE;AACjE,mEAA0F;AAC1F,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+
|
|
1
|
+
{"version":3,"file":"closeContractThread.js","sourceRoot":"","sources":["../../../src/instructions/closeContractThread.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AA0CH,kDAkDC;AA1FD,qCAAiE;AACjE,mEAA0F;AAC1F,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+CAA0D;AAC1D,0CAAkE;AAClE,wCAAqD;AAsBrD;;;;;;;;;;GAUG;AACI,KAAK,UAAU,mBAAmB,CACvC,MAAiC,EACjC,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,oBAAoB;IACpB,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IACtD,MAAM,cAAc,GAAG,MAAM,IAAA,6BAAoB,EAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEpF,gDAAgD;IAChD,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAoB,EAAC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAa,CAAC;IAErE,sEAAsE;IACtE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,OAAO,EAAE,MAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,EAAE,CAAC;QAC9C,IAAI,EAAE,iBAAW,CAAC,QAAiB;KACpC,CAAC,CAAC,CACJ,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,IAAA,qDAAsC,EACjE;QACE,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,eAAe;QACzB,MAAM,EAAE,cAAc;KACvB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,8DAA8D;IAC9D,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IAE/C,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -18,6 +18,7 @@ const fleet_1 = require("../accounts/fleet");
|
|
|
18
18
|
const rental_1 = require("../accounts/rental");
|
|
19
19
|
const sage_1 = require("../pda/sage");
|
|
20
20
|
const srsly_1 = require("../pda/srsly");
|
|
21
|
+
const thread_1 = require("../pda/thread");
|
|
21
22
|
const sage_2 = require("../pda/sage");
|
|
22
23
|
const token_1 = require("../pda/token");
|
|
23
24
|
const instructions_2 = require("../utils/instructions");
|
|
@@ -73,6 +74,15 @@ async function closeRental(params, config) {
|
|
|
73
74
|
queuedBorrowerProfileAddress = queuedRentalState.data.borrowerProfile;
|
|
74
75
|
queuedBorrowerProfileFactionAddress = await (0, sage_2.deriveProfileFaction)(queuedBorrowerProfileAddress);
|
|
75
76
|
}
|
|
77
|
+
// Thread accounts needed for inline activation restage
|
|
78
|
+
const hasThread = contractAccount.data.thread !== SYSTEM_PROGRAM_ID;
|
|
79
|
+
let contractThreadAddress;
|
|
80
|
+
let closeRentalFiberAddress;
|
|
81
|
+
if (hasQueuedRental && hasThread) {
|
|
82
|
+
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
83
|
+
contractThreadAddress = await (0, thread_1.deriveContractThread)(params.contract, rentalAuthority);
|
|
84
|
+
closeRentalFiberAddress = await (0, thread_1.deriveFiber)(contractThreadAddress, 1);
|
|
85
|
+
}
|
|
76
86
|
// Convert payer to transaction signer
|
|
77
87
|
const payerSigner = (0, signer_1.toTransactionSigner)(params.payer);
|
|
78
88
|
// Derive active rental PDA (no more slot logic)
|
|
@@ -121,6 +131,8 @@ async function closeRental(params, config) {
|
|
|
121
131
|
queuedRental: queuedRentalAddress ?? programAddress,
|
|
122
132
|
queuedBorrowerProfile: queuedBorrowerProfileAddress ?? programAddress,
|
|
123
133
|
queuedBorrowerProfileFaction: queuedBorrowerProfileFactionAddress ?? programAddress,
|
|
134
|
+
contractThread: contractThreadAddress,
|
|
135
|
+
closeRentalFiber: closeRentalFiberAddress,
|
|
124
136
|
sageProgram,
|
|
125
137
|
}, { programAddress });
|
|
126
138
|
return (0, instructions_2.prepareInstructions)(kitInstruction, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../src/instructions/closeRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ async function deleteContractThread(params, config) {
|
|
|
44
44
|
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
45
45
|
const contractThread = await (0, thread_2.deriveContractThread)(contractAddress, rentalAuthority);
|
|
46
46
|
// Fetch thread account to read actual fiber_ids
|
|
47
|
-
const threadAccount = await (0, thread_1.
|
|
47
|
+
const threadAccount = await (0, thread_1.fetchThreadByAddress)(contractThread, finalConfig.rpcUrl);
|
|
48
48
|
const fiberIds = Array.from(threadAccount.data.fiberIds);
|
|
49
49
|
// Derive fiber PDAs only for fibers that actually exist on the thread
|
|
50
50
|
const fiberAccounts = await Promise.all(fiberIds.map(async (id) => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteContractThread.js","sourceRoot":"","sources":["../../../src/instructions/deleteContractThread.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA2CH,oDAiDC;AA1FD,qCAAiE;AACjE,mEAA2F;AAC3F,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+
|
|
1
|
+
{"version":3,"file":"deleteContractThread.js","sourceRoot":"","sources":["../../../src/instructions/deleteContractThread.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AA2CH,oDAiDC;AA1FD,qCAAiE;AACjE,mEAA2F;AAC3F,4CAA4E;AAC5E,4CAA4E;AAC5E,wDAA4D;AAC5D,+CAA0D;AAC1D,0CAAkE;AAClE,wCAAqD;AAsBrD;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,oBAAoB,CACxC,MAAkC,EAClC,MAA2B;IAE3B,MAAM,WAAW,GAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,CAAC;IAExC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;IACvC,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,WAAW,GAAG,IAAA,4BAAmB,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,IAAA,qBAAY,EAAC,MAAM,CAAC,CAAC;IACvC,MAAM,cAAc,GAAG,IAAA,aAAO,EAAC,SAAS,CAAC,KAAgB,CAAC,CAAC;IAC3D,MAAM,eAAe,GAAG,IAAA,aAAO,EAAC,MAAM,CAAC,QAAmB,CAAC,CAAC;IAE5D,oBAAoB;IACpB,MAAM,eAAe,GAAG,MAAM,IAAA,6BAAqB,GAAE,CAAC;IACtD,MAAM,cAAc,GAAG,MAAM,IAAA,6BAAoB,EAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEpF,gDAAgD;IAChD,MAAM,aAAa,GAAG,MAAM,IAAA,6BAAoB,EAAC,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrF,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAa,CAAC;IAErE,sEAAsE;IACtE,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CACrC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC1B,OAAO,EAAE,MAAM,IAAA,oBAAW,EAAC,cAAc,EAAE,EAAE,CAAC;QAC9C,IAAI,EAAE,iBAAW,CAAC,QAAiB;KACpC,CAAC,CAAC,CACJ,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,IAAA,sDAAuC,EAClE;QACE,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,cAAc;KACvB,EACD,EAAE,cAAc,EAAE,CACnB,CAAC;IAEF,8DAA8D;IAC9D,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,CAAC;IAE/C,OAAO,IAAA,kCAAmB,EAAC,cAAc,EAAE;QACzC,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;KACjC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -82,7 +82,8 @@ async function reserveRental(params, config) {
|
|
|
82
82
|
const atlasMint = configAccount.data.atlasMint;
|
|
83
83
|
// Fetch contract to get contractTokenAccount
|
|
84
84
|
const contractAccount = await (0, contract_1.fetchContract)(params.contract, finalConfig.rpcUrl);
|
|
85
|
-
// Derive
|
|
85
|
+
// Derive rental PDAs
|
|
86
|
+
const activeRental = await (0, srsly_1.deriveActiveRental)(params.contract);
|
|
86
87
|
const rentalState = await (0, srsly_1.deriveQueuedRental)(params.contract);
|
|
87
88
|
// Derive rental authority
|
|
88
89
|
const rentalAuthority = await (0, srsly_1.deriveRentalAuthority)();
|
|
@@ -104,6 +105,7 @@ async function reserveRental(params, config) {
|
|
|
104
105
|
contractThread,
|
|
105
106
|
closeRentalFiber,
|
|
106
107
|
contractTokenAccount,
|
|
108
|
+
activeRental,
|
|
107
109
|
challengerTokenAccount,
|
|
108
110
|
rentalState,
|
|
109
111
|
referrer,
|
|
@@ -119,14 +121,18 @@ async function reserveRental(params, config) {
|
|
|
119
121
|
if (queuedRental.data.status === types_1.RentalStatus.Queued) {
|
|
120
122
|
const defenderBorrowerState = queuedRental.data.borrowerState;
|
|
121
123
|
const challengerBorrowerState = await (0, srsly_1.deriveBorrowerState)(challengerSigner);
|
|
122
|
-
// Self-knockoff is not allowed — you can't bid against your own queued reservation
|
|
123
124
|
if (defenderBorrowerState === challengerBorrowerState) {
|
|
124
|
-
|
|
125
|
-
|
|
125
|
+
// Self-knockoff: challenger is the current defender.
|
|
126
|
+
// Program reuses challenger_state, but we still need defender_managed_token_account
|
|
127
|
+
// for the ATLAS refund path.
|
|
128
|
+
const challengerAccount = await (0, borrower_1.fetchBorrower)(challengerBorrowerState, finalConfig.rpcUrl);
|
|
129
|
+
instructionInput.defenderManagedTokenAccount = challengerAccount.data.managedTokenAccount;
|
|
130
|
+
}
|
|
131
|
+
else {
|
|
132
|
+
instructionInput.defenderState = defenderBorrowerState;
|
|
133
|
+
const defenderAccount = await (0, borrower_1.fetchBorrower)(defenderBorrowerState, finalConfig.rpcUrl);
|
|
134
|
+
instructionInput.defenderManagedTokenAccount = defenderAccount.data.managedTokenAccount;
|
|
126
135
|
}
|
|
127
|
-
instructionInput.defenderState = defenderBorrowerState;
|
|
128
|
-
const defenderAccount = await (0, borrower_1.fetchBorrower)(defenderBorrowerState, finalConfig.rpcUrl);
|
|
129
|
-
instructionInput.defenderManagedTokenAccount = defenderAccount.data.managedTokenAccount;
|
|
130
136
|
}
|
|
131
137
|
}
|
|
132
138
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../src/instructions/reserveRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAqGH,
|
|
1
|
+
{"version":3,"file":"reserveRental.js","sourceRoot":"","sources":["../../../src/instructions/reserveRental.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 = '4.2.
|
|
6
|
+
exports.VERSION = '4.2.6';
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
|
@@ -7,19 +7,25 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { getBase64Encoder } from '@solana/kit';
|
|
9
9
|
import { getThreadDecoder } from '../generated/codama/types/thread';
|
|
10
|
+
import { fetchContractState } from '../generated/codama/accounts';
|
|
10
11
|
import { getRpcUrl } from '../utils/config';
|
|
11
12
|
import { createRpc } from '../utils/rpc';
|
|
12
13
|
/** Anchor discriminator size (8 bytes) */
|
|
13
14
|
const DISCRIMINATOR_SIZE = 8;
|
|
15
|
+
/** System program ID — contract.thread == this means no thread */
|
|
16
|
+
const SYSTEM_PROGRAM_ID = '11111111111111111111111111111111';
|
|
14
17
|
/**
|
|
15
|
-
* Fetch and decode
|
|
18
|
+
* Fetch and decode a raw Antegen thread account by its direct address.
|
|
16
19
|
*
|
|
17
|
-
*
|
|
20
|
+
* Used internally by instruction wrappers that already know the thread address.
|
|
21
|
+
*
|
|
22
|
+
* @param threadAddress - Direct address of the thread account
|
|
18
23
|
* @param rpcUrl - Optional RPC URL override
|
|
19
24
|
* @returns Decoded thread data
|
|
20
25
|
*/
|
|
21
|
-
export async function
|
|
22
|
-
const
|
|
26
|
+
export async function fetchThreadByAddress(threadAddress, rpcUrl) {
|
|
27
|
+
const resolvedRpcUrl = rpcUrl || getRpcUrl();
|
|
28
|
+
const rpc = createRpc(resolvedRpcUrl);
|
|
23
29
|
const addr = threadAddress;
|
|
24
30
|
const acct = await rpc.getAccountInfo(addr, { encoding: 'base64' }).send();
|
|
25
31
|
const rawData = acct.value?.data;
|
|
@@ -31,4 +37,24 @@ export async function fetchThread(threadAddress, rpcUrl) {
|
|
|
31
37
|
const data = getThreadDecoder().decode(bytes.subarray(DISCRIMINATOR_SIZE));
|
|
32
38
|
return { address: addr, data };
|
|
33
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* Fetch and decode an Antegen thread account by contract address.
|
|
42
|
+
*
|
|
43
|
+
* Looks up the contract's `thread` field, then fetches and decodes the
|
|
44
|
+
* thread account. Returns null if no thread is configured on the contract.
|
|
45
|
+
*
|
|
46
|
+
* @param contractAddress - Address of the rental contract
|
|
47
|
+
* @param rpcUrl - Optional RPC URL override
|
|
48
|
+
* @returns Decoded thread data, or null if no thread configured
|
|
49
|
+
*/
|
|
50
|
+
export async function fetchThread(contractAddress, rpcUrl) {
|
|
51
|
+
const resolvedRpcUrl = rpcUrl || getRpcUrl();
|
|
52
|
+
const rpc = createRpc(resolvedRpcUrl);
|
|
53
|
+
const contract = await fetchContractState(rpc, contractAddress);
|
|
54
|
+
const threadAddr = contract.data.thread;
|
|
55
|
+
if (!threadAddr || threadAddr === SYSTEM_PROGRAM_ID) {
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
return fetchThreadByAddress(threadAddr, resolvedRpcUrl);
|
|
59
|
+
}
|
|
34
60
|
//# sourceMappingURL=thread.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/accounts/thread.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAgB,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAe,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,0CAA0C;AAC1C,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/accounts/thread.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAgB,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAe,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,0CAA0C;AAC1C,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAE7B,kEAAkE;AAClE,MAAM,iBAAiB,GAAG,kCAAkC,CAAC;AAE7D;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,aAA+B,EAC/B,MAAe;IAEf,MAAM,cAAc,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,aAAwB,CAAC;IACtC,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3E,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC;IAEjC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,6BAA6B,aAAa,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,KAAK,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,gBAAgB,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAE3E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AACjC,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,eAAiC,EACjC,MAAe;IAEf,MAAM,cAAc,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;IAC7C,MAAM,GAAG,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,eAA0B,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAgB,CAAC;IAElD,IAAI,CAAC,UAAU,IAAI,UAAU,KAAK,iBAAiB,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,oBAAoB,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;AAC1D,CAAC"}
|