@triadxyz/triad-protocol 1.9.4-beta → 1.9.5-beta

package/dist/stake.d.ts

@@ -26,10 +26,9 @@ export default class Stake {
     /**
      * Get Stake By Wallet
      * @param wallet - User Wallet
-     * @param multiplier - Multiplier
      *
      */
-    getStakeByWallet(wallet: PublicKey, collections: number): Promise<StakeResponse[]>;
+    getStakeByWallet(wallet: PublicKey): Promise<StakeResponse[]>;
     /**
      *  Stake Token
      *  @param args.name - Index for finding the PDA
@@ -78,14 +77,5 @@ export default class Stake {
      *  @param options - RPC options
      *
      */
-    claimStakeRewards({ wallet, collections, ranks, verifier }: {
-        wallet: PublicKey;
-        collections: number;
-        ranks: {
-            onchainId: string;
-            name: string;
-            rarityRankHrtt: number;
-        }[];
-        verifier: string;
-    }, options?: RpcOptions): Promise<string>;
+    claimStakeRewards(wallet: PublicKey, options?: RpcOptions): Promise<string>;
 }

package/dist/stake.js

@@ -18,7 +18,6 @@ const stake_1 = require("./utils/pda/stake");
 const constants_1 = require("./utils/constants");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
-const convertSecretKeyToKeypair_1 = require("./utils/convertSecretKeyToKeypair");
 class Stake {
     constructor(program, provider) {
         this.program = program;
@@ -59,15 +58,14 @@ class Stake {
     /**
      * Get Stake By Wallet
      * @param wallet - User Wallet
-     * @param multiplier - Multiplier
      *
      */
-    getStakeByWallet(wallet, collections) {
+    getStakeByWallet(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = yield this.getUserStakes(wallet);
             const data = [];
             for (const stake of response) {
-                let available = (0, helpers_1.calculateStakeRewards)(stake, collections);
+                let available = (0, helpers_1.calculateStakeRewards)(stake);
                 data.push(Object.assign(Object.assign({}, stake), { available }));
             }
             return data;
@@ -135,7 +133,6 @@ class Stake {
                     .requestWithdrawStake()
                     .accounts({
                     signer: wallet,
-                    mint: nft.mint,
                     stake: stakePDA
                 })
                     .instruction());
@@ -175,7 +172,7 @@ class Stake {
      *  @param options - RPC options
      *
      */
-    claimStakeRewards({ wallet, collections, ranks, verifier }, options) {
+    claimStakeRewards(wallet, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const stakes = (yield this.getUserStakes(wallet)).sort((a, b) => a.claimedTs - b.claimedTs);
             const ixs = [];
@@ -193,20 +190,16 @@ class Stake {
                 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({
-                    collections,
-                    rank: 963
-                })
+                    .claimStakeRewards()
                     .accounts({
                     signer: wallet,
                     mint: constants_1.TRD_MINT,
                     stake: stakePDA,
-                    stakeVault: stakeVaultPDA,
-                    verifier: constants_1.VERIFIER
+                    stakeVault: stakeVaultPDA
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, (0, convertSecretKeyToKeypair_1.convertSecretKeyToKeypair)(verifier));
+            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options);
         });
     }
 }

package/dist/trade.d.ts

@@ -1,7 +1,7 @@
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, UpdateMarketAdminArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs } from './types/trade';
+import { CreateMarketArgs, OpenOrderArgs, UserTrade, CreateCustomerArgs, Order, MarketBidOrderArgs, CancelBidOrderArgs, CancelAskOrderArgs, PlaceBidOrderArgs, PlaceAskOrderArgs } from './types/trade';
 import { RpcOptions } from './types';
 import BN from 'bn.js';
 export default class Trade {
@@ -344,12 +344,4 @@ export default class Trade {
             ask: Order[];
         };
     }>;
-    /**
-     * Update Market Admin
-     * @param args.payoutFee - The payout fee of the market
-     * @param args.feeBps - The fee bps of the market
-     *
-     * @param options - RPC options
-     */
-    updateMarketAdmin(args: UpdateMarketAdminArgs, options?: RpcOptions): Promise<string>;
 }

package/dist/trade.js

@@ -232,9 +232,6 @@ class Trade {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, marketId);
             const market = yield this.getMarketByAddress(marketPDA);
-            if (market.isAllowedToPayout) {
-                return;
-            }
             return (0, sendTransactionWithOptions_1.default)(this.program.methods.collectRemainingLiquidity().accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
@@ -670,21 +667,5 @@ class Trade {
             return orderBook;
         });
     }
-    /**
-     * Update Market Admin
-     * @param args.payoutFee - The payout fee of the market
-     * @param args.feeBps - The fee bps of the market
-     *
-     * @param options - RPC options
-     */
-    updateMarketAdmin(args, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, trade_2.getMarketPDA)(this.program.programId, args.marketId);
-            return (0, sendTransactionWithOptions_1.default)(this.program.methods.updateMarketAdmin(args).accounts({
-                signer: this.provider.publicKey,
-                market: marketPDA
-            }), options);
-        });
-    }
 }
 exports.default = Trade;

