@hawksightco/hawk-sdk 1.2.10 → 1.2.11

package/dist/src/hawksight.d.ts

@@ -7,6 +7,13 @@ export declare function depositMultipleToken(params: {
         mint: web3.PublicKey;
         amount: BN;
     }[];
+}): Promise<web3.TransactionInstruction>;
+export declare function depositMultipleTokenV2(params: {
+    payer: web3.PublicKey;
+    deposit: {
+        mint: web3.PublicKey;
+        amount: BN;
+    }[];
     pdaTokenType?: TokenType;
 }): Promise<web3.TransactionInstruction>;
 export declare function withdrawMultipleToken(params: {
@@ -15,6 +22,13 @@ export declare function withdrawMultipleToken(params: {
         mint: web3.PublicKey;
     }[];
     useSta?: boolean;
+}): Promise<web3.TransactionInstruction>;
+export declare function withdrawMultipleTokenV2(params: {
+    payer: web3.PublicKey;
+    withdraw: {
+        mint: web3.PublicKey;
+    }[];
+    useSta?: boolean;
     pdaTokenType?: TokenType;
 }): Promise<web3.TransactionInstruction>;
 export type AtomicityContextParams = {

package/dist/src/hawksight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUrH;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUxH;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,wBAAsB,UAAU,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAkBtG"}
+{"version":3,"file":"hawksight.d.ts","sourceRoot":"","sources":["../../src/hawksight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,OAAO,CAAC;AASvB,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAEpC,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;CACL,wCAyCA;AAED,wBAAsB,sBAAsB,CAAC,MAAM,EAAE;IACnD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,OAAO,EAAE;QACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,EAAE,EAAE,CAAC;KACZ,EAAE,CAAC;IACJ,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,wBAAsB,qBAAqB,CAAC,MAAM,EAAE;IAClD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,wCAyCA;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;IACtB,QAAQ,EAAE;QACR,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;KACtB,EAAE,CAAC;IACJ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,YAAY,CAAC,EAAE,SAAS,CAAC;CAC1B,wCAmDA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,kBAAkB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUrH;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;CAC5B,CAAC;AACF,wBAAsB,qBAAqB,CAAC,EAAE,UAAU,EAAE,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAUxH;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC;IAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;CACtB,CAAC;AAEF,wBAAsB,UAAU,CAAC,MAAM,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAkBtG"}

package/dist/src/hawksight.js

@@ -32,13 +32,58 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.storeToken = exports.verifyTransactionSlot = exports.setTransactionSlot = exports.withdrawMultipleToken = exports.depositMultipleToken = void 0;
+exports.storeToken = exports.verifyTransactionSlot = exports.setTransactionSlot = exports.withdrawMultipleTokenV2 = exports.withdrawMultipleToken = exports.depositMultipleTokenV2 = exports.depositMultipleToken = void 0;
 const web3 = __importStar(require("@solana/web3.js"));
 const anchor_1 = require("./anchor");
 const addresses_1 = require("./addresses");
 const util = __importStar(require("./functions"));
 const types_1 = require("./types");
 function depositMultipleToken(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const farm = addresses_1.USDC_FARM;
+        const userPda = util.generateUserPda(params.payer, farm);
+        const amounts = params.deposit.map((d) => d.amount);
+        const remainingAccounts = [];
+        params.deposit.map((d) => {
+            const mint = d.mint;
+            const userToken = util.generateAta(params.payer, d.mint);
+            const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint);
+            const userPdaToken = util.generateAta(userPda, d.mint);
+            remainingAccounts.push({ pubkey: mint, isSigner: false, isWritable: true });
+            remainingAccounts.push({
+                pubkey: userToken,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: userPdaToken,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: ownerFeeToken,
+                isSigner: false,
+                isWritable: true,
+            });
+        });
+        const ix = yield anchor_1.Anchor.instance().iyfMain.methods
+            .depositMultipleToken(amounts)
+            .accounts({
+            farm,
+            userPda,
+            payer: params.payer,
+            hsFeeOwner: addresses_1.SITE_FEE_OWNER,
+            associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+            tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3.SystemProgram.programId,
+        })
+            .remainingAccounts(remainingAccounts)
+            .instruction();
+        return ix;
+    });
+}
+exports.depositMultipleToken = depositMultipleToken;
+function depositMultipleTokenV2(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const farm = addresses_1.USDC_FARM;
         const userPda = util.generateUserPda(params.payer, farm);
@@ -79,7 +124,7 @@ function depositMultipleToken(params) {
             });
         });
         const ix = yield anchor_1.Anchor.instance().iyfMain.methods
-            .depositMultipleToken(amounts, skipIdempotent)
+            .depositMultipleTokenV2(amounts, skipIdempotent)
             .accounts({
             farm,
             userPda,
@@ -94,8 +139,53 @@ function depositMultipleToken(params) {
         return ix;
     });
 }
