@triadxyz/triad-protocol 2.0.8-beta → 2.1.0-beta

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
-import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import { Connection, PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import Trade from './trade';
 import Stake from './stake';
@@ -15,12 +15,11 @@ export default class TriadProtocolClient {
      * @param args.poseidonAsset - Poseidon Asset
      * @param args.ticketAsset - Ticket Asset
      * @param args.ticketNumber - Ticket Number
-     * @param verifier - Verifier
      *
      * @param options - RPC options
      *
      */
-    transferPoseidon(args: TransferPoseidonArgs[], verifier: Keypair, options?: RpcOptions): Promise<string>;
+    transferPoseidon(args: TransferPoseidonArgs[], options?: RpcOptions): Promise<string>;
     /**
      * Withdraw Poseidon
      * @param args.poseidonAsset - Poseidon Asset - CORE PublicKey

package/dist/index.js

@@ -35,12 +35,11 @@ class TriadProtocolClient {
      * @param args.poseidonAsset - Poseidon Asset
      * @param args.ticketAsset - Ticket Asset
      * @param args.ticketNumber - Ticket Number
-     * @param verifier - Verifier
      *
      * @param options - RPC options
      *
      */
-    transferPoseidon(args, verifier, options) {
+    transferPoseidon(args, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const arg of args) {
@@ -51,7 +50,6 @@ class TriadProtocolClient {
                     nft: (0, poseidon_1.getNftPDA)(this.program.programId, arg.ticketNumber),
                     poseidonAsset: arg.poseidonAsset,
                     ticketAsset: arg.ticketAsset,
-                    verifier: constants_1.VERIFIER,
                     poseidonCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.POSEIDON_COLLECTION_SYMBOL),
                     ticketCollection: (0, poseidon_1.getCollectionPDA)(this.program.programId, constants_1.TICKET_COLLECTION_SYMBOL),
                     coreTicketCollection: constants_1.TICKET_CORE_COLLECTION,
@@ -59,7 +57,7 @@ class TriadProtocolClient {
                 })
                     .instruction());
             }
-            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, [], verifier);
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, options, []);
         });
     }
     /**

package/dist/stake.d.ts

@@ -69,9 +69,6 @@ export default class Stake {
     /**
      *  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
      *

package/dist/stake.js

@@ -152,9 +152,6 @@ class Stake {
     /**
      *  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
      *

package/dist/trade.js

@@ -440,7 +440,7 @@ class Trade {
                 .accounts({
                 signer: this.program.provider.publicKey,
                 market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                userTrade: userTradePDA,
+                bidUserTrade: userTradePDA,
                 mint,
                 tokenProgram: (0, helpers_1.getTokenProgram)(mint)
             })
@@ -557,16 +557,16 @@ class Trade {
             const ixs = [];
             const { userTradePDA: buyerTrade, ixs: userTradeIxs } = yield this.getUserTradeIxs();
             const orderBook = yield this.getOrderBook(marketId);
-            let remainingUSDC = amount * Math.pow(10, this.decimals);
+            let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, this.decimals));
             const orders = Object.keys(direction)[0] === 'hype'
                 ? orderBook.hype.ask
                 : orderBook.flop.ask;
             const sortedOrders = orders.sort((a, b) => Number(a.price) - Number(b.price));
             for (const order of sortedOrders) {
-                if (remainingUSDC <= 0)
+                if (remainingUSDC.div(new bn_js_1.default(Math.pow(10, this.decimals))).toString() === '0')
                     break;
                 if (order.authority === this.program.provider.publicKey.toBase58()) {
-                    continue;
+                    return;
                 }
                 let linkedSellerBidTradePDA = null;
                 if (order.linkedBidOrderId !== '0') {
@@ -582,11 +582,17 @@ class Trade {
                         linkedSellerBidTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, subUserTradePDA);
                     }
                 }
-                const orderPrice = Number(order.price);
-                const maxSharesForPrice = remainingUSDC / orderPrice;
-                const availableShares = Number(order.totalShares);
-                const sharesToBuy = Math.min(maxSharesForPrice, availableShares);
-                const usdcAmount = sharesToBuy * orderPrice;
+                const orderPrice = new bn_js_1.default(order.price);
+                const availableShares = new bn_js_1.default(order.totalShares);
+                const maxSharesForPrice = remainingUSDC
+                    .mul(new bn_js_1.default(Math.pow(10, this.decimals)))
+                    .div(orderPrice);
+                const sharesToBuy = bn_js_1.default.min(maxSharesForPrice, availableShares);
+                if (sharesToBuy.lten(0))
+                    continue;
+                const usdcAmount = sharesToBuy
+                    .mul(orderPrice)
+                    .div(new bn_js_1.default(Math.pow(10, this.decimals)));
                 let sellerTradePDA = (0, pda_1.getUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority));
                 if (order.userNonce !== '0') {
                     const subUserTradePDA = (0, pda_1.getSubUserTradePDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), Number(order.userNonce));
@@ -612,7 +618,7 @@ class Trade {
                     linkedSellerBidTrade: linkedSellerBidTradePDA
                 })
                     .instruction());
-                remainingUSDC -= usdcAmount;
+                remainingUSDC = remainingUSDC.sub(usdcAmount);
             }
             if (userTradeIxs.length > 0) {
                 ixs.unshift(...userTradeIxs);

package/dist/types/idl_triad_protocol.json

@@ -1116,9 +1116,8 @@
                     "signer": true
                 },
                 {
-                    "name": "squads",
-                    "writable": true,
-                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
+                    "name": "market",
+                    "writable": true
                 },
                 {
                     "name": "ask_user_trade",
@@ -1128,10 +1127,6 @@
                     "name": "bid_user_trade",
                     "writable": true
                 },
-                {
-                    "name": "market",
-                    "writable": true
-                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -1158,16 +1153,11 @@
                     "signer": true
                 },
                 {
-                    "name": "squads",
-                    "writable": true,
-                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
-                },
-                {
-                    "name": "user_trade",
+                    "name": "market",
                     "writable": true
                 },
                 {
-                    "name": "market",
+                    "name": "bid_user_trade",
                     "writable": true
                 },
                 {
@@ -1175,7 +1165,7 @@
                     "writable": true
                 },
                 {
-                    "name": "user_from_ata",
+                    "name": "user_ata",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -1203,7 +1193,7 @@
                     }
                 },
                 {
-                    "name": "market_to_ata",
+                    "name": "market_ata",
                     "writable": true,
                     "pda": {
                         "seeds": [
@@ -1451,9 +1441,9 @@
                     "signer": true
                 },
                 {
-                    "name": "verifier",
+                    "name": "squads",
                     "writable": true,
-                    "signer": true
+                    "address": "6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq"
                 },
                 {
                     "name": "nft",
@@ -1972,6 +1962,11 @@
             "code": 6026,
             "name": "Overflow",
             "msg": "Overflow"
+        },
+        {
+            "code": 6027,
+            "name": "LinkedBidOrderNotFound",
+            "msg": "Linked bid order not found"
         }
     ],
     "types": [

package/dist/types/triad_protocol.d.ts

@@ -1569,9 +1569,8 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'squads';
+                    name: 'market';
                     writable: true;
-                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
                 },
                 {
                     name: 'askUserTrade';
@@ -1581,10 +1580,6 @@ export type TriadProtocol = {
                     name: 'bidUserTrade';
                     writable: true;
                 },
-                {
-                    name: 'market';
-                    writable: true;
-                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -1611,16 +1606,11 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'squads';
-                    writable: true;
-                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
-                },
-                {
-                    name: 'userTrade';
+                    name: 'market';
                     writable: true;
                 },
                 {
-                    name: 'market';
+                    name: 'bidUserTrade';
                     writable: true;
                 },
                 {
@@ -1628,7 +1618,7 @@ export type TriadProtocol = {
                     writable: true;
                 },
                 {
-                    name: 'userFromAta';
+                    name: 'userAta';
                     writable: true;
                     pda: {
                         seeds: [
@@ -1685,7 +1675,7 @@ export type TriadProtocol = {
                     };
                 },
                 {
-                    name: 'marketToAta';
+                    name: 'marketAta';
                     writable: true;
                     pda: {
                         seeds: [
@@ -2032,9 +2022,9 @@ export type TriadProtocol = {
                     signer: true;
                 },
                 {
-                    name: 'verifier';
+                    name: 'squads';
                     writable: true;
-                    signer: true;
+                    address: '6fcSf6qfwPNR9AUUNC1UWYZDy5cQ4TzTb2aaipN2zFdq';
                 },
                 {
                     name: 'nft';
@@ -2693,6 +2683,11 @@ export type TriadProtocol = {
             code: 6026;
             name: 'overflow';
             msg: 'overflow';
+        },
+        {
+            code: 6027;
+            name: 'linkedBidOrderNotFound';
+            msg: 'Linked bid order not found';
         }
     ];
     types: [

package/dist/utils/constants.d.ts

@@ -1,6 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const TRD_DECIMALS = 6;
-export declare const VERIFIER: PublicKey;
 export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;

package/dist/utils/constants.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = void 0;
+exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.TRD_DECIMALS = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.TRD_DECIMALS = 6;
-exports.VERIFIER = new web3_js_1.PublicKey('42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');

package/dist/utils/sendVersionedTransaction.d.ts

@@ -2,7 +2,6 @@ import { TransactionInstruction } from '@solana/web3.js';
 import { RpcOptions } from '../types';
 import { AddressLookupTableAccount } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
-import { Keypair } from '@solana/web3.js';
 import { TriadProtocol } from '../types/triad_protocol';
-declare const sendVersionedTransaction: (program: Program<TriadProtocol>, ixs: TransactionInstruction[], options?: RpcOptions, addressLookupTableAccounts?: AddressLookupTableAccount[], verifier?: Keypair) => Promise<string>;
+declare const sendVersionedTransaction: (program: Program<TriadProtocol>, ixs: TransactionInstruction[], options?: RpcOptions, addressLookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
 export default sendVersionedTransaction;

package/dist/utils/sendVersionedTransaction.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
-const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccounts, verifier) => __awaiter(void 0, void 0, void 0, function* () {
+const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccounts) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
@@ -32,12 +32,7 @@ const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccou
         recentBlockhash: blockhash,
         payerKey: program.provider.publicKey
     }).compileToV0Message(addressLookupTableAccounts));
-    let signers = [];
-    if (verifier) {
-        tx.sign([verifier]);
-        signers.push(verifier);
-    }
-    return program.provider.sendAndConfirm(tx, signers, {
+    return program.provider.sendAndConfirm(tx, [], {
         skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
         commitment: 'confirmed'
     });

package/package.json

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