package/dist/types/idl_triad_protocol.json

@@ -202,11 +202,6 @@
                     "writable": true,
                     "signer": true
                 },
-                {
-                    "name": "verifier",
-                    "writable": true,
-                    "signer": true
-                },
                 {
                     "name": "stake_vault",
                     "writable": true
@@ -288,16 +283,7 @@
                     "address": "11111111111111111111111111111111"
                 }
             ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "ClaimStakeRewardsArgs"
-                        }
-                    }
-                }
-            ],
+            "args": [],
             "returns": "u64"
         },
         {
@@ -1099,7 +1085,7 @@
                     }
                 },
                 {
-                    "name": "market_vault",
+                    "name": "market_ata",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -1127,8 +1113,7 @@
                     }
                 },
                 {
-                    "name": "token_program",
-                    "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
+                    "name": "token_program"
                 },
                 {
                     "name": "associated_token_program",
@@ -1343,14 +1328,6 @@
                     "name": "stake",
                     "writable": true
                 },
-                {
-                    "name": "mint",
-                    "writable": true
-                },
-                {
-                    "name": "token_program",
-                    "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
-                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -1594,35 +1571,6 @@
                 }
             ]
         },
-        {
-            "name": "update_market_admin",
-            "discriminator": [167, 63, 152, 152, 112, 165, 97, 114],
-            "accounts": [
-                {
-                    "name": "signer",
-                    "writable": true,
-                    "signer": true
-                },
-                {
-                    "name": "market",
-                    "writable": true
-                },
-                {
-                    "name": "system_program",
-                    "address": "11111111111111111111111111111111"
-                }
-            ],
-            "args": [
-                {
-                    "name": "args",
-                    "type": {
-                        "defined": {
-                            "name": "UpdateMarketAdminArgs"
-                        }
-                    }
-                }
-            ]
-        },
         {
             "name": "update_stake_vault",
             "discriminator": [84, 171, 100, 153, 126, 215, 229, 68],
@@ -2132,22 +2080,6 @@
                 ]
             }
         },
-        {
-            "name": "ClaimStakeRewardsArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "rank",
-                        "type": "u16"
-                    },
-                    {
-                        "name": "collections",
-                        "type": "u8"
-                    }
-                ]
-            }
-        },
         {
             "name": "Collection",
             "type": {
@@ -3152,26 +3084,6 @@
                 ]
             }
         },
-        {
-            "name": "UpdateMarketAdminArgs",
-            "type": {
-                "kind": "struct",
-                "fields": [
-                    {
-                        "name": "payout_fee",
-                        "type": {
-                            "option": "u16"
-                        }
-                    },
-                    {
-                        "name": "fee_bps",
-                        "type": {
-                            "option": "u16"
-                        }
-                    }
-                ]
-            }
-        },
         {
             "name": "UpdateStakeVaultArgs",
             "type": {

package/dist/types/trade.d.ts

@@ -176,8 +176,3 @@ export type MarketBidOrderArgs = {
     };
     mint: PublicKey;
 };
-export type UpdateMarketAdminArgs = {
-    marketId: number;
-    payoutFee: number | null;
-    feeBps: number | null;
-};

package/dist/types/triad_protocol.d.ts

@@ -266,11 +266,6 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
-                {
-                    name: 'verifier';
-                    writable: true;
-                    signer: true;
-                },
                 {
                     name: 'stakeVault';
                     writable: true;
@@ -410,16 +405,7 @@ export type TriadProtocol = {
                     address: '11111111111111111111111111111111';
                 }
             ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'claimStakeRewardsArgs';
-                        };
-                    };
-                }
-            ];
+            args: [];
             returns: 'u64';
         },
         {
@@ -1540,7 +1526,7 @@ export type TriadProtocol = {
                     };
                 },
                 {
-                    name: 'marketVault';
+                    name: 'marketAta';
                     writable: true;
                     pda: {
                         seeds: [
@@ -1598,7 +1584,6 @@ export type TriadProtocol = {
                 },
                 {
                     name: 'tokenProgram';
-                    address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
                 },
                 {
                     name: 'associatedTokenProgram';
@@ -1871,14 +1856,6 @@ export type TriadProtocol = {
                     name: 'stake';
                     writable: true;
                 },
-                {
-                    name: 'mint';
-                    writable: true;
-                },
-                {
-                    name: 'tokenProgram';
-                    address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
-                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -2180,35 +2157,6 @@ export type TriadProtocol = {
                 }
             ];
         },
-        {
-            name: 'updateMarketAdmin';
-            discriminator: [167, 63, 152, 152, 112, 165, 97, 114];
-            accounts: [
-                {
-                    name: 'signer';
-                    writable: true;
-                    signer: true;
-                },
-                {
-                    name: 'market';
-                    writable: true;
-                },
-                {
-                    name: 'systemProgram';
-                    address: '11111111111111111111111111111111';
-                }
-            ];
-            args: [
-                {
-                    name: 'args';
-                    type: {
-                        defined: {
-                            name: 'updateMarketAdminArgs';
-                        };
-                    };
-                }
-            ];
-        },
         {
             name: 'updateStakeVault';
             discriminator: [84, 171, 100, 153, 126, 215, 229, 68];
@@ -2834,22 +2782,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'claimStakeRewardsArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'rank';
-                        type: 'u16';
-                    },
-                    {
-                        name: 'collections';
-                        type: 'u8';
-                    }
-                ];
-            };
-        },
         {
             name: 'collection';
             type: {
@@ -3854,26 +3786,6 @@ export type TriadProtocol = {
                 ];
             };
         },
