@triadxyz/triad-protocol 3.2.8-beta → 3.3.0-beta

package/dist/claim.d.ts

@@ -49,7 +49,7 @@ export default class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, claimData }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Claim Vault End Ts
      * @param endTs - End ts

package/dist/claim.js

@@ -94,7 +94,11 @@ class Claim {
      */
     createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, claimData, mint }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { merkleRoot } = (0, merkle_1.generateMerkleTree)(claimData);
+            let merkleRoot = null;
+            if (claimData) {
+                const { merkleRoot: root } = (0, merkle_1.generateMerkleTree)(claimData);
+                merkleRoot = root;
+            }
             const ixs = [
                 yield this.program.methods
                     .createClaimVault({
@@ -141,8 +145,13 @@ class Claim {
      * @param claimVaultName - Claim vault name
      * @param mint - Mint
      */
-    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, merkleRoot }) {
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint, claimData }) {
         return __awaiter(this, void 0, void 0, function* () {
+            let merkleRoot = null;
+            if (claimData) {
+                const { merkleRoot: root } = (0, merkle_1.generateMerkleTree)(claimData);
+                merkleRoot = root;
+            }
             const ixs = [
                 yield this.program.methods
                     .updateClaimVaultAmount({

package/dist/index.js

@@ -519,7 +519,7 @@ class TriadProtocolClient {
                     inToken: token,
                     outToken: constants_1.TRD_MINT.toString(),
                     amount,
-                    feePayer: this.rpcOptions.payer.toBase58()
+                    payer: this.rpcOptions.payer.toBase58()
                 });
                 amountInTRD = outAmount;
                 if (swapIxs.length === 0) {
@@ -752,7 +752,7 @@ class TriadProtocolClient {
                     inToken: constants_1.TRD_MINT.toString(),
                     outToken: constants_1.USDC_MINT.toString(),
                     amount: Math.floor(amountInTRD),
-                    feePayer: this.rpcOptions.payer.toBase58()
+                    payer: this.rpcOptions.payer.toBase58()
                 });
                 if (swapIxs.length === 0) {
                     return;
@@ -946,7 +946,7 @@ class TriadProtocolClient {
                     inToken: constants_1.TRD_MINT.toString(),
                     outToken: constants_1.USDC_MINT.toString(),
                     amount: Math.floor(amountInTRD),
-                    feePayer: this.rpcOptions.payer.toBase58()
+                    payer: this.rpcOptions.payer.toBase58()
                 });
                 if (swapIxs.length === 0) {
                     return;
@@ -1087,7 +1087,7 @@ class TriadProtocolClient {
                     inToken: constants_1.USDC_MINT.toBase58(),
                     outToken: constants_1.TRD_MINT.toString(),
                     amount: amountOfUSDC.toNumber() / Math.pow(10, 6),
-                    feePayer: this.rpcOptions.payer.toBase58()
+                    payer: this.rpcOptions.payer.toBase58()
                 });
                 if (swapIxs.length > 0) {
                     ixs.push(...setupInstructions);

package/dist/types/index.d.ts

@@ -351,7 +351,7 @@ export type UpdateClaimVaultAmountArgs = {
     newUsers: number;
     claimVaultName: string;
     mint: PublicKey;
-    merkleRoot: number[];
+    claimData: ClaimData[];
 };
 export type UpdateClaimVaultEndTsArgs = {
     endTs: number;

package/dist/utils/swap.d.ts

@@ -1,15 +1,15 @@
 import { AddressLookupTableAccount, Connection, TransactionInstruction } from '@solana/web3.js';
-export declare const swap: ({ connection, wallet, inToken, outToken, amount, feePayer }: {
+export declare const swap: ({ connection, wallet, inToken, outToken, amount, payer }: {
     connection: Connection;
     wallet: string;
     inToken: string;
     outToken: string;
     amount: number;
-    feePayer: string;
+    payer: string;
 }) => Promise<{
     swapIxs: TransactionInstruction[];
     addressLookupTableAccounts: AddressLookupTableAccount[];
-    setupInstructions: TransactionInstruction[];
+    setupInstructions: any[];
     outAmount: any;
 }>;
 export declare const getPrice: (token: string) => Promise<any>;

package/dist/utils/swap.js

@@ -18,7 +18,7 @@ const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const pda_1 = require("./pda");
 const constants_1 = require("./constants");
-const swap = ({ connection, wallet, inToken, outToken, amount, feePayer }) => __awaiter(void 0, void 0, void 0, function* () {
+const swap = ({ connection, wallet, inToken, outToken, amount, payer }) => __awaiter(void 0, void 0, void 0, function* () {
     const token = TOKENS[inToken];
     if (!token) {
         throw new Error('Token not found');
@@ -29,7 +29,7 @@ const swap = ({ connection, wallet, inToken, outToken, amount, feePayer }) => __
     const swapResponse = yield axios_1.default.post('https://lite-api.jup.ag/swap/v1/swap-instructions', {
         quoteResponse: quoteData,
         userPublicKey: wallet,
-        feePayer,
+        payer,
         feeAccount: inToken === constants_1.TRD_MINT.toString() ? getFeeAccount() : undefined
     });
     const { setupInstructions, swapInstruction, addressLookupTableAddresses } = swapResponse.data;
@@ -37,7 +37,7 @@ const swap = ({ connection, wallet, inToken, outToken, amount, feePayer }) => __
         swapIxs: [deserializeInstruction(swapInstruction)],
         addressLookupTableAccounts: yield getAddressLookupTableAccounts(connection, addressLookupTableAddresses),
         setupInstructions: setupInstructions.length > 0
-            ? [deserializeInstruction(setupInstructions)]
+            ? [...setupInstructions.map(deserializeInstruction)]
             : [],
         outAmount: quoteData.otherAmountThreshold
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "3.2.8-beta",
+  "version": "3.3.0-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",