@triadxyz/triad-protocol 1.4.8-beta → 1.5.0-beta

package/dist/stake.d.ts

@@ -4,69 +4,81 @@ import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
 import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, StakeTokenArgs } from './types/stake';
 export default class Stake {
-    program: Program<TriadProtocol>;
-    provider: AnchorProvider;
-    stakeVaultName: string;
+    private program;
+    private provider;
     constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
     /**
      * Get all Stake Vaults
+     *
      */
     getStakeVaults(): Promise<import("./types/stake").StakeVault[]>;
     /**
      * Get all Stakes
+     *
      */
     getStakes(): Promise<StakeResponse[]>;
     /**
-     * Get User Stakes
+     * Get User Stakes By Wallet
+     * @param wallet - User wallet
+     *
      */
     getUserStakes(wallet: PublicKey): Promise<StakeResponse[]>;
     /**
      * Get Stake By Wallet
-     * @param wallet - User wallet
-     * @param collections - NFT collections
-     * @param tensor rank
+     * @param wallet - User Wallet
+     * @param multiplier - Multiplier
      *
      */
     getStakeByWallet(wallet: PublicKey, collections: number): Promise<StakeResponse[]>;
     /**
      *  Stake Token
-     *  @param name - Index
-     *  @param wallet - User wallet
-     *  @param amount - Amount to stake
+     *  @param args.name - Index for finding the PDA
+     *  @param args.wallet - User wallet
+     *  @param args.amount - Amount to stake
+     *
+     *  @param options - RPC options
      *
      */
     stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Update Stake Vault
-     *  @param wallet - User wallet
-     *  @param amount - Reward amount to deposit (optional)
-     *  @param isLocked - is locked stake vault (optional)
+     *  @param args.amount - Reward amount to deposit (optional)
+     *  @param args.isLocked - is locked stake vault (optional)
+     *
+     *  @param options - RPC options
      *
      */
-    updateStakeVault({ wallet, amount, isLocked }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
+    updateStakeVault({ amount, isLocked }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Request Withdraw
-     *  @param wallet - User wallet
-     *  @param nfts - NFTs to Request withdraw
+     *  @param args.wallet - User wallet
+     *  @param args.nfts - NFTs to Request withdraw
+     *
+     *  @param options - RPC options
      *
      */
     requestWithdraw({ wallet, nfts }: RequestWithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
      *  Withdraw Stake
-     *  @param wallet - User wallet
-     *  @param name - Stake name
-     *  @param mint - NFT mint
+     *  @param args.wallet - User wallet
+     *  @param args.name - Stake name
+     *  @param args.mint - Stake native mint (TRD)
+     *
+     *  @param options - RPC options
      *
      */
     withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<string>;
     /**
-     *  Claim All Stake Rewards
-     *  @param wallet - User wallet
-     *  @param collections - NFT collections
-     *  @param ranks - Tensor ranks
+     *  Claim Stake Rewards
+     *  @param args.wallet - User wallet
+     *  @param args.collections - NFT collections
+     *  @param args.ranks - Tensor ranks
+     *  @param args.verifier - Verifier
+     *
+     *  @param options - RPC options
      *
      */
-    claimStakeRewards({ wallet, collections, ranks, verifier, isToken }: {
+    claimStakeRewards({ wallet, collections, ranks, verifier }: {
         wallet: PublicKey;
         collections: number;
         ranks: {
@@ -75,6 +87,5 @@ export default class Stake {
             rarityRankHrtt: number;
         }[];
         verifier: string;
-        isToken?: boolean;
     }, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -22,12 +22,12 @@ const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransa
 const convertSecretKeyToKeypair_1 = require("./utils/convertSecretKeyToKeypair");
 class Stake {
     constructor(program, provider) {
-        this.stakeVaultName = constants_1.STAKE_VAULT_NAME;
-        this.provider = provider;
         this.program = program;
+        this.provider = provider;
     }
     /**
      * Get all Stake Vaults
+     *
      */
     getStakeVaults() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -37,6 +37,7 @@ class Stake {
     }
     /**
      * Get all Stakes
+     *
      */
     getStakes() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -45,7 +46,9 @@ class Stake {
         });
     }
     /**
-     * Get User Stakes
+     * Get User Stakes By Wallet
+     * @param wallet - User wallet
+     *
      */
     getUserStakes(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -62,9 +65,8 @@ class Stake {
     }
     /**
      * Get Stake By Wallet
-     * @param wallet - User wallet
-     * @param collections - NFT collections
-     * @param tensor rank
+     * @param wallet - User Wallet
+     * @param multiplier - Multiplier
      *
      */
     getStakeByWallet(wallet, collections) {
@@ -80,9 +82,11 @@ class Stake {
     }
     /**
      *  Stake Token
-     *  @param name - Index
-     *  @param wallet - User wallet
-     *  @param amount - Amount to stake
+     *  @param args.name - Index for finding the PDA
+     *  @param args.wallet - User wallet
+     *  @param args.amount - Amount to stake
+     *
+     *  @param options - RPC options
      *
      */
     stakeToken({ name, wallet, amount }, options) {
@@ -91,7 +95,7 @@ class Stake {
                 .stakeToken({
                 name,
                 amount: new anchor_1.BN(amount * Math.pow(10, 6)),
-                stakeVault: this.stakeVaultName
+                stakeVault: constants_1.STAKE_VAULT_NAME
             })
                 .accounts({
                 signer: wallet,
@@ -101,35 +105,37 @@ class Stake {
     }
     /**
      *  Update Stake Vault
-     *  @param wallet - User wallet
-     *  @param amount - Reward amount to deposit (optional)
-     *  @param isLocked - is locked stake vault (optional)
+     *  @param args.amount - Reward amount to deposit (optional)
+     *  @param args.isLocked - is locked stake vault (optional)
+     *
+     *  @param options - RPC options
      *
      */
-    updateStakeVault({ wallet, amount, isLocked }, options) {
+    updateStakeVault({ amount, isLocked }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return (0, sendTransactionWithOptions_1.default)(this.program.methods
                 .updateStakeVault({
                 amount,
                 isLocked,
-                stakeVault: this.stakeVaultName
+                stakeVault: constants_1.STAKE_VAULT_NAME
             })
                 .accounts({
-                signer: wallet,
+                signer: this.provider.publicKey,
                 mint: constants_1.TRD_MINT
             }), options);
         });
     }
     /**
      *  Request Withdraw
-     *  @param wallet - User wallet
-     *  @param nfts - NFTs to Request withdraw
+     *  @param args.wallet - User wallet
+     *  @param args.nfts - NFTs to Request withdraw
+     *
+     *  @param options - RPC options
      *
      */
     requestWithdraw({ wallet, nfts }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
             for (const nft of nfts) {
                 const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name);
                 ixs.push(yield this.program.methods
@@ -137,8 +143,7 @@ class Stake {
                     .accounts({
                     signer: wallet,
                     mint: nft.mint,
-                    stake: stakePDA,
-                    stakeVault: stakeVaultPDA
+                    stake: stakePDA
                 })
                     .instruction());
             }
@@ -147,14 +152,16 @@ class Stake {
     }
     /**
      *  Withdraw Stake
-     *  @param wallet - User wallet
-     *  @param name - Stake name
-     *  @param mint - NFT mint
+     *  @param args.wallet - User wallet
+     *  @param args.name - Stake name
+     *  @param args.mint - Stake native mint (TRD)
+     *
+     *  @param options - RPC options
      *
      */
     withdrawStake({ wallet, name, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, constants_1.STAKE_VAULT_NAME);
             const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.withdrawStake().accounts({
                 signer: wallet,
@@ -166,35 +173,32 @@ class Stake {
         });
     }
     /**
-     *  Claim All Stake Rewards
-     *  @param wallet - User wallet
-     *  @param collections - NFT collections
-     *  @param ranks - Tensor ranks
+     *  Claim Stake Rewards
+     *  @param args.wallet - User wallet
+     *  @param args.collections - NFT collections
+     *  @param args.ranks - Tensor ranks
+     *  @param args.verifier - Verifier
+     *
+     *  @param options - RPC options
      *
      */
-    claimStakeRewards({ wallet, collections, ranks, verifier, isToken }, options) {
+    claimStakeRewards({ wallet, collections, ranks, verifier }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const stakes = (yield this.getUserStakes(wallet)).sort((a, b) => a.claimedTs - b.claimedTs);
             const ixs = [];
-            let tokenStakes = [];
-            let nftStakes = [];
+            let items = [];
             stakes.forEach((stake) => {
                 if (stake.withdrawTs !== 0) {
                     return;
                 }
-                if (stake.mint === constants_1.TRD_MINT.toBase58()) {
-                    tokenStakes.push(stake);
-                    return;
-                }
-                nftStakes.push(stake);
+                items.push(stake);
             });
-            let items = isToken ? tokenStakes : nftStakes;
             for (const stake of items) {
                 const rank = (0, getRarityRank_1.default)(ranks, stake.mint, stake.name);
                 if (ixs.length >= 10) {
                     break;
                 }
-                const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+                const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, constants_1.STAKE_VAULT_NAME);
                 const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name);
                 ixs.push(yield this.program.methods
                     .claimStakeRewards({

package/dist/trade.d.ts

@@ -1,33 +1,33 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey } from '@solana/web3.js';
-import { InitializeMarketArgs, Market, OpenOrderArgs, OrderDirection } from './types/trade';
+import { InitializeMarketArgs, OpenOrderArgs, OrderDirection } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
-    program: Program<TriadProtocol>;
-    provider: AnchorProvider;
-    mint: PublicKey;
+    private program;
+    private provider;
     constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
     /**
-     * Get all Markets
+     * Get All Markets
+     *
      */
-    getAllMarkets(): Promise<Market[]>;
+    getAllMarkets(): Promise<import("./types/trade").Market[]>;
     /**
-     * Get Market by ID
+     * Get Market By ID
      * @param marketId - The ID of the market
      *
      */
-    getMarketById(marketId: number): Promise<Market>;
+    getMarketById(marketId: number): Promise<import("./types/trade").Market>;
     /**
-     * Get Market by Address
+     * Get Market By Address
      * @param address - The address of the market
      *
      */
-    getMarketByAddress(address: PublicKey): Promise<Market>;
+    getMarketByAddress(address: PublicKey): Promise<import("./types/trade").Market>;
     /**
      * Get User Trade
-     * @param user - The user's public key
+     * @param user - User PublicKey
      *
      */
     getUserTrade(user: PublicKey): Promise<{
@@ -104,8 +104,10 @@ export default class Trade {
     }>;
     /**
      * Initialize Market
-     * @param market id - new markert id - length + 1
-     * @param name - PYTH/TRD JUP/TRD DRIFT/TRD
+     * @param args.marketId - new markert id - length + 1
+     * @param args.startTime - start time
+     * @param args.endTime - end time
+     * @param args.question - question (max 80 characters)
      *
      * @param options - RPC options
      *
@@ -113,11 +115,10 @@ export default class Trade {
     initializeMarket({ marketId, startTime, endTime, question }: InitializeMarketArgs, options?: RpcOptions): Promise<string>;
     /**
      * Open Order
-     * @param marketId - The ID of the market
-     * @param amount - The amount of the order
-     * @param direction - The direction of the order
-     * @param token - The token to use for the order
-     * @param comment - The comment of the order
+     * @param args.marketId - The ID of the Market
+     * @param args.amount - The amount of the Order
+     * @param args.direction - The direction of the Order
+     * @param args.token - The token to use for the Order
      *
      * @param options - RPC options
      *
@@ -125,8 +126,8 @@ export default class Trade {
     openOrder({ marketId, amount, direction, token }: OpenOrderArgs, options?: RpcOptions): Promise<string>;
     /**
      * Close Order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order
      *
      * @param options - RPC options
      *
@@ -137,8 +138,8 @@ export default class Trade {
     }, options?: RpcOptions): Promise<string>;
     /**
      * Resolve Market
-     * @param marketId - The ID of the market
-     * @param winningDirection - The winning direction of the market
+     * @param args.marketId - The ID of the Market
+     * @param args.winningDirection - The Winning Direction of the Market
      *
      * @param options - RPC options
      *
@@ -151,14 +152,16 @@ export default class Trade {
             flop: {};
         } | {
             none: {};
+        } | {
+            draw: {};
         };
     }, options?: RpcOptions): Promise<string>;
     /**
      * Resolve Market With Liquidity
-     * @param marketId - The ID of the market
-     * @param winningDirection - The winning direction of the market
-     * @param marketToAddLiquidity - The market to add liquidity
-     * @param amount - The amount of the order
+     * @param args.marketId - The ID of the Market
+     * @param args.winningDirection - The Winning Direction of the Market
+     * @param args.marketToAddLiquidity - The Market to Add Liquidity
+     * @param args.amount - The amount of the Order
      *
      * @param options - RPC options
      *
@@ -170,16 +173,18 @@ export default class Trade {
         amount: number;
     }, options?: RpcOptions): Promise<string>;
     /**
-     * Settle an order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order to settle
+     * Settle an Order for a V1 Market
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order to Settle
+     * @param args.user - The user to settle the order for
      *
      * @param options - RPC options
      *
      */
-    settleOrder({ marketId, orderId }: {
+    settleOrder({ marketId, orderId, user }: {
         marketId: number;
         orderId: number;
+        user: PublicKey;
     }, options?: RpcOptions): Promise<string>;
     /**
      * Add Liquidity
@@ -196,23 +201,17 @@ export default class Trade {
         direction: OrderDirection;
     }, options?: RpcOptions): Promise<string>;
     /**
-     * Collect Fee
+     * Collect Remaining Liquidity
      * @param marketId - The ID of the market
      *
      * @param options - RPC options
      *
      */
-    collectFee({ marketId, vault }: {
-        marketId: number;
-        vault: PublicKey;
-    }, options?: RpcOptions): Promise<{
-        feeToSwap: number;
-        lamport: number;
-    }>;
+    collectRemainingLiquidity(marketId: number, options?: RpcOptions): Promise<string>;
     /**
-     * Payout an order
-     * @param marketId - The ID of the market
-     * @param orderId - The ID of the order to payout
+     * Payout Order
+     * @param args.marketId - The ID of the Market
+     * @param args.orderId - The ID of the Order to Payout
      *
      * @param options - RPC options
      *
@@ -221,4 +220,5 @@ export default class Trade {
         marketId: number;
         orderId: number;
     }, options?: RpcOptions): Promise<string>;
+    allowMarketPayout(marketId: number, options?: RpcOptions): Promise<string>;
 }