@triadxyz/triad-protocol 4.2.1 → 4.2.3

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Connection, PublicKey } from '@solana/web3.js';
+import { Connection } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import { TriadProtocol as TriadProtocolIDL } from './types/triad_protocol';
 import { RpcOptions } from './types';
@@ -31,26 +31,6 @@ export default class TriadProtocol {
     market: Market;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
     getPriorityFee(): Promise<void>;
-    /**
-     * Get User Orders
-     * @param wallet - User wallet PublicKey
-     */
-    getUserOrders(wallet: PublicKey): Promise<import("./types").Order[]>;
-    /**
-     * Get User Orders By Market ID
-     * @param wallet - User wallet PublicKey
-     * @param marketId - The ID of the market
-     */
-    getUserOrdersByMarketId(wallet: PublicKey, marketId: number): Promise<import("./types").Order[]>;
-    /**
-     * Get all User Book Orders
-     * @param wallet - User wallet PublicKey
-     */
-    getUserBookOrders(wallet: PublicKey): Promise<import("./types").BookOrder[]>;
-    /**
-     * Get User Book Orders By Market ID
-     */
-    getUserBookOrdersByMarketId(wallet: PublicKey, marketId: number): Promise<import("./types").BookOrder[]>;
     /**
      * Burn Triad
      * @param amount - Amount to burn

package/dist/index.js

@@ -29,9 +29,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const anchor_1 = require("@coral-xyz/anchor");
 const bn_js_1 = __importDefault(require("bn.js"));
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
-const constants_1 = require("./utils/constants");
-const helpers_1 = require("./utils/helpers");
-const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const stake_1 = __importDefault(require("./stake"));
 const poseidon_1 = __importDefault(require("./poseidon"));
@@ -77,63 +74,6 @@ class TriadProtocol {
             this.rpcOptions.microLamports = yield (0, getPriorityFee_1.default)();
         });
     }
-    /**
-     * Get User Orders
-     * @param wallet - User wallet PublicKey
-     */
-    getUserOrders(wallet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const orders = yield this.program.account.orderV2.all([
-                {
-                    memcmp: {
-                        offset: 8,
-                        bytes: wallet.toBase58()
-                    }
-                }
-            ]);
-            return orders.map(({ account, publicKey }) => (0, helpers_1.formatOrder)(account, publicKey));
-        });
-    }
-    /**
-     * Get User Orders By Market ID
-     * @param wallet - User wallet PublicKey
-     * @param marketId - The ID of the market
-     */
-    getUserOrdersByMarketId(wallet, marketId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const orders = yield this.getUserOrders(wallet);
-            return orders.filter((order) => order.marketId === marketId.toString());
-        });
-    }
-    /**
-     * Get all User Book Orders
-     * @param wallet - User wallet PublicKey
-     */
-    getUserBookOrders(wallet) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const orderbooks = yield this.program.account.orderBook.all();
-            const bookOrders = orderbooks.map((orderbook) => {
-                return [...orderbook.account.hypeOrders, ...orderbook.account.flopOrders]
-                    .map((order) => (0, helpers_1.formatBookOrder)(order, orderbook.account.marketId.toNumber()))
-                    .filter((order) => order.authority === wallet.toBase58() &&
-                    order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
-            });
-            return bookOrders.flat();
-        });
-    }
-    /**
-     * Get User Book Orders By Market ID
-     */
-    getUserBookOrdersByMarketId(wallet, marketId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const orderBook = yield this.program.account.orderBook.fetch((0, pda_1.getOrderBookPDA)(this.program.programId, marketId), this.provider.opts.commitment);
-            const orders = [...orderBook.hypeOrders, ...orderBook.flopOrders];
-            return orders
-                .map((order) => (0, helpers_1.formatBookOrder)(order, marketId))
-                .filter((order) => order.authority === wallet.toBase58() &&
-                order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
-        });
-    }
     /**
      * Burn Triad
      * @param amount - Amount to burn

package/dist/market.d.ts

@@ -10,7 +10,7 @@ export default class Market {
      * Get Orders By Market ID
      * @param marketId - The ID of the market
      */
