@hawksightco/hawk-sdk 1.1.53 → 1.1.54
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAe;IAGxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAGrC;;OAEG;IACG,gCAAgC,CAAC,EACrC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAa,GACd,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"OrcaIxGenerator.d.ts","sourceRoot":"","sources":["../../../src/ixGenerator/OrcaIxGenerator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAIxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D,KAAK,gCAAgC,GAAG;IACtC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAA;AAED;;GAEG;AACH,qBAAa,eAAe;IAGxB,OAAO,CAAC,OAAO;gBAAP,OAAO,EAAE,kBAAkB;IAGrC;;OAEG;IACG,gCAAgC,CAAC,EACrC,UAAU,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,MAAa,GACd,EAAE,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC;CA6E3E"}
|
|
@@ -63,8 +63,16 @@ class OrcaIxGenerator {
|
|
|
63
63
|
const tokenOwnerAccountB = useAta ? (0, functions_1.generateAta)(userPda, whirlpoolInfo.tokenMintB) : (0, functions_1.generateUserPdaStorageAccount)(userPda, whirlpoolInfo.tokenMintB);
|
|
64
64
|
const tokenVaultA = whirlpoolInfo.tokenVaultA;
|
|
65
65
|
const tokenVaultB = whirlpoolInfo.tokenVaultB;
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
let startIndex;
|
|
67
|
+
let nextIndex;
|
|
68
|
+
if (whirlpoolInfo.tickCurrentIndex < 0) {
|
|
69
|
+
startIndex = (0, orca_1.getPreviousStartTick)(whirlpoolInfo.tickCurrentIndex, whirlpoolInfo.tickSpacing);
|
|
70
|
+
nextIndex = (0, orca_1.getStartTickIndex)(whirlpoolInfo.tickCurrentIndex, whirlpoolInfo.tickSpacing);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
startIndex = (0, orca_1.getStartTickIndex)(whirlpoolInfo.tickCurrentIndex, whirlpoolInfo.tickSpacing);
|
|
74
|
+
nextIndex = (0, orca_1.getNextStartTick)(whirlpoolInfo.tickCurrentIndex, whirlpoolInfo.tickSpacing);
|
|
75
|
+
}
|
|
68
76
|
const { publicKey: tickArrayLower } = (0, orca_1.getTickArray)(addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool, startIndex);
|
|
69
77
|
const { publicKey: tickArrayUpper } = (0, orca_1.getTickArray)(addresses_1.ORCA_WHIRLPOOL_PROGRAM, whirlpool, nextIndex);
|
|
70
78
|
const ownerFeeA = (0, functions_1.generateAta)(addresses_1.SITE_FEE_OWNER, whirlpoolInfo.tokenMintA);
|
package/dist/src/orca.d.ts
CHANGED
|
@@ -35,6 +35,14 @@ export declare function getStartTickIndex(tickIndex: number, tickSpacing: number
|
|
|
35
35
|
* @returns
|
|
36
36
|
*/
|
|
37
37
|
export declare function getNextStartTick(tickIndex: number, tickSpacing: number): number;
|
|
38
|
+
/**
|
|
39
|
+
* Returns previous start tick
|
|
40
|
+
*
|
|
41
|
+
* @param tickIndex
|
|
42
|
+
* @param tickSpacing
|
|
43
|
+
* @returns
|
|
44
|
+
*/
|
|
45
|
+
export declare function getPreviousStartTick(tickIndex: number, tickSpacing: number): number;
|
|
38
46
|
/**
|
|
39
47
|
* @category Program Derived Addresses
|
|
40
48
|
* @param programId
|
package/dist/src/orca.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/orca.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,eAAe,GAAE,MAAU;;;EAGlK;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,UAQ3F;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAKtE;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM;;;EAO1G"}
|
|
1
|
+
{"version":3,"file":"orca.d.ts","sourceRoot":"","sources":["../../src/orca.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,eAAO,MAAM,eAAe,KAAK,CAAC;AAClC,eAAO,MAAM,cAAc,UAAU,CAAC;AACtC,eAAO,MAAM,cAAc,SAAS,CAAC;AACrC,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAEhD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,eAAe,GAAE,MAAU;;;EAGlK;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,MAAU,UAQ3F;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAKtE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,UAK1E;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,gBAAgB,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM;;;EAO1G"}
|
package/dist/src/orca.js
CHANGED
|
@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
26
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.getTickArray = exports.getNextStartTick = exports.getStartTickIndex = exports.getTickArrayFromTickIndex = exports.PDA_TICK_ARRAY_SEED = exports.MAX_TICK_INDEX = exports.MIN_TICK_INDEX = exports.TICK_ARRAY_SIZE = void 0;
|
|
29
|
+
exports.getTickArray = exports.getPreviousStartTick = exports.getNextStartTick = exports.getStartTickIndex = exports.getTickArrayFromTickIndex = exports.PDA_TICK_ARRAY_SEED = exports.MAX_TICK_INDEX = exports.MIN_TICK_INDEX = exports.TICK_ARRAY_SIZE = void 0;
|
|
30
30
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
31
31
|
const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
|
|
32
32
|
exports.TICK_ARRAY_SIZE = 88;
|
|
@@ -81,6 +81,20 @@ function getNextStartTick(tickIndex, tickSpacing) {
|
|
|
81
81
|
return nextTick;
|
|
82
82
|
}
|
|
83
83
|
exports.getNextStartTick = getNextStartTick;
|
|
84
|
+
/**
|
|
85
|
+
* Returns previous start tick
|
|
86
|
+
*
|
|
87
|
+
* @param tickIndex
|
|
88
|
+
* @param tickSpacing
|
|
89
|
+
* @returns
|
|
90
|
+
*/
|
|
91
|
+
function getPreviousStartTick(tickIndex, tickSpacing) {
|
|
92
|
+
const startTick = getStartTickIndex(tickIndex, tickSpacing);
|
|
93
|
+
const multiple = tickSpacing * exports.TICK_ARRAY_SIZE;
|
|
94
|
+
const nextTick = getStartTickIndex(startTick - multiple, tickSpacing);
|
|
95
|
+
return nextTick;
|
|
96
|
+
}
|
|
97
|
+
exports.getPreviousStartTick = getPreviousStartTick;
|
|
84
98
|
/**
|
|
85
99
|
* @category Program Derived Addresses
|
|
86
100
|
* @param programId
|