@hawksightco/hawk-sdk 1.1.9 → 1.1.11

package/dist/src/classes/Atomicity.d.ts

@@ -2,13 +2,14 @@
 import * as web3 from '@solana/web3.js';
 import { DummySigners, TransactionBatchExecute } from "./TransactionBatchExecute";
 import { SimpleIxGenerator } from './SimpleIxGenerator';
+import { JupiterAlts } from './JupiterAlts';
 export declare class Atomicity extends TransactionBatchExecute {
     private ixGenerator;
     /**
      * User wallet
      */
     private userWallet?;
-    constructor(lookupTableAddresses: web3.PublicKey[], instructions: web3.TransactionInstruction[], payer: web3.Keypair, connection: web3.Connection, signers: web3.Keypair[] | undefined, ixGenerator: SimpleIxGenerator);
+    constructor(lookupTableAddresses: web3.PublicKey[], instructions: web3.TransactionInstruction[], payer: web3.Keypair, connection: web3.Connection, signers: web3.Keypair[] | undefined, jupiterAlts: JupiterAlts, ixGenerator: SimpleIxGenerator);
     /**
      * Set user wallet
      */

package/dist/src/classes/Atomicity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Atomicity.d.ts","sourceRoot":"","sources":["../../../src/classes/Atomicity.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGxD,qBAAa,SAAU,SAAQ,uBAAuB;IAalD,OAAO,CAAC,WAAW;IAXrB;;OAEG;IACH,OAAO,CAAC,UAAU,CAAC,CAAiB;gBAGlC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,EACtC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,KAAK,EAAE,IAAI,CAAC,OAAO,EACnB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,OAAO,4BAAqB,EACpB,WAAW,EAAE,iBAAiB;IAWxC;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS;IAIxC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IA4B5D;;;;;;OAMG;cACa,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;CAiDxJ"}
+{"version":3,"file":"Atomicity.d.ts","sourceRoot":"","sources":["../../../src/classes/Atomicity.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,SAAU,SAAQ,uBAAuB;IAclD,OAAO,CAAC,WAAW;IAZrB;;OAEG;IACH,OAAO,CAAC,UAAU,CAAC,CAAiB;gBAGlC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,EACtC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,KAAK,EAAE,IAAI,CAAC,OAAO,EACnB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,OAAO,4BAAqB,EAC5B,WAAW,EAAE,WAAW,EAChB,WAAW,EAAE,iBAAiB;IAYxC;;OAEG;IACH,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS;IAIxC;;;OAGG;IACH,OAAO,CAAC,aAAa;IAOrB;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IA4B5D;;;;;;OAMG;cACa,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;CAiDxJ"}

package/dist/src/classes/Atomicity.js

@@ -13,8 +13,8 @@ exports.Atomicity = void 0;
 const TransactionBatchExecute_1 = require("./TransactionBatchExecute");
 const functions_1 = require("../functions");
 class Atomicity extends TransactionBatchExecute_1.TransactionBatchExecute {
-    constructor(lookupTableAddresses, instructions, payer, connection, signers = [], ixGenerator) {
-        super(lookupTableAddresses, instructions, payer, connection, signers);
+    constructor(lookupTableAddresses, instructions, payer, connection, signers = [], jupiterAlts, ixGenerator) {
+        super(lookupTableAddresses, instructions, payer, connection, signers, jupiterAlts);
         this.ixGenerator = ixGenerator;
     }
     /**

package/dist/src/classes/HawkAPI.d.ts

@@ -10,6 +10,7 @@ import { HawkApiOptions } from "../types";
 import { SimpleIxGenerator } from "./SimpleIxGenerator";
 import { TransactionBatchExecute, TransactionBatchExecuteParams } from "./TransactionBatchExecute";
 import { Atomicity } from "./Atomicity";
+import { JupiterAlts } from "./JupiterAlts";
 /**
  * HawkAPI is a central gateway class that aggregates access to various functional modules
  * for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
@@ -41,6 +42,8 @@ export declare class HawkAPI {
     readonly search: Search;
     /** Simple instruction generator */
     readonly simpleIxGenerator: SimpleIxGenerator;
+    /** Jupiter alts */
+    readonly jupAlts: JupiterAlts;
     /**
      * Initializes a new instance of the HawkAPI class with a specified API URL.
      * @param url The base URL for the HawkSight API services, defaulted to "https://api2.hawksight.co" if not specified.

package/dist/src/classes/HawkAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC;;;;;;;;GAQG;AACH,qBAAa,OAAO;IAkChB,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IAlC7B,+BAA+B;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC,iEAAiE;IACjE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,6GAA6G;IAC7G,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,+BAA+B;IAC/B,SAAgB,cAAc,EAAE,cAAc,CAAC;IAE/C,0FAA0F;IAC1F,SAAgB,IAAI,EAAE,IAAI,CAAC;IAE3B,mFAAmF;IACnF,OAAO,CAAC,YAAY,CAAc;IAClC,IAAI,WAAW,gBAAgC;IAE/C,kGAAkG;IAClG,SAAgB,qBAAqB,EAAE,sBAAsB,CAAC;IAE9D,mDAAmD;IACnD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,mCAAmC;IACnC,SAAgB,iBAAiB,EAAE,iBAAiB,CAAC;IAErD;;;OAGG;gBAEkB,GAAG,GAAE,MAAoC,EACzC,OAAO,CAAC,4BAAgB;IAwB7C;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,KAAK,WAAW;IAI9F;;;;OAIG;IACH,YAAY,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;IAU5G;;;;OAIG;IACH,SAAS,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;CAU1G"}
+{"version":3,"file":"HawkAPI.d.ts","sourceRoot":"","sources":["../../../src/classes/HawkAPI.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,6BAA6B,EAAE,MAAM,2BAA2B,CAAC;AACnG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C;;;;;;;;GAQG;AACH,qBAAa,OAAO;IAqChB,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IArC7B,+BAA+B;IAC/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC,iEAAiE;IACjE,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,6GAA6G;IAC7G,SAAgB,OAAO,EAAE,OAAO,CAAC;IAEjC,+BAA+B;IAC/B,SAAgB,cAAc,EAAE,cAAc,CAAC;IAE/C,0FAA0F;IAC1F,SAAgB,IAAI,EAAE,IAAI,CAAC;IAE3B,mFAAmF;IACnF,OAAO,CAAC,YAAY,CAAc;IAClC,IAAI,WAAW,gBAAgC;IAE/C,kGAAkG;IAClG,SAAgB,qBAAqB,EAAE,sBAAsB,CAAC;IAE9D,mDAAmD;IACnD,SAAgB,MAAM,EAAE,MAAM,CAAC;IAE/B,mCAAmC;IACnC,SAAgB,iBAAiB,EAAE,iBAAiB,CAAC;IAErD,mBAAmB;IACnB,SAAgB,OAAO,EAAE,WAAW,CAAC;IAErC;;;OAGG;gBAEkB,GAAG,GAAE,MAAoC,EACzC,OAAO,CAAC,4BAAgB;IAyB7C;;;;OAIG;IACH,mBAAmB,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,KAAK,WAAW;IAI9F;;;;OAIG;IACH,YAAY,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;IAW5G;;;;OAIG;IACH,SAAS,CAAC,EAAC,oBAAoB,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAC,EAAE,6BAA6B;CAW1G"}

package/dist/src/classes/HawkAPI.js

@@ -13,6 +13,7 @@ const CreateTxMetadata_1 = require("./CreateTxMetadata");
 const SimpleIxGenerator_1 = require("./SimpleIxGenerator");
 const TransactionBatchExecute_1 = require("./TransactionBatchExecute");
 const Atomicity_1 = require("./Atomicity");
+const JupiterAlts_1 = require("./JupiterAlts");
 /**
  * HawkAPI is a central gateway class that aggregates access to various functional modules
  * for interacting with HawkSight's blockchain APIs. This class initializes and exposes modules
@@ -41,6 +42,7 @@ class HawkAPI {
         this.txGeneratorAutomation = new TxGeneratorAutomations_1.TxGeneratorAutomations(client, this.generalUtility);
         this.search = new Search_1.Search(url);
         this.simpleIxGenerator = new SimpleIxGenerator_1.SimpleIxGenerator();
+        this.jupAlts = new JupiterAlts_1.JupiterAlts();
         // Load create tx metadata module
         if (this.options === undefined || !this.options.disableTxMetadataLoad) {
             CreateTxMetadata_1.CreateTxMetadata.instance().load();
@@ -64,7 +66,7 @@ class HawkAPI {
      * @param param
      */
     batchExecute({ lookupTableAddresses, instructions, payer, connection, signers }) {
-        return new TransactionBatchExecute_1.TransactionBatchExecute(lookupTableAddresses, instructions, payer, connection, signers);
+        return new TransactionBatchExecute_1.TransactionBatchExecute(lookupTableAddresses, instructions, payer, connection, signers, this.jupAlts);
     }
     /**
      * Create instance of Atomicity class
@@ -72,7 +74,7 @@ class HawkAPI {
      * @param param
      */
     atomicity({ lookupTableAddresses, instructions, payer, connection, signers }) {
-        return new Atomicity_1.Atomicity(lookupTableAddresses, instructions, payer, connection, signers, this.simpleIxGenerator);
+        return new Atomicity_1.Atomicity(lookupTableAddresses, instructions, payer, connection, signers, this.jupAlts, this.simpleIxGenerator);
     }
 }
 exports.HawkAPI = HawkAPI;

package/dist/src/classes/JupiterAlts.d.ts

@@ -0,0 +1,38 @@
+/// <reference types="@meteora-ag/dlmm/node_modules/@solana/web3.js" />
+import * as web3 from "@solana/web3.js";
+export type Alts = Record<string, string>;
+export declare class JupiterAlts {
+    private username?;
+    private password?;
+    private hash?;
+    private url?;
+    private _alts;
+    /**
+     * Return jupiter alts object
+     */
+    get alts(): Alts;
+    /**
+     * Set API URL
+     */
+    setApiUrl(url: string): void;
+    /**
+     * Find address lookup table from given public keys
+     *
+     * @param pubkeys
+     */
+    findAltByPubkeys(pubkeys: web3.PublicKey[]): web3.PublicKey[];
+    /**
+     * Set server credentials
+     *
+     * @param username
+     * @param password
+     */
+    setCredentials(username: string, password: string): void;
+    /**
+     * Download jupiter alts from endpoint
+     *
+     * @returns
+     */
+    downloadAlts(): Promise<void>;
+}
+//# sourceMappingURL=JupiterAlts.d.ts.map

package/dist/src/classes/JupiterAlts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JupiterAlts.d.ts","sourceRoot":"","sources":["../../../src/classes/JupiterAlts.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE1C,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,IAAI,CAAC,CAAS;IACtB,OAAO,CAAC,GAAG,CAAC,CAAS;IACrB,OAAO,CAAC,KAAK,CAAY;IAEzB;;OAEG;IACH,IAAI,IAAI,IAAI,IAAI,CAEf;IAED;;OAEG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM;IAIrB;;;;OAIG;IACH,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE;IAW7D;;;;;OAKG;IACH,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAKjD;;;;OAIG;IACG,YAAY;CAsBnB"}

package/dist/src/classes/JupiterAlts.js

@@ -0,0 +1,104 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JupiterAlts = void 0;
+const web3 = __importStar(require("@solana/web3.js"));
+class JupiterAlts {
+    constructor() {
+        this._alts = {};
+    }
+    /**
+     * Return jupiter alts object
+     */
+    get alts() {
+        return this._alts;
+    }
+    /**
+     * Set API URL
+     */
+    setApiUrl(url) {
+        this.url = url;
+    }
+    /**
+     * Find address lookup table from given public keys
+     *
+     * @param pubkeys
+     */
+    findAltByPubkeys(pubkeys) {
+        const alts = [];
+        for (const pubkey of pubkeys) {
+            const alt = this._alts[pubkey.toBase58()];
+            if (alt !== undefined) {
+                alts.push(new web3.PublicKey(alt));
+            }
+        }
+        return alts;
+    }
+    /**
+     * Set server credentials
+     *
+     * @param username
+     * @param password
+     */
+    setCredentials(username, password) {
+        this.username = username;
+        this.password = password;
+    }
+    /**
+     * Download jupiter alts from endpoint
+     *
+     * @returns
+     */
+    downloadAlts() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.url === undefined) {
+                throw new Error('Please set endpoint URL via hawkAPI.jupAlts.setApiUrl first!');
+            }
+            if (this.username === undefined || this.password === undefined) {
+                throw new Error('Please set credentials via hawkAPI.jupAlts.setCredentials() first!');
+            }
+            const base64Credentials = btoa(`${this.username}:${this.password}`);
+            const hash = yield (yield fetch(this.url, { headers: { Authorization: `Basic ${base64Credentials}`, Range: 'bytes=9-72' } })).text();
+            // If hash matches, then no need to download the file.
+            if (this.hash === hash)
+                return;
+            // Otherwise, download the alts
+            const response = yield fetch(this.url, { headers: { Authorization: `Basic ${base64Credentials}` } });
+            const content = yield response.text();
+            const jsonString = content.slice(82, content.length - 1);
+            this._alts = JSON.parse(jsonString);
+        });
+    }
+}
+exports.JupiterAlts = JupiterAlts;