-exports.depositMultipleToken = depositMultipleToken;
+exports.depositMultipleTokenV2 = depositMultipleTokenV2;
 function withdrawMultipleToken(params) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const farm = addresses_1.USDC_FARM;
+        const userPda = util.generateUserPda(params.payer, farm);
+        const remainingAccounts = [];
+        let skipIdempotent = false;
+        params.withdraw.map((d) => {
+            const mint = d.mint;
+            const userToken = util.generateAta(params.payer, d.mint);
+            const userPdaToken = params.useSta ? util.generateUserPdaStorageAccount(userPda, d.mint) : util.generateAta(userPda, d.mint);
+            const ownerFeeToken = util.generateAta(addresses_1.SITE_FEE_OWNER, d.mint);
+            remainingAccounts.push({ pubkey: mint, isSigner: false, isWritable: true });
+            remainingAccounts.push({
+                pubkey: userToken,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: userPdaToken,
+                isSigner: false,
+                isWritable: true,
+            });
+            remainingAccounts.push({
+                pubkey: ownerFeeToken,
+                isSigner: false,
+                isWritable: true,
+            });
+        });
+        const ix = yield anchor_1.Anchor.instance().iyfMain.methods
+            .withdrawMultipleToken()
+            .accounts({
+            farm,
+            userPda,
+            payer: params.payer,
+            hsFeeOwner: addresses_1.SITE_FEE_OWNER,
+            associatedTokenProgram: addresses_1.ASSOCIATED_TOKEN_PROGRAM,
+            tokenProgram: addresses_1.TOKEN_PROGRAM_ID,
+            systemProgram: web3.SystemProgram.programId,
+        })
+            .remainingAccounts(remainingAccounts)
+            .instruction();
+        return ix;
+    });
+}
+exports.withdrawMultipleToken = withdrawMultipleToken;
+function withdrawMultipleTokenV2(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const farm = addresses_1.USDC_FARM;
         const userPda = util.generateUserPda(params.payer, farm);
@@ -136,7 +226,7 @@ function withdrawMultipleToken(params) {
             });
         });
         const ix = yield anchor_1.Anchor.instance().iyfMain.methods
-            .withdrawMultipleToken(skipIdempotent)
+            .withdrawMultipleTokenV2(skipIdempotent)
             .accounts({
             farm,
             userPda,
@@ -151,7 +241,7 @@ function withdrawMultipleToken(params) {
         return ix;
     });
 }
-exports.withdrawMultipleToken = withdrawMultipleToken;
+exports.withdrawMultipleTokenV2 = withdrawMultipleTokenV2;
 function setTransactionSlot(_a) {
     return __awaiter(this, arguments, void 0, function* ({ userWallet }) {
         const ix = yield anchor_1.Anchor

package/dist/src/idl/iyf-main-idl.d.ts

@@ -6055,6 +6055,74 @@ export type IndexYieldFarming = {
                     "isSigner": false;
                 }
             ];
+            "args": [
+                {
+                    "name": "amounts";
+                    "type": {
+                        "vec": "u64";
+                    };
+                }
+            ];
+        },
+        {
+            "name": "depositMultipleTokenV2";
+            "accounts": [
+                {
+                    "name": "farm";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "userPda";
+                    "isMut": true;
+                    "isSigner": false;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "type": "string";
+                                "value": "multi-user";
+                            },
+                            {
+                                "kind": "account";
+                                "type": "publicKey";
+                                "account": "FarmAccountMulti";
+                                "path": "farm";
+                            },
+                            {
+                                "kind": "account";
+                                "type": "publicKey";
+                                "path": "payer";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "payer";
+                    "isMut": false;
+                    "isSigner": true;
+                },
+                {
+                    "name": "hsFeeOwner";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "associatedTokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "tokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "systemProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                }
+            ];
             "args": [
                 {
                     "name": "amounts";
@@ -6127,6 +6195,67 @@ export type IndexYieldFarming = {
                     "isSigner": false;
                 }
             ];
+            "args": [];
+        },
+        {
+            "name": "withdrawMultipleTokenV2";
+            "accounts": [
+                {
+                    "name": "farm";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "userPda";
+                    "isMut": true;
+                    "isSigner": false;
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const";
+                                "type": "string";
+                                "value": "multi-user";
+                            },
+                            {
+                                "kind": "account";
+                                "type": "publicKey";
+                                "account": "FarmAccountMulti";
+                                "path": "farm";
+                            },
+                            {
+                                "kind": "account";
+                                "type": "publicKey";
+                                "path": "payer";
+                            }
+                        ];
+                    };
+                },
+                {
+                    "name": "payer";
+                    "isMut": false;
+                    "isSigner": true;
+                },
+                {
+                    "name": "hsFeeOwner";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "associatedTokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "tokenProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                },
+                {
+                    "name": "systemProgram";
+                    "isMut": false;
+                    "isSigner": false;
+                }
+            ];
             "args": [
                 {
                     "name": "skipIdempotent";