@hawksightco/hawk-sdk 1.2.80 → 1.2.81
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.
|
@@ -4,6 +4,7 @@ import BN from "bn.js";
|
|
|
4
4
|
import { JupiterRouteIxReturn } from '../ixGenerator/IyfMainIxGenerator';
|
|
5
5
|
type JupiterIxToHawksight = {
|
|
6
6
|
connection: web3.Connection;
|
|
7
|
+
userWallet?: web3.PublicKey;
|
|
7
8
|
swapInstruction: web3.TransactionInstruction;
|
|
8
9
|
slippageBpsOverride?: number;
|
|
9
10
|
slippageOutPct?: number;
|
|
@@ -14,7 +15,7 @@ type JupiterIxToHawksight = {
|
|
|
14
15
|
export declare class JupiterSwap {
|
|
15
16
|
private ix;
|
|
16
17
|
constructor(ix: SimpleIxGenerator);
|
|
17
|
-
jupiterIxToHawksight({ connection, swapInstruction, quotedOutAmount_override, slippageOutPct, slippageBpsOverride, platformFeeBpsOverride, isWalletSigner }: JupiterIxToHawksight): Promise<JupiterRouteIxReturn>;
|
|
18
|
+
jupiterIxToHawksight({ connection, userWallet, swapInstruction, quotedOutAmount_override, slippageOutPct, slippageBpsOverride, platformFeeBpsOverride, isWalletSigner }: JupiterIxToHawksight): Promise<JupiterRouteIxReturn>;
|
|
18
19
|
}
|
|
19
20
|
export {};
|
|
20
21
|
//# sourceMappingURL=JupiterSwap.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JupiterSwap.d.ts","sourceRoot":"","sources":["../../../src/classes/JupiterSwap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,KAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,eAAe,EAAE,IAAI,CAAC,sBAAsB,CAAC;IAC7C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,EAAE,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;CAE1B,CAAC;AAEF,qBAAa,WAAW;IAGpB,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAGzB,oBAAoB,CAAC,EAAC,UAAU,EAAE,eAAe,EAAE,wBAAwB,EAAE,cAAc,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,cAAc,EAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"JupiterSwap.d.ts","sourceRoot":"","sources":["../../../src/classes/JupiterSwap.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,MAAM,OAAO,CAAC;AACvB,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,KAAK,oBAAoB,GAAG;IAC1B,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC;IAC5B,eAAe,EAAE,IAAI,CAAC,sBAAsB,CAAC;IAC7C,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wBAAwB,CAAC,EAAE,EAAE,CAAC;IAC9B,cAAc,CAAC,EAAE,OAAO,CAAC;CAE1B,CAAC;AAEF,qBAAa,WAAW;IAGpB,OAAO,CAAC,EAAE;gBAAF,EAAE,EAAE,iBAAiB;IAGzB,oBAAoB,CAAC,EAAC,UAAU,EAAE,UAAU,EAAC,eAAe,EAAE,wBAAwB,EAAE,cAAc,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,cAAc,EAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAoBjO"}
|
|
@@ -15,9 +15,10 @@ class JupiterSwap {
|
|
|
15
15
|
this.ix = ix;
|
|
16
16
|
}
|
|
17
17
|
jupiterIxToHawksight(_a) {
|
|
18
|
-
return __awaiter(this, arguments, void 0, function* ({ connection, swapInstruction, quotedOutAmount_override, slippageOutPct, slippageBpsOverride, platformFeeBpsOverride, isWalletSigner }) {
|
|
18
|
+
return __awaiter(this, arguments, void 0, function* ({ connection, userWallet, swapInstruction, quotedOutAmount_override, slippageOutPct, slippageBpsOverride, platformFeeBpsOverride, isWalletSigner }) {
|
|
19
19
|
return yield this.ix.iyfMain.jupiterRouteIx({
|
|
20
20
|
connection,
|
|
21
|
+
userWallet: userWallet,
|
|
21
22
|
userPda: swapInstruction.keys[1].pubkey,
|
|
22
23
|
sourceTokenAccount: swapInstruction.keys[2].pubkey,
|
|
23
24
|
destinationTokenAccount: swapInstruction.keys[3].pubkey,
|
|
@@ -291,7 +291,7 @@ class IyfMainIxGenerator {
|
|
|
291
291
|
.closeAta()
|
|
292
292
|
.accounts({
|
|
293
293
|
userPda,
|
|
294
|
-
hsAuthority:
|
|
294
|
+
hsAuthority: addresses_1.HS_AUTHORITY,
|
|
295
295
|
userTokenAccount: destinationTokenAccount,
|
|
296
296
|
tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
|
|
297
297
|
})
|
|
@@ -345,7 +345,7 @@ class IyfMainIxGenerator {
|
|
|
345
345
|
const simulation = yield (0, functions_1.simulateTransaction)({
|
|
346
346
|
connection,
|
|
347
347
|
instructions,
|
|
348
|
-
payerKey: addresses_1.HS_AUTHORITY,
|
|
348
|
+
payerKey: isWalletSigner ? userWallet : addresses_1.HS_AUTHORITY,
|
|
349
349
|
alts: [],
|
|
350
350
|
signers: [],
|
|
351
351
|
addresses: [destinationTokenAccount.toString()],
|