@wuwei-labs/srsly 3.0.0-beta.24 → 3.0.0-beta.26
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 +0 -1
- package/dist/cjs/demos.js.map +1 -1
- package/dist/cjs/generated/codama/accounts/thread.js +0 -2
- package/dist/cjs/generated/codama/accounts/thread.js.map +1 -1
- package/dist/cjs/generated/codama/instructions/closeContractThread.js.map +1 -1
- package/dist/cjs/generated/codama/types/contractProcessed.js +33 -0
- package/dist/cjs/generated/codama/types/contractProcessed.js.map +1 -0
- package/dist/cjs/generated/codama/types/index.js +2 -2
- package/dist/cjs/generated/codama/types/index.js.map +1 -1
- package/dist/cjs/generated/codama/types/rentalExpired.js +31 -0
- package/dist/cjs/generated/codama/types/rentalExpired.js.map +1 -0
- package/dist/cjs/instructions/acceptRental.js +37 -9
- package/dist/cjs/instructions/acceptRental.js.map +1 -1
- package/dist/cjs/instructions/createContract.js +36 -1
- package/dist/cjs/instructions/createContract.js.map +1 -1
- package/dist/cjs/package.json +1 -1
- package/dist/cjs/pda/lookupTable.js +3 -2
- package/dist/cjs/pda/lookupTable.js.map +1 -1
- package/dist/cjs/pda/sage.js +11 -10
- package/dist/cjs/pda/sage.js.map +1 -1
- package/dist/cjs/pda/srsly.js +9 -8
- package/dist/cjs/pda/srsly.js.map +1 -1
- package/dist/cjs/pda/thread.js +6 -5
- package/dist/cjs/pda/thread.js.map +1 -1
- package/dist/cjs/pda/token.js +5 -4
- package/dist/cjs/pda/token.js.map +1 -1
- package/dist/cjs/utils/signer.js +8 -1
- package/dist/cjs/utils/signer.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/demos.js +0 -1
- package/dist/esm/demos.js.map +1 -1
- package/dist/esm/generated/codama/accounts/thread.js +1 -3
- package/dist/esm/generated/codama/accounts/thread.js.map +1 -1
- package/dist/esm/generated/codama/instructions/closeContractThread.js.map +1 -1
- package/dist/esm/generated/codama/types/contractProcessed.js +28 -0
- package/dist/esm/generated/codama/types/contractProcessed.js.map +1 -0
- package/dist/esm/generated/codama/types/index.js +2 -2
- package/dist/esm/generated/codama/types/index.js.map +1 -1
- package/dist/esm/generated/codama/types/rentalExpired.js +26 -0
- package/dist/esm/generated/codama/types/rentalExpired.js.map +1 -0
- package/dist/esm/instructions/acceptRental.js +38 -10
- package/dist/esm/instructions/acceptRental.js.map +1 -1
- package/dist/esm/instructions/createContract.js +38 -3
- package/dist/esm/instructions/createContract.js.map +1 -1
- package/dist/esm/package.json +1 -1
- package/dist/esm/pda/lookupTable.js +3 -2
- package/dist/esm/pda/lookupTable.js.map +1 -1
- package/dist/esm/pda/sage.js +11 -10
- package/dist/esm/pda/sage.js.map +1 -1
- package/dist/esm/pda/srsly.js +9 -8
- package/dist/esm/pda/srsly.js.map +1 -1
- package/dist/esm/pda/thread.js +6 -5
- package/dist/esm/pda/thread.js.map +1 -1
- package/dist/esm/pda/token.js +5 -4
- package/dist/esm/pda/token.js.map +1 -1
- package/dist/esm/utils/signer.js +8 -1
- package/dist/esm/utils/signer.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/idl/srsly.json +50 -53
- package/dist/types/demos.d.ts.map +1 -1
- package/dist/types/generated/codama/accounts/thread.d.ts +1 -3
- package/dist/types/generated/codama/accounts/thread.d.ts.map +1 -1
- package/dist/types/generated/codama/instructions/closeContractThread.d.ts +3 -0
- package/dist/types/generated/codama/instructions/closeContractThread.d.ts.map +1 -1
- package/dist/types/generated/codama/types/contractProcessed.d.ts +24 -0
- package/dist/types/generated/codama/types/contractProcessed.d.ts.map +1 -0
- package/dist/types/generated/codama/types/index.d.ts +2 -2
- package/dist/types/generated/codama/types/index.d.ts.map +1 -1
- package/dist/types/generated/codama/types/rentalExpired.d.ts +18 -0
- package/dist/types/generated/codama/types/rentalExpired.d.ts.map +1 -0
- package/dist/types/instructions/acceptRental.d.ts +8 -0
- package/dist/types/instructions/acceptRental.d.ts.map +1 -1
- package/dist/types/instructions/createContract.d.ts +23 -0
- package/dist/types/instructions/createContract.d.ts.map +1 -1
- package/dist/types/pda/index.d.ts +1 -0
- package/dist/types/pda/index.d.ts.map +1 -1
- package/dist/types/pda/lookupTable.d.ts +2 -1
- package/dist/types/pda/lookupTable.d.ts.map +1 -1
- package/dist/types/pda/sage.d.ts +6 -5
- package/dist/types/pda/sage.d.ts.map +1 -1
- package/dist/types/pda/srsly.d.ts +7 -6
- package/dist/types/pda/srsly.d.ts.map +1 -1
- package/dist/types/pda/thread.d.ts +3 -2
- package/dist/types/pda/thread.d.ts.map +1 -1
- package/dist/types/pda/token.d.ts +2 -1
- package/dist/types/pda/token.d.ts.map +1 -1
- package/dist/types/utils/signer.d.ts +3 -0
- package/dist/types/utils/signer.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +2 -2
package/dist/cjs/pda/thread.js
CHANGED
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.deriveContractThread = deriveContractThread;
|
|
8
8
|
exports.deriveFiber = deriveFiber;
|
|
9
9
|
const kit_1 = require("@solana/kit");
|
|
10
|
+
const signer_1 = require("../utils/signer");
|
|
10
11
|
const constants_1 = require("./constants");
|
|
11
12
|
/**
|
|
12
13
|
* Address encoder for PDA seeds
|
|
@@ -29,10 +30,10 @@ const textEncoder = new TextEncoder();
|
|
|
29
30
|
* @returns The derived contract thread PDA
|
|
30
31
|
*/
|
|
31
32
|
async function deriveContractThread(contract, authority, programAddress) {
|
|
32
|
-
const contractAddress = (0,
|
|
33
|
-
const authorityAddr = (0,
|
|
33
|
+
const contractAddress = (0, signer_1.getSignerAddress)(contract);
|
|
34
|
+
const authorityAddr = (0, signer_1.getSignerAddress)(authority);
|
|
34
35
|
const program = programAddress
|
|
35
|
-
? (0,
|
|
36
|
+
? (0, signer_1.getSignerAddress)(programAddress)
|
|
36
37
|
: (0, kit_1.address)(constants_1.ANTEGEN_THREAD_PROGRAM);
|
|
37
38
|
// Encode seeds to bytes
|
|
38
39
|
// Antegen ALWAYS uses: [SEED_THREAD, authority, id]
|
|
@@ -57,9 +58,9 @@ async function deriveContractThread(contract, authority, programAddress) {
|
|
|
57
58
|
* @returns The derived fiber PDA
|
|
58
59
|
*/
|
|
59
60
|
async function deriveFiber(thread, fiberIndex, programAddress) {
|
|
60
|
-
const threadAddress = (0,
|
|
61
|
+
const threadAddress = (0, signer_1.getSignerAddress)(thread);
|
|
61
62
|
const program = programAddress
|
|
62
|
-
? (0,
|
|
63
|
+
? (0, signer_1.getSignerAddress)(programAddress)
|
|
63
64
|
: (0, kit_1.address)(constants_1.ANTEGEN_FIBER_PROGRAM);
|
|
64
65
|
const fiberSeedBytes = textEncoder.encode(constants_1.THREAD_FIBER_SEED);
|
|
65
66
|
const threadBytes = addressEncoder.encode(threadAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/pda/thread.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../src/pda/thread.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AA4BH,oDAyBC;AAYD,kCAoBC;AAnFD,qCAA4F;AAC5F,4CAAyE;AACzE,2CAA4G;AAE5G;;GAEG;AACH,MAAM,cAAc,GAAG,IAAA,uBAAiB,GAAE,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,oBAAoB,CACxC,QAAyB,EACzB,SAA0B,EAC1B,cAAgC;IAEhC,MAAM,eAAe,GAAG,IAAA,yBAAgB,EAAC,QAAQ,CAAC,CAAC;IACnD,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,SAAS,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,cAAc;QAC5B,CAAC,CAAC,IAAA,yBAAgB,EAAC,cAAc,CAAC;QAClC,CAAC,CAAC,IAAA,aAAO,EAAC,kCAAsB,CAAC,CAAC;IAEpC,wBAAwB;IACxB,oDAAoD;IACpD,MAAM,eAAe,GAAG,WAAW,CAAC,MAAM,CAAC,uBAAW,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAC5D,MAAM,aAAa,GAAG,cAAc,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;IAE7D,MAAM,KAAK,GAAG,CAAC,eAAe,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAE/D,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAA,8BAAwB,EAAC;QAC3C,cAAc,EAAE,OAAO;QACvB,KAAK;KACN,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,WAAW,CAC/B,MAAuB,EACvB,UAAkB,EAClB,cAAgC;IAEhC,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,OAAO,GAAG,cAAc;QAC5B,CAAC,CAAC,IAAA,yBAAgB,EAAC,cAAc,CAAC;QAClC,CAAC,CAAC,IAAA,aAAO,EAAC,iCAAqB,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,6BAAiB,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAA,8BAAwB,EAAC;QAC3C,cAAc,EAAE,OAAO;QACvB,KAAK,EAAE,CAAC,cAAc,EAAE,WAAW,EAAE,UAAU,CAAC;KACjD,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/cjs/pda/token.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.deriveAssociatedTokenAccount = deriveAssociatedTokenAccount;
|
|
8
8
|
const kit_1 = require("@solana/kit");
|
|
9
|
+
const signer_1 = require("../utils/signer");
|
|
9
10
|
/**
|
|
10
11
|
* SPL Token program address
|
|
11
12
|
*/
|
|
@@ -41,13 +42,13 @@ const addressEncoder = (0, kit_1.getAddressEncoder)();
|
|
|
41
42
|
* ```
|
|
42
43
|
*/
|
|
43
44
|
async function deriveAssociatedTokenAccount(owner, mint, tokenProgramAddress, associatedTokenProgramAddress) {
|
|
44
|
-
const ownerAddress = (0,
|
|
45
|
-
const mintAddress = (0,
|
|
45
|
+
const ownerAddress = (0, signer_1.getSignerAddress)(owner);
|
|
46
|
+
const mintAddress = (0, signer_1.getSignerAddress)(mint);
|
|
46
47
|
const tokenProgram = tokenProgramAddress
|
|
47
|
-
? (0,
|
|
48
|
+
? (0, signer_1.getSignerAddress)(tokenProgramAddress)
|
|
48
49
|
: (0, kit_1.address)(TOKEN_PROGRAM);
|
|
49
50
|
const ataProgram = associatedTokenProgramAddress
|
|
50
|
-
? (0,
|
|
51
|
+
? (0, signer_1.getSignerAddress)(associatedTokenProgramAddress)
|
|
51
52
|
: (0, kit_1.address)(ASSOCIATED_TOKEN_PROGRAM);
|
|
52
53
|
// Encode all address seeds to bytes for PDA derivation
|
|
53
54
|
const ownerBytes = addressEncoder.encode(ownerAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/pda/token.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/pda/token.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AA0CH,oEA0BC;AAlED,qCAA4F;AAC5F,4CAAyE;AAEzE;;GAEG;AACH,MAAM,aAAa,GAAG,6CAA6C,CAAC;AAEpE;;GAEG;AACH,MAAM,wBAAwB,GAAG,8CAA8C,CAAC;AAEhF;;GAEG;AACH,MAAM,cAAc,GAAG,IAAA,uBAAiB,GAAE,CAAC;AAE3C;;;;;;;;;;;;;;;;;;;;;GAqBG;AACI,KAAK,UAAU,4BAA4B,CAChD,KAAsB,EACtB,IAAqB,EACrB,mBAAqC,EACrC,6BAA+C;IAE/C,MAAM,YAAY,GAAG,IAAA,yBAAgB,EAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,WAAW,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,YAAY,GAAG,mBAAmB;QACtC,CAAC,CAAC,IAAA,yBAAgB,EAAC,mBAAmB,CAAC;QACvC,CAAC,CAAC,IAAA,aAAO,EAAC,aAAa,CAAC,CAAC;IAC3B,MAAM,UAAU,GAAG,6BAA6B;QAC9C,CAAC,CAAC,IAAA,yBAAgB,EAAC,6BAA6B,CAAC;QACjD,CAAC,CAAC,IAAA,aAAO,EAAC,wBAAwB,CAAC,CAAC;IAEtC,uDAAuD;IACvD,MAAM,UAAU,GAAG,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IACvD,MAAM,iBAAiB,GAAG,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC9D,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,IAAA,8BAAwB,EAAC;QAC3C,cAAc,EAAE,UAAU;QAC1B,KAAK,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,SAAS,CAAC;KAClD,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
package/dist/cjs/utils/signer.js
CHANGED
|
@@ -43,12 +43,18 @@ function getSignerAddress(signer) {
|
|
|
43
43
|
}
|
|
44
44
|
// Handle object signers
|
|
45
45
|
if (signer && typeof signer === 'object') {
|
|
46
|
-
// web3.js Keypair/Wallet format
|
|
46
|
+
// web3.js Keypair/Wallet format (has publicKey.toBase58())
|
|
47
47
|
if ('publicKey' in signer && signer.publicKey && typeof signer.publicKey.toBase58 === 'function') {
|
|
48
48
|
const addr = signer.publicKey.toBase58();
|
|
49
49
|
validateAddress(addr);
|
|
50
50
|
return (0, kit_1.address)(addr);
|
|
51
51
|
}
|
|
52
|
+
// web3.js PublicKey format (has direct toBase58())
|
|
53
|
+
if ('toBase58' in signer && typeof signer.toBase58 === 'function') {
|
|
54
|
+
const addr = signer.toBase58();
|
|
55
|
+
validateAddress(addr);
|
|
56
|
+
return (0, kit_1.address)(addr);
|
|
57
|
+
}
|
|
52
58
|
// @solana/kit signer format
|
|
53
59
|
if ('address' in signer) {
|
|
54
60
|
const addr = String(signer.address);
|
|
@@ -59,6 +65,7 @@ function getSignerAddress(signer) {
|
|
|
59
65
|
throw new Error('Invalid signer format. Expected:\n' +
|
|
60
66
|
' - string address\n' +
|
|
61
67
|
' - web3.js Keypair (with publicKey.toBase58())\n' +
|
|
68
|
+
' - web3.js PublicKey (with toBase58())\n' +
|
|
62
69
|
' - @solana/kit TransactionSigner (with address property)');
|
|
63
70
|
}
|
|
64
71
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../src/utils/signer.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;
|
|
1
|
+
{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../../src/utils/signer.ts"],"names":[],"mappings":"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"}
|
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.25';
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
package/dist/esm/demos.js
CHANGED
|
@@ -227,7 +227,6 @@ import { setSdkConfig, acceptRental, createDiscount } from '@wuwei-labs/srsly/le
|
|
|
227
227
|
setSdkConfig({ PublicKey });`,
|
|
228
228
|
instruction: `const instructions = await acceptRental({
|
|
229
229
|
borrower: {{signerType}},
|
|
230
|
-
borrowerProfile: "BORROWER_PLAYER_PROFILE_ADDRESS",
|
|
231
230
|
contract: "CONTRACT_ADDRESS",
|
|
232
231
|
duration: { days: 7 },
|
|
233
232
|
computeUnits: 275_000
|
package/dist/esm/demos.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"demos.js","sourceRoot":"","sources":["../../src/demos.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* @see https://github.com/codama-idl/codama
|
|
7
7
|
*/
|
|
8
|
-
import { addDecoderSizePrefix, addEncoderSizePrefix, assertAccountExists, assertAccountsExist, combineCodec, decodeAccount, fetchEncodedAccount, fetchEncodedAccounts, fixDecoderSize, fixEncoderSize, getAddressDecoder, getAddressEncoder, getBooleanDecoder, getBooleanEncoder, getBytesDecoder, getBytesEncoder, getI64Decoder, getI64Encoder,
|
|
8
|
+
import { addDecoderSizePrefix, addEncoderSizePrefix, assertAccountExists, assertAccountsExist, combineCodec, decodeAccount, fetchEncodedAccount, fetchEncodedAccounts, fixDecoderSize, fixEncoderSize, getAddressDecoder, getAddressEncoder, getBooleanDecoder, getBooleanEncoder, getBytesDecoder, getBytesEncoder, getI64Decoder, getI64Encoder, getStructDecoder, getStructEncoder, getU32Decoder, getU32Encoder, getU64Decoder, getU64Encoder, getU8Decoder, getU8Encoder, getUtf8Decoder, getUtf8Encoder, transformEncoder, } from "@solana/kit";
|
|
9
9
|
import { getScheduleDecoder, getScheduleEncoder, getSignalDecoder, getSignalEncoder, getTriggerDecoder, getTriggerEncoder, } from "../types";
|
|
10
10
|
export const THREAD_DISCRIMINATOR = new Uint8Array([
|
|
11
11
|
186, 27, 154, 111, 51, 36, 159, 90,
|
|
@@ -32,7 +32,6 @@ export function getThreadEncoder() {
|
|
|
32
32
|
["paused", getBooleanEncoder()],
|
|
33
33
|
["execCount", getU64Encoder()],
|
|
34
34
|
["lastExecutor", getAddressEncoder()],
|
|
35
|
-
["lastErrorTime", getOptionEncoder(getI64Encoder())],
|
|
36
35
|
["nonceAccount", getAddressEncoder()],
|
|
37
36
|
["lastNonce", addEncoderSizePrefix(getUtf8Encoder(), getU32Encoder())],
|
|
38
37
|
["closeFiber", addEncoderSizePrefix(getBytesEncoder(), getU32Encoder())],
|
|
@@ -57,7 +56,6 @@ export function getThreadDecoder() {
|
|
|
57
56
|
["paused", getBooleanDecoder()],
|
|
58
57
|
["execCount", getU64Decoder()],
|
|
59
58
|
["lastExecutor", getAddressDecoder()],
|
|
60
|
-
["lastErrorTime", getOptionDecoder(getI64Decoder())],
|
|
61
59
|
["nonceAccount", getAddressDecoder()],
|
|
62
60
|
["lastNonce", addDecoderSizePrefix(getUtf8Decoder(), getU32Decoder())],
|
|
63
61
|
["closeFiber", addDecoderSizePrefix(getBytesDecoder(), getU32Decoder())],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../../../src/generated/codama/accounts/thread.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,mBAAmB,EACnB,mBAAmB,EACnB,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,oBAAoB,EACpB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,aAAa,EACb,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"thread.js","sourceRoot":"","sources":["../../../../../src/generated/codama/accounts/thread.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"closeContractThread.js","sourceRoot":"","sources":["../../../../../src/generated/codama/instructions/closeContractThread.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,wBAAwB,EACxB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,GAejB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAwB,MAAM,WAAW,CAAC;AAExE,MAAM,CAAC,MAAM,mCAAmC,GAAG,IAAI,UAAU,CAAC;IAChE,GAAG,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CACpC,CAAC,CAAC;AAEH,MAAM,UAAU,wCAAwC;IACtD,OAAO,cAAc,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAChD,mCAAmC,CACpC,CAAC;AACJ,CAAC;AAmDD,MAAM,UAAU,4CAA4C;IAC1D,OAAO,gBAAgB,CACrB,gBAAgB,CAAC,CAAC,CAAC,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAC3E,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,GAAG,KAAK;QACR,aAAa,EAAE,mCAAmC;KACnD,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4CAA4C;IAC1D,OAAO,gBAAgB,CAAC;QACtB,CAAC,eAAe,EAAE,cAAc,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;KACxD,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,0CAA0C;IAIxD,OAAO,YAAY,CACjB,4CAA4C,EAAE,EAC9C,4CAA4C,EAAE,CAC/C,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"closeContractThread.js","sourceRoot":"","sources":["../../../../../src/generated/codama/instructions/closeContractThread.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was AUTOGENERATED using the Codama library.
|
|
3
|
+
* Please DO NOT EDIT THIS FILE, instead use visitors
|
|
4
|
+
* to add features, then rerun Codama to update it.
|
|
5
|
+
*
|
|
6
|
+
* @see https://github.com/codama-idl/codama
|
|
7
|
+
*/
|
|
8
|
+
import { combineCodec, getAddressDecoder, getAddressEncoder, getBooleanDecoder, getBooleanEncoder, getStructDecoder, getStructEncoder, getU64Decoder, getU64Encoder, } from "@solana/kit";
|
|
9
|
+
export function getContractProcessedEncoder() {
|
|
10
|
+
return getStructEncoder([
|
|
11
|
+
["rentalState", getAddressEncoder()],
|
|
12
|
+
["contract", getAddressEncoder()],
|
|
13
|
+
["paymentAmount", getU64Encoder()],
|
|
14
|
+
["isFinal", getBooleanEncoder()],
|
|
15
|
+
]);
|
|
16
|
+
}
|
|
17
|
+
export function getContractProcessedDecoder() {
|
|
18
|
+
return getStructDecoder([
|
|
19
|
+
["rentalState", getAddressDecoder()],
|
|
20
|
+
["contract", getAddressDecoder()],
|
|
21
|
+
["paymentAmount", getU64Decoder()],
|
|
22
|
+
["isFinal", getBooleanDecoder()],
|
|
23
|
+
]);
|
|
24
|
+
}
|
|
25
|
+
export function getContractProcessedCodec() {
|
|
26
|
+
return combineCodec(getContractProcessedEncoder(), getContractProcessedDecoder());
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=contractProcessed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contractProcessed.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/contractProcessed.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,aAAa,GAKd,MAAM,aAAa,CAAC;AAgBrB,MAAM,UAAU,2BAA2B;IACzC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;QAClC,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC;KACjC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,OAAO,gBAAgB,CAAC;QACtB,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;QACpC,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,eAAe,EAAE,aAAa,EAAE,CAAC;QAClC,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAC;KACjC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,yBAAyB;IAIvC,OAAO,YAAY,CACjB,2BAA2B,EAAE,EAC7B,2BAA2B,EAAE,CAC9B,CAAC;AACJ,CAAC"}
|
|
@@ -12,6 +12,7 @@ export * from "./contractClosed";
|
|
|
12
12
|
export * from "./contractCreated";
|
|
13
13
|
export * from "./contractDelegateSet";
|
|
14
14
|
export * from "./contractPendingClose";
|
|
15
|
+
export * from "./contractProcessed";
|
|
15
16
|
export * from "./contractThreadClosed";
|
|
16
17
|
export * from "./contractThreadCreated";
|
|
17
18
|
export * from "./contractThreadUpdated";
|
|
@@ -26,8 +27,7 @@ export * from "./rentalAccepted";
|
|
|
26
27
|
export * from "./rentalActivated";
|
|
27
28
|
export * from "./rentalCancelled";
|
|
28
29
|
export * from "./rentalClosed";
|
|
29
|
-
export * from "./
|
|
30
|
-
export * from "./rentalPaymentProcessed";
|
|
30
|
+
export * from "./rentalExpired";
|
|
31
31
|
export * from "./rentalStatus";
|
|
32
32
|
export * from "./reservationCreated";
|
|
33
33
|
export * from "./reservationKnockoff";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was AUTOGENERATED using the Codama library.
|
|
3
|
+
* Please DO NOT EDIT THIS FILE, instead use visitors
|
|
4
|
+
* to add features, then rerun Codama to update it.
|
|
5
|
+
*
|
|
6
|
+
* @see https://github.com/codama-idl/codama
|
|
7
|
+
*/
|
|
8
|
+
import { combineCodec, getAddressDecoder, getAddressEncoder, getStructDecoder, getStructEncoder, } from "@solana/kit";
|
|
9
|
+
export function getRentalExpiredEncoder() {
|
|
10
|
+
return getStructEncoder([
|
|
11
|
+
["contract", getAddressEncoder()],
|
|
12
|
+
["expiredBorrower", getAddressEncoder()],
|
|
13
|
+
["newBorrower", getAddressEncoder()],
|
|
14
|
+
]);
|
|
15
|
+
}
|
|
16
|
+
export function getRentalExpiredDecoder() {
|
|
17
|
+
return getStructDecoder([
|
|
18
|
+
["contract", getAddressDecoder()],
|
|
19
|
+
["expiredBorrower", getAddressDecoder()],
|
|
20
|
+
["newBorrower", getAddressDecoder()],
|
|
21
|
+
]);
|
|
22
|
+
}
|
|
23
|
+
export function getRentalExpiredCodec() {
|
|
24
|
+
return combineCodec(getRentalExpiredEncoder(), getRentalExpiredDecoder());
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=rentalExpired.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rentalExpired.js","sourceRoot":"","sources":["../../../../../src/generated/codama/types/rentalExpired.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GAKjB,MAAM,aAAa,CAAC;AAUrB,MAAM,UAAU,uBAAuB;IACrC,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;QACxC,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO,gBAAgB,CAAC;QACtB,CAAC,UAAU,EAAE,iBAAiB,EAAE,CAAC;QACjC,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,CAAC;QACxC,CAAC,aAAa,EAAE,iBAAiB,EAAE,CAAC;KACrC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,qBAAqB;IAInC,OAAO,YAAY,CAAC,uBAAuB,EAAE,EAAE,uBAAuB,EAAE,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -14,12 +14,14 @@ import { fetchFleet } from '../accounts/fleet';
|
|
|
14
14
|
import { fetchContract } from '../accounts/contract';
|
|
15
15
|
import { fetchConfig } from '../accounts/config';
|
|
16
16
|
import { fetchBorrower } from '../accounts/borrower';
|
|
17
|
+
import { fetchRental } from '../accounts/rental';
|
|
17
18
|
import { deriveGameAccounts } from '../pda/sage';
|
|
18
|
-
import { deriveActiveRental, deriveRentalAuthority } from '../pda/srsly';
|
|
19
|
+
import { deriveActiveRental, deriveBorrowerState, deriveRentalAuthority } from '../pda/srsly';
|
|
19
20
|
import { deriveAssociatedTokenAccount } from '../pda/token';
|
|
20
21
|
import { deriveContractThread, deriveFiber } from '../pda/thread';
|
|
21
22
|
import { prepareInstructions } from '../utils/instructions';
|
|
22
23
|
import { deserializeDiscountAuth } from '../utils/discountAuth';
|
|
24
|
+
import { RentalStatus } from '../generated/codama/types';
|
|
23
25
|
/**
|
|
24
26
|
* Accept a rental contract
|
|
25
27
|
*
|
|
@@ -61,18 +63,17 @@ export async function acceptRental(params, config) {
|
|
|
61
63
|
}
|
|
62
64
|
// Convert borrower to transaction signer
|
|
63
65
|
const borrowerSigner = toTransactionSigner(params.borrower);
|
|
64
|
-
//
|
|
66
|
+
// Use param if provided, auto-fetch only when omitted
|
|
65
67
|
let borrowerProfile;
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
borrowerProfile = borrowerAccount.data.borrowerProfile;
|
|
68
|
+
if (params.borrowerProfile) {
|
|
69
|
+
borrowerProfile = address(params.borrowerProfile);
|
|
69
70
|
}
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
borrowerProfile =
|
|
71
|
+
else {
|
|
72
|
+
try {
|
|
73
|
+
const borrowerAccount = await fetchBorrower(borrowerSigner.address, finalConfig.rpcUrl);
|
|
74
|
+
borrowerProfile = borrowerAccount.data.borrowerProfile;
|
|
74
75
|
}
|
|
75
|
-
|
|
76
|
+
catch {
|
|
76
77
|
throw new Error('borrowerProfile is required for first-time borrowers');
|
|
77
78
|
}
|
|
78
79
|
}
|
|
@@ -98,6 +99,32 @@ export async function acceptRental(params, config) {
|
|
|
98
99
|
const gameAccounts = await deriveGameAccounts(borrowerProfile, faction, gameId);
|
|
99
100
|
// Derive active rental PDA (no more slot logic)
|
|
100
101
|
const rentalState = await deriveActiveRental(params.contract);
|
|
102
|
+
// Resolve expiredBorrowerState: use param if provided, otherwise auto-detect
|
|
103
|
+
// When the same borrower re-rents their own expired contract, skip passing
|
|
104
|
+
// expiredBorrowerState to avoid Anchor's duplicate mutable account error.
|
|
105
|
+
const borrowerStatePda = await deriveBorrowerState(borrowerSigner);
|
|
106
|
+
let expiredBorrowerState;
|
|
107
|
+
if (params.expiredBorrowerState) {
|
|
108
|
+
const explicit = address(params.expiredBorrowerState);
|
|
109
|
+
// Don't pass if it matches the current borrower's state (same-borrower re-rent)
|
|
110
|
+
if (explicit !== borrowerStatePda) {
|
|
111
|
+
expiredBorrowerState = explicit;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
try {
|
|
116
|
+
const activeRental = await fetchRental(rentalState, finalConfig.rpcUrl);
|
|
117
|
+
if (activeRental.data.status !== RentalStatus.Available) {
|
|
118
|
+
// Only pass as separate account if it's a DIFFERENT borrower's state
|
|
119
|
+
if (activeRental.data.borrowerState !== borrowerStatePda) {
|
|
120
|
+
expiredBorrowerState = activeRental.data.borrowerState;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
// Rental state doesn't exist or can't be fetched — no expired rental to replace
|
|
126
|
+
}
|
|
127
|
+
}
|
|
101
128
|
// Derive rental authority PDA
|
|
102
129
|
const rentalAuthority = await deriveRentalAuthority();
|
|
103
130
|
// Derive contract thread and close_rental fiber (fiber index 1) — only if thread configured
|
|
@@ -130,6 +157,7 @@ export async function acceptRental(params, config) {
|
|
|
130
157
|
borrower: borrowerSigner,
|
|
131
158
|
borrowerTokenAccount,
|
|
132
159
|
fleet: address(fleet),
|
|
160
|
+
expiredBorrowerState,
|
|
133
161
|
contract: contractAddress,
|
|
134
162
|
rentalState,
|
|
135
163
|
vault: address(vault),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,WAAW,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,kCAAkC,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,mBAAmB,EAAwB,MAAM,iBAAiB,CAAC;AAC5E,OAAO,EAAE,aAAa,EAAoB,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,eAAe,EAAsB,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"acceptRental.js","sourceRoot":"","sources":["../../../src/instructions/acceptRental.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,19 @@
|
|
|
5
5
|
* Handles parameter conversion and optional web3.js compatibility.
|
|
6
6
|
*/
|
|
7
7
|
import { address } from '@solana/kit';
|
|
8
|
-
import { getCreateContractInstructionAsync } from '../generated/codama/instructions';
|
|
8
|
+
import { getCreateContractInstructionAsync, getCreateContractThreadInstructionAsync } from '../generated/codama/instructions';
|
|
9
9
|
import { mergeConfig, getAddresses } from '../utils/config';
|
|
10
|
-
import { toTransactionSigner } from '../utils/signer';
|
|
10
|
+
import { toTransactionSigner, getSignerAddress } from '../utils/signer';
|
|
11
11
|
import { convertAmount, stardustToAtlas } from '../params/amount';
|
|
12
12
|
import { convertDuration } from '../params/duration';
|
|
13
|
+
import { normalizeSchedule } from '../params/schedule';
|
|
14
|
+
import { convertSol } from '../params/sol';
|
|
13
15
|
import { fetchFleet } from '../accounts/fleet';
|
|
14
16
|
import { fetchConfig } from '../accounts/config';
|
|
15
17
|
import { prepareInstructions } from '../utils/instructions';
|
|
18
|
+
import { deriveContract, deriveRentalAuthority } from '../pda/srsly';
|
|
19
|
+
import { deriveContractThread, deriveFiber } from '../pda/thread';
|
|
20
|
+
import { deriveAssociatedTokenAccount } from '../pda/token';
|
|
16
21
|
/**
|
|
17
22
|
* Create a rental contract for a Star Atlas fleet
|
|
18
23
|
*
|
|
@@ -77,7 +82,7 @@ export async function createContract(params, config) {
|
|
|
77
82
|
const sageProgram = address(addresses.sage);
|
|
78
83
|
const programAddress = address(addresses.srsly);
|
|
79
84
|
// Convert cancelDelayMin duration to seconds
|
|
80
|
-
const cancelDelayMinSeconds = params.cancelDelayMin
|
|
85
|
+
const cancelDelayMinSeconds = params.cancelDelayMin !== undefined
|
|
81
86
|
? BigInt(convertDuration(params.cancelDelayMin))
|
|
82
87
|
: 1n; // Default 1 second (no instant cancel)
|
|
83
88
|
// Call Codama-generated instruction
|
|
@@ -95,6 +100,36 @@ export async function createContract(params, config) {
|
|
|
95
100
|
cancelDelayMin: cancelDelayMinSeconds,
|
|
96
101
|
reservationsDisabled: params.reservationsDisabled ?? true
|
|
97
102
|
}, { programAddress });
|
|
103
|
+
// Default: bundle thread creation for automation
|
|
104
|
+
if (params.automated !== false) {
|
|
105
|
+
const paymentsFreq = normalizeSchedule(params.paymentsFreq ?? '@daily');
|
|
106
|
+
// Derive PDAs locally (contract doesn't exist on-chain yet)
|
|
107
|
+
const contractAddress = await deriveContract(params.fleet);
|
|
108
|
+
const contractTokenAccount = await deriveAssociatedTokenAccount(contractAddress, atlasMint);
|
|
109
|
+
const rentalAuthority = await deriveRentalAuthority();
|
|
110
|
+
const contractThread = await deriveContractThread(contractAddress, rentalAuthority);
|
|
111
|
+
const fiber0 = await deriveFiber(contractThread, 0);
|
|
112
|
+
const closeRentalFiber = await deriveFiber(contractThread, 1);
|
|
113
|
+
const ownerAddress = getSignerAddress(params.owner);
|
|
114
|
+
const MINIMUM_THREAD_FUNDING = 40000000n;
|
|
115
|
+
const threadIx = await getCreateContractThreadInstructionAsync({
|
|
116
|
+
payer: ownerSigner,
|
|
117
|
+
mint: atlasMint,
|
|
118
|
+
contract: contractAddress,
|
|
119
|
+
contractThread,
|
|
120
|
+
fiber0,
|
|
121
|
+
closeRentalFiber,
|
|
122
|
+
owner: ownerAddress,
|
|
123
|
+
contractTokenAccount,
|
|
124
|
+
sageProgram,
|
|
125
|
+
lamports: MINIMUM_THREAD_FUNDING + convertSol(params.threadLamports ?? 0),
|
|
126
|
+
paymentsFreq,
|
|
127
|
+
}, { programAddress });
|
|
128
|
+
return prepareInstructions([kitInstruction, threadIx], {
|
|
129
|
+
computeUnits: params.computeUnits,
|
|
130
|
+
PublicKey: finalConfig.PublicKey
|
|
131
|
+
});
|
|
132
|
+
}
|
|
98
133
|
return prepareInstructions(kitInstruction, {
|
|
99
134
|
computeUnits: params.computeUnits,
|
|
100
135
|
PublicKey: finalConfig.PublicKey
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAgB,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"createContract.js","sourceRoot":"","sources":["../../../src/instructions/createContract.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/package.json
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
* @module pda/lookupTable
|
|
4
4
|
*/
|
|
5
5
|
import { address, getProgramDerivedAddress, getAddressEncoder } from '@solana/kit';
|
|
6
|
+
import { getSignerAddress } from '../utils/signer';
|
|
6
7
|
/**
|
|
7
8
|
* Address Lookup Table program address
|
|
8
9
|
*/
|
|
@@ -40,9 +41,9 @@ function slotToBytes(slot) {
|
|
|
40
41
|
* ```
|
|
41
42
|
*/
|
|
42
43
|
export async function deriveLookupTable(authority, recentSlot, altProgramAddress) {
|
|
43
|
-
const authorityAddress =
|
|
44
|
+
const authorityAddress = getSignerAddress(authority);
|
|
44
45
|
const altProgram = altProgramAddress
|
|
45
|
-
?
|
|
46
|
+
? getSignerAddress(altProgramAddress)
|
|
46
47
|
: address(ALT_PROGRAM);
|
|
47
48
|
// Encode authority and slot to bytes
|
|
48
49
|
const authorityBytes = addressEncoder.encode(authorityAddress);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookupTable.js","sourceRoot":"","sources":["../../../src/pda/lookupTable.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAW,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"lookupTable.js","sourceRoot":"","sources":["../../../src/pda/lookupTable.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAW,wBAAwB,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,EAAE,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAEzE;;GAEG;AACH,MAAM,WAAW,GAAG,6CAA6C,CAAC;AAElE,MAAM,cAAc,GAAG,iBAAiB,EAAE,CAAC;AAE3C;;GAEG;AACH,SAAS,WAAW,CAAC,IAAqB;IACxC,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,gBAAgB;IAC1D,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;AAChC,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,SAA0B,EAC1B,UAA2B,EAC3B,iBAAmC;IAEnC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,iBAAiB;QAClC,CAAC,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;QACrC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IAEzB,qCAAqC;IACrC,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAC/D,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAE1C,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,wBAAwB,CAAC;QAC3C,cAAc,EAAE,UAAU;QAC1B,KAAK,EAAE,CAAC,cAAc,EAAE,SAAS,CAAC;KACnC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC"}
|