@hawksightco/hawk-sdk 1.1.40 → 1.1.41-hotfix-1
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/classes/MultiTransaction.d.ts.map +1 -1
- package/dist/src/classes/MultiTransaction.js +2 -4
- package/dist/src/classes/Transaction.d.ts.map +1 -1
- package/dist/src/classes/Transaction.js +1 -0
- package/dist/src/classes/Transaction3.d.ts.map +1 -1
- package/dist/src/classes/Transaction3.js +1 -0
- package/dist/src/hsToMeteora.d.ts.map +1 -1
- package/dist/src/hsToMeteora.js +173 -27
- package/dist/src/idl/meteora-idl.d.ts +5251 -0
- package/dist/src/idl/meteora-idl.d.ts.map +1 -0
- package/dist/src/idl/meteora-idl.js +5252 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiTransaction.d.ts","sourceRoot":"","sources":["../../../src/classes/MultiTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAA+B,MAAM,UAAU,CAAC;AAKlG,KAAK,6BAA6B,GAAG;IACnC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D,CAAA;AAED,qBAAa,gBAAgB;IAczB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,cAAc;IAChC,eAAe,EAAE;QACtB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,oBAAoB,EAAE,MAAM,CAAA;KAC7B;IACD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IAlBnC,OAAO,CAAC,GAAG,CAAgF;IAC3F,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,aAAa,CAA6C;IAElE;;OAEG;IACH,IAAI,KAAK,WAER;gBAGU,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,EAChC,eAAe,EAAE;QACtB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,oBAAoB,EAAE,MAAM,CAAA;KAC7B,EACQ,QAAQ,EAAE,IAAI,CAAC,SAAS;IAGnC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAOzE,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAI5D;;;;;OAKG;IACG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAWnD;;;;;OAKG;IACG,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC;IAoE/J,WAAW,CACf,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,iBAAiB,EAAE,MAAM,EACzB,wBAAwB,EAAE,aAAa,EACvC,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,eAAe;YA+CT,qBAAqB;IA0BnC,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAWrB;;;;;OAKG;YACW,cAAc;YAYd,eAAe;
|
|
1
|
+
{"version":3,"file":"MultiTransaction.d.ts","sourceRoot":"","sources":["../../../src/classes/MultiTransaction.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,aAAa,EAA+B,MAAM,UAAU,CAAC;AAKlG,KAAK,6BAA6B,GAAG;IACnC,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,SAAS,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,iBAAiB,EAAE,MAAM,IAAI,CAAC;IAC9B,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACrC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7D,CAAA;AAED,qBAAa,gBAAgB;IAczB,QAAQ,CAAC,WAAW,EAAE,MAAM;IAC5B,QAAQ,CAAC,cAAc,EAAE,cAAc;IAChC,eAAe,EAAE;QACtB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,oBAAoB,EAAE,MAAM,CAAA;KAC7B;IACD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IAlBnC,OAAO,CAAC,GAAG,CAAgF;IAC3F,OAAO,CAAC,mBAAmB,CAAa;IACxC,OAAO,CAAC,aAAa,CAA6C;IAElE;;OAEG;IACH,IAAI,KAAK,WAER;gBAGU,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,cAAc,EAChC,eAAe,EAAE;QACtB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC;QAC1B,oBAAoB,EAAE,MAAM,CAAA;KAC7B,EACQ,QAAQ,EAAE,IAAI,CAAC,SAAS;IAGnC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,sBAAsB,EAAE;IAOzE,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAI5D;;;;;OAKG;IACG,iBAAiB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IAWnD;;;;;OAKG;IACG,yBAAyB,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,EAAE,6BAA6B,GAAG,OAAO,CAAC,OAAO,CAAC;IAoE/J,WAAW,CACf,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,iBAAiB,EAAE,MAAM,EACzB,wBAAwB,EAAE,aAAa,EACvC,YAAY,EAAE,YAAY,EAC1B,IAAI,EAAE,eAAe;YA+CT,qBAAqB;IA0BnC,OAAO,CAAC,mBAAmB;IAU3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAUtB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAWrB;;;;;OAKG;YACW,cAAc;YAYd,eAAe;CAc9B"}
|
|
@@ -36,7 +36,6 @@ exports.MultiTransaction = void 0;
|
|
|
36
36
|
const web3 = __importStar(require("@solana/web3.js"));
|
|
37
37
|
const functions_1 = require("../functions");
|
|
38
38
|
const Transaction2_1 = require("./Transaction2");
|
|
39
|
-
const Logging_1 = require("./Logging");
|
|
40
39
|
const functions_2 = require("../functions");
|
|
41
40
|
class MultiTransaction {
|
|
42
41
|
/**
|
|
@@ -277,10 +276,9 @@ class MultiTransaction {
|
|
|
277
276
|
getFeeEstimate2(priorityLevel, txMetadataResponse) {
|
|
278
277
|
return __awaiter(this, void 0, void 0, function* () {
|
|
279
278
|
// Get fee estimate by simulating the transaction
|
|
280
|
-
|
|
281
|
-
(0, Logging_1.Log)(`addPriorityFeeIx: Starting getFeeEstimate function`);
|
|
279
|
+
(0, functions_1.benchmark)({ name: `getFeeEstimate2`, msg: `Starting getFeeEstimate function` });
|
|
282
280
|
let estimate = yield (0, functions_2.getFeeEstimate)(this.generalUtility, priorityLevel, txMetadataResponse);
|
|
283
|
-
(0,
|
|
281
|
+
(0, functions_1.benchmark)({ name: `getFeeEstimate2`, msg: `getFeeEstimate function`, end: true });
|
|
284
282
|
return estimate;
|
|
285
283
|
});
|
|
286
284
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,IAAI,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAClE,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,yBAAyB,EAAE,WAAW,EAAE,CAAC;IACzC,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC;QAClB,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,qBAAa,WAAW;IA+CpB,QAAQ,CAAC,kBAAkB,EAAE,2BAA2B;IACxD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IACjC,SAAS,CAAC,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE;IAC/C,SAAS,CAAC,cAAc,EAAE,cAAc;IAlD1C,2FAA2F;IAC3F,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC;IAC9C,IAAI,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAEvC;IAED,+DAA+D;IAC/D,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,oBAAoB,CAAC;IAC3D,IAAI,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAEpD;IAED,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElD,oFAAoF;IACpF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAM;IAC5C,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,6CAA6C;IAC7C,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,yEAAyE;IACzE,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACvD,IAAI,YAAY,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAEhD;IAED,8BAA8B;IAC9B,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED;;;;;;;OAOG;gBAEQ,kBAAkB,EAAE,2BAA2B,EAC/C,QAAQ,EAAE,IAAI,CAAC,SAAS,EACvB,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EACrE,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,EACrC,cAAc,EAAE,cAAc,EACxC,QAAQ,GAAE,IAAI,CAAC,sBAAsB,EAAO;
|
|
1
|
+
{"version":3,"file":"Transaction.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,6 +79,7 @@ class Transaction {
|
|
|
79
79
|
this.generalUtility = generalUtility;
|
|
80
80
|
/** Estimated fee in SOL for priority fee when addPriorityFee() method is called. */
|
|
81
81
|
this._priorityFeeEstimate = "";
|
|
82
|
+
txMetadataResponse.payer = payerKey.toBase58();
|
|
82
83
|
let mainIxs;
|
|
83
84
|
if (_mainIxs.length > 0) {
|
|
84
85
|
mainIxs = _mainIxs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction3.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction3.ts"],"names":[],"mappings":";AAYA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,IAAI,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAClE,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,yBAAyB,EAAE,WAAW,EAAE,CAAC;IACzC,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC;QAClB,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY;IA+CrB,QAAQ,CAAC,kBAAkB,EAAE,2BAA2B;IACxD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IACjC,SAAS,CAAC,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE;IAC/C,SAAS,CAAC,cAAc,EAAE,cAAc;IAlD1C,2FAA2F;IAC3F,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC;IAC9C,IAAI,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAEvC;IAED,+DAA+D;IAC/D,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,oBAAoB,CAAC;IAC3D,IAAI,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAEpD;IAED,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElD,oFAAoF;IACpF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAM;IAC5C,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,6CAA6C;IAC7C,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,yEAAyE;IACzE,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACvD,IAAI,YAAY,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAEhD;IAED,8BAA8B;IAC9B,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED;;;;;;;OAOG;gBAEQ,kBAAkB,EAAE,2BAA2B,EAC/C,QAAQ,EAAE,IAAI,CAAC,SAAS,EACvB,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EACrE,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,EACrC,cAAc,EAAE,cAAc,EACxC,QAAQ,GAAE,IAAI,CAAC,sBAAsB,EAAO;
|
|
1
|
+
{"version":3,"file":"Transaction3.d.ts","sourceRoot":"","sources":["../../../src/classes/Transaction3.ts"],"names":[],"mappings":";AAYA,OAAO,KAAK,MAAM,MAAM,6BAA6B,CAAC;AACtD,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,MAAM,4BAA4B,GAAG;IACzC,GAAG,EAAE,IAAI,CAAC,gBAAgB,GAAG,MAAM,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAC3B,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,+BAA+B,GAAG,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC;IAClE,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;CAChD,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,2BAA2B,EAAE,MAAM,EAAE,CAAC;IACtC,yBAAyB,EAAE,WAAW,EAAE,CAAC;IACzC,gBAAgB,EAAE,WAAW,EAAE,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,EAAE;QACR,QAAQ,EAAE,OAAO,CAAC;QAClB,UAAU,EAAE,OAAO,CAAC;QACpB,MAAM,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;IACJ,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF;;;GAGG;AACH,qBAAa,YAAY;IA+CrB,QAAQ,CAAC,kBAAkB,EAAE,2BAA2B;IACxD,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS;IACjC,SAAS,CAAC,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE;IAC9E,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE;IAC/C,SAAS,CAAC,cAAc,EAAE,cAAc;IAlD1C,2FAA2F;IAC3F,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,CAAC;IAC9C,IAAI,SAAS,IAAI,IAAI,CAAC,kBAAkB,CAEvC;IAED,+DAA+D;IAC/D,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,oBAAoB,CAAC;IAC3D,IAAI,oBAAoB,IAAI,IAAI,CAAC,oBAAoB,CAEpD;IAED,+EAA+E;IAC/E,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElD,oFAAoF;IACpF,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAM;IAC5C,IAAI,mBAAmB,IAAI,MAAM,CAEhC;IAED,6CAA6C;IAC7C,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,yEAAyE;IACzE,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IACvD,IAAI,YAAY,IAAI,IAAI,CAAC,sBAAsB,EAAE,CAEhD;IAED,8BAA8B;IAC9B,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED;;;;;;;OAOG;gBAEQ,kBAAkB,EAAE,2BAA2B,EAC/C,QAAQ,EAAE,IAAI,CAAC,SAAS,EACvB,eAAe,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,MAAM,CAAA;KAAE,EACrE,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,EACrC,cAAc,EAAE,cAAc,EACxC,QAAQ,GAAE,IAAI,CAAC,sBAAsB,EAAO;IA8C9C;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,UAAU,GAAE,OAAe,GAAG,IAAI;IAuB/D;;;;;;OAMG;IACH,YAAY,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,UAAU,GAAG,IAAI;IAcpE;;;;OAIG;IACH,yBAAyB,IAAI,OAAO;IAIpC;;;;;;;;;;OAUG;IACG,gBAAgB,CACpB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,IAAI,EACnB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAEzC;;;;;;;;;;;;;OAaG;IACG,gBAAgB,CACpB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,KAAK,EACpB,aAAa,EAAE,MAAM,CAAC,aAAa,EACnC,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAwFzC;;;;;;;;;;;;OAYG;IACG,mBAAmB,CACvB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,sBAAsB,CAAC,EAAE,MAAM,GAC9B,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;OAKG;IACG,mBAAmB,CACvB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,OAAO,GAAE,IAAI,CAAC,OAAO,EAAO,GAC3B,OAAO,CAAC,4BAA4B,CAAC;IAyCxC;;OAEG;IACH,gBAAgB,CACd,eAAe,EAAE,IAAI,CAAC,8BAA8B,GACnD,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,oBAAoB,CAAC;IAcvD;;;;OAIG;IACH,SAAS,CAAC,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAWvD;;OAEG;IACH,SAAS,CAAC,4BAA4B,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,MAAM;IAgB5F;;OAEG;IACH,SAAS,CAAC,4BAA4B,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,sBAAsB,EAAE,GAAG,MAAM;IAgB5F;;OAEG;IACH,SAAS,CAAC,oBAAoB;CAW/B"}
|
|
@@ -91,6 +91,7 @@ class Transaction3 {
|
|
|
91
91
|
this.generalUtility = generalUtility;
|
|
92
92
|
/** Estimated fee in SOL for priority fee when addPriorityFee() method is called. */
|
|
93
93
|
this._priorityFeeEstimate = "";
|
|
94
|
+
txMetadataResponse.payer = payerKey.toBase58();
|
|
94
95
|
let mainIxs;
|
|
95
96
|
if (_mainIxs.length > 0) {
|
|
96
97
|
mainIxs = _mainIxs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hsToMeteora.d.ts","sourceRoot":"","sources":["../../src/hsToMeteora.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAcnD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"hsToMeteora.d.ts","sourceRoot":"","sources":["../../src/hsToMeteora.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAcnD;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAUpI;AAED;;;;;GAKG;AACH,wBAAsB,+BAA+B,CAAC,EAAC,GAAG,EAAE,OAAO,EAAE,SAAS,EAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAUjJ"}
|
package/dist/src/hsToMeteora.js
CHANGED
|
@@ -45,13 +45,15 @@ const util = __importStar(require("./functions"));
|
|
|
45
45
|
*/
|
|
46
46
|
function meteoraToHawksight(_a) {
|
|
47
47
|
return __awaiter(this, arguments, void 0, function* ({ ixs, userPda, authority }) {
|
|
48
|
-
|
|
49
|
-
|
|
48
|
+
const _ixs = [];
|
|
49
|
+
for (const ix of ixs) {
|
|
50
|
+
const _ix = yield HawksightMeteoraCpi.factory(ix, userPda, authority).getInstruction();
|
|
50
51
|
if (ix.programId.toString() === addresses_1.ASSOCIATED_TOKEN_PROGRAM.toString() && ix.keys.length === 6) {
|
|
51
52
|
ix.keys[0] = Object.assign(Object.assign({}, ix.keys[0]), { pubkey: authority });
|
|
52
53
|
}
|
|
53
|
-
|
|
54
|
-
}
|
|
54
|
+
_ixs.push(_ix);
|
|
55
|
+
}
|
|
56
|
+
return _ixs;
|
|
55
57
|
});
|
|
56
58
|
}
|
|
57
59
|
exports.meteoraToHawksight = meteoraToHawksight;
|
|
@@ -141,13 +143,34 @@ class HawksightMeteoraCpi {
|
|
|
141
143
|
* @returns The (possibly modified) transaction instruction.
|
|
142
144
|
*/
|
|
143
145
|
getInstruction() {
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
146
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
147
|
+
const matchInstance = this.sighashMatch();
|
|
148
|
+
if (this.programIdMatch() && matchInstance !== undefined) {
|
|
149
|
+
matchInstance.replace();
|
|
150
|
+
yield matchInstance.addHawksightCpi();
|
|
151
|
+
return this.ix;
|
|
152
|
+
}
|
|
148
153
|
return this.ix;
|
|
149
|
-
}
|
|
150
|
-
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
/**
|
|
157
|
+
* Modifies the transaction instruction to include specific Hawksight CPI details.
|
|
158
|
+
* Prepares the instruction for execution by adjusting its program ID and data based on Hawksight criteria.
|
|
159
|
+
*/
|
|
160
|
+
addHawksightCpi() {
|
|
161
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
162
|
+
const METEORA_PROGRAM = addresses_1.METEORA_DLMM_PROGRAM;
|
|
163
|
+
const size = Buffer.alloc(4);
|
|
164
|
+
size.writeUint32LE(this.ix.data.length);
|
|
165
|
+
const data = Buffer.concat([util.sighash('meteora_dynamic_cpi'), size, this.ix.data]);
|
|
166
|
+
this.ix.programId = addresses_1.IYF_MAIN;
|
|
167
|
+
this.ix.data = data;
|
|
168
|
+
this.ix.keys.unshift(...[
|
|
169
|
+
{ pubkey: this.userPda, isSigner: false, isWritable: false },
|
|
170
|
+
{ pubkey: this.authority, isSigner: true, isWritable: true },
|
|
171
|
+
{ pubkey: METEORA_PROGRAM, isSigner: false, isWritable: false },
|
|
172
|
+
]);
|
|
173
|
+
});
|
|
151
174
|
}
|
|
152
175
|
/**
|
|
153
176
|
* Adds a subsequent CPI to the chain.
|
|
@@ -187,23 +210,6 @@ class HawksightMeteoraCpi {
|
|
|
187
210
|
programIdMatch() {
|
|
188
211
|
return this.ix.programId.equals(addresses_1.METEORA_DLMM_PROGRAM);
|
|
189
212
|
}
|
|
190
|
-
/**
|
|
191
|
-
* Modifies the transaction instruction to include specific Hawksight CPI details.
|
|
192
|
-
* Prepares the instruction for execution by adjusting its program ID and data based on Hawksight criteria.
|
|
193
|
-
*/
|
|
194
|
-
addHawksightCpi() {
|
|
195
|
-
const METEORA_PROGRAM = addresses_1.METEORA_DLMM_PROGRAM;
|
|
196
|
-
const size = Buffer.alloc(4);
|
|
197
|
-
size.writeUint32LE(this.ix.data.length);
|
|
198
|
-
const data = Buffer.concat([util.sighash('meteora_dynamic_cpi'), size, this.ix.data]);
|
|
199
|
-
this.ix.programId = addresses_1.IYF_MAIN;
|
|
200
|
-
this.ix.data = data;
|
|
201
|
-
this.ix.keys.unshift(...[
|
|
202
|
-
{ pubkey: this.userPda, isSigner: false, isWritable: false },
|
|
203
|
-
{ pubkey: this.authority, isSigner: true, isWritable: true },
|
|
204
|
-
{ pubkey: METEORA_PROGRAM, isSigner: false, isWritable: false },
|
|
205
|
-
]);
|
|
206
|
-
}
|
|
207
213
|
}
|
|
208
214
|
/**
|
|
209
215
|
* Handles the initialization of a position in a blockchain transaction.
|
|
@@ -379,6 +385,80 @@ class ClaimFee extends HawksightMeteoraCpi {
|
|
|
379
385
|
this.ix.keys[4].pubkey = this.userPda;
|
|
380
386
|
this.ix.keys[4].isSigner = false;
|
|
381
387
|
}
|
|
388
|
+
/**
|
|
389
|
+
* Overrides default add hawksight cpi to use meteoraDlmmClaimFee instead of meteoraDynamicCpi
|
|
390
|
+
*/
|
|
391
|
+
addHawksightCpi() {
|
|
392
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
393
|
+
// Common parameters
|
|
394
|
+
const farm = addresses_1.USDC_FARM;
|
|
395
|
+
const userPda = this.userPda;
|
|
396
|
+
const authority = this.authority;
|
|
397
|
+
const iyfProgram = addresses_1.IYF_MAIN;
|
|
398
|
+
// Get token mints X and Y
|
|
399
|
+
const tokenXMint = this.ix.keys[9].pubkey;
|
|
400
|
+
const tokenYMint = this.ix.keys[10].pubkey;
|
|
401
|
+
// Generate owner fee X and Y ATA
|
|
402
|
+
const ownerFeeX = util.generateAta(addresses_1.SITE_FEE_OWNER, tokenXMint);
|
|
403
|
+
const ownerFeeY = util.generateAta(addresses_1.SITE_FEE_OWNER, tokenYMint);
|
|
404
|
+
// Generate IX via extension contract
|
|
405
|
+
const claimFeeIx = yield anchor_1.Anchor.instance().iyfExtension.methods
|
|
406
|
+
.meteoraDlmmClaimFee()
|
|
407
|
+
.accounts({
|
|
408
|
+
farm,
|
|
409
|
+
userPda,
|
|
410
|
+
authority,
|
|
411
|
+
iyfProgram,
|
|
412
|
+
lbPair: this.ix.keys[0].pubkey,
|
|
413
|
+
position: this.ix.keys[1].pubkey,
|
|
414
|
+
binArrayLower: this.ix.keys[2].pubkey,
|
|
415
|
+
binArrayUpper: this.ix.keys[3].pubkey,
|
|
416
|
+
reserveX: this.ix.keys[5].pubkey,
|
|
417
|
+
reserveY: this.ix.keys[6].pubkey,
|
|
418
|
+
userTokenX: this.ix.keys[7].pubkey,
|
|
419
|
+
userTokenY: this.ix.keys[8].pubkey,
|
|
420
|
+
tokenXMint: this.ix.keys[9].pubkey,
|
|
421
|
+
tokenYMint: this.ix.keys[10].pubkey,
|
|
422
|
+
tokenProgram: this.ix.keys[11].pubkey,
|
|
423
|
+
eventAuthority: this.ix.keys[12].pubkey,
|
|
424
|
+
meteoraDlmmProgram: this.ix.keys[13].pubkey,
|
|
425
|
+
ownerFeeX,
|
|
426
|
+
ownerFeeY,
|
|
427
|
+
}).instruction();
|
|
428
|
+
// Instruction via main hawksight contract
|
|
429
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
430
|
+
.iyfExtensionExecute(claimFeeIx.data)
|
|
431
|
+
.accounts({
|
|
432
|
+
farm,
|
|
433
|
+
userPda,
|
|
434
|
+
authority,
|
|
435
|
+
iyfProgram,
|
|
436
|
+
iyfExtensionProgram: addresses_1.IYF_EXTENSION,
|
|
437
|
+
})
|
|
438
|
+
.remainingAccounts([
|
|
439
|
+
claimFeeIx.keys[4],
|
|
440
|
+
claimFeeIx.keys[5],
|
|
441
|
+
claimFeeIx.keys[6],
|
|
442
|
+
claimFeeIx.keys[7],
|
|
443
|
+
claimFeeIx.keys[8],
|
|
444
|
+
claimFeeIx.keys[9],
|
|
445
|
+
claimFeeIx.keys[10],
|
|
446
|
+
claimFeeIx.keys[11],
|
|
447
|
+
claimFeeIx.keys[12],
|
|
448
|
+
claimFeeIx.keys[13],
|
|
449
|
+
claimFeeIx.keys[14],
|
|
450
|
+
claimFeeIx.keys[15],
|
|
451
|
+
claimFeeIx.keys[16],
|
|
452
|
+
claimFeeIx.keys[17],
|
|
453
|
+
claimFeeIx.keys[18],
|
|
454
|
+
])
|
|
455
|
+
.instruction();
|
|
456
|
+
// Override the instruction
|
|
457
|
+
this.ix.programId = ix.programId;
|
|
458
|
+
this.ix.data = ix.data;
|
|
459
|
+
this.ix.keys = ix.keys;
|
|
460
|
+
});
|
|
461
|
+
}
|
|
382
462
|
}
|
|
383
463
|
/**
|
|
384
464
|
* Manages the claiming of rewards in blockchain operations, typically associated with staking or similar activities.
|
|
@@ -401,6 +481,72 @@ class ClaimReward extends HawksightMeteoraCpi {
|
|
|
401
481
|
this.ix.keys[4].pubkey = this.userPda;
|
|
402
482
|
this.ix.keys[4].isSigner = false;
|
|
403
483
|
}
|
|
484
|
+
/**
|
|
485
|
+
* Overrides default add hawksight cpi to use meteoraDlmmClaimReward instead of meteoraDynamicCpi
|
|
486
|
+
*/
|
|
487
|
+
addHawksightCpi() {
|
|
488
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
489
|
+
// Common parameters
|
|
490
|
+
const farm = addresses_1.USDC_FARM;
|
|
491
|
+
const userPda = this.userPda;
|
|
492
|
+
const authority = this.authority;
|
|
493
|
+
const iyfProgram = addresses_1.IYF_MAIN;
|
|
494
|
+
// Get token mint
|
|
495
|
+
const rewardMint = this.ix.keys[9].pubkey;
|
|
496
|
+
// Generate owner fee X and Y ATA
|
|
497
|
+
const ownerFee = util.generateAta(addresses_1.SITE_FEE_OWNER, rewardMint);
|
|
498
|
+
// Get reward index from parameter
|
|
499
|
+
const rewardIndex = new bn_js_1.BN(this.ix.data.readBigInt64LE(8).toString());
|
|
500
|
+
// Generate IX via extension contract
|
|
501
|
+
const claimReward = yield anchor_1.Anchor.instance().iyfExtension.methods
|
|
502
|
+
.meteoraDlmmClaimReward(rewardIndex)
|
|
503
|
+
.accounts({
|
|
504
|
+
farm,
|
|
505
|
+
userPda,
|
|
506
|
+
authority,
|
|
507
|
+
iyfProgram,
|
|
508
|
+
lbPair: this.ix.keys[4].pubkey,
|
|
509
|
+
position: this.ix.keys[5].pubkey,
|
|
510
|
+
binArrayLower: this.ix.keys[6].pubkey,
|
|
511
|
+
binArrayUpper: this.ix.keys[7].pubkey,
|
|
512
|
+
rewardVault: this.ix.keys[8].pubkey,
|
|
513
|
+
rewardMint: this.ix.keys[9].pubkey,
|
|
514
|
+
userTokenAccount: this.ix.keys[10].pubkey,
|
|
515
|
+
tokenProgram: this.ix.keys[11].pubkey,
|
|
516
|
+
eventAuthority: this.ix.keys[12].pubkey,
|
|
517
|
+
meteoraDlmmProgram: this.ix.keys[13].pubkey,
|
|
518
|
+
ownerFee,
|
|
519
|
+
}).instruction();
|
|
520
|
+
// Instruction via main hawksight contract
|
|
521
|
+
const ix = yield anchor_1.Anchor.instance().iyfMain.methods
|
|
522
|
+
.iyfExtensionExecute(claimReward.data)
|
|
523
|
+
.accounts({
|
|
524
|
+
farm,
|
|
525
|
+
userPda,
|
|
526
|
+
authority,
|
|
527
|
+
iyfProgram,
|
|
528
|
+
iyfExtensionProgram: addresses_1.IYF_EXTENSION,
|
|
529
|
+
})
|
|
530
|
+
.remainingAccounts([
|
|
531
|
+
claimReward.keys[4],
|
|
532
|
+
claimReward.keys[5],
|
|
533
|
+
claimReward.keys[6],
|
|
534
|
+
claimReward.keys[7],
|
|
535
|
+
claimReward.keys[8],
|
|
536
|
+
claimReward.keys[9],
|
|
537
|
+
claimReward.keys[10],
|
|
538
|
+
claimReward.keys[11],
|
|
539
|
+
claimReward.keys[12],
|
|
540
|
+
claimReward.keys[13],
|
|
541
|
+
claimReward.keys[14],
|
|
542
|
+
])
|
|
543
|
+
.instruction();
|
|
544
|
+
// Override the instruction
|
|
545
|
+
this.ix.programId = ix.programId;
|
|
546
|
+
this.ix.data = ix.data;
|
|
547
|
+
this.ix.keys = ix.keys;
|
|
548
|
+
});
|
|
549
|
+
}
|
|
404
550
|
}
|
|
405
551
|
/**
|
|
406
552
|
* Handles the closure of a position within a blockchain transaction.
|