@triadxyz/triad-protocol 2.5.2-beta → 2.5.4-beta

package/dist/stake.d.ts

@@ -20,7 +20,7 @@ export default class Stake {
      * Get all Stakes
      *
      */
-    getStakes(): Promise<import("./types/stake").StakeV3[]>;
+    getStakes(): Promise<import("./types/stake").Stake[]>;
     /**
      * Get Stake By Wallet
      * @param wallet - User wallet
@@ -70,7 +70,7 @@ export default class Stake {
      *  @param options - RPC options
      *
      */
-    unstakeToken(options?: RpcOptions): Promise<string>;
+    unstakeToken(unstakePDA: PublicKey, options?: RpcOptions): Promise<string>;
     /**
      *  Claim Stake Rewards
      *  @param options - RPC options

package/dist/stake.js

@@ -80,7 +80,7 @@ class Stake {
                     }
                 }
             ]);
-            return stake.map((stake) => (0, helpers_1.formatUnstake)(stake.account));
+            return stake.map((stake) => (0, helpers_1.formatUnstake)(stake.account, stake.publicKey));
         });
     }
     /**
@@ -155,13 +155,14 @@ class Stake {
      *  @param options - RPC options
      *
      */
-    unstakeToken(options) {
+    unstakeToken(unstakePDA, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             ixs.push(yield this.program.methods
                 .unstakeToken()
                 .accounts({
-                signer: this.program.provider.publicKey
+                signer: this.program.provider.publicKey,
+                unstake: unstakePDA
             })
                 .instruction());
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, options);

package/dist/types/stake.d.ts

@@ -33,11 +33,12 @@ export type StakeV2 = {
     amount: number;
 };
 export type Unstake = {
+    address: string;
     authority: string;
     amount: number;
     withdrawTs: number;
 };
-export type StakeV3 = {
+export type Stake = {
     authority: string;
     initTs: number;
     checkedTs: number;

package/dist/utils/helpers.d.ts

@@ -1,20 +1,20 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts } from '@coral-xyz/anchor';
-import { StakeV2, StakeV3, StakeVault, Unstake } from './../types/stake';
+import { StakeV2, Stake, StakeVault, Unstake } from './../types/stake';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Pool, BookOrder, Refer } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
 export declare const formatStakeV2: (stake: IdlAccounts<TriadProtocol>['stakeV2']) => StakeV2;
-export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3']) => StakeV3;
-export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake']) => Unstake;
+export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3']) => Stake;
+export declare const formatUnstake: (unstake: IdlAccounts<TriadProtocol>['unstake'], address: PublicKey) => Unstake;
 export declare const formatPool: (account: IdlAccounts<TriadProtocol>['pool'], address: PublicKey) => Pool;
 export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;
 export declare const formatUserTrade: (account: IdlAccounts<TriadProtocol>['userTrade'], publicKey: PublicKey) => UserTrade;
 export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['userTrade']['orders'][number], authority?: string) => Order;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number]) => BookOrder;
-export declare const calculateStakeRewards: (stake: StakeV3) => number;
+export declare const calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
 export declare const getOrderDirection: (direction: {
     hype: {};

package/dist/utils/helpers.js

@@ -63,8 +63,9 @@ const formatStake = (stake) => {
     };
 };
 exports.formatStake = formatStake;
-const formatUnstake = (unstake) => {
+const formatUnstake = (unstake, address) => {
     return {
+        address: address.toBase58(),
         authority: unstake.authority.toBase58(),
         amount: unstake.amount.toNumber() / Math.pow(10, 6),
         withdrawTs: unstake.withdrawTs.toNumber()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "2.5.2-beta",
+  "version": "2.5.4-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",