@triadxyz/triad-protocol 3.1.2-beta → 3.1.4-beta

package/dist/claim.d.ts

@@ -0,0 +1,47 @@
+import { Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import { TriadProtocol } from './types/triad_protocol';
+import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultMerkleRootArgs, UpdateClaimVaultIsActiveArgs } from './types';
+export default class Claim {
+    private program;
+    private rpcOptions;
+    constructor(program: Program<TriadProtocol>, rpcOptions: RpcOptions);
+    /**
+     * Get All Claim Vaults
+     */
+    getAllClaimVaults(): Promise<import("./types").ClaimVault[]>;
+    /**
+     * Get Claim Vault
+     * @param name - Name of the claim vault
+     */
+    getClaimVault(name: string): Promise<import("./types").ClaimVault>;
+    /**
+     * Get Claimed User
+     * @param claimVault - Claim vault
+     * @param user - User
+     */
+    getClaimedUser(claimVault: PublicKey, user: PublicKey): Promise<import("./types").ClaimedUser>;
+    /**
+     * Claim Token
+     * @param amount - Amount to claim
+     * @param merkleProof - Merkle proof
+     */
+    claimToken({ amount, merkleProof, mint, claimVault }: ClaimTokenArgs): Promise<string>;
+    /**
+     * Create Claim Vault
+     * @param args - Create Claim Vault Args
+     */
+    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, merkleRoot, mint }: CreateClaimVaultArgs): Promise<string>;
+    /**
+     * Update Claim Vault Is Active
+     * @param isActive - Is active
+     * @param claimVault - Claim vault
+     */
+    updateClaimVaultIsActive({ isActive, claimVault }: UpdateClaimVaultIsActiveArgs): Promise<string>;
+    /**
+     * Update Claim Vault Merkle Root
+     * @param merkleRoot - Merkle root
+     * @param claimVault - Claim vault
+     */
+    updateClaimVaultMerkleRoot({ merkleRoot, claimVault }: UpdateClaimVaultMerkleRootArgs): Promise<string>;
+}

package/dist/claim.js

@@ -0,0 +1,143 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const anchor_1 = require("@coral-xyz/anchor");
+const helpers_1 = require("./utils/helpers");
+const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
+const pda_1 = require("./utils/pda");
+class Claim {
+    constructor(program, rpcOptions) {
+        this.program = program;
+        this.rpcOptions = rpcOptions;
+    }
+    /**
+     * Get All Claim Vaults
+     */
+    getAllClaimVaults() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const claimVaults = yield this.program.account.claimVault.all();
+            return claimVaults.map(({ account, publicKey }) => (0, helpers_1.formatClaimVault)(account, publicKey));
+        });
+    }
+    /**
+     * Get Claim Vault
+     * @param name - Name of the claim vault
+     */
+    getClaimVault(name) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const claimVaultPDA = (0, pda_1.getClaimVaultPDA)(this.program.programId, name);
+            const claimVault = yield this.program.account.claimVault.fetch(claimVaultPDA);
+            return (0, helpers_1.formatClaimVault)(claimVault, claimVaultPDA);
+        });
+    }
+    /**
+     * Get Claimed User
+     * @param claimVault - Claim vault
+     * @param user - User
+     */
+    getClaimedUser(claimVault, user) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const claimedUserPDA = (0, pda_1.getClaimedUserPDA)(this.program.programId, claimVault, user);
+            const claimedUser = yield this.program.account.claimedUser.fetch(claimedUserPDA);
+            return (0, helpers_1.formatClaimedUser)(claimedUser, claimedUserPDA);
+        });
+    }
+    /**
+     * Claim Token
+     * @param amount - Amount to claim
+     * @param merkleProof - Merkle proof
+     */
+    claimToken({ amount, merkleProof, mint, claimVault }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .claimToken({
+                    amount: new anchor_1.BN(amount),
+                    merkleProof
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint,
+                    claimVault
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Create Claim Vault
+     * @param args - Create Claim Vault Args
+     */
+    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, merkleRoot, mint }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .createClaimVault({
+                    totalAmount: new anchor_1.BN(totalAmount),
+                    totalUsers: new anchor_1.BN(totalUsers),
+                    name,
+                    isFirstComeFirstServed,
+                    endTs: new anchor_1.BN(endTs),
+                    merkleRoot
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Claim Vault Is Active
+     * @param isActive - Is active
+     * @param claimVault - Claim vault
+     */
+    updateClaimVaultIsActive({ isActive, claimVault }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .updateClaimVaultIsActive(isActive)
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    claimVault
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Claim Vault Merkle Root
+     * @param merkleRoot - Merkle root
+     * @param claimVault - Claim vault
+     */
+    updateClaimVaultMerkleRoot({ merkleRoot, claimVault }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .updateClaimVaultMerkleRoot(merkleRoot)
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    claimVault
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+}
+exports.default = Claim;

package/dist/index.d.ts

@@ -95,9 +95,9 @@ export default class TriadProtocolClient {
     getUserTrade(wallet: PublicKey, userNonce?: number): Promise<{
         bump: number;
         authority: PublicKey;
-        totalDeposits: BN;
-        totalWithdraws: BN;
         padding1: number[];
+        padding2: number[];
+        padding3: number[];
         orders: {
             ts: BN;
             orderId: BN;
@@ -253,11 +253,6 @@ export default class TriadProtocolClient {
             draw: {};
         };
     }): Promise<string>;
-    /**
-     * Collect Remaining Liquidity
-     * @param marketId - The ID of the market
-     */
-    collectRemainingLiquidity(marketId: number): Promise<string>;
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market
@@ -423,9 +418,20 @@ export default class TriadProtocolClient {
      * @param args.markets.customerFeeRecipient - The address of the customer fee recipient
      */
     collectMarketFee({ markets }: CollectMarketFeeArgs): Promise<string>;
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress: PublicKey[]): Promise<string>;
     /**
      * Close Order Book
      * @param marketIds - Market IDs
      */
     closeOrderBook(marketIds: number[]): Promise<string>;
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId: number, question: string): Promise<string>;
 }

package/dist/index.js

@@ -432,26 +432,6 @@ class TriadProtocolClient {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
-    /**
-     * Collect Remaining Liquidity
-     * @param marketId - The ID of the market
-     */
-    collectRemainingLiquidity(marketId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [];
-            const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
-            const market = yield this.getMarketByAddress(marketPDA);
-            ixs.push(yield this.program.methods
-                .collectRemainingLiquidity()
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: marketPDA,
-                mint: market.mint
-            })
-                .instruction());
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
-        });
-    }
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market
@@ -722,9 +702,7 @@ class TriadProtocolClient {
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    userTrade: userTradePDA,
-                    mint: constants_1.USDC_MINT,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                    userTrade: userTradePDA
                 })
                     .instruction());
             }
