@wuwei-labs/srsly 2.0.0-beta.33 → 2.0.0-beta.35
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/codama/instructions/cancelRental.js +77 -12
- package/dist/cjs/codama/instructions/cancelRental.js.map +1 -1
- package/dist/cjs/codama/instructions/closeContract.js +1 -60
- package/dist/cjs/codama/instructions/closeContract.js.map +1 -1
- package/dist/cjs/codama/instructions/closeRental.js +95 -14
- package/dist/cjs/codama/instructions/closeRental.js.map +1 -1
- package/dist/cjs/contract/cancel.js +4 -4
- package/dist/cjs/contract/cancel.js.map +1 -1
- package/dist/cjs/contract/close.js +17 -17
- package/dist/cjs/contract/close.js.map +1 -1
- package/dist/cjs/contract/create.js +8 -10
- package/dist/cjs/contract/create.js.map +1 -1
- package/dist/cjs/index.js +7 -5
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/rental/accept.js +6 -6
- package/dist/cjs/rental/accept.js.map +1 -1
- package/dist/cjs/rental/cancel.js +3 -2
- package/dist/cjs/rental/cancel.js.map +1 -1
- package/dist/cjs/rental/close.js +3 -2
- package/dist/cjs/rental/close.js.map +1 -1
- package/dist/cjs/rental/reset.js +6 -7
- package/dist/cjs/rental/reset.js.map +1 -1
- package/dist/cjs/utils/config.js +22 -8
- package/dist/cjs/utils/config.js.map +1 -1
- package/dist/cjs/utils/constants.js +10 -5
- package/dist/cjs/utils/constants.js.map +1 -1
- package/dist/cjs/utils/fetch-accounts.js +115 -0
- package/dist/cjs/utils/fetch-accounts.js.map +1 -0
- package/dist/cjs/utils/index.js +1 -0
- package/dist/cjs/utils/index.js.map +1 -1
- package/dist/esm/codama/instructions/cancelRental.js +77 -12
- package/dist/esm/codama/instructions/cancelRental.js.map +1 -1
- package/dist/esm/codama/instructions/closeContract.js +1 -60
- package/dist/esm/codama/instructions/closeContract.js.map +1 -1
- package/dist/esm/codama/instructions/closeRental.js +95 -14
- package/dist/esm/codama/instructions/closeRental.js.map +1 -1
- package/dist/esm/contract/cancel.js +6 -6
- package/dist/esm/contract/cancel.js.map +1 -1
- package/dist/esm/contract/close.js +19 -19
- package/dist/esm/contract/close.js.map +1 -1
- package/dist/esm/contract/create.js +10 -12
- package/dist/esm/contract/create.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/rental/accept.js +8 -8
- package/dist/esm/rental/accept.js.map +1 -1
- package/dist/esm/rental/cancel.js +4 -3
- package/dist/esm/rental/cancel.js.map +1 -1
- package/dist/esm/rental/close.js +4 -3
- package/dist/esm/rental/close.js.map +1 -1
- package/dist/esm/rental/reset.js +8 -9
- package/dist/esm/rental/reset.js.map +1 -1
- package/dist/esm/utils/config.js +22 -8
- package/dist/esm/utils/config.js.map +1 -1
- package/dist/esm/utils/constants.js +10 -5
- package/dist/esm/utils/constants.js.map +1 -1
- package/dist/esm/utils/fetch-accounts.js +109 -0
- package/dist/esm/utils/fetch-accounts.js.map +1 -0
- package/dist/esm/utils/index.js +1 -0
- package/dist/esm/utils/index.js.map +1 -1
- package/dist/types/codama/instructions/cancelRental.d.ts +34 -22
- package/dist/types/codama/instructions/cancelRental.d.ts.map +1 -1
- package/dist/types/codama/instructions/closeContract.d.ts +15 -48
- package/dist/types/codama/instructions/closeContract.d.ts.map +1 -1
- package/dist/types/codama/instructions/closeRental.d.ts +46 -26
- package/dist/types/codama/instructions/closeRental.d.ts.map +1 -1
- package/dist/types/contract/cancel.d.ts +0 -5
- package/dist/types/contract/cancel.d.ts.map +1 -1
- package/dist/types/contract/close.d.ts +1 -6
- package/dist/types/contract/close.d.ts.map +1 -1
- package/dist/types/contract/create.d.ts +0 -3
- package/dist/types/contract/create.d.ts.map +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/rental/accept.d.ts +1 -6
- package/dist/types/rental/accept.d.ts.map +1 -1
- package/dist/types/rental/cancel.d.ts +1 -2
- package/dist/types/rental/cancel.d.ts.map +1 -1
- package/dist/types/rental/close.d.ts +1 -2
- package/dist/types/rental/close.d.ts.map +1 -1
- package/dist/types/rental/reset.d.ts +1 -7
- package/dist/types/rental/reset.d.ts.map +1 -1
- package/dist/types/utils/config.d.ts +8 -8
- package/dist/types/utils/config.d.ts.map +1 -1
- package/dist/types/utils/constants.d.ts +0 -1
- package/dist/types/utils/constants.d.ts.map +1 -1
- package/dist/types/utils/fetch-accounts.d.ts +88 -0
- package/dist/types/utils/fetch-accounts.d.ts.map +1 -0
- package/dist/types/utils/index.d.ts +1 -0
- package/dist/types/utils/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/target/idl/srsly.json +101 -299
|
@@ -30,7 +30,12 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
30
30
|
const programAddress = config?.programAddress ?? SRSLY_PROGRAM_ADDRESS;
|
|
31
31
|
// Original accounts.
|
|
32
32
|
const originalAccounts = {
|
|
33
|
+
payer: { value: input.payer ?? null, isWritable: true },
|
|
34
|
+
config: { value: input.config ?? null, isWritable: false },
|
|
35
|
+
mint: { value: input.mint ?? null, isWritable: false },
|
|
36
|
+
authority: { value: input.authority ?? null, isWritable: false },
|
|
33
37
|
borrower: { value: input.borrower ?? null, isWritable: true },
|
|
38
|
+
owner: { value: input.owner ?? null, isWritable: true },
|
|
34
39
|
ownerTokenAccount: {
|
|
35
40
|
value: input.ownerTokenAccount ?? null,
|
|
36
41
|
isWritable: true,
|
|
@@ -47,13 +52,38 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
47
52
|
},
|
|
48
53
|
feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
|
|
49
54
|
rentalThread: { value: input.rentalThread ?? null, isWritable: true },
|
|
50
|
-
config: { value: input.config ?? null, isWritable: false },
|
|
51
55
|
antegenProgram: { value: input.antegenProgram ?? null, isWritable: false },
|
|
52
56
|
tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
|
|
57
|
+
associatedTokenProgram: {
|
|
58
|
+
value: input.associatedTokenProgram ?? null,
|
|
59
|
+
isWritable: false,
|
|
60
|
+
},
|
|
53
61
|
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
|
|
54
62
|
};
|
|
55
63
|
const accounts = originalAccounts;
|
|
56
64
|
// Resolve default values.
|
|
65
|
+
if (!accounts.config.value) {
|
|
66
|
+
accounts.config.value = await getProgramDerivedAddress({
|
|
67
|
+
programAddress,
|
|
68
|
+
seeds: [
|
|
69
|
+
getBytesEncoder().encode(new Uint8Array([99, 111, 110, 102, 105, 103])),
|
|
70
|
+
],
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
if (!accounts.ownerTokenAccount.value) {
|
|
74
|
+
accounts.ownerTokenAccount.value = await getProgramDerivedAddress({
|
|
75
|
+
programAddress: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
|
|
76
|
+
seeds: [
|
|
77
|
+
getAddressEncoder().encode(expectAddress(accounts.owner.value)),
|
|
78
|
+
getBytesEncoder().encode(new Uint8Array([
|
|
79
|
+
6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235,
|
|
80
|
+
121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133,
|
|
81
|
+
126, 255, 0, 169,
|
|
82
|
+
])),
|
|
83
|
+
getAddressEncoder().encode(expectAddress(accounts.mint.value)),
|
|
84
|
+
],
|
|
85
|
+
});
|
|
86
|
+
}
|
|
57
87
|
if (!accounts.rentalState.value) {
|
|
58
88
|
accounts.rentalState.value = await getProgramDerivedAddress({
|
|
59
89
|
programAddress,
|
|
@@ -66,6 +96,20 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
66
96
|
],
|
|
67
97
|
});
|
|
68
98
|
}
|
|
99
|
+
if (!accounts.rentalTokenAccount.value) {
|
|
100
|
+
accounts.rentalTokenAccount.value = await getProgramDerivedAddress({
|
|
101
|
+
programAddress: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
|
|
102
|
+
seeds: [
|
|
103
|
+
getAddressEncoder().encode(expectAddress(accounts.rentalState.value)),
|
|
104
|
+
getBytesEncoder().encode(new Uint8Array([
|
|
105
|
+
6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235,
|
|
106
|
+
121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133,
|
|
107
|
+
126, 255, 0, 169,
|
|
108
|
+
])),
|
|
109
|
+
getAddressEncoder().encode(expectAddress(accounts.mint.value)),
|
|
110
|
+
],
|
|
111
|
+
});
|
|
112
|
+
}
|
|
69
113
|
if (!accounts.rentalAuthority.value) {
|
|
70
114
|
accounts.rentalAuthority.value = await getProgramDerivedAddress({
|
|
71
115
|
programAddress,
|
|
@@ -77,6 +121,20 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
77
121
|
],
|
|
78
122
|
});
|
|
79
123
|
}
|
|
124
|
+
if (!accounts.feeTokenAccount.value) {
|
|
125
|
+
accounts.feeTokenAccount.value = await getProgramDerivedAddress({
|
|
126
|
+
programAddress: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
|
|
127
|
+
seeds: [
|
|
128
|
+
getAddressEncoder().encode(expectAddress(accounts.authority.value)),
|
|
129
|
+
getBytesEncoder().encode(new Uint8Array([
|
|
130
|
+
6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235,
|
|
131
|
+
121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133,
|
|
132
|
+
126, 255, 0, 169,
|
|
133
|
+
])),
|
|
134
|
+
getAddressEncoder().encode(expectAddress(accounts.mint.value)),
|
|
135
|
+
],
|
|
136
|
+
});
|
|
137
|
+
}
|
|
80
138
|
if (!accounts.rentalThread.value) {
|
|
81
139
|
accounts.rentalThread.value = await getProgramDerivedAddress({
|
|
82
140
|
programAddress,
|
|
@@ -87,14 +145,6 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
87
145
|
],
|
|
88
146
|
});
|
|
89
147
|
}
|
|
90
|
-
if (!accounts.config.value) {
|
|
91
|
-
accounts.config.value = await getProgramDerivedAddress({
|
|
92
|
-
programAddress,
|
|
93
|
-
seeds: [
|
|
94
|
-
getBytesEncoder().encode(new Uint8Array([99, 111, 110, 102, 105, 103])),
|
|
95
|
-
],
|
|
96
|
-
});
|
|
97
|
-
}
|
|
98
148
|
if (!accounts.antegenProgram.value) {
|
|
99
149
|
accounts.antegenProgram.value =
|
|
100
150
|
'AgThdyi1P5RkVeZD2rQahTvs8HePJoGFFxKtvok5s2J1';
|
|
@@ -103,6 +153,10 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
103
153
|
accounts.tokenProgram.value =
|
|
104
154
|
'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
|
105
155
|
}
|
|
156
|
+
if (!accounts.associatedTokenProgram.value) {
|
|
157
|
+
accounts.associatedTokenProgram.value =
|
|
158
|
+
'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
|
159
|
+
}
|
|
106
160
|
if (!accounts.systemProgram.value) {
|
|
107
161
|
accounts.systemProgram.value =
|
|
108
162
|
'11111111111111111111111111111111';
|
|
@@ -110,7 +164,12 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
110
164
|
const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
|
|
111
165
|
const instruction = {
|
|
112
166
|
accounts: [
|
|
167
|
+
getAccountMeta(accounts.payer),
|
|
168
|
+
getAccountMeta(accounts.config),
|
|
169
|
+
getAccountMeta(accounts.mint),
|
|
170
|
+
getAccountMeta(accounts.authority),
|
|
113
171
|
getAccountMeta(accounts.borrower),
|
|
172
|
+
getAccountMeta(accounts.owner),
|
|
114
173
|
getAccountMeta(accounts.ownerTokenAccount),
|
|
115
174
|
getAccountMeta(accounts.contract),
|
|
116
175
|
getAccountMeta(accounts.rentalState),
|
|
@@ -118,9 +177,9 @@ export async function getCloseRentalInstructionAsync(input, config) {
|
|
|
118
177
|
getAccountMeta(accounts.rentalAuthority),
|
|
119
178
|
getAccountMeta(accounts.feeTokenAccount),
|
|
120
179
|
getAccountMeta(accounts.rentalThread),
|
|
121
|
-
getAccountMeta(accounts.config),
|
|
122
180
|
getAccountMeta(accounts.antegenProgram),
|
|
123
181
|
getAccountMeta(accounts.tokenProgram),
|
|
182
|
+
getAccountMeta(accounts.associatedTokenProgram),
|
|
124
183
|
getAccountMeta(accounts.systemProgram),
|
|
125
184
|
],
|
|
126
185
|
programAddress,
|
|
@@ -133,7 +192,12 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
133
192
|
const programAddress = config?.programAddress ?? SRSLY_PROGRAM_ADDRESS;
|
|
134
193
|
// Original accounts.
|
|
135
194
|
const originalAccounts = {
|
|
195
|
+
payer: { value: input.payer ?? null, isWritable: true },
|
|
196
|
+
config: { value: input.config ?? null, isWritable: false },
|
|
197
|
+
mint: { value: input.mint ?? null, isWritable: false },
|
|
198
|
+
authority: { value: input.authority ?? null, isWritable: false },
|
|
136
199
|
borrower: { value: input.borrower ?? null, isWritable: true },
|
|
200
|
+
owner: { value: input.owner ?? null, isWritable: true },
|
|
137
201
|
ownerTokenAccount: {
|
|
138
202
|
value: input.ownerTokenAccount ?? null,
|
|
139
203
|
isWritable: true,
|
|
@@ -150,9 +214,12 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
150
214
|
},
|
|
151
215
|
feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
|
|
152
216
|
rentalThread: { value: input.rentalThread ?? null, isWritable: true },
|
|
153
|
-
config: { value: input.config ?? null, isWritable: false },
|
|
154
217
|
antegenProgram: { value: input.antegenProgram ?? null, isWritable: false },
|
|
155
218
|
tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
|
|
219
|
+
associatedTokenProgram: {
|
|
220
|
+
value: input.associatedTokenProgram ?? null,
|
|
221
|
+
isWritable: false,
|
|
222
|
+
},
|
|
156
223
|
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
|
|
157
224
|
};
|
|
158
225
|
const accounts = originalAccounts;
|
|
@@ -165,6 +232,10 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
165
232
|
accounts.tokenProgram.value =
|
|
166
233
|
'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
|
167
234
|
}
|
|
235
|
+
if (!accounts.associatedTokenProgram.value) {
|
|
236
|
+
accounts.associatedTokenProgram.value =
|
|
237
|
+
'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
|
238
|
+
}
|
|
168
239
|
if (!accounts.systemProgram.value) {
|
|
169
240
|
accounts.systemProgram.value =
|
|
170
241
|
'11111111111111111111111111111111';
|
|
@@ -172,7 +243,12 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
172
243
|
const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
|
|
173
244
|
const instruction = {
|
|
174
245
|
accounts: [
|
|
246
|
+
getAccountMeta(accounts.payer),
|
|
247
|
+
getAccountMeta(accounts.config),
|
|
248
|
+
getAccountMeta(accounts.mint),
|
|
249
|
+
getAccountMeta(accounts.authority),
|
|
175
250
|
getAccountMeta(accounts.borrower),
|
|
251
|
+
getAccountMeta(accounts.owner),
|
|
176
252
|
getAccountMeta(accounts.ownerTokenAccount),
|
|
177
253
|
getAccountMeta(accounts.contract),
|
|
178
254
|
getAccountMeta(accounts.rentalState),
|
|
@@ -180,9 +256,9 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
180
256
|
getAccountMeta(accounts.rentalAuthority),
|
|
181
257
|
getAccountMeta(accounts.feeTokenAccount),
|
|
182
258
|
getAccountMeta(accounts.rentalThread),
|
|
183
|
-
getAccountMeta(accounts.config),
|
|
184
259
|
getAccountMeta(accounts.antegenProgram),
|
|
185
260
|
getAccountMeta(accounts.tokenProgram),
|
|
261
|
+
getAccountMeta(accounts.associatedTokenProgram),
|
|
186
262
|
getAccountMeta(accounts.systemProgram),
|
|
187
263
|
],
|
|
188
264
|
programAddress,
|
|
@@ -191,7 +267,7 @@ export function getCloseRentalInstruction(input, config) {
|
|
|
191
267
|
return instruction;
|
|
192
268
|
}
|
|
193
269
|
export function parseCloseRentalInstruction(instruction) {
|
|
194
|
-
if (instruction.accounts.length <
|
|
270
|
+
if (instruction.accounts.length < 17) {
|
|
195
271
|
// TODO: Coded error.
|
|
196
272
|
throw new Error('Not enough accounts');
|
|
197
273
|
}
|
|
@@ -204,7 +280,12 @@ export function parseCloseRentalInstruction(instruction) {
|
|
|
204
280
|
return {
|
|
205
281
|
programAddress: instruction.programAddress,
|
|
206
282
|
accounts: {
|
|
283
|
+
payer: getNextAccount(),
|
|
284
|
+
config: getNextAccount(),
|
|
285
|
+
mint: getNextAccount(),
|
|
286
|
+
authority: getNextAccount(),
|
|
207
287
|
borrower: getNextAccount(),
|
|
288
|
+
owner: getNextAccount(),
|
|
208
289
|
ownerTokenAccount: getNextAccount(),
|
|
209
290
|
contract: getNextAccount(),
|
|
210
291
|
rentalState: getNextAccount(),
|
|
@@ -212,9 +293,9 @@ export function parseCloseRentalInstruction(instruction) {
|
|
|
212
293
|
rentalAuthority: getNextAccount(),
|
|
213
294
|
feeTokenAccount: getNextAccount(),
|
|
214
295
|
rentalThread: getNextAccount(),
|
|
215
|
-
config: getNextAccount(),
|
|
216
296
|
antegenProgram: getNextAccount(),
|
|
217
297
|
tokenProgram: getNextAccount(),
|
|
298
|
+
associatedTokenProgram: getNextAccount(),
|
|
218
299
|
systemProgram: getNextAccount(),
|
|
219
300
|
},
|
|
220
301
|
data: getCloseRentalInstructionDataDecoder().decode(instruction.data),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../../src/codama/instructions/closeRental.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"closeRental.js","sourceRoot":"","sources":["../../../../src/codama/instructions/closeRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
2
|
-
import {
|
|
1
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
2
|
+
import { toAddress } from '../utils/constants';
|
|
3
3
|
import { createFluentInstruction, createFluentConfigSelector } from '../utils/instruction-converter';
|
|
4
4
|
/**
|
|
5
5
|
* Internal function to cancel a contract instruction with configuration options
|
|
6
6
|
*/
|
|
7
7
|
async function _cancelContract(params, config) {
|
|
8
|
-
const { owner, fleet, contract,
|
|
9
|
-
// Get the
|
|
10
|
-
const
|
|
8
|
+
const { owner, fleet, contract, } = params;
|
|
9
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
10
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
11
11
|
// Get network-specific codama functions from centralized config
|
|
12
12
|
const instructionsModule = getModule('instructions');
|
|
13
13
|
const programsModule = getModule('programs');
|
|
@@ -18,7 +18,7 @@ async function _cancelContract(params, config) {
|
|
|
18
18
|
owner, // Pass as-is (string or signer)
|
|
19
19
|
fleet: toAddress(fleet), // Ensure string
|
|
20
20
|
contract: toAddress(contract), // Ensure string
|
|
21
|
-
sageProgram:
|
|
21
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
22
22
|
};
|
|
23
23
|
const rawInstruction = await getCancelContractInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
|
|
24
24
|
return createFluentInstruction(rawInstruction);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/contract/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/contract/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,uBAAuB,EAA2C,MAAM,iBAAiB,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAqD,MAAM,gCAAgC,CAAC;AA0BxJ;;GAEG;AACH,KAAK,UAAU,eAAe,CAC5B,MAA4B,EAC5B,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,KAAK,EACL,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,iCAAiC,EAAE,GAAG,kBAAkB,CAAC;IACjE,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,qDAAqD;IACrD,MAAM,KAAK,GAAG;QACZ,KAAK,EAAyB,gCAAgC;QAC9D,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAO,gBAAgB;QAC9C,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,gBAAgB;QAC/C,WAAW,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,+CAA+C;KACnG,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAC5D,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;IACF,OAAO,uBAAuB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,UAAU,cAAc,CAC5B,MAA4B;IAE5B,MAAM,YAAY,GAAG,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvF,OAAO,0BAA0B,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,iCAAiC,CAAC,KAAU,EAAE,OAAa;IACzE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,iCAAiC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
2
|
-
import {
|
|
1
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
2
|
+
import { toAddress } from '../utils/constants';
|
|
3
3
|
import { deriveGameAccounts } from '../utils';
|
|
4
4
|
import { createFluentInstruction, createFluentConfigSelector } from '../utils/instruction-converter';
|
|
5
5
|
/**
|
|
@@ -35,6 +35,9 @@ import { createFluentInstruction, createFluentConfigSelector } from '../utils/in
|
|
|
35
35
|
* gameId: 'custom-game-id...'
|
|
36
36
|
* });
|
|
37
37
|
*
|
|
38
|
+
* // Configure gameId via .set() instead of parameter
|
|
39
|
+
* await closeContract(params).set({ gameId: 'custom-game-id...' });
|
|
40
|
+
*
|
|
38
41
|
* // Use the instruction with your preferred Solana library
|
|
39
42
|
* // instruction is compatible with both @solana/kit and @solana/web3.js
|
|
40
43
|
* ```
|
|
@@ -46,29 +49,26 @@ import { createFluentInstruction, createFluentConfigSelector } from '../utils/in
|
|
|
46
49
|
* Internal function to close a contract instruction with configuration options
|
|
47
50
|
*/
|
|
48
51
|
async function _closeContract(params, config) {
|
|
49
|
-
const { owner, fleet, contract, faction,
|
|
50
|
-
// Get the
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
const ownerAddress = typeof owner === 'string' ? owner :
|
|
54
|
-
(owner && typeof owner === 'object' && 'address' in owner) ? owner.address : owner;
|
|
55
|
-
const derivedAccounts = await deriveGameAccounts(ownerAddress, faction, actualGameId, 0, // starbaseSeqId
|
|
52
|
+
const { owner, fleet, contract, faction, } = params;
|
|
53
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
54
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
55
|
+
const derivedAccounts = await deriveGameAccounts(toAddress(owner), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
|
|
56
56
|
config);
|
|
57
|
-
const starbase = derivedAccounts.starbase;
|
|
58
|
-
const starbasePlayer = derivedAccounts.starbasePlayer;
|
|
59
57
|
// Get network-specific codama functions from centralized config
|
|
60
58
|
const instructionsModule = getModule('instructions');
|
|
61
59
|
const programsModule = getModule('programs');
|
|
62
60
|
const { getCloseContractInstructionAsync } = instructionsModule;
|
|
63
61
|
const { SRSLY_PROGRAM_ADDRESS } = programsModule;
|
|
64
|
-
// Let codama
|
|
62
|
+
// Let codama handle all the account derivation and instruction building
|
|
65
63
|
const input = {
|
|
66
64
|
owner, // Pass as-is (string or signer)
|
|
67
|
-
fleet: toAddress(fleet), //
|
|
68
|
-
contract: toAddress(contract), //
|
|
69
|
-
starbase, //
|
|
70
|
-
starbasePlayer, //
|
|
71
|
-
gameId:
|
|
65
|
+
fleet: toAddress(fleet), // Convert fleet to Address
|
|
66
|
+
contract: toAddress(contract), // Convert contract to Address
|
|
67
|
+
starbase: toAddress(derivedAccounts.starbase), // Convert starbase to Address
|
|
68
|
+
starbasePlayer: toAddress(derivedAccounts.starbasePlayer), // Convert starbasePlayer to Address
|
|
69
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolved config or param override
|
|
70
|
+
mint: resolvedAddresses.atlasMint, // Already Address from resolveProgramAddresses
|
|
71
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
72
72
|
};
|
|
73
73
|
const rawInstruction = await getCloseContractInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
|
|
74
74
|
return createFluentInstruction(rawInstruction);
|
|
@@ -88,7 +88,7 @@ async function _closeContract(params, config) {
|
|
|
88
88
|
* await closeContract(params).set({ programs: 'mainnet' });
|
|
89
89
|
*
|
|
90
90
|
* // Override game ID
|
|
91
|
-
* await closeContract(params).set({ gameId: 'custom...' });
|
|
91
|
+
* await closeContract(params).set({ gameId: 'custom...' }); // gameId configured via .set()
|
|
92
92
|
* ```
|
|
93
93
|
*/
|
|
94
94
|
export function closeContract(params) {
|
|
@@ -97,7 +97,7 @@ export function closeContract(params) {
|
|
|
97
97
|
}
|
|
98
98
|
// Export config selector for getCloseContractInstructionAsync
|
|
99
99
|
export function getCloseContractInstructionAsync(input, options) {
|
|
100
|
-
return createConfigSelector(async (
|
|
100
|
+
return createConfigSelector(async () => {
|
|
101
101
|
const instructionsModule = getModule('instructions');
|
|
102
102
|
return instructionsModule.getCloseContractInstructionAsync(input, options);
|
|
103
103
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/contract/close.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/contract/close.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,uBAAuB,EAA2C,MAAM,iBAAiB,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAqD,MAAM,gCAAgC,CAAC;AAgCxJ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH;;GAEG;AACH,KAAK,UAAU,cAAc,CAC3B,MAA2B,EAC3B,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,KAAK,EACL,QAAQ,EACR,OAAO,GACR,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC9C,SAAS,CAAC,KAAK,CAAC,EAChB,OAAQ,EACR,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,gCAAgC,EAAE,GAAG,kBAAkB,CAAC;IAChE,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,wEAAwE;IACxE,MAAM,KAAK,GAAG;QACZ,KAAK,EAAqC,gCAAgC;QAC1E,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAmB,2BAA2B;QACrE,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAa,8BAA8B;QACxE,QAAQ,EAAE,SAAS,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAQ,8BAA8B;QACnF,cAAc,EAAE,SAAS,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,oCAAoC;QAC/F,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAsB,yDAAyD;QAC/G,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAS,+CAA+C;QACzF,WAAW,EAAE,iBAAiB,CAAC,kBAAkB,EAAG,+CAA+C;KACpG,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,gCAAgC,CAC3D,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;IACF,OAAO,uBAAuB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,aAAa,CAC3B,MAA2B;IAE3B,MAAM,YAAY,GAAG,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtF,OAAO,0BAA0B,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,gCAAgC,CAAC,KAAU,EAAE,OAAa;IACxE,OAAO,oBAAoB,CAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,gCAAgC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* Unified contract creation - works with both @solana/kit and @solana/web3.js
|
|
3
3
|
* Uses strings for all addresses to eliminate library-specific type complexity
|
|
4
4
|
*/
|
|
5
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
6
|
-
import {
|
|
5
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
6
|
+
import { toAddress } from '../utils/constants';
|
|
7
7
|
import { validateDurationAlignment, paymentFrequencyStringToSeconds } from '../utils/paymentFrequency';
|
|
8
8
|
import { isValidPaymentFrequency } from '../types/paymentFrequency';
|
|
9
9
|
import { createFluentInstruction, createFluentConfigSelector } from '../utils/instruction-converter';
|
|
@@ -11,7 +11,7 @@ import { createFluentInstruction, createFluentConfigSelector } from '../utils/in
|
|
|
11
11
|
* Internal function to create a rental contract instruction with configuration options
|
|
12
12
|
*/
|
|
13
13
|
async function _createContract(params, config) {
|
|
14
|
-
const { owner, fleet, ownerProfile, rate, durationMax, paymentsFreq,
|
|
14
|
+
const { owner, fleet, ownerProfile, rate, durationMax, paymentsFreq, ownerKeyIndex = 0, } = params;
|
|
15
15
|
// Validate payment frequency
|
|
16
16
|
if (!isValidPaymentFrequency(paymentsFreq)) {
|
|
17
17
|
throw new Error(`Invalid payment frequency: "${paymentsFreq}". Valid values are: ${JSON.stringify(Object.keys({ daily: true, weekly: true, monthly: true, hourly: true }))}`);
|
|
@@ -22,17 +22,15 @@ async function _createContract(params, config) {
|
|
|
22
22
|
const durationMin = paymentFrequencyStringToSeconds(paymentsFreq);
|
|
23
23
|
// Convert the payment frequency to the format expected by the Rust program (with @ prefix)
|
|
24
24
|
const paymentsFreqWithPrefix = `@${paymentsFreq}`;
|
|
25
|
-
// Get
|
|
26
|
-
const
|
|
27
|
-
const actualSageProgramAddress = sageProgramAddress ? toAddress(sageProgramAddress) : await getSageProgramAddress(config);
|
|
28
|
-
const actualAtlasMint = atlasMint ? toAddress(atlasMint) : await getAtlasMint(config);
|
|
25
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
26
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
29
27
|
const input = {
|
|
30
28
|
owner, // Pass as-is (string or signer)
|
|
31
|
-
fleet: toAddress(fleet), //
|
|
32
|
-
ownerProfile: toAddress(ownerProfile), //
|
|
33
|
-
gameId:
|
|
34
|
-
sageProgram:
|
|
35
|
-
mint:
|
|
29
|
+
fleet: toAddress(fleet), // Convert fleet to Address
|
|
30
|
+
ownerProfile: toAddress(ownerProfile), // Convert ownerProfile to Address
|
|
31
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
|
|
32
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
33
|
+
mint: resolvedAddresses.atlasMint, // Already Address from resolveProgramAddresses
|
|
36
34
|
durationMin,
|
|
37
35
|
durationMax,
|
|
38
36
|
rate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/contract/create.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,oBAAoB,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/contract/create.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,uBAAuB,EAAsB,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,+BAA+B,EAAE,MAAM,2BAA2B,CAAC;AACvG,OAAO,EAA0B,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAC5F,OAAO,EAAE,uBAAuB,EAAE,0BAA0B,EAAqD,MAAM,gCAAgC,CAAC;AAmBxJ;;GAEG;AACH,KAAK,UAAU,eAAe,CAAC,MAA4B,EAAE,MAAsB;IACjF,MAAM,EACJ,KAAK,EACL,KAAK,EACL,YAAY,EACZ,IAAI,EACJ,WAAW,EACX,YAAY,EACZ,aAAa,GAAG,CAAC,GAClB,GAAG,MAAM,CAAC;IAEX,6BAA6B;IAC7B,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,wBAAwB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IAChL,CAAC;IAED,8BAA8B;IAC9B,yBAAyB,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC;IAE7D,yEAAyE;IACzE,MAAM,WAAW,GAAG,+BAA+B,CAAC,YAAY,CAAC,CAAC;IAElE,2FAA2F;IAC3F,MAAM,sBAAsB,GAAG,IAAI,YAAY,EAAE,CAAC;IAElD,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG;QACZ,KAAK,EAAqC,gCAAgC;QAC1E,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,EAAkB,2BAA2B;QACpE,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,EAAI,kCAAkC;QAC3E,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAS,+CAA+C;QACxF,WAAW,EAAE,iBAAiB,CAAC,kBAAkB,EAAE,+CAA+C;QAClG,IAAI,EAAE,iBAAiB,CAAC,SAAS,EAAQ,+CAA+C;QACxF,WAAW;QACX,WAAW;QACX,IAAI;QACJ,WAAW,EAAE,sBAAsB,EAAM,+CAA+C;QACxF,aAAa;KACd,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,iCAAiC,EAAE,GAAG,kBAAkB,CAAC;IACjE,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,MAAM,cAAc,GAAG,MAAM,iCAAiC,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACjH,OAAO,uBAAuB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,MAAM,UAAU,cAAc,CAAC,MAA4B;IACzD,MAAM,YAAY,GAAG,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvF,OAAO,0BAA0B,CAAC,YAAY,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/esm/index.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
export * from "./contract";
|
|
3
3
|
export * from "./rental";
|
|
4
4
|
export * from "./utils";
|
|
5
|
-
// Export account fetch functions
|
|
6
|
-
export { fetchContractState, fetchRentalState } from "./
|
|
5
|
+
// Export account fetch functions that accept RPC URL strings
|
|
6
|
+
export { fetchContractState, fetchRentalState, fetchMultipleContractStates, fetchMultipleRentalStates } from "./utils/fetch-accounts";
|
|
7
7
|
// Export PaymentFrequency from codama (generated from Rust)
|
|
8
8
|
export { PaymentFrequency } from "./codama/types/paymentFrequency";
|
|
9
9
|
// Export auto-generated payment frequency types and utilities
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AAuBxB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,4BAA4B;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AAuBxB,6DAA6D;AAC7D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,2BAA2B,EAC3B,yBAAyB,EAC1B,MAAM,wBAAwB,CAAC;AAEhC,4DAA4D;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAEnE,8DAA8D;AAC9D,OAAO,EAEL,yBAAyB,EACzB,qBAAqB,EACrB,2BAA2B,EAC3B,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAElC,qEAAqE;AACrE,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAC/B,yBAAyB,EAC1B,MAAM,0BAA0B,CAAC;AAElC,uEAAuE;AACvE,OAAO,EACL,WAAW,EACX,OAAO,EACP,KAAK,EACL,IAAI,EACJ,KAAK,EACL,MAAM,EACN,QAAQ,EACT,MAAM,kBAAkB,CAAC"}
|
package/dist/esm/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
2
|
-
import {
|
|
1
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
2
|
+
import { ATLAS_TO_STARDUST, toAddress } from '../utils/constants';
|
|
3
3
|
import { deriveGameAccounts } from '../utils';
|
|
4
4
|
import { createFluentInstruction, createFluentConfigSelector } from '../utils/instruction-converter';
|
|
5
5
|
/**
|
|
6
6
|
* Internal function to accept a rental instruction with configuration options
|
|
7
7
|
*/
|
|
8
8
|
async function _acceptRental(params, config) {
|
|
9
|
-
const { borrower, borrowerProfile, borrowerFaction, fleet, contract,
|
|
10
|
-
// Get the
|
|
11
|
-
const
|
|
9
|
+
const { borrower, borrowerProfile, borrowerFaction, fleet, contract, rate, duration, referralTokenAccount, } = params;
|
|
10
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
11
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
12
12
|
// Calculate the total amount from rate and duration
|
|
13
13
|
// Convert ATLAS to stardust (smallest unit): 1 ATLAS = 100,000,000 stardust
|
|
14
14
|
const amount = BigInt(rate) * BigInt(duration) * BigInt(ATLAS_TO_STARDUST);
|
|
15
15
|
// Derive the three accounts we need
|
|
16
|
-
const { profileFaction, starbase, starbasePlayer } = await deriveGameAccounts(toAddress(borrowerProfile), borrowerFaction,
|
|
16
|
+
const { profileFaction, starbase, starbasePlayer } = await deriveGameAccounts(toAddress(borrowerProfile), borrowerFaction, resolvedAddresses.gameId, 0, // starbaseSeqId
|
|
17
17
|
config);
|
|
18
18
|
// Let codama derive the rest (rentalThread, rentalState, rentalAuthority, etc.)
|
|
19
19
|
const input = {
|
|
@@ -22,7 +22,7 @@ async function _acceptRental(params, config) {
|
|
|
22
22
|
borrowerProfileFaction: profileFaction, // Already string from deriveGameAccounts
|
|
23
23
|
fleet: toAddress(fleet), // Ensure string
|
|
24
24
|
contract: toAddress(contract), // Ensure string
|
|
25
|
-
gameId:
|
|
25
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
|
|
26
26
|
starbase, // Already string from deriveGameAccounts
|
|
27
27
|
starbasePlayer, // Already string from deriveGameAccounts
|
|
28
28
|
amount, // BigInt value
|
|
@@ -71,7 +71,7 @@ async function _acceptRental(params, config) {
|
|
|
71
71
|
* // Override specific constants
|
|
72
72
|
* const instruction = await acceptRental(params).set({
|
|
73
73
|
* programs: 'mainnet',
|
|
74
|
-
* gameId: 'custom-game-id...'
|
|
74
|
+
* gameId: 'custom-game-id...' // gameId configured via .set()
|
|
75
75
|
* });
|
|
76
76
|
*
|
|
77
77
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
1
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
2
2
|
import { toAddress } from '../utils/constants';
|
|
3
3
|
/**
|
|
4
4
|
* Internal function to cancel a rental instruction with configuration options
|
|
5
5
|
*/
|
|
6
6
|
async function _cancelRental(params, config) {
|
|
7
7
|
const { borrower, contract, } = params;
|
|
8
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
9
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
8
10
|
// Let codama derive all the optional accounts
|
|
9
11
|
const input = {
|
|
10
12
|
borrower, // Pass as-is (string or signer)
|
|
@@ -33,8 +35,7 @@ async function _cancelRental(params, config) {
|
|
|
33
35
|
*
|
|
34
36
|
* // Override specific constants
|
|
35
37
|
* const instruction = await cancelRental(params).set({
|
|
36
|
-
* programs: 'mainnet'
|
|
37
|
-
* sageProgramAddress: 'custom...'
|
|
38
|
+
* programs: 'mainnet'
|
|
38
39
|
* });
|
|
39
40
|
*
|
|
40
41
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAA2C,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,uBAAuB,EAA2C,MAAM,iBAAiB,CAAC;AACpI,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAsB/C;;GAEG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAqB,gCAAgC;QAC7D,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,SAAS,CAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,+BAA+B,CACpC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,YAAY,CAC1B,MAA0B;IAE1B,OAAO,oBAAoB,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,UAAU,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/esm/rental/close.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { getModule, createConfigSelector } from '../utils/config';
|
|
1
|
+
import { getModule, createConfigSelector, resolveProgramAddresses } from '../utils/config';
|
|
2
2
|
import { toAddress } from '../utils/constants';
|
|
3
3
|
/**
|
|
4
4
|
* Internal function to close a rental instruction with configuration options
|
|
5
5
|
*/
|
|
6
6
|
async function _closeRental(params, config) {
|
|
7
7
|
const { borrower, ownerTokenAccount, contract, } = params;
|
|
8
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
9
|
+
const resolvedAddresses = resolveProgramAddresses(config || {});
|
|
8
10
|
// Let codama derive the optional accounts
|
|
9
11
|
const input = {
|
|
10
12
|
borrower: toAddress(borrower), // Ensure string
|
|
@@ -35,8 +37,7 @@ async function _closeRental(params, config) {
|
|
|
35
37
|
*
|
|
36
38
|
* // Override specific constants
|
|
37
39
|
* const instruction = await closeRental(params).set({
|
|
38
|
-
* programs: 'mainnet'
|
|
39
|
-
* sageProgramAddress: 'custom...'
|
|
40
|
+
* programs: 'mainnet'
|
|
40
41
|
* });
|
|
41
42
|
*
|
|
42
43
|
* // Use the instruction with your preferred Solana library
|