@wuwei-labs/srsly 3.0.0-beta.15 → 3.0.0-beta.16
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/demos.js +4 -4
- package/dist/cjs/demos.js.map +1 -1
- package/dist/cjs/instructions/acceptRental.js +2 -28
- package/dist/cjs/instructions/acceptRental.js.map +1 -1
- package/dist/cjs/instructions/claimRental.js +2 -28
- package/dist/cjs/instructions/claimRental.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/demos.js +4 -4
- package/dist/esm/demos.js.map +1 -1
- package/dist/esm/instructions/acceptRental.js +4 -30
- package/dist/esm/instructions/acceptRental.js.map +1 -1
- package/dist/esm/instructions/claimRental.js +4 -30
- package/dist/esm/instructions/claimRental.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/instructions/acceptRental.d.ts +1 -16
- package/dist/types/instructions/acceptRental.d.ts.map +1 -1
- package/dist/types/instructions/claimRental.d.ts +1 -16
- package/dist/types/instructions/claimRental.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +1 -1
package/dist/cjs/demos.js
CHANGED
|
@@ -111,9 +111,9 @@ setSdkConfig({ PublicKey });`,
|
|
|
111
111
|
exports.acceptRentalDemo = {
|
|
112
112
|
tabName: 'accept',
|
|
113
113
|
description: 'Accept a rental offer from an existing contract',
|
|
114
|
-
imports: `import { acceptRental } from '@wuwei-labs/srsly/kit';`,
|
|
114
|
+
imports: `import { acceptRental, createDiscount } from '@wuwei-labs/srsly/kit';`,
|
|
115
115
|
legacyImports: `import { PublicKey } from '@solana/web3.js';
|
|
116
|
-
import { setSdkConfig, acceptRental } from '@wuwei-labs/srsly/legacy';
|
|
116
|
+
import { setSdkConfig, acceptRental, createDiscount } from '@wuwei-labs/srsly/legacy';
|
|
117
117
|
|
|
118
118
|
setSdkConfig({ PublicKey });`,
|
|
119
119
|
instruction: `const instructions = await acceptRental({
|
|
@@ -187,9 +187,9 @@ setSdkConfig({ PublicKey });`,
|
|
|
187
187
|
exports.claimRentalDemo = {
|
|
188
188
|
tabName: 'claim',
|
|
189
189
|
description: 'Claim rental slot as crowned winner (reservation holder)',
|
|
190
|
-
imports: `import { claimRental } from '@wuwei-labs/srsly/kit';`,
|
|
190
|
+
imports: `import { claimRental, createDiscount } from '@wuwei-labs/srsly/kit';`,
|
|
191
191
|
legacyImports: `import { PublicKey } from '@solana/web3.js';
|
|
192
|
-
import { setSdkConfig, claimRental } from '@wuwei-labs/srsly/legacy';
|
|
192
|
+
import { setSdkConfig, claimRental, createDiscount } from '@wuwei-labs/srsly/legacy';
|
|
193
193
|
|
|
194
194
|
setSdkConfig({ PublicKey });`,
|
|
195
195
|
instruction: `const instructions = await claimRental({
|
package/dist/cjs/demos.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAeH,+EAA+E;AAC/E,iBAAiB;AACjB,+EAA+E;AAElE,QAAA,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,8BAA8B;IAC3C,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;;;;;IAQX;CACH,CAAC;AAEW,QAAA,iBAAiB,GAAiB;IAC7C,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,gDAAgD;IAC7D,OAAO,EAAE,wDAAwD;IACjE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;IAGX;CACH,CAAC;AAEW,QAAA,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,iDAAiD;IAC9D,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;;;;;;;;IAWX;CACH,CAAC;AAEW,QAAA,eAAe,GAAiB;IAC3C,OAAO,EAAE,UAAU;IACnB,WAAW,EAAE,yCAAyC;IACtD,OAAO,EAAE,sDAAsD;IAC/D,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;IAIX;CACH,CAAC;AAEF,+EAA+E;AAC/E,iBAAiB;AACjB,+EAA+E;AAElE,QAAA,iBAAiB,GAAiB;IAC7C,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,uCAAuC;IACpD,OAAO,EAAE,wDAAwD;IACjE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;IAEX;CACH,CAAC;AAEW,QAAA,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,wDAAwD;IACrE,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;IAIX;CACH,CAAC;AAEF,+EAA+E;AAC/E,eAAe;AACf,+EAA+E;AAElE,QAAA,gBAAgB,GAAiB;IAC5C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,iDAAiD;IAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,12 @@ const duration_1 = require("../params/duration");
|
|
|
17
17
|
const fleet_1 = require("../accounts/fleet");
|
|
18
18
|
const contract_1 = require("../accounts/contract");
|
|
19
19
|
const config_2 = require("../accounts/config");
|
|
20
|
-
const member_1 = require("../accounts/member");
|
|
21
20
|
const accounts_1 = require("../generated/codama/accounts");
|
|
22
21
|
const sage_1 = require("../pda/sage");
|
|
23
22
|
const srsly_1 = require("../pda/srsly");
|
|
24
23
|
const token_1 = require("../pda/token");
|
|
25
24
|
const thread_1 = require("../pda/thread");
|
|
26
25
|
const instructions_2 = require("../utils/instructions");
|
|
27
|
-
const slyvault_1 = require("@wuwei-labs/slyvault");
|
|
28
26
|
const discountAuth_1 = require("../utils/discountAuth");
|
|
29
27
|
/**
|
|
30
28
|
* Accept a rental contract
|
|
@@ -154,36 +152,12 @@ async function acceptRental(params, config) {
|
|
|
154
152
|
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
155
153
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
156
154
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
157
|
-
//
|
|
155
|
+
// Deserialize discount auth if provided
|
|
158
156
|
let discountAuth = null;
|
|
159
157
|
if (params.discountAuth) {
|
|
160
158
|
discountAuth = (0, discountAuth_1.deserializeDiscountAuth)(params.discountAuth);
|
|
161
159
|
}
|
|
162
|
-
|
|
163
|
-
if (params.discount && !params.discountAuth) {
|
|
164
|
-
const affiliateConfig = (0, config_1.getAffiliateConfig)(config);
|
|
165
|
-
if (!affiliateConfig) {
|
|
166
|
-
throw new Error('discount requires affiliate config. Call setSdkConfig({ affiliate: {...} }) first.');
|
|
167
|
-
}
|
|
168
|
-
// Fetch member to get vault and nonce
|
|
169
|
-
const memberAddress = (0, kit_1.address)(affiliateConfig.address);
|
|
170
|
-
const rpcUrl = (0, config_1.getRpcUrl)(finalConfig);
|
|
171
|
-
const member = await (0, member_1.fetchMember)(memberAddress, rpcUrl);
|
|
172
|
-
// Get current slot for expiry
|
|
173
|
-
const rpc = (0, rpc_1.createRpc)(rpcUrl);
|
|
174
|
-
const currentSlot = await rpc.getSlot({ commitment: 'confirmed' }).send();
|
|
175
|
-
const expirySlot = currentSlot + (affiliateConfig.expirySlotBuffer ?? 1000n);
|
|
176
|
-
// Create discount auth and serialize → deserialize (same path as server-side API response)
|
|
177
|
-
const raw = await (0, slyvault_1.createDiscountAuth)({
|
|
178
|
-
memberNonce: member.data.nonce,
|
|
179
|
-
discount: params.discount,
|
|
180
|
-
expirySlot,
|
|
181
|
-
discountAuthority: affiliateConfig.signer,
|
|
182
|
-
});
|
|
183
|
-
discountAuth = (0, discountAuth_1.deserializeDiscountAuth)((0, discountAuth_1.serializeDiscountAuth)(raw));
|
|
184
|
-
// Auto-set referrer if not explicitly provided
|
|
185
|
-
referrer = referrer ?? memberAddress;
|
|
186
|
-
}
|
|
160
|
+
const referrer = params.referrer ? (0, kit_1.address)(params.referrer) : undefined;
|
|
187
161
|
// Determine if we need to include scheduleRental
|
|
188
162
|
// Either explicitly requested or contract requires automation
|
|
189
163
|
const shouldSchedule = params.automate || contractAccount.data.automationRequired;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,14 +17,12 @@ const duration_1 = require("../params/duration");
|
|
|
17
17
|
const fleet_1 = require("../accounts/fleet");
|
|
18
18
|
const contract_1 = require("../accounts/contract");
|
|
19
19
|
const config_2 = require("../accounts/config");
|
|
20
|
-
const member_1 = require("../accounts/member");
|
|
21
20
|
const sage_1 = require("../pda/sage");
|
|
22
21
|
const srsly_1 = require("../pda/srsly");
|
|
23
22
|
const token_1 = require("../pda/token");
|
|
24
23
|
const thread_1 = require("../pda/thread");
|
|
25
24
|
const instructions_2 = require("../utils/instructions");
|
|
26
25
|
const accounts_1 = require("../generated/codama/accounts");
|
|
27
|
-
const slyvault_1 = require("@wuwei-labs/slyvault");
|
|
28
26
|
const discountAuth_1 = require("../utils/discountAuth");
|
|
29
27
|
/**
|
|
30
28
|
* Claim a rental slot as the crowned winner
|
|
@@ -146,36 +144,12 @@ async function claimRental(params, config) {
|
|
|
146
144
|
const atlasMint = (0, kit_1.address)(addresses.atlasMint);
|
|
147
145
|
const sageProgram = (0, kit_1.address)(addresses.sage);
|
|
148
146
|
const programAddress = (0, kit_1.address)(addresses.srsly);
|
|
149
|
-
//
|
|
147
|
+
// Deserialize discount auth if provided
|
|
150
148
|
let discountAuth = null;
|
|
151
149
|
if (params.discountAuth) {
|
|
152
150
|
discountAuth = (0, discountAuth_1.deserializeDiscountAuth)(params.discountAuth);
|
|
153
151
|
}
|
|
154
|
-
|
|
155
|
-
if (params.discount && !params.discountAuth) {
|
|
156
|
-
const affiliateConfig = (0, config_1.getAffiliateConfig)(config);
|
|
157
|
-
if (!affiliateConfig) {
|
|
158
|
-
throw new Error('discount requires affiliate config. Call setSdkConfig({ affiliate: {...} }) first.');
|
|
159
|
-
}
|
|
160
|
-
// Fetch member to get vault and nonce
|
|
161
|
-
const memberAddress = (0, kit_1.address)(affiliateConfig.address);
|
|
162
|
-
const rpcUrl = (0, config_1.getRpcUrl)(finalConfig);
|
|
163
|
-
const member = await (0, member_1.fetchMember)(memberAddress, rpcUrl);
|
|
164
|
-
// Get current slot for expiry
|
|
165
|
-
const rpc = (0, rpc_1.createRpc)(rpcUrl);
|
|
166
|
-
const currentSlot = await rpc.getSlot({ commitment: 'confirmed' }).send();
|
|
167
|
-
const expirySlot = currentSlot + (affiliateConfig.expirySlotBuffer ?? 1000n);
|
|
168
|
-
// Create discount auth and serialize → deserialize (same path as server-side API response)
|
|
169
|
-
const raw = await (0, slyvault_1.createDiscountAuth)({
|
|
170
|
-
memberNonce: member.data.nonce,
|
|
171
|
-
discount: params.discount,
|
|
172
|
-
expirySlot,
|
|
173
|
-
discountAuthority: affiliateConfig.signer,
|
|
174
|
-
});
|
|
175
|
-
discountAuth = (0, discountAuth_1.deserializeDiscountAuth)((0, discountAuth_1.serializeDiscountAuth)(raw));
|
|
176
|
-
// Auto-set referrer if not explicitly provided
|
|
177
|
-
referrer = referrer ?? memberAddress;
|
|
178
|
-
}
|
|
152
|
+
const referrer = params.referrer ? (0, kit_1.address)(params.referrer) : undefined;
|
|
179
153
|
// Determine if we need to include scheduleRental
|
|
180
154
|
// Either explicitly requested or contract requires automation
|
|
181
155
|
const shouldSchedule = params.automate || contractAccount.data.automationRequired;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.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.16';
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/demos.js
CHANGED
|
@@ -108,9 +108,9 @@ setSdkConfig({ PublicKey });`,
|
|
|
108
108
|
export const acceptRentalDemo = {
|
|
109
109
|
tabName: 'accept',
|
|
110
110
|
description: 'Accept a rental offer from an existing contract',
|
|
111
|
-
imports: `import { acceptRental } from '@wuwei-labs/srsly/kit';`,
|
|
111
|
+
imports: `import { acceptRental, createDiscount } from '@wuwei-labs/srsly/kit';`,
|
|
112
112
|
legacyImports: `import { PublicKey } from '@solana/web3.js';
|
|
113
|
-
import { setSdkConfig, acceptRental } from '@wuwei-labs/srsly/legacy';
|
|
113
|
+
import { setSdkConfig, acceptRental, createDiscount } from '@wuwei-labs/srsly/legacy';
|
|
114
114
|
|
|
115
115
|
setSdkConfig({ PublicKey });`,
|
|
116
116
|
instruction: `const instructions = await acceptRental({
|
|
@@ -184,9 +184,9 @@ setSdkConfig({ PublicKey });`,
|
|
|
184
184
|
export const claimRentalDemo = {
|
|
185
185
|
tabName: 'claim',
|
|
186
186
|
description: 'Claim rental slot as crowned winner (reservation holder)',
|
|
187
|
-
imports: `import { claimRental } from '@wuwei-labs/srsly/kit';`,
|
|
187
|
+
imports: `import { claimRental, createDiscount } from '@wuwei-labs/srsly/kit';`,
|
|
188
188
|
legacyImports: `import { PublicKey } from '@solana/web3.js';
|
|
189
|
-
import { setSdkConfig, claimRental } from '@wuwei-labs/srsly/legacy';
|
|
189
|
+
import { setSdkConfig, claimRental, createDiscount } from '@wuwei-labs/srsly/legacy';
|
|
190
190
|
|
|
191
191
|
setSdkConfig({ PublicKey });`,
|
|
192
192
|
instruction: `const instructions = await claimRental({
|
package/dist/esm/demos.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAeH,+EAA+E;AAC/E,iBAAiB;AACjB,+EAA+E;AAE/E,MAAM,CAAC,MAAM,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,8BAA8B;IAC3C,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;;;;;IAQX;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAiB;IAC7C,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,gDAAgD;IAC7D,OAAO,EAAE,wDAAwD;IACjE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;IAGX;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,iDAAiD;IAC9D,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;;;;;;;;IAWX;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAiB;IAC3C,OAAO,EAAE,UAAU;IACnB,WAAW,EAAE,yCAAyC;IACtD,OAAO,EAAE,sDAAsD;IAC/D,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;IAIX;CACH,CAAC;AAEF,+EAA+E;AAC/E,iBAAiB;AACjB,+EAA+E;AAE/E,MAAM,CAAC,MAAM,iBAAiB,GAAiB;IAC7C,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,uCAAuC;IACpD,OAAO,EAAE,wDAAwD;IACjE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;IAEX;CACH,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAiB;IAC9C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,wDAAwD;IACrE,OAAO,EAAE,yDAAyD;IAClE,aAAa,EAAE;;;6BAGY;IAC3B,WAAW,EAAE;;;;IAIX;CACH,CAAC;AAEF,+EAA+E;AAC/E,eAAe;AACf,+EAA+E;AAE/E,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,iDAAiD;IAC9D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,22 +7,20 @@
|
|
|
7
7
|
import { address } from '@solana/kit';
|
|
8
8
|
import { createRpc } from '../utils/rpc';
|
|
9
9
|
import { getAcceptRentalInstructionAsync, getScheduleRentalInstructionAsync } from '../generated/codama/instructions';
|
|
10
|
-
import { mergeConfig, getAddresses
|
|
10
|
+
import { mergeConfig, getAddresses } from '../utils/config';
|
|
11
11
|
import { toTransactionSigner } from '../utils/signer';
|
|
12
12
|
import { convertAmount } from '../params/amount';
|
|
13
13
|
import { convertDuration } from '../params/duration';
|
|
14
14
|
import { fetchFleet } from '../accounts/fleet';
|
|
15
15
|
import { fetchContract } from '../accounts/contract';
|
|
16
16
|
import { fetchConfig } from '../accounts/config';
|
|
17
|
-
import { fetchMember } from '../accounts/member';
|
|
18
17
|
import { fetchBorrowerState } from '../generated/codama/accounts';
|
|
19
18
|
import { deriveGameAccounts } from '../pda/sage';
|
|
20
19
|
import { deriveRental, deriveRentalAuthority, deriveBorrowerState } from '../pda/srsly';
|
|
21
20
|
import { deriveAssociatedTokenAccount } from '../pda/token';
|
|
22
21
|
import { deriveRentalThread } from '../pda/thread';
|
|
23
22
|
import { prepareInstructions } from '../utils/instructions';
|
|
24
|
-
import {
|
|
25
|
-
import { deserializeDiscountAuth, serializeDiscountAuth } from '../utils/discountAuth';
|
|
23
|
+
import { deserializeDiscountAuth } from '../utils/discountAuth';
|
|
26
24
|
/**
|
|
27
25
|
* Accept a rental contract
|
|
28
26
|
*
|
|
@@ -151,36 +149,12 @@ export async function acceptRental(params, config) {
|
|
|
151
149
|
const atlasMint = address(addresses.atlasMint);
|
|
152
150
|
const sageProgram = address(addresses.sage);
|
|
153
151
|
const programAddress = address(addresses.srsly);
|
|
154
|
-
//
|
|
152
|
+
// Deserialize discount auth if provided
|
|
155
153
|
let discountAuth = null;
|
|
156
154
|
if (params.discountAuth) {
|
|
157
155
|
discountAuth = deserializeDiscountAuth(params.discountAuth);
|
|
158
156
|
}
|
|
159
|
-
|
|
160
|
-
if (params.discount && !params.discountAuth) {
|
|
161
|
-
const affiliateConfig = getAffiliateConfig(config);
|
|
162
|
-
if (!affiliateConfig) {
|
|
163
|
-
throw new Error('discount requires affiliate config. Call setSdkConfig({ affiliate: {...} }) first.');
|
|
164
|
-
}
|
|
165
|
-
// Fetch member to get vault and nonce
|
|
166
|
-
const memberAddress = address(affiliateConfig.address);
|
|
167
|
-
const rpcUrl = getRpcUrl(finalConfig);
|
|
168
|
-
const member = await fetchMember(memberAddress, rpcUrl);
|
|
169
|
-
// Get current slot for expiry
|
|
170
|
-
const rpc = createRpc(rpcUrl);
|
|
171
|
-
const currentSlot = await rpc.getSlot({ commitment: 'confirmed' }).send();
|
|
172
|
-
const expirySlot = currentSlot + (affiliateConfig.expirySlotBuffer ?? 1000n);
|
|
173
|
-
// Create discount auth and serialize → deserialize (same path as server-side API response)
|
|
174
|
-
const raw = await createDiscountAuth({
|
|
175
|
-
memberNonce: member.data.nonce,
|
|
176
|
-
discount: params.discount,
|
|
177
|
-
expirySlot,
|
|
178
|
-
discountAuthority: affiliateConfig.signer,
|
|
179
|
-
});
|
|
180
|
-
discountAuth = deserializeDiscountAuth(serializeDiscountAuth(raw));
|
|
181
|
-
// Auto-set referrer if not explicitly provided
|
|
182
|
-
referrer = referrer ?? memberAddress;
|
|
183
|
-
}
|
|
157
|
+
const referrer = params.referrer ? address(params.referrer) : undefined;
|
|
184
158
|
// Determine if we need to include scheduleRental
|
|
185
159
|
// Either explicitly requested or contract requires automation
|
|
186
160
|
const shouldSchedule = params.automate || contractAccount.data.automationRequired;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,+BAA+B,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAC;AACtH,OAAO,EAAE,WAAW,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,22 +7,20 @@
|
|
|
7
7
|
import { address } from '@solana/kit';
|
|
8
8
|
import { createRpc } from '../utils/rpc';
|
|
9
9
|
import { getClaimRentalInstructionAsync, getScheduleRentalInstructionAsync } from '../generated/codama/instructions';
|
|
10
|
-
import { mergeConfig, getAddresses
|
|
10
|
+
import { mergeConfig, getAddresses } from '../utils/config';
|
|
11
11
|
import { toTransactionSigner } from '../utils/signer';
|
|
12
12
|
import { convertAmount } from '../params/amount';
|
|
13
13
|
import { convertDuration } from '../params/duration';
|
|
14
14
|
import { fetchFleet } from '../accounts/fleet';
|
|
15
15
|
import { fetchContract } from '../accounts/contract';
|
|
16
16
|
import { fetchConfig } from '../accounts/config';
|
|
17
|
-
import { fetchMember } from '../accounts/member';
|
|
18
17
|
import { deriveGameAccounts } from '../pda/sage';
|
|
19
18
|
import { deriveRental, deriveRentalAuthority, deriveBorrowerState } from '../pda/srsly';
|
|
20
19
|
import { deriveAssociatedTokenAccount } from '../pda/token';
|
|
21
20
|
import { deriveRentalThread } from '../pda/thread';
|
|
22
21
|
import { prepareInstructions } from '../utils/instructions';
|
|
23
22
|
import { fetchBorrowerState } from '../generated/codama/accounts';
|
|
24
|
-
import {
|
|
25
|
-
import { deserializeDiscountAuth, serializeDiscountAuth } from '../utils/discountAuth';
|
|
23
|
+
import { deserializeDiscountAuth } from '../utils/discountAuth';
|
|
26
24
|
/**
|
|
27
25
|
* Claim a rental slot as the crowned winner
|
|
28
26
|
*
|
|
@@ -143,36 +141,12 @@ export async function claimRental(params, config) {
|
|
|
143
141
|
const atlasMint = address(addresses.atlasMint);
|
|
144
142
|
const sageProgram = address(addresses.sage);
|
|
145
143
|
const programAddress = address(addresses.srsly);
|
|
146
|
-
//
|
|
144
|
+
// Deserialize discount auth if provided
|
|
147
145
|
let discountAuth = null;
|
|
148
146
|
if (params.discountAuth) {
|
|
149
147
|
discountAuth = deserializeDiscountAuth(params.discountAuth);
|
|
150
148
|
}
|
|
151
|
-
|
|
152
|
-
if (params.discount && !params.discountAuth) {
|
|
153
|
-
const affiliateConfig = getAffiliateConfig(config);
|
|
154
|
-
if (!affiliateConfig) {
|
|
155
|
-
throw new Error('discount requires affiliate config. Call setSdkConfig({ affiliate: {...} }) first.');
|
|
156
|
-
}
|
|
157
|
-
// Fetch member to get vault and nonce
|
|
158
|
-
const memberAddress = address(affiliateConfig.address);
|
|
159
|
-
const rpcUrl = getRpcUrl(finalConfig);
|
|
160
|
-
const member = await fetchMember(memberAddress, rpcUrl);
|
|
161
|
-
// Get current slot for expiry
|
|
162
|
-
const rpc = createRpc(rpcUrl);
|
|
163
|
-
const currentSlot = await rpc.getSlot({ commitment: 'confirmed' }).send();
|
|
164
|
-
const expirySlot = currentSlot + (affiliateConfig.expirySlotBuffer ?? 1000n);
|
|
165
|
-
// Create discount auth and serialize → deserialize (same path as server-side API response)
|
|
166
|
-
const raw = await createDiscountAuth({
|
|
167
|
-
memberNonce: member.data.nonce,
|
|
168
|
-
discount: params.discount,
|
|
169
|
-
expirySlot,
|
|
170
|
-
discountAuthority: affiliateConfig.signer,
|
|
171
|
-
});
|
|
172
|
-
discountAuth = deserializeDiscountAuth(serializeDiscountAuth(raw));
|
|
173
|
-
// Auto-set referrer if not explicitly provided
|
|
174
|
-
referrer = referrer ?? memberAddress;
|
|
175
|
-
}
|
|
149
|
+
const referrer = params.referrer ? address(params.referrer) : undefined;
|
|
176
150
|
// Determine if we need to include scheduleRental
|
|
177
151
|
// Either explicitly requested or contract requires automation
|
|
178
152
|
const shouldSchedule = params.automate || contractAccount.data.automationRequired;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,8BAA8B,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAC;AACrH,OAAO,EAAE,WAAW,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"claimRental.js","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/package.json
CHANGED
package/dist/esm/version.js
CHANGED
|
@@ -57,26 +57,11 @@ export interface AcceptRentalParams {
|
|
|
57
57
|
* @example 400000
|
|
58
58
|
*/
|
|
59
59
|
computeUnits?: number;
|
|
60
|
-
/**
|
|
61
|
-
* Discount percentage (0-100)
|
|
62
|
-
*
|
|
63
|
-
* When specified, the SDK will automatically:
|
|
64
|
-
* 1. Fetch the affiliate member account from the configured affiliate.address
|
|
65
|
-
* 2. Get the current slot and calculate expiry
|
|
66
|
-
* 3. Create a signed discount authorization
|
|
67
|
-
* 4. Set the referrer to the affiliate member address (if not explicitly provided)
|
|
68
|
-
*
|
|
69
|
-
* Requires affiliate config to be set via setSdkConfig({ affiliate: {...} })
|
|
70
|
-
*
|
|
71
|
-
* @example 5 // 5% discount to borrower
|
|
72
|
-
* @example 2.5 // 2.5% discount
|
|
73
|
-
*/
|
|
74
|
-
discount?: number;
|
|
75
60
|
/**
|
|
76
61
|
* Optional discount authorization from an affiliate member
|
|
77
62
|
*
|
|
78
63
|
* Accepts a SerializedDiscountAuth from createDiscount() (JSON-safe, for server-to-client).
|
|
79
|
-
*
|
|
64
|
+
* Use createDiscount() to generate this value before calling acceptRental().
|
|
80
65
|
*/
|
|
81
66
|
discountAuth?: SerializedDiscountAuth | null;
|
|
82
67
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.d.ts","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,
|
|
1
|
+
{"version":3,"file":"acceptRental.d.ts","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE5E,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AASzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAA2B,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAG7F;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAEnC;;OAEG;IACH,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,EAAE,aAAa,CAAC;IAExB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAE7C;;;;;;;;;;OAUG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8CG;AACH,wBAAsB,YAAY,CAChC,MAAM,EAAE,kBAAkB,EAC1B,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC1B,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CAqKjD"}
|
|
@@ -56,26 +56,11 @@ export interface ClaimRentalParams {
|
|
|
56
56
|
* @example 400000
|
|
57
57
|
*/
|
|
58
58
|
computeUnits?: number;
|
|
59
|
-
/**
|
|
60
|
-
* Discount percentage (0-100)
|
|
61
|
-
*
|
|
62
|
-
* When specified, the SDK will automatically:
|
|
63
|
-
* 1. Fetch the affiliate member account from the configured affiliate.address
|
|
64
|
-
* 2. Get the current slot and calculate expiry
|
|
65
|
-
* 3. Create a signed discount authorization
|
|
66
|
-
* 4. Set the referrer to the affiliate member address (if not explicitly provided)
|
|
67
|
-
*
|
|
68
|
-
* Requires affiliate config to be set via setSdkConfig({ affiliate: {...} })
|
|
69
|
-
*
|
|
70
|
-
* @example 5 // 5% discount to borrower
|
|
71
|
-
* @example 2.5 // 2.5% discount
|
|
72
|
-
*/
|
|
73
|
-
discount?: number;
|
|
74
59
|
/**
|
|
75
60
|
* Optional discount authorization from an affiliate member
|
|
76
61
|
*
|
|
77
62
|
* Accepts a SerializedDiscountAuth from createDiscount() (JSON-safe, for server-to-client).
|
|
78
|
-
*
|
|
63
|
+
* Use createDiscount() to generate this value before calling claimRental().
|
|
79
64
|
*/
|
|
80
65
|
discountAuth?: SerializedDiscountAuth | null;
|
|
81
66
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claimRental.d.ts","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,
|
|
1
|
+
{"version":3,"file":"claimRental.d.ts","sourceRoot":"","sources":["../../../src/instructions/claimRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EAA6B,KAAK,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAuB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAiB,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAmB,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAQzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAA2B,KAAK,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAG7F;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,EAAE,eAAe,CAAC;IAE1B;;OAEG;IACH,QAAQ,EAAE,OAAO,GAAG,MAAM,CAAC;IAE3B;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAEnC;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE5B;;;;;;OAMG;IACH,QAAQ,EAAE,aAAa,CAAC;IAExB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,sBAAsB,GAAG,IAAI,CAAC;IAE7C;;;;;;;;;;OAUG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,iBAAiB,EACzB,MAAM,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,GAC1B,OAAO,CAAC,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC,CA0KjD"}
|
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.16";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|