-        {
-            name: 'updateMarketAdminArgs';
-            type: {
-                kind: 'struct';
-                fields: [
-                    {
-                        name: 'payoutFee';
-                        type: {
-                            option: 'u16';
-                        };
-                    },
-                    {
-                        name: 'feeBps';
-                        type: {
-                            option: 'u16';
-                        };
-                    }
-                ];
-            };
-        },
         {
             name: 'updateStakeVaultArgs';
             type: {

package/dist/utils/helpers.d.ts

@@ -1,6 +1,6 @@
 import { Stake, StakeVault } from './../types/stake';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
-import { PublicKey, AddressLookupTableAccount } from '@solana/web3.js';
+import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
@@ -8,7 +8,7 @@ export declare const formatStake: (stake: any) => Stake;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
 export declare const formatOrder: (order: any, authority?: string) => Order;
 export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
-export declare const calculateStakeRewards: (stake: Stake, multiplier: number) => number;
+export declare const calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
 export declare const getOrderDirection: (direction: {
     hype: {};
@@ -38,4 +38,3 @@ export declare const getOrderStatus: (status: {
 } | {
     waiting: {};
 }) => OrderStatus;
-export declare const defaultLookupTable: AddressLookupTableAccount;

package/dist/utils/helpers.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultLookupTable = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
-const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
 const spl_token_2 = require("@solana/spl-token");
@@ -123,19 +122,16 @@ const formatUserTrade = (account, publicKey) => {
     };
 };
 exports.formatUserTrade = formatUserTrade;
-const calculateStakeRewards = (stake, multiplier) => {
+const calculateStakeRewards = (stake) => {
     if (stake.withdrawTs !== 0)
         return 0;
-    if (multiplier > 3)
-        return 0;
-    const collectionsMultiplier = multiplier * 150;
     const maxRank = 1633;
-    const rank = 963;
+    const rank = 639;
     const rankWeight = (maxRank - rank + 1) / maxRank;
     const userStakedAmount = stake.mint === constants_1.TRD_MINT.toBase58()
         ? stake.amount
         : stake.amount * 10000 * Math.pow(10, constants_1.TRD_DECIMALS);
-    const formattedAmount = userStakedAmount / Math.pow(10, constants_1.TRD_DECIMALS) + collectionsMultiplier;
+    const formattedAmount = userStakedAmount / Math.pow(10, constants_1.TRD_DECIMALS);
     const adjustedAmount = formattedAmount * rankWeight;
     const lastClaim = stake.claimedTs === 0 ? stake.initTs : stake.claimedTs;
     const currentTime = Math.floor(Date.now() / 1000);
@@ -193,19 +189,3 @@ const getOrderStatus = (status) => {
     }
 };
 exports.getOrderStatus = getOrderStatus;
-exports.defaultLookupTable = {
-    isActive: () => true,
-    key: new web3_js_1.PublicKey('A2wLWeXEHjmeRvSAyijS9ofv87N1GzFyQfdYPgPoQhZf'),
-    state: {
-        deactivationSlot: BigInt(18446744073709551615),
-        lastExtendedSlot: 328789868,
-        lastExtendedSlotStartIndex: 0,
-        authority: new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR'),
-        addresses: [
-            new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV'),
-            new web3_js_1.PublicKey('6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq'),
-            new web3_js_1.PublicKey('TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb'),
-            new web3_js_1.PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL')
-        ]
-    }
-};

package/package.json

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