@@ -787,9 +765,7 @@ class TriadProtocolClient {
                     signer: this.program.provider.publicKey,
                     market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce),
-                    mint: constants_1.USDC_MINT,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                    userTrade: this.getUserPDA(this.program.provider.publicKey, order.userNonce)
                 })
                     .instruction());
             }
@@ -944,12 +920,12 @@ class TriadProtocolClient {
                     market: marketPDA,
                     buyerTrade: userTradePDA,
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                    mint: constants_1.USDC_MINT,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                     sellerAuthority: new web3_js_1.PublicKey(order.authority),
                     sellerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
                     marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
-                    buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID)
+                    buyerAta: (0, pda_1.getTokenATA)(this.program.provider.publicKey, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
+                    mint: constants_1.USDC_MINT,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -1024,10 +1000,10 @@ class TriadProtocolClient {
                         buyerAuthority: new web3_js_1.PublicKey(order.authority),
                         buyerTrade: this.getUserPDA(new web3_js_1.PublicKey(order.authority), Number(order.userNonce)),
                         orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
-                        mint: constants_1.USDC_MINT,
-                        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                         marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
-                        sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce)
+                        sellerTrade: this.getUserPDA(this.program.provider.publicKey, inputOrder.userNonce),
+                        mint: constants_1.USDC_MINT,
+                        tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
                     })
                         .instruction());
                 }
@@ -1104,10 +1080,27 @@ class TriadProtocolClient {
                     .accounts({
                     signer: this.program.provider.publicKey,
                     market: market.marketAddress,
-                    mint: constants_1.USDC_MINT,
                     customer: (0, pda_1.getCustomerPDA)(this.program.programId, market.customerId),
-                    customerFeeRecipient: market.customerFeeRecipient,
-                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID
+                    customerFeeRecipient: market.customerFeeRecipient
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Collect Market Order Fee
+     * @param marketAddress - The address of the market
+     */
+    collectMarketOrderFee(marketAddress) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const market of marketAddress) {
+                ixs.push(yield this.program.methods
+                    .collectMarketOrderFee()
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: market
                 })
                     .instruction());
             }
@@ -1134,5 +1127,23 @@ class TriadProtocolClient {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Update Pool Question
+     * @param poolId - Pool ID
+     * @param question - Question
+     */
+    updatePoolQuestion(poolId, question) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .updatePoolQuestion((0, helpers_1.encodeString)(question, 80))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                pool: (0, pda_1.getPoolPDA)(this.program.programId, poolId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/stake.d.ts

@@ -25,6 +25,9 @@ export default class Stake {
         checkedTs: number;
         claimed: number;
         amount: number;
+        revShareCheckedTs: number;
+        revShareClaimed: number;
+        revShareAvailable: number;
     }>;
     /**
      * Get Unstake By Wallet