@triadxyz/triad-protocol 3.1.5-beta → 3.1.7-beta

package/dist/claim.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 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';
+import { RpcOptions, CreateClaimVaultArgs, ClaimTokenArgs, UpdateClaimVaultMerkleRootArgs, UpdateClaimVaultIsActiveArgs, UpdateClaimVaultAmountArgs } from './types';
 export default class Claim {
     private program;
     private rpcOptions;
@@ -23,25 +24,36 @@ export default class Claim {
     getClaimedUser(claimVault: PublicKey, user: PublicKey): Promise<import("./types").ClaimedUser>;
     /**
      * Claim Token
+     * @param claimData - Claim data
+     * @param claimVaultName - Vault name
+     * @param payer - Payer
+     * @param mint - Mint
      * @param amount - Amount to claim
-     * @param merkleProof - Merkle proof
      */
-    claimToken({ amount, merkleProof, mint, claimVault }: ClaimTokenArgs): Promise<string>;
+    claimToken({ mint, claimVaultName, claimData, amount, isFirstComeFirstServed }: ClaimTokenArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Create Claim Vault
      * @param args - Create Claim Vault Args
      */
-    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, merkleRoot, mint }: CreateClaimVaultArgs): Promise<string>;
+    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, claimData, mint }: CreateClaimVaultArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Claim Vault Is Active
      * @param isActive - Is active
      * @param claimVault - Claim vault
      */
-    updateClaimVaultIsActive({ isActive, claimVault }: UpdateClaimVaultIsActiveArgs): Promise<string>;
+    updateClaimVaultIsActive({ isActive, claimVaultName }: UpdateClaimVaultIsActiveArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Claim Vault Merkle Root
      * @param merkleRoot - Merkle root
      * @param claimVault - Claim vault
      */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVault }: UpdateClaimVaultMerkleRootArgs): Promise<string>;
+    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }: UpdateClaimVaultMerkleRootArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Update Claim Vault Amount
+     * @param amount - Amount to add
+     * @param newUsers - New users to add
+     * @param claimVaultName - Claim vault name
+     * @param mint - Mint
+     */
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }: UpdateClaimVaultAmountArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/claim.js

