@quartz-labs/sdk 0.9.6 → 0.10.0
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/client.d.ts +8 -7
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +13 -17
- package/dist/client.js.map +1 -1
- package/dist/config/constants.d.ts +0 -1
- package/dist/config/constants.d.ts.map +1 -1
- package/dist/config/constants.js +0 -1
- package/dist/config/constants.js.map +1 -1
- package/dist/utils/helpers.d.ts +2 -0
- package/dist/utils/helpers.d.ts.map +1 -1
- package/dist/utils/helpers.js +13 -0
- package/dist/utils/helpers.js.map +1 -1
- package/package.json +1 -1
package/dist/client.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { BN } from "@drift-labs/sdk";
|
|
2
|
-
import type { PublicKey, Connection, AddressLookupTableAccount, MessageCompiledInstruction } from "@solana/web3.js";
|
|
1
|
+
import type { BN } from "@drift-labs/sdk";
|
|
2
|
+
import type { PublicKey, Connection, AddressLookupTableAccount, MessageCompiledInstruction, Signer } from "@solana/web3.js";
|
|
3
3
|
import { QuartzUser } from "./user.js";
|
|
4
4
|
import type { TransactionInstruction } from "@solana/web3.js";
|
|
5
5
|
import type { Keypair } from "@solana/web3.js";
|
|
@@ -19,10 +19,7 @@ export declare class QuartzClient {
|
|
|
19
19
|
getBorrowRate(spotMarketIndex: number): Promise<BN>;
|
|
20
20
|
private getSpotMarketAccount;
|
|
21
21
|
listenForInstruction(instructionName: string, onInstruction: (instruction: MessageCompiledInstruction, accountKeys: PublicKey[]) => void, ignoreErrors?: boolean): Promise<void>;
|
|
22
|
-
static
|
|
23
|
-
amountBaseUnits: BN;
|
|
24
|
-
messageSentEventDataAccounts: PublicKey[];
|
|
25
|
-
}>;
|
|
22
|
+
static parseSpendIx(connection: Connection, signature: string, owner: PublicKey): Promise<PublicKey>;
|
|
26
23
|
/**
|
|
27
24
|
* Creates instructions to initialize a new Quartz user account.
|
|
28
25
|
* @param owner - The public key of Quartz account owner.
|
|
@@ -45,7 +42,11 @@ export declare class QuartzClient {
|
|
|
45
42
|
signers: Keypair[];
|
|
46
43
|
}>;
|
|
47
44
|
admin: {
|
|
48
|
-
makeReclaimBridgeRentIxs: (messageSentEventData: PublicKey, attestation: Buffer<ArrayBuffer
|
|
45
|
+
makeReclaimBridgeRentIxs: (messageSentEventData: PublicKey, attestation: Buffer<ArrayBuffer>, rentReclaimer: Signer) => Promise<{
|
|
46
|
+
ixs: TransactionInstruction[];
|
|
47
|
+
lookupTables: AddressLookupTableAccount[];
|
|
48
|
+
signers: Signer[];
|
|
49
|
+
}>;
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
52
|
//# sourceMappingURL=client.d.ts.map
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAe,MAAM,iBAAiB,CAAC;AAKvD,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,yBAAyB,EAAE,0BAA0B,EAAQ,MAAM,EAAG,MAAM,iBAAiB,CAAC;AACnI,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAIvC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAG/C,qBAAa,YAAY;IACrB,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,OAAO,CAAkB;IACjC,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,WAAW,CAAc;IAEjC,OAAO;mBAYc,UAAU;WAOX,WAAW,CAC3B,UAAU,EAAE,UAAU,GACvB,OAAO,CAAC,YAAY,CAAC;WAeJ,mBAAmB,CACnC,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,SAAS;IAiBP,+BAA+B,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;IAMvD,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IA0BvD,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC;IA4C9E,cAAc,CAAC,eAAe,EAAE,MAAM;IAMtC,aAAa,CAAC,eAAe,EAAE,MAAM;YAMpC,oBAAoB;IAMrB,oBAAoB,CAC7B,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,CAAC,WAAW,EAAE,0BAA0B,EAAE,WAAW,EAAE,SAAS,EAAE,KAAK,IAAI,EAC1F,YAAY,UAAO;WAoCH,YAAY,CAC5B,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,GACjB,OAAO,CAAC,SAAS,CAAC;IA4CrB;;;;;;;;;;;;;;;OAeG;IACU,qBAAqB,CAC9B,KAAK,EAAE,SAAS,EAChB,wBAAwB,EAAE,EAAE,EAC5B,sBAAsB,EAAE,EAAE,EAC1B,kBAAkB,EAAE,EAAE,EACtB,2BAA2B,EAAE,EAAE,GAChC,OAAO,CAAC;QACP,GAAG,EAAE,sBAAsB,EAAE,CAAC;QAC9B,YAAY,EAAE,yBAAyB,EAAE,CAAC;QAC1C,OAAO,EAAE,OAAO,EAAE,CAAA;KACrB,CAAC;IA8BK,KAAK;yDAEkB,SAAS,eAClB,MAAM,CAAC,WAAW,CAAC,iBACjB,MAAM,KACtB,OAAO,CAAC;YACP,GAAG,EAAE,sBAAsB,EAAE,CAAC;YAC9B,YAAY,EAAE,yBAAyB,EAAE,CAAC;YAC1C,OAAO,EAAE,MAAM,EAAE,CAAA;SACpB,CAAC;MAkBL;CACJ"}
|
package/dist/client.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { BN } from "@drift-labs/sdk";
|
|
2
1
|
import { calculateBorrowRate, calculateDepositRate, DRIFT_PROGRAM_ID, fetchUserAccountsUsingKeys as fetchDriftAccountsUsingKeys } from "@drift-labs/sdk";
|
|
3
|
-
import { MESSAGE_TRANSMITTER_PROGRAM_ID, QUARTZ_ADDRESS_TABLE, QUARTZ_PROGRAM_ID
|
|
2
|
+
import { MESSAGE_TRANSMITTER_PROGRAM_ID, QUARTZ_ADDRESS_TABLE, QUARTZ_PROGRAM_ID } from "./config/constants.js";
|
|
4
3
|
import { IDL } from "./types/idl/quartz.js";
|
|
5
4
|
import { AnchorProvider, BorshInstructionCoder, Program, setProvider } from "@coral-xyz/anchor";
|
|
6
5
|
import { QuartzUser } from "./user.js";
|
|
@@ -129,10 +128,10 @@ export class QuartzClient {
|
|
|
129
128
|
}
|
|
130
129
|
}, "confirmed");
|
|
131
130
|
}
|
|
132
|
-
static async
|
|
133
|
-
const INSRTUCTION_NAME = "
|
|
131
|
+
static async parseSpendIx(connection, signature, owner) {
|
|
132
|
+
const INSRTUCTION_NAME = "complete_spend";
|
|
134
133
|
const ACCOUNT_INDEX_OWNER = 1;
|
|
135
|
-
const ACCOUNT_INDEX_MESSAGE_SENT_EVENT_DATA =
|
|
134
|
+
const ACCOUNT_INDEX_MESSAGE_SENT_EVENT_DATA = 12;
|
|
136
135
|
const tx = await connection.getTransaction(signature, {
|
|
137
136
|
maxSupportedTransactionVersion: 0,
|
|
138
137
|
commitment: "finalized"
|
|
@@ -141,8 +140,6 @@ export class QuartzClient {
|
|
|
141
140
|
throw new Error("Transaction not found");
|
|
142
141
|
const encodedIxs = tx.transaction.message.compiledInstructions;
|
|
143
142
|
const coder = new BorshInstructionCoder(IDL);
|
|
144
|
-
const messageSentEventDataAccounts = [];
|
|
145
|
-
let totalTopUpBaseUnits = new BN(0);
|
|
146
143
|
for (const ix of encodedIxs) {
|
|
147
144
|
try {
|
|
148
145
|
const quartzIx = coder.decode(Buffer.from(ix.data), "base58");
|
|
@@ -155,21 +152,16 @@ export class QuartzClient {
|
|
|
155
152
|
const actualOwner = accountKeys[ownerIndex];
|
|
156
153
|
if (!actualOwner.equals(owner))
|
|
157
154
|
throw new Error("Owner does not match");
|
|
158
|
-
const args = quartzIx.data;
|
|
159
|
-
totalTopUpBaseUnits = totalTopUpBaseUnits.add(args.amountUsdcBaseUnits);
|
|
160
155
|
const messageSentEventDataIndex = ix.accountKeyIndexes?.[ACCOUNT_INDEX_MESSAGE_SENT_EVENT_DATA];
|
|
161
156
|
if (messageSentEventDataIndex === undefined || accountKeys[messageSentEventDataIndex] === undefined) {
|
|
162
157
|
throw new Error("Message sent event data not found");
|
|
163
158
|
}
|
|
164
|
-
|
|
159
|
+
return accountKeys[messageSentEventDataIndex];
|
|
165
160
|
}
|
|
166
161
|
}
|
|
167
162
|
catch { }
|
|
168
163
|
}
|
|
169
|
-
|
|
170
|
-
amountBaseUnits: totalTopUpBaseUnits,
|
|
171
|
-
messageSentEventDataAccounts
|
|
172
|
-
};
|
|
164
|
+
throw new Error("Spend instruction not found");
|
|
173
165
|
}
|
|
174
166
|
// --- Instructions ---
|
|
175
167
|
/**
|
|
@@ -211,18 +203,22 @@ export class QuartzClient {
|
|
|
211
203
|
};
|
|
212
204
|
}
|
|
213
205
|
admin = {
|
|
214
|
-
makeReclaimBridgeRentIxs: async (messageSentEventData, attestation) => {
|
|
206
|
+
makeReclaimBridgeRentIxs: async (messageSentEventData, attestation, rentReclaimer) => {
|
|
215
207
|
const ix_reclaimBridgeRent = await this.program.methods
|
|
216
208
|
.reclaimBridgeRent(attestation)
|
|
217
209
|
.accounts({
|
|
218
|
-
rentReclaimer:
|
|
210
|
+
rentReclaimer: rentReclaimer.publicKey,
|
|
219
211
|
bridgeRentPayer: getBridgeRentPayerPublicKey(),
|
|
220
212
|
messageTransmitter: getMessageTransmitter(),
|
|
221
213
|
messageSentEventData: messageSentEventData,
|
|
222
214
|
cctpMessageTransmitter: MESSAGE_TRANSMITTER_PROGRAM_ID
|
|
223
215
|
})
|
|
224
216
|
.instruction();
|
|
225
|
-
return
|
|
217
|
+
return {
|
|
218
|
+
ixs: [ix_reclaimBridgeRent],
|
|
219
|
+
lookupTables: [this.quartzLookupTable],
|
|
220
|
+
signers: [rentReclaimer]
|
|
221
|
+
};
|
|
226
222
|
}
|
|
227
223
|
};
|
|
228
224
|
}
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ export declare const PYTH_ORACLE_PROGRAM_ID: PublicKey;
|
|
|
7
7
|
export declare const TOKEN_MESSAGE_MINTER_PROGRAM_ID: PublicKey;
|
|
8
8
|
export declare const MESSAGE_TRANSMITTER_PROGRAM_ID: PublicKey;
|
|
9
9
|
export declare const MARGINFI_PROGRAM_ID: PublicKey;
|
|
10
|
-
export declare const RENT_RECLAIMER_PUBKEY: PublicKey;
|
|
11
10
|
export declare const PROVIDER_BASE_ADDRESS = "0x55a2eeB9028ee51Ef91352Fa9f84A9450C5Af099";
|
|
12
11
|
export declare const QUARTZ_CALLER_BASE_ADDRESS = "0x28A0105A0cf8C0485a4956ba14b5274e9ED229DE";
|
|
13
12
|
export declare const MARGINFI_GROUP_1: PublicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAClG,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AACnG,eAAO,MAAM,+BAA+B,WAAgE,CAAC;AAC7G,eAAO,MAAM,8BAA8B,WAAgE,CAAC;AAC5G,eAAO,MAAM,mBAAmB,WAA+D,CAAC;AAEhG,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,iBAAiB,WAAgE,CAAC;AAC/F,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAClG,eAAO,MAAM,oBAAoB,WAAgE,CAAC;AAElG,eAAO,MAAM,gBAAgB,WAA+D,CAAC;AAC7F,eAAO,MAAM,sBAAsB,WAA+D,CAAC;AACnG,eAAO,MAAM,+BAA+B,WAAgE,CAAC;AAC7G,eAAO,MAAM,8BAA8B,WAAgE,CAAC;AAC5G,eAAO,MAAM,mBAAmB,WAA+D,CAAC;AAEhG,eAAO,MAAM,qBAAqB,+CAA+C,CAAC;AAClF,eAAO,MAAM,0BAA0B,+CAA+C,CAAC;AAEvF,eAAO,MAAM,gBAAgB,WAAgE,CAAC;AAE9F,eAAO,MAAM,iBAAiB,IAAI,CAAC;AACnC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC,eAAO,MAAM,0BAA0B,SAAU,CAAC;AAClD,eAAO,MAAM,0BAA0B,UAAY,CAAC"}
|
package/dist/config/constants.js
CHANGED
|
@@ -7,7 +7,6 @@ export const PYTH_ORACLE_PROGRAM_ID = new PublicKey("pythWSnswVUd12oZpeFP8e9CVaE
|
|
|
7
7
|
export const TOKEN_MESSAGE_MINTER_PROGRAM_ID = new PublicKey("CCTPiPYPc6AsJuwueEnWgSgucamXDZwBd53dQ11YiKX3");
|
|
8
8
|
export const MESSAGE_TRANSMITTER_PROGRAM_ID = new PublicKey("CCTPmbSD7gX1bxKPAmg77w8oFzNFpaQiQUWD43TKaecd");
|
|
9
9
|
export const MARGINFI_PROGRAM_ID = new PublicKey("MFv2hWf31Z9kbCa1snEPYctwafyhdvnV7FZnsebVacA");
|
|
10
|
-
export const RENT_RECLAIMER_PUBKEY = new PublicKey("AhLjdeYqv4Ytw5sukK4z3x37ZGaSJ44pRqdcxqHP4ChS");
|
|
11
10
|
export const PROVIDER_BASE_ADDRESS = "0x55a2eeB9028ee51Ef91352Fa9f84A9450C5Af099";
|
|
12
11
|
export const QUARTZ_CALLER_BASE_ADDRESS = "0x28A0105A0cf8C0485a4956ba14b5274e9ED229DE";
|
|
13
12
|
export const MARGINFI_GROUP_1 = new PublicKey("4qp6Fx6tnZkY5Wropq9wUYgtFxXKwE6viZxFHg3rdAG8");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAClG,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AACnG,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC7G,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC5G,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEhG,MAAM,CAAC,MAAM,qBAAqB,GAAG,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/config/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAClG,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAC7F,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AACnG,MAAM,CAAC,MAAM,+BAA+B,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC7G,MAAM,CAAC,MAAM,8BAA8B,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAC5G,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEhG,MAAM,CAAC,MAAM,qBAAqB,GAAG,4CAA4C,CAAC;AAClF,MAAM,CAAC,MAAM,0BAA0B,GAAG,4CAA4C,CAAC;AAEvF,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;AAE9F,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC;AACnC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC,MAAM,CAAC,MAAM,0BAA0B,GAAG,OAAO,CAAC;AAClD,MAAM,CAAC,MAAM,0BAA0B,GAAG,SAAS,CAAC"}
|
package/dist/utils/helpers.d.ts
CHANGED
|
@@ -2,10 +2,12 @@ import { PublicKey, type Connection, type TransactionInstruction } from "@solana
|
|
|
2
2
|
import type { AccountMeta } from "../types/interfaces/accountMeta.interface.js";
|
|
3
3
|
import { type MarketIndex } from "../config/tokens.js";
|
|
4
4
|
import type { AddressLookupTableAccount } from "@solana/web3.js";
|
|
5
|
+
import { VersionedTransaction } from "@solana/web3.js";
|
|
5
6
|
export declare function getComputeUnitLimit(connection: Connection, instructions: TransactionInstruction[], address: PublicKey, blockhash: string, lookupTables?: AddressLookupTableAccount[]): Promise<number>;
|
|
6
7
|
export declare function getComputerUnitLimitIx(connection: Connection, instructions: TransactionInstruction[], address: PublicKey, blockhash: string, lookupTables?: AddressLookupTableAccount[]): Promise<TransactionInstruction>;
|
|
7
8
|
export declare function getComputeUnitPrice(connection: Connection, instructions: TransactionInstruction[]): Promise<number>;
|
|
8
9
|
export declare function getComputeUnitPriceIx(connection: Connection, instructions: TransactionInstruction[]): Promise<TransactionInstruction>;
|
|
10
|
+
export declare function buildTransaction(connection: Connection, instructions: TransactionInstruction[], address: PublicKey, lookupTables?: AddressLookupTableAccount[]): Promise<VersionedTransaction>;
|
|
9
11
|
export declare const toRemainingAccount: (pubkey: PublicKey, isSigner: boolean, isWritable: boolean) => AccountMeta;
|
|
10
12
|
export declare const getTokenProgram: (connection: Connection, mint: PublicKey) => Promise<PublicKey>;
|
|
11
13
|
export declare function makeCreateAtaIxIfNeeded(connection: Connection, ata: PublicKey, authority: PublicKey, mint: PublicKey, tokenProgramId: PublicKey): Promise<TransactionInstruction[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,sBAAsB,EAAG,MAAM,iBAAiB,CAAC;AACjH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,KAAK,WAAW,EAAU,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,SAAS,EAAE,KAAK,UAAU,EAAE,KAAK,sBAAsB,EAAG,MAAM,iBAAiB,CAAC;AACjH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAChF,OAAO,EAAE,KAAK,WAAW,EAAU,MAAM,qBAAqB,CAAC;AAE/D,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIvD,wBAAsB,mBAAmB,CACrC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,sBAAsB,EAAE,EACtC,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,MAAM,EACjB,YAAY,GAAE,yBAAyB,EAAO,mBAiBjD;AAED,wBAAsB,sBAAsB,CACxC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,sBAAsB,EAAE,EACtC,OAAO,EAAE,SAAS,EAClB,SAAS,EAAE,MAAM,EACjB,YAAY,GAAE,yBAAyB,EAAO,mCAMjD;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,sBAAsB,EAAE,mBA6BvG;AAED,wBAAsB,qBAAqB,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,sBAAsB,EAAE,mCAKzG;AAED,wBAAsB,gBAAgB,CAClC,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,sBAAsB,EAAE,EACtC,OAAO,EAAE,SAAS,EAClB,YAAY,GAAE,yBAAyB,EAAO,GAC/C,OAAO,CAAC,oBAAoB,CAAC,CAa/B;AAED,eAAO,MAAM,kBAAkB,WAAY,SAAS,YAAY,OAAO,cAAc,OAAO,KAAG,WAM9F,CAAA;AAED,eAAO,MAAM,eAAe,eAAsB,UAAU,QAAQ,SAAS,uBAM5E,CAAA;AAED,wBAAsB,uBAAuB,CACzC,UAAU,EAAE,UAAU,EACtB,GAAG,EAAE,SAAS,EACd,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,SAAS,EACf,cAAc,EAAE,SAAS,qCAmB5B;AAED,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CAGrF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,GAAG,MAAM,CAGnF;AAED,wBAAsB,gBAAgB,CAAC,CAAC,EACpC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,SAAI,EACX,YAAY,SAAQ,EACpB,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,KAAK,IAAI,cAoB5D;AAED,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,MAAM,aAWpD"}
|
package/dist/utils/helpers.js
CHANGED
|
@@ -58,6 +58,19 @@ export async function getComputeUnitPriceIx(connection, instructions) {
|
|
|
58
58
|
microLamports: computeUnitPrice,
|
|
59
59
|
});
|
|
60
60
|
}
|
|
61
|
+
export async function buildTransaction(connection, instructions, address, lookupTables = []) {
|
|
62
|
+
const blockhash = (await connection.getLatestBlockhash()).blockhash;
|
|
63
|
+
const ix_computeLimit = await getComputerUnitLimitIx(connection, instructions, address, blockhash, lookupTables);
|
|
64
|
+
const ix_computePrice = await getComputeUnitPriceIx(connection, instructions);
|
|
65
|
+
instructions.unshift(ix_computeLimit, ix_computePrice);
|
|
66
|
+
const messageV0 = new TransactionMessage({
|
|
67
|
+
payerKey: address,
|
|
68
|
+
recentBlockhash: blockhash,
|
|
69
|
+
instructions: instructions
|
|
70
|
+
}).compileToV0Message(lookupTables);
|
|
71
|
+
const transaction = new VersionedTransaction(messageV0);
|
|
72
|
+
return transaction;
|
|
73
|
+
}
|
|
61
74
|
export const toRemainingAccount = (pubkey, isSigner, isWritable) => {
|
|
62
75
|
return {
|
|
63
76
|
pubkey: pubkey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/utils/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,SAAS,GAAiD,MAAM,iBAAiB,CAAC;AAEjH,OAAO,EAAoB,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,uCAAuC,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAE9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AAE7F,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACrC,UAAsB,EACtB,YAAsC,EACtC,OAAkB,EAClB,SAAiB,EACjB,eAA4C,EAAE;IAE9C,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC;QACrC,QAAQ,EAAE,OAAO;QACjB,eAAe,EAAE,SAAS;QAC1B,YAAY,EAAE,YAAY;KAC7B,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,mBAAmB,CACnD,IAAI,oBAAoB,CAAC,SAAS,CAAC,CACtC,CAAC;IAEF,MAAM,qBAAqB,GAAG,UAAU,CAAC,KAAK,CAAC,aAAa,CAAC;IAC7D,IAAI,CAAC,qBAAqB;QAAE,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;IAC3F,MAAM,gBAAgB,GAAG,qBAAqB;QAC1C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,GAAG,GAAG,CAAC;QACxC,CAAC,CAAC,0BAA0B,CAAC;IACjC,OAAO,gBAAgB,CAAC;AAC5B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CACxC,UAAsB,EACtB,YAAsC,EACtC,OAAkB,EAClB,SAAiB,EACjB,eAA4C,EAAE;IAE9C,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IAC/G,OAAO,oBAAoB,CAAC,mBAAmB,CAAC;QAC5C,KAAK,EAAE,gBAAgB;KAC1B,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,UAAsB,EAAE,YAAsC;IACpG,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACvE,MAAM,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACxG,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,2BAA2B,CAAC;QAC5D,sBAAsB,EAAE,iBAAiB;KAC5C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAExD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,0BAA0B,CAAC;IAE/D,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAE3D,sBAAsB;IACtB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,EAAE,KAAK,SAAS,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;IAEzE,2BAA2B;IAC3B,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,CAAC;IACpB,MAAM,UAAU,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,CAAC;IAClC,MAAM,UAAU,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,CAAC;IAElC,4CAA4C;IAC5C,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,GAAG,YAAY,CAAC,MAAM,CAAC;IAEtF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC9B,CAAC;AAAA,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,UAAsB,EAAE,YAAsC;IACtG,MAAM,gBAAgB,GAAG,MAAM,mBAAmB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7E,OAAO,oBAAoB,CAAC,mBAAmB,CAAC;QAC5C,aAAa,EAAE,gBAAgB;KAClC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,UAAsB,EACtB,YAAsC,EACtC,OAAkB,EAClB,eAA4C,EAAE;IAE9C,MAAM,SAAS,GAAG,CAAC,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC,SAAS,CAAC;IACpE,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;IACjH,MAAM,eAAe,GAAG,MAAM,qBAAqB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC9E,YAAY,CAAC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;IAEvD,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC;QACrC,QAAQ,EAAE,OAAO;QACjB,eAAe,EAAE,SAAS;QAC1B,YAAY,EAAE,YAAY;KAC7B,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,IAAI,oBAAoB,CAAC,SAAS,CAAC,CAAC;IACxD,OAAO,WAAW,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,MAAiB,EAAE,QAAiB,EAAE,UAAmB,EAAe,EAAE;IACzG,OAAO;QACH,MAAM,EAAE,MAAM;QACd,QAAQ,EAAE,QAAQ;QAClB,UAAU,EAAE,UAAU;KACzB,CAAA;AACL,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAAE,UAAsB,EAAE,IAAe,EAAE,EAAE;IAC7E,MAAM,WAAW,GAAG,MAAM,gBAAgB,CACtC,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,EACrC,CAAC,CACJ,CAAC;IACF,OAAO,WAAW,EAAE,KAAK,IAAI,gBAAgB,CAAC;AAClD,CAAC,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CACzC,UAAsB,EACtB,GAAc,EACd,SAAoB,EACpB,IAAe,EACf,cAAyB;IAEzB,MAAM,aAAa,GAA6B,EAAE,CAAC;IACnD,MAAM,OAAO,GAAG,MAAM,gBAAgB,CAClC,GAAG,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,EACpC,CAAC,CACJ,CAAC;IACF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACnB,aAAa,CAAC,IAAI,CACd,uCAAuC,CACnC,SAAS,EACT,GAAG,EACH,SAAS,EACT,IAAI,EACJ,cAAc,CACjB,CACJ,CAAC;IACN,CAAC;IACD,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,SAAiB,EAAE,WAAwB;IACzE,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAClC,OAAO,SAAS,GAAG,CAAC,EAAE,IAAI,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe,EAAE,WAAwB;IACvE,MAAM,KAAK,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,EAAE,IAAI,KAAK,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAClC,EAAoB,EACpB,OAAO,GAAG,CAAC,EACX,YAAY,GAAG,KAAK,EACpB,aAAyD;IAEzD,IAAI,SAAS,GAAG,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC;QAChC,IAAI,CAAC;YACD,OAAO,MAAM,EAAE,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,YAAY,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YACtC,SAAS,GAAG,CAAC,KAAK,YAAY,KAAK,CAAC;gBAChC,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YAE/B,IAAI,aAAa,EAAE,CAAC;gBAChB,aAAa,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACpC,CAAC;YAED,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;QAC7D,CAAC;IACL,CAAC;IACD,MAAM,SAAS,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAkB;IACjD,MAAM,OAAO,GAAG,6BAA6B,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IAE5E,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACvD,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,CAAC;IAChB,CAAC;IAED,OAAO,IAAI,SAAS,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC"}
|