package/dist/src/classes/TransactionBatchExecute.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="@meteora-ag/dlmm/node_modules/@solana/web3.js" />
 import * as web3 from '@solana/web3.js';
+import { JupiterAlts } from './JupiterAlts';
 /**
  * Dummy signers
  */
@@ -28,6 +29,7 @@ export declare class TransactionBatchExecute {
     protected payer: web3.Keypair;
     protected connection: web3.Connection;
     protected signers: web3.Keypair[];
+    protected jupiterAlts: JupiterAlts;
     protected readonly MAX_SIZE = 1232;
     /**
      * Downloaded address lookup table accounts
@@ -42,11 +44,24 @@ export declare class TransactionBatchExecute {
      * @param connection Connection to mainnet
      * @param signers Required signers to fulfill the transactions
      */
-    constructor(lookupTableAddresses: web3.PublicKey[], instructions: web3.TransactionInstruction[], payer: web3.Keypair, connection: web3.Connection, signers?: web3.Keypair[]);
+    constructor(lookupTableAddresses: web3.PublicKey[], instructions: web3.TransactionInstruction[], payer: web3.Keypair, connection: web3.Connection, signers: web3.Keypair[], jupiterAlts: JupiterAlts);
     /**
      * Downoad address lookup table from given cluster
      */
     downloadAlts(): Promise<void>;
+    /**
+     * Get list of lookup tables to download
+     */
+    private getListOfAltsToDownload;
+    /**
+     * Filter lookup tables
+     */
+    private filterLookupTables;
+    /**
+     * Get public keys from instruction
+     * @returns
+     */
+    private getPubkeyFromInstruction;
     /**
      * Override signers (in case that signers are set to empty array)
      *
@@ -75,6 +90,13 @@ export declare class TransactionBatchExecute {
      * Builds a batch of executable transaction instructions
      */
     buildBatch(): Promise<web3.TransactionInstruction[][]>;
+    /**
+     * Build versioned transactions from given batches of transactions
+     *
+     * @param batches
+     * @returns
+     */
+    buildV0Transactions(batches: web3.TransactionInstruction[][]): Promise<web3.VersionedTransaction[]>;
     /**
      * Split transactions
      *
@@ -96,6 +118,13 @@ export declare class TransactionBatchExecute {
      * @param dummySigners
      */
     private findRequiredSignersFromBatch;
+    /**
+     * Find signing keypairs from signers defined in instruction
+     *
+     * @param batch
+     * @returns
+     */
+    private findSigningKeypairFromIxs;
     /**
      * Find required signers from instructions
      *

package/dist/src/classes/TransactionBatchExecute.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionBatchExecute.d.ts","sourceRoot":"","sources":["../../../src/classes/TransactionBatchExecute.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,KAAK,GAAG;IAClB,mBAAmB,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IACtC,YAAY,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IAC/B,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC;CACvB,CAAA;AAED,MAAM,MAAM,6BAA6B,GAAG;IAC1C,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC;IACvC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAC5C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC;IACpB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC;IAC5B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;CACzB,CAAA;AAED;;GAEG;AACH,qBAAa,uBAAuB;IAmBhC,SAAS,CAAC,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE;IAChD,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE;IACrD,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO;IAC7B,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU;IACrC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;IArBnC,SAAS,CAAC,QAAQ,CAAC,QAAQ,QAAQ;IAEnC;;OAEG;IACH,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,yBAAyB,EAAE,CAAM;IAEtD;;;;;;;;OAQG;gBAES,oBAAoB,EAAE,IAAI,CAAC,SAAS,EAAE,EACtC,YAAY,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAC3C,KAAK,EAAE,IAAI,CAAC,OAAO,EACnB,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,OAAO,GAAE,IAAI,CAAC,OAAO,EAAO;IAGxC;;OAEG;IACG,YAAY;IAclB;;;;OAIG;IACH,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE;IAIlC;;OAEG;IACH,kBAAkB,IAAI,IAAI,CAAC,SAAS,EAAE;IActC;;OAEG;IACH,0BAA0B,IAAI,IAAI,CAAC,SAAS,EAAE;IAI9C;;;;OAIG;IACH,oBAAoB,IAAI,YAAY;IASpC;;OAEG;IACH,qBAAqB,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,CAAC;IAiBtE;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IAwB5D;;;;;;OAMG;cACa,mBAAmB,CAAC,aAAa,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC;IA8BvJ;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,CAAC,eAAe,EAAE,IAAI,CAAC,8BAA8B,EAAE,KAAK,EAAE,IAAI,CAAC,sBAAsB,EAAE,EAAE,YAAY,EAAE,YAAY,GAAG,MAAM;IAclK;;;;;OAKG;IACH,OAAO,CAAC,4BAA4B;IAapC;;;;;OAKG;IACH,OAAO,CAAC,0BAA0B;IAqBlC;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CA2BjC"}
+{"version":3,"file":"TransactionBatchExecute.d.ts","sourceRoot":"","sources":["../../../src/classes/TransactionBatchExecute.ts"],"names":[],"mappings":"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"}

package/dist/src/classes/TransactionBatchExecute.js

@@ -47,12 +47,13 @@ class TransactionBatchExecute {
      * @param connection Connection to mainnet
      * @param signers Required signers to fulfill the transactions
      */
-    constructor(lookupTableAddresses, instructions, payer, connection, signers = []) {
+    constructor(lookupTableAddresses, instructions, payer, connection, signers = [], jupiterAlts) {
         this.lookupTableAddresses = lookupTableAddresses;
         this.instructions = instructions;
         this.payer = payer;
         this.connection = connection;
         this.signers = signers;
+        this.jupiterAlts = jupiterAlts;
         this.MAX_SIZE = 1232;
         /**
          * Downloaded address lookup table accounts
@@ -65,11 +66,20 @@ class TransactionBatchExecute {
      */
     downloadAlts() {
         return __awaiter(this, void 0, void 0, function* () {
-            // Skip if we already downloaded alts from the cluster
-            if (this.alts.length > 0 && this.alts.length === this.lookupTableAddresses.length)
-                return;
+            // Public keys across all instructions
+            const pubkeys = this.getPubkeyFromInstruction();
+            // Download jupiter alts first
+            yield this.jupiterAlts.downloadAlts();
+            // Then find alts from pubkeys
+            const jupAlts = this.jupiterAlts.findAltByPubkeys(pubkeys);
+            // Then append jupiter alts in the lookup table address
+            this.lookupTableAddresses.push(...jupAlts);
+            // Then make sure lookup table addresses are unique
+            this.filterLookupTables();
+            // Get list of lookup tables to download
+            const lookupTableAddresses = this.getListOfAltsToDownload();
             // Download if address lookup table does not match with downloaded alts
-            for (const lookupTable of this.lookupTableAddresses) {
+            for (const lookupTable of lookupTableAddresses) {
                 const alt = yield this.connection.getAddressLookupTable(lookupTable);
                 if (alt.value === null) {
                     throw new Error(`Address lookup table: ${lookupTable} does not exist on the blockchain.`);
@@ -78,6 +88,44 @@ class TransactionBatchExecute {
             }
         });
     }
+    /**
+     * Get list of lookup tables to download
+     */
+    getListOfAltsToDownload() {
+        const alts = this.alts.map(alt => alt.key.toBase58());
+        const toDownload = [];
+        for (const alt of this.lookupTableAddresses) {
+            if (!alts.includes(alt.toBase58())) {
+                toDownload.push(alt);
+            }
+        }
+        return toDownload;
+    }
+    /**
+     * Filter lookup tables
+     */
+    filterLookupTables() {
+        const map = {};
+        for (const alt of this.lookupTableAddresses) {
+            map[alt.toBase58()] = 1;
+        }
+        const filtered = [];
+        for (const alt in map) {
+            filtered.push(new web3.PublicKey(alt));
+        }
+        this.lookupTableAddresses = filtered;
+    }
+    /**
+     * Get public keys from instruction
+     * @returns
+     */
+    getPubkeyFromInstruction() {
+        const pubkeys = [];
+        this.instructions.map(ix => {
+            pubkeys.push(...ix.keys.map(meta => meta.pubkey));
+        });
+        return pubkeys;
+    }
     /**
      * Override signers (in case that signers are set to empty array)
      *
@@ -165,6 +213,31 @@ class TransactionBatchExecute {
             return batch;
         });
     }
+    /**
+     * Build versioned transactions from given batches of transactions
+     *
+     * @param batches
+     * @returns
+     */
+    buildV0Transactions(batches) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const latestBlockhash = yield this.connection.getLatestBlockhash();
+            const signedVersionedTxs = [];
+            for (const batch of batches) {
+                const alts = this.findRequiredAltsForBatch(batch);
+                const messageV0 = new web3.TransactionMessage({
+                    payerKey: this.payer.publicKey,
+                    instructions: batch,
+                    recentBlockhash: latestBlockhash.blockhash,
+                }).compileToV0Message(alts);
+                const versionedTx = new web3.VersionedTransaction(messageV0);
+                const signers = this.findSigningKeypairFromIxs(batch);
+                versionedTx.sign(signers);
+                signedVersionedTxs.push(versionedTx);
+            }
+            return signedVersionedTxs;
+        });
+    }
     /**
      * Split transactions
      *
@@ -232,6 +305,24 @@ class TransactionBatchExecute {
         }
         return result;
     }
+    /**
+     * Find signing keypairs from signers defined in instruction
+     *
+     * @param batch
+     * @returns
+     */
+    findSigningKeypairFromIxs(batch) {
+        const signers = this.findRequiredSignersFromIxs(batch);
+        const result = [];
+        for (const signer of signers) {
+            const keypair = this.signers.find(keypair => keypair.publicKey.toBase58() === signer.toBase58());
+            if (keypair === undefined) {
+                throw new Error(`Keypair ${signer} cannot be found in $this.signers array. Perhaps you forgot to add it?`);
+            }
+            result.push(keypair);
+        }
+        return result;
+    }
     /**
      * Find required signers from instructions
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hawksightco/hawk-sdk",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "Hawksight v2 SDK",
   "main": "dist/src/index.js",
   "repository": "https://github.com/ghabxph/hawk-api-client.git",
@@ -17,10 +17,10 @@
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.7",
     "@types/node": "^20.11.5",
-    "dotenv": "^16.4.5",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.5"
+    "typescript": "^5.4.5",
+    "dotenv": "^16.4.5"
   },
   "dependencies": {
     "@coral-xyz/anchor": "~0.29.0",