@triadxyz/triad-protocol 2.4.9-beta → 2.5.1-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
             })
@@ -903,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());
@@ -930,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 { StakeV2, UpdateStakeVaultArgs } from './types/stake';
 export default class Stake {
     private program;
     constructor(program: Program<TriadProtocol>);
@@ -15,41 +15,39 @@ export default class Stake {
      * Get all Stakes
      *
      */
-    getStakes(): Promise<import("./types/stake").Stake[]>;
+    getStakesV2(): Promise<StakeV2[]>;
     /**
-     * Get User Stakes By Wallet
-     * @param wallet - User wallet
+     * Get all Stakes
      *
      */
-    getUserStakes(wallet: PublicKey): Promise<import("./types/stake").Stake[]>;
+    getStakes(): Promise<import("./types/stake").StakeV3[]>;
     /**
      * Get Stake By Wallet
-     * @param wallet - User Wallet
+     * @param wallet - User wallet
      *
      */
     getStakeByWallet(wallet: PublicKey): Promise<{
         available: number;
-        name: string;
-        stakeVault: string;
         authority: string;
         initTs: number;
-        withdrawTs: number;
-        mint: string;
-        claimedTs: number;
-        boost: boolean;
+        checkedTs: number;
         claimed: number;
         amount: number;
-    }[]>;
+    }>;
+    /**
+     * Get Unstake By Wallet
+     * @param wallet - User wallet
+     *
+     */
+    getUnstakeByWallet(wallet: PublicKey): Promise<import("./types/stake").Unstake[]>;
     /**
      *  Stake Token
-     *  @param args.name - Index for finding the PDA
-     *  @param args.wallet - User wallet
-     *  @param args.amount - Amount to 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,30 +58,29 @@ 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
-     *  @param args.name - Stake name
-     *  @param args.mint - Stake native mint (TRD)
-     *
+     *  Unstake Token
      *  @param options - RPC options
      *
      */
-    withdrawStake({ wallet, name, mint }: WithdrawArgs, options?: RpcOptions): Promise<string>;
+    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: StakeV2[], 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");
@@ -35,57 +36,68 @@ class Stake {
      * Get all Stakes
      *
      */
-    getStakes() {
+    getStakesV2() {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.program.account.stakeV2.all();
-            return response.map((stake) => (0, helpers_1.formatStake)(stake.account));
+            return response.map((stake) => (0, helpers_1.formatStakeV2)(stake.account));
         });
     }
     /**
-     * Get User Stakes By Wallet
-     * @param wallet - User wallet
+     * Get all Stakes
      *
      */
-    getUserStakes(wallet) {
+    getStakes() {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakes = yield this.program.account.stakeV2.all();
-            const response = stakes.filter((stake) => stake.account.authority.toBase58() === wallet.toBase58());
+            const response = yield this.program.account.stakeV3.all();
             return response.map((stake) => (0, helpers_1.formatStake)(stake.account));
         });
     }
     /**
      * Get Stake By Wallet
-     * @param wallet - User Wallet
+     * @param wallet - User wallet
      *
      */
     getStakeByWallet(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.getUserStakes(wallet);
-            return response.map((stake) => {
-                let available = (0, helpers_1.calculateStakeRewards)(stake);
-                return Object.assign(Object.assign({}, stake), { available });
-            });
+            const stake = yield this.program.account.stakeV3
+                .fetch((0, stake_1.getStakePDA)(this.program.programId, wallet))
+                .then((stake) => (0, helpers_1.formatStake)(stake));
+            return Object.assign(Object.assign({}, stake), { available: (0, helpers_1.calculateStakeRewards)(stake) });
+        });
+    }
+    /**
+     * Get Unstake By Wallet
+     * @param wallet - User wallet
+     *
+     */
+    getUnstakeByWallet(wallet) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stake = yield this.program.account.unstake.all([
+                {
+                    memcmp: {
+                        offset: 8 + 1,
+                        bytes: wallet.toBase58()
+                    }
+                }
+            ]);
+            return stake.map((stake) => (0, helpers_1.formatUnstake)(stake.account));
         });
     }
     /**
      *  Stake Token
-     *  @param args.name - Index for finding the PDA
-     *  @param args.wallet - User wallet
-     *  @param args.amount - Amount to 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 +121,6 @@ class Stake {
                 isLocked
             })
                 .accounts({
-                signer: this.program.provider.publicKey,
                 mint: constants_1.TRD_MINT
             })
                 .instruction());
@@ -117,47 +128,40 @@ 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);
         });
     }
     /**
-     *  Withdraw Stake
-     *  @param args.wallet - User wallet
-     *  @param args.name - Stake name
-     *  @param args.mint - Stake native mint (TRD)
-     *
+     *  Unstake Token
      *  @param options - RPC options
      *
      */
-    withdrawStake({ wallet, name, mint }, options) {
+    unstakeToken(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             ixs.push(yield this.program.methods
-                .withdrawStake()
+                .unstakeToken()
                 .accounts({
-                signer: wallet,
-                stake: (0, stake_1.getStakePDA)(this.program.programId, wallet, name),
-                admin: constants_1.TRIAD_ADMIN,
-                mint: mint
+                signer: this.program.provider.publicKey
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);
@@ -165,32 +169,38 @@ class Stake {
     }
     /**
      *  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) {
+                if (stake.withdrawTs !== 0)
+                    continue;
                 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());
             }