-    getOrdersByMarketId(marketId: number): Promise<import("./types").Order[]>;
+    getOrdersByMarketId(marketId: number): Promise<import("./types").PredictorOrder[]>;
     /**
      * Get All Pools
      */

package/dist/market.js

@@ -32,7 +32,7 @@ class Market {
     getOrdersByMarketId(marketId) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketIdBytes = new bn_js_1.default(marketId).toArray('le', 8);
-            const orders = yield this.program.account.orderV2.all([
+            const orders = yield this.program.account.predictorOrder.all([
                 {
                     memcmp: {
                         offset: 8 + 32,
@@ -40,7 +40,7 @@ class Market {
                     }
                 }
             ]);
-            return orders.map(({ account, publicKey }) => (0, helpers_1.formatOrder)(account, publicKey));
+            return orders.map(({ account, publicKey }) => (0, helpers_1.formatPredictorOrder)(account, publicKey));
         });
     }
     /**

package/dist/predictor.d.ts

@@ -10,15 +10,39 @@ export default class Predictor {
     /**
      * Get predictor
      * @param authority - Authority public key
-     * @param customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param customerId - Customer ID
      */
-    getPredictor(authority: PublicKey, customerId?: number): Promise<PredictorType>;
+    getPredictor(authority: PublicKey, customerId: number): Promise<PredictorType>;
+    /**
+     * Get User Orders
+     * @param wallet - User wallet PublicKey
+     */
+    getUserOrders(wallet: PublicKey, customerId: number): Promise<import("./types").PredictorOrder[]>;
+    /**
+     * Get User Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     */
+    getUserOrdersByMarketId(wallet: PublicKey, marketId: number, customerId: number): Promise<import("./types").PredictorOrder[]>;
+    /**
+     * Get all User Book Orders
+     * @param wallet - User wallet PublicKey
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrders(wallet: PublicKey, customerId: number): Promise<import("./types").BookOrder[]>;
+    /**
+     * Get User Book Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrdersByMarketId(wallet: PublicKey, marketId: number, customerId: number): Promise<import("./types").BookOrder[]>;
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
      * @param args.amount - Amount to deposit
-     * @param args.refer - Referral public key (optional) defaults to Triadmarkets public key
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.refer - Referral public key
+     * @param args.customerId - Customer ID
      */
     deposit({ authority, amount, refer, customerId }: DepositArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
@@ -32,7 +56,7 @@ export default class Predictor {
      * Collect Rewards
      * Claims accumulated TRIAD token rewards for the predictor.
      * @param args.authority - Authority of the predictor
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID
      */
     collectRewards({ authority, customerId }: CollectRewardsArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/predictor.js

@@ -12,12 +12,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
-const pda_1 = require("./utils/pda");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
 const helpers_1 = require("./utils/helpers");
+const pda_1 = require("./utils/pda");
 class Predictor {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -26,9 +25,9 @@ class Predictor {
     /**
      * Get predictor
      * @param authority - Authority public key
-     * @param customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param customerId - Customer ID
      */
-    getPredictor(authority, customerId = 7) {
+    getPredictor(authority, customerId) {
         return __awaiter(this, void 0, void 0, function* () {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             try {
@@ -48,14 +47,78 @@ class Predictor {
             }
         });
     }
+    /**
+     * Get User Orders
+     * @param wallet - User wallet PublicKey
+     */
+    getUserOrders(wallet, customerId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            const orders = yield this.program.account.predictorOrder.all([
+                {
+                    memcmp: {
+                        offset: 8,
+                        bytes: predictorPDA.toBase58()
+                    }
+                }
+            ]);
+            return orders.map(({ account, publicKey }) => (0, helpers_1.formatPredictorOrder)(account, publicKey));
+        });
+    }
+    /**
+     * Get User Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     */
+    getUserOrdersByMarketId(wallet, marketId, customerId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orders = yield this.getUserOrders(wallet, customerId);
+            return orders.filter((order) => order.marketId === marketId.toString());
+        });
+    }
+    /**
+     * Get all User Book Orders
+     * @param wallet - User wallet PublicKey
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrders(wallet, customerId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderbooks = yield this.program.account.orderBook.all();
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            const bookOrders = orderbooks.map((orderbook) => {
+                return [...orderbook.account.hypeOrders, ...orderbook.account.flopOrders]
+                    .map((order) => (0, helpers_1.formatBookOrder)(order, orderbook.account.marketId.toNumber()))
+                    .filter((order) => order.authority === predictorPDA.toBase58() &&
+                    order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
+            });
+            return bookOrders.flat();
+        });
+    }
+    /**
+     * Get User Book Orders By Market ID
+     * @param wallet - User wallet PublicKey
+     * @param marketId - The ID of the market
+     * @param customerId - User Customer ID
+     */
+    getUserBookOrdersByMarketId(wallet, marketId, customerId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const orderBook = yield this.program.account.orderBook.fetch((0, pda_1.getOrderBookPDA)(this.program.programId, marketId), this.rpcOptions.commitment);
+            const orders = [...orderBook.hypeOrders, ...orderBook.flopOrders];
+            const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, wallet, customerId);
+            return orders
+                .map((order) => (0, helpers_1.formatBookOrder)(order, marketId))
+                .filter((order) => order.authority === predictorPDA.toBase58() &&
+                order.linkedBookOrderId === constants_1.BOOK_ORDER_NULL.toString());
+        });
+    }
     /**
      * Deposit
      * @param args.authority - Authority of the deposit
      * @param args.amount - Amount to deposit
-     * @param args.refer - Referral public key (optional) defaults to Triadmarkets public key
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.refer - Referral public key
+     * @param args.customerId - Customer ID
      */
-    deposit({ authority, amount, refer = new web3_js_1.PublicKey('DqL77dzdTruyY9qssbU1aQNeDDywxL587k9FquxVv6iX'), customerId = 7 }) {
+    deposit({ authority, amount, refer, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
@@ -90,7 +153,7 @@ class Predictor {
      * @param args.amount - Amount to deposit
      * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
      */
-    withdraw({ authority, amount, customerId = 7 }) {
+    withdraw({ authority, amount, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             const ixs = [
@@ -109,9 +172,9 @@ class Predictor {
      * Collect Rewards
      * Claims accumulated TRIAD token rewards for the predictor.
      * @param args.authority - Authority of the predictor
-     * @param args.customerId - Customer ID (optional) defaults to 7 from Triadmarkets
+     * @param args.customerId - Customer ID
      */
-    collectRewards({ authority, customerId = 7 }) {
+    collectRewards({ authority, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, authority, customerId);
             const ixs = [

package/dist/trade.js

@@ -67,7 +67,7 @@ class Trade {
      * @param args.orders.price - The price of the Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeBidOrder({ orders, customerId = 7 }) {
+    placeBidOrder({ orders, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
@@ -100,7 +100,7 @@ class Trade {
      * @param args.orders.marketId - The Id from the market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    placeAskOrder({ orders, customerId = 7 }) {
+    placeAskOrder({ orders, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);
@@ -129,7 +129,7 @@ class Trade {
      * @param args.orders.marketId - The ID of the Market
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelBidOrder({ orders, customerId = 7 }) {
+    cancelBidOrder({ orders, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const order of orders) {
@@ -157,7 +157,7 @@ class Trade {
      * @param args.orders.bookOrderId - The ID of the Book Order
      * @param args.orders.orderDirection - The direction of the Order
      */
-    cancelAskOrder({ orders, customerId = 7 }) {
+    cancelAskOrder({ orders, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             const predictorPDA = (0, pda_1.getPredictorPDA)(this.program.programId, this.program.provider.publicKey, customerId);

package/dist/types/idl_triad_protocol.json

@@ -872,6 +872,22 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "customer",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [99, 117, 115, 116, 111, 109, 101, 114]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "args.customer_id"
+                            }
+                        ]
+                    }
+                },
                 {
                     "name": "predictor",
                     "writable": true,
@@ -2958,6 +2974,10 @@
                         "name": "predictor",
                         "type": "pubkey"
                     },
+                    {
+                        "name": "customer_id",
+                        "type": "u16"
+                    },
                     {
                         "name": "amount",
                         "type": "u64"
@@ -4216,6 +4236,10 @@
                         "name": "predictor",
                         "type": "pubkey"
                     },
+                    {
+                        "name": "customer_id",
+                        "type": "u16"
+                    },
                     {
                         "name": "amount",
                         "type": "u64"

package/dist/types/index.d.ts

@@ -46,16 +46,14 @@ export type Market = {
     feeRecipient: string;
     pythPrice: string;
 };
-export type Order = {
+export type PredictorOrder = {
     address: string;
     marketId: string;
     orderStatus: OrderStatus;
     price: string;
     shares: string;
-    orderType: OrderType;
     orderDirection: OrderDirection;
-    orderSide: OrderSide;
-    authority: string;
+    predictor: string;
 };
 export type BookOrder = {
     id: string;

package/dist/types/predictor.d.ts

@@ -11,15 +11,15 @@ export type Predictor = {
 export type DepositArgs = {
     authority: PublicKey;
     amount: number;
-    refer?: PublicKey;
-    customerId?: number;
+    refer: PublicKey;
+    customerId: number;
 };
 export type WithdrawArgs = {
     authority: PublicKey;
     amount: number;
-    customerId?: number;
+    customerId: number;
 };
 export type CollectRewardsArgs = {
     authority: PublicKey;
-    customerId?: number;
+    customerId: number;
 };

package/dist/types/triad_protocol.d.ts

@@ -1133,6 +1133,22 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'customer';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [99, 117, 115, 116, 111, 109, 101, 114];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'args.customer_id';
+                            }
+                        ];
+                    };
+                },
                 {
                     name: 'predictor';
                     writable: true;
@@ -3582,6 +3598,10 @@ export type TriadProtocol = {
                         name: 'predictor';
                         type: 'pubkey';
                     },
+                    {
+                        name: 'customerId';
+                        type: 'u16';
+                    },
                     {
                         name: 'amount';
                         type: 'u64';
@@ -4840,6 +4860,10 @@ export type TriadProtocol = {
                         name: 'predictor';
                         type: 'pubkey';
                     },
+                    {
+                        name: 'customerId';
+                        type: 'u16';
+                    },
                     {
                         name: 'amount';
                         type: 'u64';

package/dist/utils/helpers.d.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts, Program } from '@coral-xyz/anchor';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
+import { Market, PredictorOrder, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
 import { Stake, StakeVault, Unstake } from '../types/stake';
 import { Customer } from '../types/customer';
 import { TriadProtocol } from '../types/triad_protocol';
@@ -12,7 +12,7 @@ export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV3'],
 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 formatOrder: (order: IdlAccounts<TriadProtocol>['orderV2'], address: PublicKey) => Order;
+export declare const formatPredictorOrder: (order: IdlAccounts<TriadProtocol>['predictorOrder'], address: PublicKey) => PredictorOrder;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number], marketId: number) => BookOrder;
 export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
 export declare const calculateStakeRewards: (stake: Stake) => number;

package/dist/utils/helpers.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getCustomerById = exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatPredictorOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
@@ -116,20 +116,18 @@ const formatMarket = (account, address) => {
     };
 };
 exports.formatMarket = formatMarket;
-const formatOrder = (order, address) => {
+const formatPredictorOrder = (order, address) => {
     return {
         address: address.toString(),
-        authority: order.authority.toString(),
+        predictor: order.predictor.toString(),
         marketId: order.marketId.toString(),
         orderStatus: (0, exports.getOrderStatus)(order.orderStatus),
-        orderType: (0, exports.getOrderType)(order.orderType),
         orderDirection: (0, exports.getOrderDirection)(order.orderDirection),
-        orderSide: (0, exports.getOrderSide)(order.orderSide),
         price: order.price.toString(),
         shares: order.shares.toString()
     };
 };
-exports.formatOrder = formatOrder;
+exports.formatPredictorOrder = formatPredictorOrder;
 const formatBookOrder = (order, marketId) => {
     return {
         id: order.id.toString(),

package/package.json

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