@hawksightco/hawk-sdk 1.3.46 → 1.3.47
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/src/hsToMeteora.js +19 -19
- package/package.json +1 -1
package/dist/src/hsToMeteora.js
CHANGED
|
@@ -2378,8 +2378,8 @@ class MeteoraDlmmWithdraw2Automation extends HawksightMeteoraAutomationCpi {
|
|
|
2378
2378
|
const iyfProgram = addresses_1.IYF_MAIN;
|
|
2379
2379
|
const hawksightAuthority = addresses_1.HS_AUTHORITY;
|
|
2380
2380
|
// Get token mints X and Y
|
|
2381
|
-
const tokenXMint = this.ix.keys[
|
|
2382
|
-
const tokenYMint = this.ix.keys[
|
|
2381
|
+
const tokenXMint = this.ix.keys[7].pubkey;
|
|
2382
|
+
const tokenYMint = this.ix.keys[8].pubkey;
|
|
2383
2383
|
const tokenXMintInfo = AccountCache_1.AccountCache.get(tokenXMint);
|
|
2384
2384
|
const tokenYMintInfo = AccountCache_1.AccountCache.get(tokenYMint);
|
|
2385
2385
|
if (!(!!tokenXMintInfo && !!tokenYMintInfo)) {
|
|
@@ -2388,16 +2388,16 @@ class MeteoraDlmmWithdraw2Automation extends HawksightMeteoraAutomationCpi {
|
|
|
2388
2388
|
// Adjust by token type
|
|
2389
2389
|
const pdaTokenType = (_a = this.opt) === null || _a === void 0 ? void 0 : _a.pdaTokenType;
|
|
2390
2390
|
if (pdaTokenType === types_1.TokenType.LTA) {
|
|
2391
|
-
this.ix.keys[
|
|
2392
|
-
this.ix.keys[
|
|
2391
|
+
this.ix.keys[3].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[9].pubkey);
|
|
2392
|
+
this.ix.keys[4].pubkey = util.generateLimitToken(this.userPda, this.ix.keys[10].pubkey);
|
|
2393
2393
|
}
|
|
2394
2394
|
else if (pdaTokenType === types_1.TokenType.STA) {
|
|
2395
|
-
this.ix.keys[
|
|
2396
|
-
this.ix.keys[
|
|
2395
|
+
this.ix.keys[3].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[9].pubkey);
|
|
2396
|
+
this.ix.keys[4].pubkey = util.generateUserPdaStorageAccount(this.userPda, this.ix.keys[10].pubkey);
|
|
2397
2397
|
}
|
|
2398
2398
|
else {
|
|
2399
|
-
this.ix.keys[
|
|
2400
|
-
this.ix.keys[
|
|
2399
|
+
this.ix.keys[3].pubkey = util.generateAta(this.userPda, this.ix.keys[9].pubkey, tokenXMintInfo.info.owner);
|
|
2400
|
+
this.ix.keys[4].pubkey = util.generateAta(this.userPda, this.ix.keys[10].pubkey, tokenYMintInfo.info.owner);
|
|
2401
2401
|
}
|
|
2402
2402
|
// Generate IX via extension contract
|
|
2403
2403
|
// @ts-ignore
|
|
@@ -2409,17 +2409,17 @@ class MeteoraDlmmWithdraw2Automation extends HawksightMeteoraAutomationCpi {
|
|
|
2409
2409
|
authority,
|
|
2410
2410
|
iyfProgram,
|
|
2411
2411
|
hawksightAuthority,
|
|
2412
|
-
position: this.ix.keys[
|
|
2413
|
-
lbPair: this.ix.keys[
|
|
2414
|
-
binArrayBitmapExtension: this.ix.keys[
|
|
2415
|
-
userTokenX: this.ix.keys[
|
|
2416
|
-
userTokenY: this.ix.keys[
|
|
2417
|
-
reserveX: this.ix.keys[
|
|
2418
|
-
reserveY: this.ix.keys[
|
|
2419
|
-
tokenXMint: this.ix.keys[
|
|
2420
|
-
tokenYMint: this.ix.keys[
|
|
2421
|
-
tokenXProgram: this.ix.keys[
|
|
2422
|
-
tokenYProgram: this.ix.keys[
|
|
2412
|
+
position: this.ix.keys[0].pubkey,
|
|
2413
|
+
lbPair: this.ix.keys[1].pubkey,
|
|
2414
|
+
binArrayBitmapExtension: this.ix.keys[2].pubkey,
|
|
2415
|
+
userTokenX: this.ix.keys[3].pubkey,
|
|
2416
|
+
userTokenY: this.ix.keys[4].pubkey,
|
|
2417
|
+
reserveX: this.ix.keys[5].pubkey,
|
|
2418
|
+
reserveY: this.ix.keys[6].pubkey,
|
|
2419
|
+
tokenXMint: this.ix.keys[7].pubkey,
|
|
2420
|
+
tokenYMint: this.ix.keys[8].pubkey,
|
|
2421
|
+
tokenXProgram: this.ix.keys[10].pubkey,
|
|
2422
|
+
tokenYProgram: this.ix.keys[11].pubkey,
|
|
2423
2423
|
eventAuthority: this.ix.keys[13].pubkey,
|
|
2424
2424
|
meteoraDlmmProgram: this.ix.keys[14].pubkey,
|
|
2425
2425
|
}).instruction();
|