@wuwei-labs/srsly 2.0.0-beta.34 → 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/closeContract.js +1 -111
- package/dist/cjs/codama/instructions/closeContract.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 +16 -15
- 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/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 +6 -5
- 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/esm/codama/instructions/closeContract.js +3 -113
- package/dist/esm/codama/instructions/closeContract.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 +18 -17
- 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/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 +6 -5
- 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/types/codama/instructions/closeContract.d.ts +14 -59
- package/dist/types/codama/instructions/closeContract.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/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 +5 -5
- 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/package.json +1 -1
- package/target/idl/srsly.json +0 -318
|
@@ -41,17 +41,6 @@ async function getCloseContractInstructionAsync(input, config) {
|
|
|
41
41
|
// Original accounts.
|
|
42
42
|
const originalAccounts = {
|
|
43
43
|
owner: { value: input.owner ?? null, isWritable: true },
|
|
44
|
-
config: { value: input.config ?? null, isWritable: false },
|
|
45
|
-
mint: { value: input.mint ?? null, isWritable: false },
|
|
46
|
-
ownerTokenAccount: {
|
|
47
|
-
value: input.ownerTokenAccount ?? null,
|
|
48
|
-
isWritable: true,
|
|
49
|
-
},
|
|
50
|
-
rentalTokenAccount: {
|
|
51
|
-
value: input.rentalTokenAccount ?? null,
|
|
52
|
-
isWritable: true,
|
|
53
|
-
},
|
|
54
|
-
rentalState: { value: input.rentalState ?? null, isWritable: true },
|
|
55
44
|
fleet: { value: input.fleet ?? null, isWritable: true },
|
|
56
45
|
gameId: { value: input.gameId ?? null, isWritable: false },
|
|
57
46
|
starbase: { value: input.starbase ?? null, isWritable: false },
|
|
@@ -62,38 +51,9 @@ async function getCloseContractInstructionAsync(input, config) {
|
|
|
62
51
|
isWritable: false,
|
|
63
52
|
},
|
|
64
53
|
sageProgram: { value: input.sageProgram ?? null, isWritable: false },
|
|
65
|
-
feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
|
|
66
|
-
tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
|
|
67
|
-
associatedTokenProgram: {
|
|
68
|
-
value: input.associatedTokenProgram ?? null,
|
|
69
|
-
isWritable: false,
|
|
70
|
-
},
|
|
71
|
-
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
|
|
72
54
|
};
|
|
73
55
|
const accounts = originalAccounts;
|
|
74
56
|
// Resolve default values.
|
|
75
|
-
if (!accounts.config.value) {
|
|
76
|
-
accounts.config.value = await (0, kit_1.getProgramDerivedAddress)({
|
|
77
|
-
programAddress,
|
|
78
|
-
seeds: [
|
|
79
|
-
(0, kit_1.getBytesEncoder)().encode(new Uint8Array([99, 111, 110, 102, 105, 103])),
|
|
80
|
-
],
|
|
81
|
-
});
|
|
82
|
-
}
|
|
83
|
-
if (!accounts.ownerTokenAccount.value) {
|
|
84
|
-
accounts.ownerTokenAccount.value = await (0, kit_1.getProgramDerivedAddress)({
|
|
85
|
-
programAddress: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
|
|
86
|
-
seeds: [
|
|
87
|
-
(0, kit_1.getAddressEncoder)().encode((0, shared_1.expectAddress)(accounts.owner.value)),
|
|
88
|
-
(0, kit_1.getBytesEncoder)().encode(new Uint8Array([
|
|
89
|
-
6, 221, 246, 225, 215, 101, 161, 147, 217, 203, 225, 70, 206, 235,
|
|
90
|
-
121, 172, 28, 180, 133, 237, 95, 91, 55, 145, 58, 140, 245, 133,
|
|
91
|
-
126, 255, 0, 169,
|
|
92
|
-
])),
|
|
93
|
-
(0, kit_1.getAddressEncoder)().encode((0, shared_1.expectAddress)(accounts.mint.value)),
|
|
94
|
-
],
|
|
95
|
-
});
|
|
96
|
-
}
|
|
97
57
|
if (!accounts.rentalAuthority.value) {
|
|
98
58
|
accounts.rentalAuthority.value = await (0, kit_1.getProgramDerivedAddress)({
|
|
99
59
|
programAddress,
|
|
@@ -105,27 +65,10 @@ async function getCloseContractInstructionAsync(input, config) {
|
|
|
105
65
|
],
|
|
106
66
|
});
|
|
107
67
|
}
|
|
108
|
-
if (!accounts.tokenProgram.value) {
|
|
109
|
-
accounts.tokenProgram.value =
|
|
110
|
-
'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
|
111
|
-
}
|
|
112
|
-
if (!accounts.associatedTokenProgram.value) {
|
|
113
|
-
accounts.associatedTokenProgram.value =
|
|
114
|
-
'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
|
115
|
-
}
|
|
116
|
-
if (!accounts.systemProgram.value) {
|
|
117
|
-
accounts.systemProgram.value =
|
|
118
|
-
'11111111111111111111111111111111';
|
|
119
|
-
}
|
|
120
68
|
const getAccountMeta = (0, shared_1.getAccountMetaFactory)(programAddress, 'programId');
|
|
121
69
|
const instruction = {
|
|
122
70
|
accounts: [
|
|
123
71
|
getAccountMeta(accounts.owner),
|
|
124
|
-
getAccountMeta(accounts.config),
|
|
125
|
-
getAccountMeta(accounts.mint),
|
|
126
|
-
getAccountMeta(accounts.ownerTokenAccount),
|
|
127
|
-
getAccountMeta(accounts.rentalTokenAccount),
|
|
128
|
-
getAccountMeta(accounts.rentalState),
|
|
129
72
|
getAccountMeta(accounts.fleet),
|
|
130
73
|
getAccountMeta(accounts.gameId),
|
|
131
74
|
getAccountMeta(accounts.starbase),
|
|
@@ -133,10 +76,6 @@ async function getCloseContractInstructionAsync(input, config) {
|
|
|
133
76
|
getAccountMeta(accounts.contract),
|
|
134
77
|
getAccountMeta(accounts.rentalAuthority),
|
|
135
78
|
getAccountMeta(accounts.sageProgram),
|
|
136
|
-
getAccountMeta(accounts.feeTokenAccount),
|
|
137
|
-
getAccountMeta(accounts.tokenProgram),
|
|
138
|
-
getAccountMeta(accounts.associatedTokenProgram),
|
|
139
|
-
getAccountMeta(accounts.systemProgram),
|
|
140
79
|
],
|
|
141
80
|
programAddress,
|
|
142
81
|
data: getCloseContractInstructionDataEncoder().encode({}),
|
|
@@ -149,17 +88,6 @@ function getCloseContractInstruction(input, config) {
|
|
|
149
88
|
// Original accounts.
|
|
150
89
|
const originalAccounts = {
|
|
151
90
|
owner: { value: input.owner ?? null, isWritable: true },
|
|
152
|
-
config: { value: input.config ?? null, isWritable: false },
|
|
153
|
-
mint: { value: input.mint ?? null, isWritable: false },
|
|
154
|
-
ownerTokenAccount: {
|
|
155
|
-
value: input.ownerTokenAccount ?? null,
|
|
156
|
-
isWritable: true,
|
|
157
|
-
},
|
|
158
|
-
rentalTokenAccount: {
|
|
159
|
-
value: input.rentalTokenAccount ?? null,
|
|
160
|
-
isWritable: true,
|
|
161
|
-
},
|
|
162
|
-
rentalState: { value: input.rentalState ?? null, isWritable: true },
|
|
163
91
|
fleet: { value: input.fleet ?? null, isWritable: true },
|
|
164
92
|
gameId: { value: input.gameId ?? null, isWritable: false },
|
|
165
93
|
starbase: { value: input.starbase ?? null, isWritable: false },
|
|
@@ -170,37 +98,12 @@ function getCloseContractInstruction(input, config) {
|
|
|
170
98
|
isWritable: false,
|
|
171
99
|
},
|
|
172
100
|
sageProgram: { value: input.sageProgram ?? null, isWritable: false },
|
|
173
|
-
feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
|
|
174
|
-
tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
|
|
175
|
-
associatedTokenProgram: {
|
|
176
|
-
value: input.associatedTokenProgram ?? null,
|
|
177
|
-
isWritable: false,
|
|
178
|
-
},
|
|
179
|
-
systemProgram: { value: input.systemProgram ?? null, isWritable: false },
|
|
180
101
|
};
|
|
181
102
|
const accounts = originalAccounts;
|
|
182
|
-
// Resolve default values.
|
|
183
|
-
if (!accounts.tokenProgram.value) {
|
|
184
|
-
accounts.tokenProgram.value =
|
|
185
|
-
'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
|
|
186
|
-
}
|
|
187
|
-
if (!accounts.associatedTokenProgram.value) {
|
|
188
|
-
accounts.associatedTokenProgram.value =
|
|
189
|
-
'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
|
|
190
|
-
}
|
|
191
|
-
if (!accounts.systemProgram.value) {
|
|
192
|
-
accounts.systemProgram.value =
|
|
193
|
-
'11111111111111111111111111111111';
|
|
194
|
-
}
|
|
195
103
|
const getAccountMeta = (0, shared_1.getAccountMetaFactory)(programAddress, 'programId');
|
|
196
104
|
const instruction = {
|
|
197
105
|
accounts: [
|
|
198
106
|
getAccountMeta(accounts.owner),
|
|
199
|
-
getAccountMeta(accounts.config),
|
|
200
|
-
getAccountMeta(accounts.mint),
|
|
201
|
-
getAccountMeta(accounts.ownerTokenAccount),
|
|
202
|
-
getAccountMeta(accounts.rentalTokenAccount),
|
|
203
|
-
getAccountMeta(accounts.rentalState),
|
|
204
107
|
getAccountMeta(accounts.fleet),
|
|
205
108
|
getAccountMeta(accounts.gameId),
|
|
206
109
|
getAccountMeta(accounts.starbase),
|
|
@@ -208,10 +111,6 @@ function getCloseContractInstruction(input, config) {
|
|
|
208
111
|
getAccountMeta(accounts.contract),
|
|
209
112
|
getAccountMeta(accounts.rentalAuthority),
|
|
210
113
|
getAccountMeta(accounts.sageProgram),
|
|
211
|
-
getAccountMeta(accounts.feeTokenAccount),
|
|
212
|
-
getAccountMeta(accounts.tokenProgram),
|
|
213
|
-
getAccountMeta(accounts.associatedTokenProgram),
|
|
214
|
-
getAccountMeta(accounts.systemProgram),
|
|
215
114
|
],
|
|
216
115
|
programAddress,
|
|
217
116
|
data: getCloseContractInstructionDataEncoder().encode({}),
|
|
@@ -219,7 +118,7 @@ function getCloseContractInstruction(input, config) {
|
|
|
219
118
|
return instruction;
|
|
220
119
|
}
|
|
221
120
|
function parseCloseContractInstruction(instruction) {
|
|
222
|
-
if (instruction.accounts.length <
|
|
121
|
+
if (instruction.accounts.length < 8) {
|
|
223
122
|
// TODO: Coded error.
|
|
224
123
|
throw new Error('Not enough accounts');
|
|
225
124
|
}
|
|
@@ -233,11 +132,6 @@ function parseCloseContractInstruction(instruction) {
|
|
|
233
132
|
programAddress: instruction.programAddress,
|
|
234
133
|
accounts: {
|
|
235
134
|
owner: getNextAccount(),
|
|
236
|
-
config: getNextAccount(),
|
|
237
|
-
mint: getNextAccount(),
|
|
238
|
-
ownerTokenAccount: getNextAccount(),
|
|
239
|
-
rentalTokenAccount: getNextAccount(),
|
|
240
|
-
rentalState: getNextAccount(),
|
|
241
135
|
fleet: getNextAccount(),
|
|
242
136
|
gameId: getNextAccount(),
|
|
243
137
|
starbase: getNextAccount(),
|
|
@@ -245,10 +139,6 @@ function parseCloseContractInstruction(instruction) {
|
|
|
245
139
|
contract: getNextAccount(),
|
|
246
140
|
rentalAuthority: getNextAccount(),
|
|
247
141
|
sageProgram: getNextAccount(),
|
|
248
|
-
feeTokenAccount: getNextAccount(),
|
|
249
|
-
tokenProgram: getNextAccount(),
|
|
250
|
-
associatedTokenProgram: getNextAccount(),
|
|
251
|
-
systemProgram: getNextAccount(),
|
|
252
142
|
},
|
|
253
143
|
data: getCloseContractInstructionDataDecoder().decode(instruction.data),
|
|
254
144
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../../src/codama/instructions/closeContract.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;
|
|
1
|
+
{"version":3,"file":"closeContract.js","sourceRoot":"","sources":["../../../../src/codama/instructions/closeContract.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAkCH,gFAIC;AAoDD,wFAKC;AAED,wFAIC;AAED,oFAQC;AAsBD,4EAmGC;AAsBD,kEAkFC;AAoBD,sEAgCC;AAlYD,qCAwBqB;AACrB,0CAAoD;AACpD,sCAAwE;AAE3D,QAAA,4BAA4B,GAAG,IAAI,UAAU,CAAC;IACzD,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG;CACnC,CAAC,CAAC;AAEH,SAAgB,kCAAkC;IAChD,OAAO,IAAA,oBAAc,EAAC,IAAA,qBAAe,GAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAChD,oCAA4B,CAC7B,CAAC;AACJ,CAAC;AAoDD,SAAgB,sCAAsC;IACpD,OAAO,IAAA,sBAAgB,EACrB,IAAA,sBAAgB,EAAC,CAAC,CAAC,eAAe,EAAE,IAAA,oBAAc,EAAC,IAAA,qBAAe,GAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3E,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,EAAE,aAAa,EAAE,oCAA4B,EAAE,CAAC,CACvE,CAAC;AACJ,CAAC;AAED,SAAgB,sCAAsC;IACpD,OAAO,IAAA,sBAAgB,EAAC;QACtB,CAAC,eAAe,EAAE,IAAA,oBAAc,EAAC,IAAA,qBAAe,GAAE,EAAE,CAAC,CAAC,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,oCAAoC;IAIlD,OAAO,IAAA,kBAAY,EACjB,sCAAsC,EAAE,EACxC,sCAAsC,EAAE,CACzC,CAAC;AACJ,CAAC;AAsBM,KAAK,UAAU,gCAAgC,CAWpD,KASC,EACD,MAA6C;IAc7C,mBAAmB;IACnB,MAAM,cAAc,GAAG,MAAM,EAAE,cAAc,IAAI,gCAAqB,CAAC;IAEvE,qBAAqB;IACrB,MAAM,gBAAgB,GAAG;QACvB,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACvD,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACvD,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QAC1D,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QAC9D,cAAc,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACzE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QAC7D,eAAe,EAAE;YACf,KAAK,EAAE,KAAK,CAAC,eAAe,IAAI,IAAI;YACpC,UAAU,EAAE,KAAK;SAClB;QACD,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;KACrE,CAAC;IACF,MAAM,QAAQ,GAAG,gBAGhB,CAAC;IAEF,0BAA0B;IAC1B,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QACpC,QAAQ,CAAC,eAAe,CAAC,KAAK,GAAG,MAAM,IAAA,8BAAwB,EAAC;YAC9D,cAAc;YACd,KAAK,EAAE;gBACL,IAAA,qBAAe,GAAE,CAAC,MAAM,CACtB,IAAI,UAAU,CAAC;oBACb,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;oBACjE,GAAG,EAAE,GAAG;iBACT,CAAC,CACH;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,8BAAqB,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG;QAClB,QAAQ,EAAE;YACR,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC9B,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC9B,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/B,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC;YACvC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC;YACxC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC;SACrC;QACD,cAAc;QACd,IAAI,EAAE,sCAAsC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KAW1D,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAsBD,SAAgB,2BAA2B,CAWzC,KASC,EACD,MAA6C;IAY7C,mBAAmB;IACnB,MAAM,cAAc,GAAG,MAAM,EAAE,cAAc,IAAI,gCAAqB,CAAC;IAEvE,qBAAqB;IACrB,MAAM,gBAAgB,GAAG;QACvB,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACvD,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACvD,MAAM,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QAC1D,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QAC9D,cAAc,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QACzE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;QAC7D,eAAe,EAAE;YACf,KAAK,EAAE,KAAK,CAAC,eAAe,IAAI,IAAI;YACpC,UAAU,EAAE,KAAK;SAClB;QACD,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,IAAI,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;KACrE,CAAC;IACF,MAAM,QAAQ,GAAG,gBAGhB,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,8BAAqB,EAAC,cAAc,EAAE,WAAW,CAAC,CAAC;IAC1E,MAAM,WAAW,GAAG;QAClB,QAAQ,EAAE;YACR,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC9B,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC9B,cAAc,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/B,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,cAAc,CAAC;YACvC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC;YACxC,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC;SACrC;QACD,cAAc;QACd,IAAI,EAAE,sCAAsC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;KAW1D,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC;AAoBD,SAAgB,6BAA6B,CAI3C,WAEkC;IAElC,IAAI,WAAW,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpC,qBAAqB;QACrB,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,cAAc,GAAG,GAAG,EAAE;QAC1B,MAAM,WAAW,GAAG,WAAW,CAAC,QAAS,CAAC,YAAY,CAAE,CAAC;QACzD,YAAY,IAAI,CAAC,CAAC;QAClB,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;IACF,OAAO;QACL,cAAc,EAAE,WAAW,CAAC,cAAc;QAC1C,QAAQ,EAAE;YACR,KAAK,EAAE,cAAc,EAAE;YACvB,KAAK,EAAE,cAAc,EAAE;YACvB,MAAM,EAAE,cAAc,EAAE;YACxB,QAAQ,EAAE,cAAc,EAAE;YAC1B,cAAc,EAAE,cAAc,EAAE;YAChC,QAAQ,EAAE,cAAc,EAAE;YAC1B,eAAe,EAAE,cAAc,EAAE;YACjC,WAAW,EAAE,cAAc,EAAE;SAC9B;QACD,IAAI,EAAE,sCAAsC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;KACxE,CAAC;AACJ,CAAC"}
|
|
@@ -9,9 +9,9 @@ const instruction_converter_1 = require("../utils/instruction-converter");
|
|
|
9
9
|
* Internal function to cancel a contract instruction with configuration options
|
|
10
10
|
*/
|
|
11
11
|
async function _cancelContract(params, config) {
|
|
12
|
-
const { owner, fleet, contract,
|
|
13
|
-
// Get the
|
|
14
|
-
const
|
|
12
|
+
const { owner, fleet, contract, } = params;
|
|
13
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
14
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
15
15
|
// Get network-specific codama functions from centralized config
|
|
16
16
|
const instructionsModule = (0, config_1.getModule)('instructions');
|
|
17
17
|
const programsModule = (0, config_1.getModule)('programs');
|
|
@@ -22,7 +22,7 @@ async function _cancelContract(params, config) {
|
|
|
22
22
|
owner, // Pass as-is (string or signer)
|
|
23
23
|
fleet: (0, constants_1.toAddress)(fleet), // Ensure string
|
|
24
24
|
contract: (0, constants_1.toAddress)(contract), // Ensure string
|
|
25
|
-
sageProgram:
|
|
25
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
26
26
|
};
|
|
27
27
|
const rawInstruction = await getCancelContractInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
|
|
28
28
|
return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/contract/cancel.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/contract/cancel.ts"],"names":[],"mappings":";;AAqGA,wCAKC;AAGD,8EAKC;AAlHD,4CAAoI;AACpI,kDAA+C;AAC/C,0EAAwJ;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,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,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,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAO,gBAAgB;QAC9C,QAAQ,EAAE,IAAA,qBAAS,EAAC,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,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,SAAgB,cAAc,CAC5B,MAA4B;IAE5B,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvF,OAAO,IAAA,kDAA0B,EAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,+DAA+D;AAC/D,SAAgB,iCAAiC,CAAC,KAAU,EAAE,OAAa;IACzE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,iCAAiC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -39,6 +39,9 @@ const instruction_converter_1 = require("../utils/instruction-converter");
|
|
|
39
39
|
* gameId: 'custom-game-id...'
|
|
40
40
|
* });
|
|
41
41
|
*
|
|
42
|
+
* // Configure gameId via .set() instead of parameter
|
|
43
|
+
* await closeContract(params).set({ gameId: 'custom-game-id...' });
|
|
44
|
+
*
|
|
42
45
|
* // Use the instruction with your preferred Solana library
|
|
43
46
|
* // instruction is compatible with both @solana/kit and @solana/web3.js
|
|
44
47
|
* ```
|
|
@@ -50,28 +53,26 @@ const instruction_converter_1 = require("../utils/instruction-converter");
|
|
|
50
53
|
* Internal function to close a contract instruction with configuration options
|
|
51
54
|
*/
|
|
52
55
|
async function _closeContract(params, config) {
|
|
53
|
-
const { owner, fleet, contract, faction,
|
|
54
|
-
// Get the
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
const ownerAddress = typeof owner === 'string' ? owner :
|
|
58
|
-
(owner && typeof owner === 'object' && 'address' in owner) ? owner.address : owner;
|
|
59
|
-
const derivedAccounts = await (0, utils_1.deriveGameAccounts)(ownerAddress, faction, actualGameId, 0, // starbaseSeqId
|
|
56
|
+
const { owner, fleet, contract, faction, } = params;
|
|
57
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
58
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
59
|
+
const derivedAccounts = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(owner), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
|
|
60
60
|
config);
|
|
61
61
|
// Get network-specific codama functions from centralized config
|
|
62
62
|
const instructionsModule = (0, config_1.getModule)('instructions');
|
|
63
63
|
const programsModule = (0, config_1.getModule)('programs');
|
|
64
64
|
const { getCloseContractInstructionAsync } = instructionsModule;
|
|
65
|
-
const { SRSLY_PROGRAM_ADDRESS
|
|
65
|
+
const { SRSLY_PROGRAM_ADDRESS } = programsModule;
|
|
66
66
|
// Let codama handle all the account derivation and instruction building
|
|
67
67
|
const input = {
|
|
68
68
|
owner, // Pass as-is (string or signer)
|
|
69
|
-
fleet: (0, constants_1.toAddress)(fleet), //
|
|
70
|
-
contract: (0, constants_1.toAddress)(contract), //
|
|
71
|
-
starbase: derivedAccounts.starbase, //
|
|
72
|
-
starbasePlayer: derivedAccounts.starbasePlayer, //
|
|
73
|
-
gameId:
|
|
74
|
-
|
|
69
|
+
fleet: (0, constants_1.toAddress)(fleet), // Convert fleet to Address
|
|
70
|
+
contract: (0, constants_1.toAddress)(contract), // Convert contract to Address
|
|
71
|
+
starbase: (0, constants_1.toAddress)(derivedAccounts.starbase), // Convert starbase to Address
|
|
72
|
+
starbasePlayer: (0, constants_1.toAddress)(derivedAccounts.starbasePlayer), // Convert starbasePlayer to Address
|
|
73
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolved config or param override
|
|
74
|
+
mint: resolvedAddresses.atlasMint, // Already Address from resolveProgramAddresses
|
|
75
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
75
76
|
};
|
|
76
77
|
const rawInstruction = await getCloseContractInstructionAsync(input, { programAddress: SRSLY_PROGRAM_ADDRESS });
|
|
77
78
|
return (0, instruction_converter_1.createFluentInstruction)(rawInstruction);
|
|
@@ -91,7 +92,7 @@ async function _closeContract(params, config) {
|
|
|
91
92
|
* await closeContract(params).set({ programs: 'mainnet' });
|
|
92
93
|
*
|
|
93
94
|
* // Override game ID
|
|
94
|
-
* await closeContract(params).set({ gameId: 'custom...' });
|
|
95
|
+
* await closeContract(params).set({ gameId: 'custom...' }); // gameId configured via .set()
|
|
95
96
|
* ```
|
|
96
97
|
*/
|
|
97
98
|
function closeContract(params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/contract/close.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/contract/close.ts"],"names":[],"mappings":";;AAkJA,sCAKC;AAGD,4EAKC;AA/JD,4CAAoI;AACpI,kDAA+C;AAC/C,oCAA8C;AAC9C,0EAAwJ;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,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,eAAe,GAAG,MAAM,IAAA,0BAAkB,EAC9C,IAAA,qBAAS,EAAC,KAAK,CAAC,EAChB,OAAQ,EACR,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,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,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAmB,2BAA2B;QACrE,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAa,8BAA8B;QACxE,QAAQ,EAAE,IAAA,qBAAS,EAAC,eAAe,CAAC,QAAQ,CAAC,EAAQ,8BAA8B;QACnF,cAAc,EAAE,IAAA,qBAAS,EAAC,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,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAgB,aAAa,CAC3B,MAA2B;IAE3B,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtF,OAAO,IAAA,kDAA0B,EAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,8DAA8D;AAC9D,SAAgB,gCAAgC,CAAC,KAAU,EAAE,OAAa;IACxE,OAAO,IAAA,6BAAoB,EAAC,KAAK,IAAI,EAAE;QACrC,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,gCAAgC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -14,7 +14,7 @@ const instruction_converter_1 = require("../utils/instruction-converter");
|
|
|
14
14
|
* Internal function to create a rental contract instruction with configuration options
|
|
15
15
|
*/
|
|
16
16
|
async function _createContract(params, config) {
|
|
17
|
-
const { owner, fleet, ownerProfile, rate, durationMax, paymentsFreq,
|
|
17
|
+
const { owner, fleet, ownerProfile, rate, durationMax, paymentsFreq, ownerKeyIndex = 0, } = params;
|
|
18
18
|
// Validate payment frequency
|
|
19
19
|
if (!(0, paymentFrequency_2.isValidPaymentFrequency)(paymentsFreq)) {
|
|
20
20
|
throw new Error(`Invalid payment frequency: "${paymentsFreq}". Valid values are: ${JSON.stringify(Object.keys({ daily: true, weekly: true, monthly: true, hourly: true }))}`);
|
|
@@ -25,17 +25,15 @@ async function _createContract(params, config) {
|
|
|
25
25
|
const durationMin = (0, paymentFrequency_1.paymentFrequencyStringToSeconds)(paymentsFreq);
|
|
26
26
|
// Convert the payment frequency to the format expected by the Rust program (with @ prefix)
|
|
27
27
|
const paymentsFreqWithPrefix = `@${paymentsFreq}`;
|
|
28
|
-
// Get
|
|
29
|
-
const
|
|
30
|
-
const actualSageProgramAddress = sageProgramAddress ? (0, constants_1.toAddress)(sageProgramAddress) : await (0, constants_1.getSageProgramAddress)(config);
|
|
31
|
-
const actualAtlasMint = atlasMint ? (0, constants_1.toAddress)(atlasMint) : await (0, constants_1.getAtlasMint)(config);
|
|
28
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
29
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
32
30
|
const input = {
|
|
33
31
|
owner, // Pass as-is (string or signer)
|
|
34
|
-
fleet: (0, constants_1.toAddress)(fleet), //
|
|
35
|
-
ownerProfile: (0, constants_1.toAddress)(ownerProfile), //
|
|
36
|
-
gameId:
|
|
37
|
-
sageProgram:
|
|
38
|
-
mint:
|
|
32
|
+
fleet: (0, constants_1.toAddress)(fleet), // Convert fleet to Address
|
|
33
|
+
ownerProfile: (0, constants_1.toAddress)(ownerProfile), // Convert ownerProfile to Address
|
|
34
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
|
|
35
|
+
sageProgram: resolvedAddresses.sageProgramAddress, // Already Address from resolveProgramAddresses
|
|
36
|
+
mint: resolvedAddresses.atlasMint, // Already Address from resolveProgramAddresses
|
|
39
37
|
durationMin,
|
|
40
38
|
durationMax,
|
|
41
39
|
rate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/contract/create.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/contract/create.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AA6HH,wCAGC;AA9HD,4CAA+G;AAC/G,kDAA+C;AAC/C,gEAAuG;AACvG,gEAA4F;AAC5F,0EAAwJ;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,IAAA,0CAAuB,EAAC,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,IAAA,4CAAyB,EAAC,MAAM,CAAC,WAAW,CAAC,EAAE,YAAY,CAAC,CAAC;IAE7D,yEAAyE;IACzE,MAAM,WAAW,GAAG,IAAA,kDAA+B,EAAC,YAAY,CAAC,CAAC;IAElE,2FAA2F;IAC3F,MAAM,sBAAsB,GAAG,IAAI,YAAY,EAAE,CAAC;IAElD,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,MAAM,KAAK,GAAG;QACZ,KAAK,EAAqC,gCAAgC;QAC1E,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAkB,2BAA2B;QACpE,YAAY,EAAE,IAAA,qBAAS,EAAC,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,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,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,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH,SAAgB,cAAc,CAAC,MAA4B;IACzD,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACvF,OAAO,IAAA,kDAA0B,EAAC,YAAY,CAAC,CAAC;AAClD,CAAC"}
|
package/dist/cjs/package.json
CHANGED
|
@@ -10,14 +10,14 @@ const instruction_converter_1 = require("../utils/instruction-converter");
|
|
|
10
10
|
* Internal function to accept a rental instruction with configuration options
|
|
11
11
|
*/
|
|
12
12
|
async function _acceptRental(params, config) {
|
|
13
|
-
const { borrower, borrowerProfile, borrowerFaction, fleet, contract,
|
|
14
|
-
// Get the
|
|
15
|
-
const
|
|
13
|
+
const { borrower, borrowerProfile, borrowerFaction, fleet, contract, rate, duration, referralTokenAccount, } = params;
|
|
14
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
15
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
16
16
|
// Calculate the total amount from rate and duration
|
|
17
17
|
// Convert ATLAS to stardust (smallest unit): 1 ATLAS = 100,000,000 stardust
|
|
18
18
|
const amount = BigInt(rate) * BigInt(duration) * BigInt(constants_1.ATLAS_TO_STARDUST);
|
|
19
19
|
// Derive the three accounts we need
|
|
20
|
-
const { profileFaction, starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(borrowerProfile), borrowerFaction,
|
|
20
|
+
const { profileFaction, starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(borrowerProfile), borrowerFaction, resolvedAddresses.gameId, 0, // starbaseSeqId
|
|
21
21
|
config);
|
|
22
22
|
// Let codama derive the rest (rentalThread, rentalState, rentalAuthority, etc.)
|
|
23
23
|
const input = {
|
|
@@ -26,7 +26,7 @@ async function _acceptRental(params, config) {
|
|
|
26
26
|
borrowerProfileFaction: profileFaction, // Already string from deriveGameAccounts
|
|
27
27
|
fleet: (0, constants_1.toAddress)(fleet), // Ensure string
|
|
28
28
|
contract: (0, constants_1.toAddress)(contract), // Ensure string
|
|
29
|
-
gameId:
|
|
29
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
|
|
30
30
|
starbase, // Already string from deriveGameAccounts
|
|
31
31
|
starbasePlayer, // Already string from deriveGameAccounts
|
|
32
32
|
amount, // BigInt value
|
|
@@ -75,7 +75,7 @@ async function _acceptRental(params, config) {
|
|
|
75
75
|
* // Override specific constants
|
|
76
76
|
* const instruction = await acceptRental(params).set({
|
|
77
77
|
* programs: 'mainnet',
|
|
78
|
-
* gameId: 'custom-game-id...'
|
|
78
|
+
* gameId: 'custom-game-id...' // gameId configured via .set()
|
|
79
79
|
* });
|
|
80
80
|
*
|
|
81
81
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"accept.js","sourceRoot":"","sources":["../../../src/rental/accept.ts"],"names":[],"mappings":";;AAuKA,oCAKC;AAED,0EAKC;AAnLD,4CAAoI;AACpI,kDAAkE;AAClE,oCAA8C;AAC9C,0EAAwJ;AAsDxJ;;GAEG;AACH,KAAK,UAAU,aAAa,CAC1B,MAA0B,EAC1B,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,eAAe,EACf,eAAe,EACf,KAAK,EACL,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,oBAAoB,GACrB,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,oDAAoD;IACpD,4EAA4E;IAC5E,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,6BAAiB,CAAC,CAAC;IAE3E,oCAAoC;IACpC,MAAM,EACJ,cAAc,EACd,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,IAAA,qBAAS,EAAC,eAAe,CAAC,EAC1B,eAAe,EACf,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gFAAgF;IAChF,MAAM,KAAK,GAAoC;QAC7C,QAAQ,EAAwC,gCAAgC;QAChF,eAAe,EAAE,IAAA,qBAAS,EAAC,eAAe,CAAC,EAAK,gBAAgB;QAChE,sBAAsB,EAAE,cAAc,EAAU,yCAAyC;QACzF,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAyB,gBAAgB;QAChE,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAmB,gBAAgB;QAChE,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAe,+CAA+C;QAC9F,QAAQ,EAAuC,yCAAyC;QACxF,cAAc,EAAiC,yCAAyC;QACxF,MAAM,EAAyC,eAAe;QAC9D,QAAQ,EAAuC,eAAe;QAC9D,oBAAoB,EAAE,oBAAoB,CAAC,CAAC,CAAC,IAAA,qBAAS,EAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,SAAS;KACzF,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,+BAA+B,EAAE,GAAG,kBAAkB,CAAC;IAC/D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,MAAM,cAAc,GAAG,MAAM,+BAA+B,CAC1D,KAAY,EACZ,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;IACF,OAAO,IAAA,+CAAuB,EAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,SAAgB,YAAY,CAC1B,MAA0B;IAE1B,MAAM,YAAY,GAAG,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACrF,OAAO,IAAA,kDAA0B,EAAC,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,SAAgB,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -9,6 +9,8 @@ const constants_1 = require("../utils/constants");
|
|
|
9
9
|
*/
|
|
10
10
|
async function _cancelRental(params, config) {
|
|
11
11
|
const { borrower, contract, } = params;
|
|
12
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
13
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
12
14
|
// Let codama derive all the optional accounts
|
|
13
15
|
const input = {
|
|
14
16
|
borrower, // Pass as-is (string or signer)
|
|
@@ -37,8 +39,7 @@ async function _cancelRental(params, config) {
|
|
|
37
39
|
*
|
|
38
40
|
* // Override specific constants
|
|
39
41
|
* const instruction = await cancelRental(params).set({
|
|
40
|
-
* programs: 'mainnet'
|
|
41
|
-
* sageProgramAddress: 'custom...'
|
|
42
|
+
* programs: 'mainnet'
|
|
42
43
|
* });
|
|
43
44
|
*
|
|
44
45
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../src/rental/cancel.ts"],"names":[],"mappings":";;AAkFA,oCAIC;AAED,0EAKC;AA7FD,4CAAoI;AACpI,kDAA+C;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,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,8CAA8C;IAC9C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAqB,gCAAgC;QAC7D,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAE,gBAAgB;KAChD,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,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,SAAgB,YAAY,CAC1B,MAA0B;IAE1B,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAgB,+BAA+B,CAAC,KAAU,EAAE,OAAa;IACvE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,+BAA+B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cjs/rental/close.js
CHANGED
|
@@ -9,6 +9,8 @@ const constants_1 = require("../utils/constants");
|
|
|
9
9
|
*/
|
|
10
10
|
async function _closeRental(params, config) {
|
|
11
11
|
const { borrower, ownerTokenAccount, contract, } = params;
|
|
12
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
13
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
12
14
|
// Let codama derive the optional accounts
|
|
13
15
|
const input = {
|
|
14
16
|
borrower: (0, constants_1.toAddress)(borrower), // Ensure string
|
|
@@ -39,8 +41,7 @@ async function _closeRental(params, config) {
|
|
|
39
41
|
*
|
|
40
42
|
* // Override specific constants
|
|
41
43
|
* const instruction = await closeRental(params).set({
|
|
42
|
-
* programs: 'mainnet'
|
|
43
|
-
* sageProgramAddress: 'custom...'
|
|
44
|
+
* programs: 'mainnet'
|
|
44
45
|
* });
|
|
45
46
|
*
|
|
46
47
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"close.js","sourceRoot":"","sources":["../../../src/rental/close.ts"],"names":[],"mappings":";;AAyFA,kCAIC;AAED,wEAKC;AApGD,4CAAoI;AACpI,kDAA+C;AA0B/C;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,0CAA0C;IAC1C,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAgB,gBAAgB;QAC7D,iBAAiB,EAAE,IAAA,qBAAS,EAAC,iBAAiB,CAAC,EAAE,gBAAgB;QACjE,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAe,gBAAgB;KAC7D,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,8BAA8B,EAAE,GAAG,kBAAkB,CAAC;IAC9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cjs/rental/reset.js
CHANGED
|
@@ -9,11 +9,11 @@ const utils_1 = require("../utils");
|
|
|
9
9
|
* Internal function to reset a rental instruction with configuration options
|
|
10
10
|
*/
|
|
11
11
|
async function _resetRental(params, config) {
|
|
12
|
-
const { fleet, contract, rentalState,
|
|
13
|
-
// Get the
|
|
14
|
-
const
|
|
12
|
+
const { fleet, contract, rentalState, faction, ownerProfile, } = params;
|
|
13
|
+
// Get the resolved addresses from config (including network-specific addresses)
|
|
14
|
+
const resolvedAddresses = (0, config_1.resolveProgramAddresses)(config || {});
|
|
15
15
|
// Derive the three accounts we need
|
|
16
|
-
const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction,
|
|
16
|
+
const { starbase, starbasePlayer } = await (0, utils_1.deriveGameAccounts)((0, constants_1.toAddress)(ownerProfile), faction, resolvedAddresses.gameId, 0, // starbaseSeqId
|
|
17
17
|
config);
|
|
18
18
|
// Get network-specific codama functions from centralized config
|
|
19
19
|
const instructionsModule = (0, config_1.getModule)('instructions');
|
|
@@ -25,7 +25,7 @@ async function _resetRental(params, config) {
|
|
|
25
25
|
fleet: (0, constants_1.toAddress)(fleet), // Ensure string
|
|
26
26
|
contract: (0, constants_1.toAddress)(contract), // Ensure string
|
|
27
27
|
rentalState: (0, constants_1.toAddress)(rentalState), // Ensure string
|
|
28
|
-
gameId:
|
|
28
|
+
gameId: resolvedAddresses.gameId, // Already Address from resolveProgramAddresses
|
|
29
29
|
starbase, // Already string from deriveGameAccounts
|
|
30
30
|
starbasePlayer, // Already string from deriveGameAccounts
|
|
31
31
|
};
|
|
@@ -51,8 +51,7 @@ async function _resetRental(params, config) {
|
|
|
51
51
|
* // Override specific constants
|
|
52
52
|
* const instruction = await resetRental(params).set({
|
|
53
53
|
* programs: 'mainnet',
|
|
54
|
-
* gameId: 'custom-game-id...'
|
|
55
|
-
* sageProgramAddress: 'custom...'
|
|
54
|
+
* gameId: 'custom-game-id...' // gameId configured via .set()
|
|
56
55
|
* });
|
|
57
56
|
*
|
|
58
57
|
* // Use the instruction with your preferred Solana library
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"reset.js","sourceRoot":"","sources":["../../../src/rental/reset.ts"],"names":[],"mappings":";;AA2HA,kCAIC;AAED,wEAKC;AAtID,4CAAoI;AACpI,kDAA+C;AAC/C,oCAA8C;AAuC9C;;GAEG;AACH,KAAK,UAAU,YAAY,CACzB,MAAyB,EACzB,MAAsB;IAEtB,MAAM,EACJ,KAAK,EACL,QAAQ,EACR,WAAW,EACX,OAAO,EACP,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,gFAAgF;IAChF,MAAM,iBAAiB,GAAG,IAAA,gCAAuB,EAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IAEhE,oCAAoC;IACpC,MAAM,EACJ,QAAQ,EACR,cAAc,EACf,GAAG,MAAM,IAAA,0BAAkB,EAC1B,IAAA,qBAAS,EAAC,YAAY,CAAC,EACvB,OAAO,EACP,iBAAiB,CAAC,MAAM,EACxB,CAAC,EAAE,gBAAgB;IACnB,MAAM,CACP,CAAC;IAEF,gEAAgE;IAChE,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;IACrD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,UAAU,CAAC,CAAC;IAC7C,MAAM,EAAE,8BAA8B,EAAE,GAAG,kBAAkB,CAAC;IAC9D,MAAM,EAAE,qBAAqB,EAAE,GAAG,cAAc,CAAC;IAEjD,+CAA+C;IAC/C,MAAM,KAAK,GAAG;QACZ,KAAK,EAAE,IAAA,qBAAS,EAAC,KAAK,CAAC,EAAW,gBAAgB;QAClD,QAAQ,EAAE,IAAA,qBAAS,EAAC,QAAQ,CAAC,EAAK,gBAAgB;QAClD,WAAW,EAAE,IAAA,qBAAS,EAAC,WAAW,CAAC,EAAE,gBAAgB;QACrD,MAAM,EAAE,iBAAiB,CAAC,MAAM,EAAE,+CAA+C;QACjF,QAAQ,EAAyB,yCAAyC;QAC1E,cAAc,EAAmB,yCAAyC;KAC3E,CAAC;IAEF,OAAO,8BAA8B,CACnC,KAAK,EACL,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAC1C,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,SAAgB,WAAW,CACzB,MAAyB;IAEzB,OAAO,IAAA,6BAAoB,EAAC,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACxE,CAAC;AAED,SAAgB,8BAA8B,CAAC,KAAU,EAAE,OAAa;IACtE,OAAO,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QAC3C,MAAM,kBAAkB,GAAG,IAAA,kBAAS,EAAC,cAAc,CAAC,CAAC;QACrD,OAAO,kBAAkB,CAAC,8BAA8B,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cjs/utils/config.js
CHANGED
|
@@ -49,6 +49,7 @@ const instructions = __importStar(require("../codama/instructions"));
|
|
|
49
49
|
const programs = __importStar(require("../codama/programs"));
|
|
50
50
|
const accounts = __importStar(require("../codama/accounts"));
|
|
51
51
|
const kit_1 = require("@solana/kit");
|
|
52
|
+
const constants_1 = require("./constants");
|
|
52
53
|
const PROGRAM_SETS = {
|
|
53
54
|
mainnet: {
|
|
54
55
|
SAGE_PROGRAM_ADDRESS: 'SAGE2HAwep459SNq61LHvjxPk4pLPEJLoMETef7f7EE',
|
|
@@ -88,11 +89,11 @@ function resolveProgramAddresses(config) {
|
|
|
88
89
|
throw new Error(`Unknown program set: ${programSet}. Available: ${Object.keys(PROGRAM_SETS).join(', ')}`);
|
|
89
90
|
}
|
|
90
91
|
return {
|
|
91
|
-
srslyProgramAddress: config.srslyProgramAddress || 'SRSLY1fq9TJqCk1gNSE7VZL2bztvTn9wm4VR8u8jMKT',
|
|
92
|
-
sageProgramAddress: programConfig.SAGE_PROGRAM_ADDRESS, // Fixed - cannot be overridden
|
|
93
|
-
profileFactionProgramAddress: config.profileFactionProgramAddress || programConfig.PROFILE_FACTION_PROGRAM_ADDRESS,
|
|
94
|
-
gameId: config.gameId || programConfig.SAGE_GAME_ID,
|
|
95
|
-
atlasMint: config.atlasMint || programConfig.ATLAS_MINT,
|
|
92
|
+
srslyProgramAddress: (0, constants_1.toAddress)(config.srslyProgramAddress || 'SRSLY1fq9TJqCk1gNSE7VZL2bztvTn9wm4VR8u8jMKT'),
|
|
93
|
+
sageProgramAddress: (0, constants_1.toAddress)(programConfig.SAGE_PROGRAM_ADDRESS), // Fixed - cannot be overridden
|
|
94
|
+
profileFactionProgramAddress: (0, constants_1.toAddress)(config.profileFactionProgramAddress || programConfig.PROFILE_FACTION_PROGRAM_ADDRESS),
|
|
95
|
+
gameId: (0, constants_1.toAddress)(config.gameId || programConfig.SAGE_GAME_ID),
|
|
96
|
+
atlasMint: (0, constants_1.toAddress)(config.atlasMint || programConfig.ATLAS_MINT),
|
|
96
97
|
};
|
|
97
98
|
}
|
|
98
99
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":";AAAA;;GAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/utils/config.ts"],"names":[],"mappings":"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"}
|