@@ -16,6 +16,7 @@ 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");
+const merkle_1 = require("./utils/merkle");
 class Claim {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -55,21 +56,32 @@ class Claim {
     }
     /**
      * Claim Token
+     * @param claimData - Claim data
+     * @param claimVaultName - Vault name
+     * @param payer - Payer
+     * @param mint - Mint
      * @param amount - Amount to claim
-     * @param merkleProof - Merkle proof
      */
-    claimToken({ amount, merkleProof, mint, claimVault }) {
+    claimToken({ mint, claimVaultName, claimData, amount, isFirstComeFirstServed }) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            let proof = [];
+            if (!isFirstComeFirstServed) {
+                const { proofs } = (0, merkle_1.generateMerkleTree)(claimData);
+                proof = (_a = proofs.find((p) => p.user.toBase58() === this.program.provider.publicKey.toBase58())) === null || _a === void 0 ? void 0 : _a.proof;
+            }
             const ixs = [
                 yield this.program.methods
                     .claimToken({
-                    amount: new anchor_1.BN(amount),
-                    merkleProof
+                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
+                    merkleProof: proof
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
+                    payer: this.rpcOptions.payer,
                     mint,
-                    claimVault
+                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName),
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
                 })
                     .instruction()
             ];
@@ -80,12 +92,13 @@ class Claim {
      * Create Claim Vault
      * @param args - Create Claim Vault Args
      */
-    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, merkleRoot, mint }) {
+    createClaimVault({ totalAmount, totalUsers, name, isFirstComeFirstServed, endTs, claimData, mint }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { merkleRoot } = (0, merkle_1.generateMerkleTree)(claimData);
             const ixs = [
                 yield this.program.methods
                     .createClaimVault({
-                    totalAmount: new anchor_1.BN(totalAmount),
+                    totalAmount: new anchor_1.BN(totalAmount * Math.pow(10, 6)),
                     totalUsers: new anchor_1.BN(totalUsers),
                     name,
                     isFirstComeFirstServed,
@@ -94,7 +107,8 @@ class Claim {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    mint
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint)
                 })
                     .instruction()
             ];
@@ -106,14 +120,14 @@ class Claim {
      * @param isActive - Is active
      * @param claimVault - Claim vault
      */
-    updateClaimVaultIsActive({ isActive, claimVault }) {
+    updateClaimVaultIsActive({ isActive, claimVaultName }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
                     .updateClaimVaultIsActive(isActive)
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    claimVault
+                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
                 })
                     .instruction()
             ];
@@ -125,14 +139,40 @@ class Claim {
      * @param merkleRoot - Merkle root
      * @param claimVault - Claim vault
      */
-    updateClaimVaultMerkleRoot({ merkleRoot, claimVault }) {
+    updateClaimVaultMerkleRoot({ merkleRoot, claimVaultName }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
                     .updateClaimVaultMerkleRoot(merkleRoot)
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    claimVault
+                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Claim Vault Amount
+     * @param amount - Amount to add
+     * @param newUsers - New users to add
+     * @param claimVaultName - Claim vault name
+     * @param mint - Mint
+     */
+    updateClaimVaultAmount({ amount, newUsers, claimVaultName, mint }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .updateClaimVaultAmount({
+                    amount: new anchor_1.BN(amount * Math.pow(10, 6)),
+                    newUsers: new anchor_1.BN(newUsers)
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(mint),
+                    claimVault: (0, pda_1.getClaimVaultPDA)(this.program.programId, claimVaultName)
                 })
                     .instruction()
             ];

package/dist/index.d.ts

@@ -1,12 +1,16 @@
+/// <reference types="@coral-xyz/anchor/node_modules/@solana/web3.js" />
 import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import BN from 'bn.js';
 import { TriadProtocol } from './types/triad_protocol';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, CollectMarketFeeArgs, CreatePoolArgs, BookOrder, MarketAskOrderArgs, RpcOptions, OrderDirection } from './types';
+import { OpenOrderArgs, UserTrade, CreateCustomerArgs, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs, BookOrder, MarketAskOrderArgs, RpcOptions, OrderDirection, CloseOrderArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
+import Claim from './claim';
+import Market from './market';
 export * from './types';
 export * from './utils/helpers';
+export * from './utils/merkle';
 export default class TriadProtocolClient {
     private connection;
     private wallet;
@@ -15,15 +19,9 @@ export default class TriadProtocolClient {
     provider: AnchorProvider;
     stake: Stake;
     poseidon: Poseidon;
+    claim: Claim;
+    market: Market;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
-    /**
-     * Get All Pools
-     */
-    getAllPools(): Promise<import("./types").Pool[]>;
-    /**
-     * Get All Markets
-     */
-    getAllMarkets(): Promise<import("./types").Market[]>;
     /**
      * Get My User Trades from a user authority
      * @param wallet - User wallet PublicKey
@@ -44,21 +42,6 @@ export default class TriadProtocolClient {
      * Get User Book Orders
      */
     getUserBookOrders(wallet: PublicKey, marketId: number): Promise<BookOrder[]>;
-    /**
-     * Get Pool By ID
-     * @param poolId - The ID of the pool
-     */
-    getPoolById(poolId: number): Promise<import("./types").Pool>;
-    /**
-     * Get Market By ID
-     * @param marketId - The ID of the market
-     */
-    getMarketById(marketId: number): Promise<import("./types").Market>;
-    /**
-     * Get Market By Address
-     * @param marketAddress - The address of the market
-     */
-    getMarketByAddress(marketAddress: PublicKey): Promise<import("./types").Market>;
     /**
      * Get Costumer By Wallet Address
      * @param wallet - The wallet address of the customer
@@ -69,18 +52,6 @@ export default class TriadProtocolClient {
      * @param customerId - The ID of the customer
      */
     getCustomerById(customerId: number): Promise<import("./types").Customer>;
-    /**
-     * Get Current Market ID
-     */
-    nextMarketId(): Promise<number>;
-    /**
-     * Get Next Customer ID
-     */
-    nextCustomerId(): Promise<number>;
-    /**
-     * Get Next Pool ID
-     */
-    nextPoolId(): Promise<number>;
     /**
      * Get User Trade PDA
      * @param wallet - User wallet PublicKey
@@ -92,7 +63,7 @@ export default class TriadProtocolClient {
      * @param wallet - User wallet PublicKey
      * @param userNonce - The nonce of the user
      */
-    getUserTrade(wallet: PublicKey, userNonce?: number): Promise<{
+    getUserTradeByNonce(wallet: PublicKey, userNonce?: number): Promise<{
         bump: number;
         authority: PublicKey;
         padding1: number[];
@@ -194,26 +165,6 @@ export default class TriadProtocolClient {
         poseidon: number;
         padding: number[];
     }>;
-    /**
-     * Create Market
-     * @param args.markets - Array of markets to create
-     * @param args.markets.marketId - Market ID
-     * @param args.markets.startTime - start time
-     * @param args.markets.endTime - end time
-     * @param args.markets.question - question (max 80 characters)
-     * @param args.markets.liquidityAtStart - liquidity at start
-     * @param args.markets.payoutFee - payout fee (to add affiliate system)
-     * @param args.customer - The customer of the market
-     * @param args.poolId - The ID of the pool
-     */
-    createMarket({ markets, customer, poolId }: CreateMarketArgs): Promise<string>;
-    /**
-     * Create Pool
-     * @param poolId - The ID of the pool
-     * @param question - The question of the pool
-     * @param markets - The markets of the pool
-     */
-    createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast }: CreatePoolArgs): Promise<string>;
     /**
      * Open Order
      * @param args.marketId - The ID of the Market
@@ -222,37 +173,14 @@ export default class TriadProtocolClient {
      * @param args.mint - The mint of the Order
      * @param args.token - The token to use for the Order
      */
-    openOrder({ marketId, amount, direction, mint, token }: OpenOrderArgs): Promise<string>;
+    openOrder({ marketId, amount, direction, mint, token }: OpenOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Close Order
      * @param args.marketId - The ID of the Market
      * @param args.orderId - The ID of the Order
      * @param args.userNonce - The nonce of the user
      */
-    closeOrder({ marketId, orderId, userNonce }: {
-        marketId: number;
-        orderId: number;
-        userNonce: number;
-    }): Promise<string>;
-    /**
-     * Resolve Market
-     * @param args.marketId - The ID of the Market
-     * @param args.poolId - The ID of the Pool
-     * @param args.winningDirection - The Winning Direction of the Market
-     */
-    updateMarketWinningDirection({ marketId, poolId, winningDirection }: {
-        marketId: number;
-        poolId?: number;
-        winningDirection: {
-            hype: {};
-        } | {
-            flop: {};
-        } | {
-            none: {};
-        } | {
-            draw: {};
-        };
-    }): Promise<string>;
+    closeOrder({ marketId, orderId, userNonce }: CloseOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market
@@ -265,41 +193,12 @@ export default class TriadProtocolClient {
         orderId: number;
         userNonce: number;
         mint: PublicKey;
-    }[]): Promise<string>;
-    /**
-     * Update Market Payout
-     * @param marketId - The ID of the market
-     * @param poolId - The ID of the pool
-     * @param allowPayout - Whether to allow the market to payout
-     */
-    updateMarketPayout({ marketId, poolId, allowPayout }: {
-        marketId: number;
-        poolId?: number;
-        allowPayout: boolean;
-    }): Promise<string>;
+    }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Create Sub User Trade
      * @param user - User PublicKey the main user
      */
-    createSubUserTrade(user: PublicKey): Promise<string>;
-    /**
-     * Update Market End
-     * @param marketId - The ID of the market
-     * @param marketEnd - The end time of the market
-     */
-    updateMarketEnd({ marketId, marketEnd }: {
-        marketId: number;
-        marketEnd: number;
-    }): Promise<string>;
-    /**
-     * Update Market Question
-     * @param marketId - The ID of the market
-     * @param question - The question of the market
-     */
-    updateMarketQuestion({ marketId, question }: {
-        marketId: number;
-        question: string;
-    }): Promise<string>;
+    createSubUserTrade(user: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Create Customer
      * @param args.id - The ID of the customer
@@ -307,12 +206,7 @@ export default class TriadProtocolClient {
      * @param args.authority - The authority of the customer
      * @param args.feeRecipient - The fee recipient of the customer
      */
-    createCustomer({ id, name, authority, feeRecipient }: CreateCustomerArgs): Promise<string>;
-    /**
-     * Get User Trade Nonce With Slots
-     * @param userTrades - User Trades
-     */
-    getUserTradeNonceWithSlots(userTrades: UserTrade[]): PublicKey;
+    createCustomer({ id, name, authority, feeRecipient }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Get User Trade Ixs
      */
@@ -344,7 +238,7 @@ export default class TriadProtocolClient {
      * @param args.mint - The mint of the Order
      * @param args.isTrdPayout - Whether to payout in TRD or not
      */
-    placeBidOrder({ marketId, orders, isTrdPayout }: PlaceBidOrderArgs): Promise<string>;
+    placeBidOrder({ marketId, orders, isTrdPayout }: PlaceBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Place Ask Order
      * @param args.marketId - The ID of the Market
@@ -354,7 +248,7 @@ export default class TriadProtocolClient {
      * @param args.orders.bidOrderId - The ID of the Bid Order
      * @param args.orders.bidNonce - The nonce of the Bid Order
      */
-    placeAskOrder({ marketId, orders }: PlaceAskOrderArgs): Promise<string>;
+    placeAskOrder({ marketId, orders }: PlaceAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Bid Order
      * @param args.marketId - The ID of the Market
@@ -362,7 +256,7 @@ export default class TriadProtocolClient {
      * @param args.orders.userNonce - The nonce of the user
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ marketId, orders }: CancelBidOrderArgs): Promise<string>;
+    cancelBidOrder({ marketId, orders }: CancelBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Cancel Ask Order
      * @param args.marketId - The ID of the Market
@@ -370,16 +264,15 @@ export default class TriadProtocolClient {
      * @param args.orders.userNonce - The nonce of the user
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ marketId, orders }: CancelAskOrderArgs): Promise<string>;
+    cancelAskOrder({ marketId, orders }: CancelAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Bid Order
      * @param args.marketId - The ID of the Market
      * @param args.amount - The amount of the Order
      * @param args.orderDirection - The direction of the Order
-     * @param args.feeBps - The fee in basis points
      * @param args.isTrdPayout - Whether to payout in TRD or not
      */
-    marketBidOrder({ marketId, amount, orderDirection, feeBps, isTrdPayout }: MarketBidOrderArgs): Promise<string>;
+    marketBidOrder({ marketId, amount, orderDirection, isTrdPayout }: MarketBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
@@ -391,7 +284,7 @@ export default class TriadProtocolClient {
      * @param args.isTrdPayout - Whether to payout in TRD or not
      * @param args.feeBps - The fee in basis points
      */
-    marketAskOrder({ marketId, orders, orderDirection, isTrdPayout, feeBps }: MarketAskOrderArgs): Promise<string>;
+    marketAskOrder({ marketId, orders, orderDirection, isTrdPayout, feeBps }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Get Orders By Market ID
      * @param marketId - Market ID
@@ -410,30 +303,6 @@ export default class TriadProtocolClient {
             ask: BookOrder[];
         };
     }>;
-    /**
-     * Collect Market Fee
-     * @param args.markets - The markets to collect the fee from
-     * @param args.markets.marketAddress - The address of the market
-     * @param args.markets.customerId - The ID of the customer
-     * @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>;
     /**
      * Update Customer Fee
      * @param customerId - Customer ID
@@ -442,5 +311,5 @@ export default class TriadProtocolClient {
     updateCustomerFee({ customerId, feeBps }: {
         customerId: number;
         feeBps: number;
-    }): Promise<string>;
+    }): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }