@triadxyz/triad-protocol 2.4.8-beta → 2.5.0-beta

package/dist/index.d.ts

@@ -297,7 +297,7 @@ export default class TriadProtocolClient {
      * @param options - RPC options
      *
      */
-    createCustomer({ id, name, authority, feeRecipient }: CreateCustomerArgs, options?: RpcOptions): Promise<string>;
+    createCustomer({ id, name, authority, feeRecipient, feeBps }: CreateCustomerArgs, options?: RpcOptions): Promise<string>;
     /**
      * Get User Trade Nonce With Slots
      * @param userTrades - User Trades
@@ -416,4 +416,11 @@ export default class TriadProtocolClient {
      * @param options - RPC options
      */
     closeOrderBook(marketId: number, options?: RpcOptions): Promise<string>;
+    /**
+     * Create Refer
+     * @param id - The ID of the refer
+     *
+     * @param options - RPC options
+     */
+    createRefer(id: number, options?: RpcOptions): Promise<string>;
 }

package/dist/index.js

@@ -159,12 +159,6 @@ class TriadProtocolClient {
     createMarket({ markets, customer, mint, poolId }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            let userTrade = null;
-            try {
-                yield this.getUserTrade(this.program.provider.publicKey);
-                userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
-            }
-            catch (_a) { }
             let poolPDA = null;
             if (poolId) {
                 poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
@@ -184,11 +178,9 @@ class TriadProtocolClient {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                     customer,
-                    pool: poolPDA,
-                    userTrade
+                    pool: poolPDA
                 })
                     .instruction());
                 ixs.push(yield this.program.methods
@@ -227,12 +219,6 @@ class TriadProtocolClient {
                 signer: this.program.provider.publicKey
             })
                 .instruction());
-            let userTrade = null;
-            try {
-                yield this.getUserTrade(this.program.provider.publicKey);
-                userTrade = (0, pda_1.getUserTradePDA)(this.program.programId, this.program.provider.publicKey);
-            }
-            catch (_a) { }
             for (const market of markets) {
                 if (market.question.length > 80) {
                     throw new Error('Market question must be less than 80 characters');
@@ -248,11 +234,9 @@ class TriadProtocolClient {
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    mint,
                     tokenProgram: (0, helpers_1.getTokenProgram)(mint),
                     pool: poolPDA,
-                    customer,
-                    userTrade
+                    customer
                 })
                     .instruction());
                 ixs.push(yield this.program.methods
@@ -511,11 +495,11 @@ class TriadProtocolClient {
      * @param options - RPC options
      *
      */
-    createCustomer({ id, name, authority, feeRecipient }, options) {
+    createCustomer({ id, name, authority, feeRecipient, feeBps }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             ixs.push(yield this.program.methods
-                .createCustomer({ id, name, authority, feeRecipient })
+                .createCustomer({ id, name, authority, feeRecipient, feeBps })
                 .accounts({
                 signer: this.program.provider.publicKey
             })
@@ -827,7 +811,8 @@ class TriadProtocolClient {
                     .marketAskOrder({
                     shares: new bn_js_1.default(sharesToSell),
                     orderDirection: direction,
-                    bidOrderId: new bn_js_1.default(bidOrderId)
+                    bidOrderId: new bn_js_1.default(bidOrderId),
+                    bookOrderBidId: new bn_js_1.default(order.id)
                 })
                     .accounts({
                     signer: this.program.provider.publicKey,
@@ -902,7 +887,6 @@ class TriadProtocolClient {
                 .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                feeRecipient,
                 mint: constants_1.TRD_MINT
             })
                 .instruction());
@@ -929,5 +913,23 @@ class TriadProtocolClient {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
+    /**
+     * Create Refer
+     * @param id - The ID of the refer
+     *
+     * @param options - RPC options
+     */
+    createRefer(id, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .createRefer(new bn_js_1.default(id))
+                .accounts({
+                signer: this.program.provider.publicKey
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
+    }
 }
 exports.default = TriadProtocolClient;

package/dist/stake.d.ts

@@ -2,7 +2,7 @@ import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { UpdateStakeVaultArgs, RequestWithdrawArgs, WithdrawArgs, StakeTokenArgs } from './types/stake';
+import { Stake as StakeType, UpdateStakeVaultArgs, WithdrawArgs } from './types/stake';
 export default class Stake {
     private program;
     constructor(program: Program<TriadProtocol>);
@@ -15,13 +15,13 @@ export default class Stake {
      * Get all Stakes
      *
      */
-    getStakes(): Promise<import("./types/stake").Stake[]>;
+    getStakes(): Promise<StakeType[]>;
     /**
      * Get User Stakes By Wallet
      * @param wallet - User wallet
      *
      */
-    getUserStakes(wallet: PublicKey): Promise<import("./types/stake").Stake[]>;
+    getUserStakes(wallet: PublicKey): Promise<StakeType[]>;
     /**
      * Get Stake By Wallet
      * @param wallet - User Wallet
@@ -41,15 +41,13 @@ export default class Stake {
         amount: number;
     }[]>;
     /**
-     *  Stake Token
-     *  @param args.name - Index for finding the PDA
-     *  @param args.wallet - User wallet
-     *  @param args.amount - Amount to stake
+     *  Stake
+     *  @param amount - Amount to stake
      *
      *  @param options - RPC options
      *
      */
-    stakeToken({ name, wallet, amount }: StakeTokenArgs, options?: RpcOptions): Promise<string>;
+    stakeToken(amount: number, options?: RpcOptions): Promise<string>;
     /**
      *  Update Stake Vault
      *  @param args.amount - Reward amount to deposit (optional)
@@ -60,14 +58,13 @@ export default class Stake {
      */
     updateStakeVault({ amount, isLocked }: UpdateStakeVaultArgs, options?: RpcOptions): Promise<string>;
     /**
-     *  Request Withdraw
-     *  @param args.wallet - User wallet
-     *  @param args.nfts - NFTs to Request withdraw
+     *  Request Unstake
+     *  @param amount - Amount to unstake
      *
      *  @param options - RPC options
      *
      */
-    requestWithdraw({ wallet, nfts }: RequestWithdrawArgs, options?: RpcOptions): Promise<string>;
+    requestUnstake(amount: number, options?: RpcOptions): Promise<string>;
     /**
      *  Withdraw Stake
      *  @param args.wallet - User wallet
@@ -78,12 +75,22 @@ export default class Stake {
      *
      */
     withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    /**
+     *  Unstake Token
+     *  @param options - RPC options
+     *
+     */
+    unstakeToken(options?: RpcOptions): Promise<string>;
     /**
      *  Claim Stake Rewards
-     *  @param wallet - User wallet
+     *  @param options - RPC options
      *
+     */
+    claimStakeRewards(options?: RpcOptions): Promise<string>;
+    /**
+     *  Migrate Stake
      *  @param options - RPC options
      *
      */
-    claimStakeRewards(wallet: PublicKey, options?: RpcOptions): Promise<string>;
+    migrateStake(stakes: StakeType[], options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
+const web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("./utils/helpers");
 const stake_1 = require("./utils/pda/stake");
 const constants_1 = require("./utils/constants");
@@ -68,24 +69,20 @@ class Stake {
         });
     }
     /**
-     *  Stake Token
-     *  @param args.name - Index for finding the PDA
-     *  @param args.wallet - User wallet
-     *  @param args.amount - Amount to stake
+     *  Stake
+     *  @param amount - Amount to stake
      *
      *  @param options - RPC options
      *
      */
-    stakeToken({ name, wallet, amount }, options) {
+    stakeToken(amount, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             ixs.push(yield this.program.methods
                 .stakeToken({
-                name,
                 amount: new anchor_1.BN(amount * Math.pow(10, 6))
             })
                 .accounts({
-                signer: wallet,
                 mint: constants_1.TRD_MINT
             })
                 .instruction());
@@ -109,7 +106,6 @@ class Stake {
                 isLocked
             })
                 .accounts({
-                signer: this.program.provider.publicKey,
                 mint: constants_1.TRD_MINT
             })
                 .instruction());
@@ -117,25 +113,25 @@ class Stake {
         });
     }
     /**
-     *  Request Withdraw
-     *  @param args.wallet - User wallet
-     *  @param args.nfts - NFTs to Request withdraw
+     *  Request Unstake
+     *  @param amount - Amount to unstake
      *
      *  @param options - RPC options
      *
      */
-    requestWithdraw({ wallet, nfts }, options) {
+    requestUnstake(amount, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            for (const nft of nfts) {
-                ixs.push(yield this.program.methods
-                    .requestWithdrawStake()
-                    .accounts({
-                    signer: wallet,
-                    stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, nft.name)
-                })
-                    .instruction());
-            }
+            ixs.push(yield this.program.methods
+                .requestUnstake({
+                amount: new anchor_1.BN(amount),
+                ts: new anchor_1.BN(Date.now())
+            })
+                .accounts({
+                stake: (0, stake_1.getStakePDA)(this.program.programId, this.program.provider.publicKey),
+                mint: constants_1.TRD_MINT
+            })
+                .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
@@ -154,43 +150,62 @@ class Stake {
             ixs.push(yield this.program.methods
                 .withdrawStake()
                 .accounts({
-                signer: wallet,
-                stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
-                admin: constants_1.TRIAD_ADMIN,
+                stake: (0, stake_1.getStakeV2PDA)(this.program.programId, wallet, name),
                 mint: mint
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
         });
     }
+    /**
+     *  Unstake Token
+     *  @param options - RPC options
+     *
+     */
+    unstakeToken(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .unstakeToken()
+                .accounts({
+                signer: this.program.provider.publicKey
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
+    }
     /**
      *  Claim Stake Rewards
-     *  @param wallet - User wallet
+     *  @param options - RPC options
      *
+     */
+    claimStakeRewards(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            ixs.push(yield this.program.methods
+                .claimStakeRewards()
+                .accounts({
+                mint: constants_1.TRD_MINT,
+                stake: (0, stake_1.getStakePDA)(this.program.programId, this.program.provider.publicKey)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
+        });
+    }
+    /**
+     *  Migrate Stake
      *  @param options - RPC options
      *
      */
-    claimStakeRewards(wallet, options) {
+    migrateStake(stakes, 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 items = [];
-            stakes.forEach((stake) => {
-                if (stake.withdrawTs !== 0) {
-                    return;
-                }
-                items.push(stake);
-            });
-            for (const stake of items) {
-                if (ixs.length >= 10) {
-                    break;
-                }
+            for (const stake of stakes) {
                 ixs.push(yield this.program.methods
-                    .claimStakeRewards()
+                    .migrateStake()
                     .accounts({
-                    signer: wallet,
-                    mint: constants_1.TRD_MINT,
-                    stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name)
+                    stakeV2: (0, stake_1.getStakeV2PDA)(this.program.programId, new web3_js_1.PublicKey(stake.authority), stake.name),
+                    mint: constants_1.TRD_MINT
                 })
                     .instruction());
             }