@triadxyz/triad-protocol 4.1.7 → 4.1.9

package/dist/customer.d.ts

@@ -29,5 +29,5 @@ export default class Customer {
      * @param args.feeRecipient - The fee recipient of the customer
      * @param args.feeBps - The fee in basis points of the customer
      */
-    createCustomer({ id, name, authority, feeRecipient, feeBps }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    createCustomer({ id, name, authority, feeRecipient, feeBps, marketFeeBps, payoutFeeBps }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/customer.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("./utils/helpers");
 const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const pda_1 = require("./utils/pda");
 class Customer {
     constructor(program, rpcOptions) {
         this.program = program;
@@ -52,9 +51,7 @@ class Customer {
      */
     getCustomerById(customerId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const customerPDA = (0, pda_1.getCustomerPDA)(this.program.programId, customerId);
-            const customer = yield this.program.account.customer.fetch(customerPDA, this.rpcOptions.commitment);
-            return (0, helpers_1.formatCustomer)(customer, customerPDA);
+            return (0, helpers_1.getCustomerById)(this.program, customerId);
         });
     }
     /**
@@ -65,11 +62,19 @@ class Customer {
      * @param args.feeRecipient - The fee recipient of the customer
      * @param args.feeBps - The fee in basis points of the customer
      */
-    createCustomer({ id, name, authority, feeRecipient, feeBps }) {
+    createCustomer({ id, name, authority, feeRecipient, feeBps, marketFeeBps, payoutFeeBps }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
-                    .createCustomer({ id, name, authority, feeRecipient, feeBps })
+                    .createCustomer({
+                    id,
+                    name,
+                    authority,
+                    feeRecipient,
+                    feeBps,
+                    marketFeeBps,
+                    payoutFeeBps
+                })
                     .accounts({
                     signer: this.program.provider.publicKey
                 })

package/dist/index.d.ts

@@ -119,7 +119,7 @@ export default class TriadProtocol {
      * @param args.poolId - The ID of the Pool
      * @param args.withPayout - Whether to allow the market to payout
      */
-    updateMarketWinningDirection({ marketId, winningDirection, poolId, withPayout }: UpdateMarketWinningDirectionArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    updateMarketWinningDirection({ markets }: UpdateMarketWinningDirectionArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Market Payout
      * @param args.marketId - The ID of the market
@@ -159,6 +159,17 @@ export default class TriadProtocol {
         id: number;
         authority: PublicKey;
     }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Close IDLE Market
+     * @param markets.id - Market ID
+     * @param markets.authority - Market authority
+     * @param markets.mint - Market mint
+     */
+    closeIdleMarket(markets: {
+        id: number;
+        authority: PublicKey;
+        mint: PublicKey;
+    }[]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Update Pool Question
      * @param poolId - Pool ID
@@ -173,7 +184,7 @@ export default class TriadProtocol {
      * @param args.customer - The customer of the market
      * @param args.poolId - The ID of the pool
      */
-    createMarketPyth({ marketId, resolveIn, customer, poolId, feedId, direction }: CreateMarketPythArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    createMarketPyth({ markets }: CreateMarketPythArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Burn Triad
      * @param amount - Amount to burn

package/dist/index.js

@@ -198,8 +198,17 @@ class TriadProtocol {
      */
     nextMarketId() {
         return __awaiter(this, void 0, void 0, function* () {
-            const markets = yield this.program.account.marketV2.all();
-            return markets.length + 10;
+            let validId = null;
+            while (!validId) {
+                const marketId = Math.floor(Math.random() * 1000000000000000);
+                try {
+                    yield this.program.account.marketV2.fetch((0, pda_1.getMarketPDA)(this.program.programId, marketId));
+                }
+                catch (_a) {
+                    validId = marketId;
+                }
+            }
+            return validId;
         });
     }
     /**
@@ -342,26 +351,29 @@ class TriadProtocol {
      * @param args.poolId - The ID of the Pool
      * @param args.withPayout - Whether to allow the market to payout
      */
-    updateMarketWinningDirection({ marketId, winningDirection, poolId, withPayout = false }) {
+    updateMarketWinningDirection({ markets }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const ixs = [
-                yield this.program.methods
-                    .updateMarketWinningDirection(winningDirection)
-                    .accounts({
-                    signer: this.program.provider.publicKey,
-                    market: (0, pda_1.getMarketPDA)(this.program.programId, marketId),
-                    pool: poolId ? (0, pda_1.getPoolPDA)(this.program.programId, poolId) : null
-                })
-                    .instruction()
-            ];
-            if (withPayout) {
+            const ixs = [];
+            for (const market of markets) {
                 ixs.push(yield this.program.methods
-                    .updateMarketPayout(true)
+                    .updateMarketWinningDirection(market.winningDirection)
                     .accounts({
                     signer: this.program.provider.publicKey,
-                    market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId),
+                    pool: market.poolId
+                        ? (0, pda_1.getPoolPDA)(this.program.programId, market.poolId)
+                        : null
                 })
                     .instruction());
+                if (market.withPayout) {
+                    ixs.push(yield this.program.methods
+                        .updateMarketPayout(true)
+                        .accounts({
+                        signer: this.program.provider.publicKey,
+                        market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
+                    })
+                        .instruction());
+                }
             }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
@@ -468,6 +480,28 @@ class TriadProtocol {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Close IDLE Market
+     * @param markets.id - Market ID
+     * @param markets.authority - Market authority
+     * @param markets.mint - Market mint
+     */
+    closeIdleMarket(markets) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            for (const market of markets) {
+                ixs.push(yield this.program.methods
+                    .closeIdleMarket(new bn_js_1.default(market.id))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    mint: market.mint,
+                    tokenProgram: (0, helpers_1.getTokenProgram)(market.mint)
+                })
+                    .instruction());
+            }
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
     /**
      * Update Pool Question
      * @param poolId - Pool ID
@@ -495,32 +529,34 @@ class TriadProtocol {
      * @param args.customer - The customer of the market
      * @param args.poolId - The ID of the pool
      */
-    createMarketPyth({ marketId, resolveIn, customer, poolId, feedId, direction }) {
+    createMarketPyth({ markets }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
-            let poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
-            const feedPDA = (0, helpers_2.getPriceFeedAccountForProgram)(feedId);
-            ixs.push(yield this.program.methods
-                .createMarketPyth({
-                marketId: new bn_js_1.default(marketId),
-                resolveIn: new bn_js_1.default(resolveIn),
-                direction
-            })
-                .accounts({
-                signer: this.program.provider.publicKey,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                pool: poolPDA,
-                customer,
-                priceUpdate: feedPDA
-            })
-                .instruction());
-            ixs.push(yield this.program.methods
-                .createOrderBook(new bn_js_1.default(marketId))
-                .accounts({
-                signer: this.program.provider.publicKey,
-                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
-            })
-                .instruction());
+            for (const market of markets) {
+                let poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, market.poolId);
+                const feedPDA = (0, helpers_2.getPriceFeedAccountForProgram)(market.feedId);
+                ixs.push(yield this.program.methods
+                    .createMarketPyth({
+                    marketId: new bn_js_1.default(market.marketId),
+                    resolveIn: new bn_js_1.default(market.resolveIn),
+                    direction: market.direction
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    pool: poolPDA,
+                    customer: market.customer,
+                    priceUpdate: feedPDA
+                })
+                    .instruction());
+                ixs.push(yield this.program.methods
+                    .createOrderBook(new bn_js_1.default(market.marketId))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.marketId)
+                })
+                    .instruction());
+            }
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }

package/dist/trade.d.ts

@@ -64,7 +64,7 @@ export default class Trade {
      * @param args.amount - The amount of the Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketBidOrder({ marketId, amount, orderDirection }: MarketBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketBidOrder({ marketId, amount, customerId, orderDirection }: MarketBidOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Market Ask Order
      * @param args.marketId - The ID of the Market
@@ -72,7 +72,7 @@ export default class Trade {
      * @param args.bookOrderBidId - The ID of the Bid Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketAskOrder({ marketId, shares, orderDirection }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    marketAskOrder({ marketId, shares, orderDirection, customerId }: MarketAskOrderArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
      * Payout Order
      * @param args.marketId - The ID of the Market

package/dist/trade.js

@@ -196,11 +196,12 @@ class Trade {
      * @param args.amount - The amount of the Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketBidOrder({ marketId, amount, orderDirection }) {
+    marketBidOrder({ marketId, amount, customerId, orderDirection }) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
+            const customer = yield (0, helpers_1.getCustomerById)(this.program, customerId);
             const orderBook = yield this.getOrderBook(marketId);
             let remainingUSDC = new bn_js_1.default(amount * Math.pow(10, constants_1.BASE_DECIMALS));
             const orders = Object.keys(orderDirection)[0] === 'hype'
@@ -215,7 +216,7 @@ class Trade {
                 }
                 const orderPrice = new bn_js_1.default(order.price);
                 const availableShares = new bn_js_1.default(order.totalShares).sub(new bn_js_1.default(order.filledShares));
-                const effectivePriceDecimal = (0, feeCalculator_1.applyBuyFee)(orderPrice.toNumber() / 1000000, 500);
+                const effectivePriceDecimal = (0, feeCalculator_1.applyBuyFee)(orderPrice.toNumber() / 1000000, 500, customer.marketFeeBps);
                 const adjustedPrice = new bn_js_1.default(Math.floor(effectivePriceDecimal * 1000000));
                 const maxSharesForPrice = remainingUSDC
                     .mul(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS)))
@@ -244,7 +245,8 @@ class Trade {
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     bookOrderAskAuthority: new web3_js_1.PublicKey(order.authority),
                     order: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    oppositeOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection))
+                    oppositeOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(oppositeOrderDirection)),
+                    customer: (0, pda_1.getCustomerPDA)(this.program.programId, customerId)
                 })
                     .instruction());
                 remainingUSDC = remainingUSDC.sub(usdcAmount);
@@ -262,11 +264,12 @@ class Trade {
      * @param args.bookOrderBidId - The ID of the Bid Order
      * @param args.orderDirection - The direction of the Order
      */
-    marketAskOrder({ marketId, shares, orderDirection }) {
+    marketAskOrder({ marketId, shares, orderDirection, customerId }) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, pda_1.getMarketPDA)(this.program.programId, marketId);
             const ixs = [];
             const addressLookupTableAccounts = [];
+            const customer = yield (0, helpers_1.getCustomerById)(this.program, customerId);
             const orderBook = yield this.getOrderBook(marketId);
             const bidOrders = Object.keys(orderDirection)[0] === 'hype'
                 ? orderBook.hype.bid
@@ -287,7 +290,7 @@ class Trade {
                     continue;
                 remainingShares = remainingShares.sub(sharesToSell);
                 const orderPrice = new bn_js_1.default(order.price);
-                const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000, 500);
+                const effectivePriceDecimal = (0, feeCalculator_1.applySellFee)(orderPrice.toNumber() / 1000000, 500, customer.marketFeeBps);
                 const adjustedPrice = new bn_js_1.default(Math.floor(effectivePriceDecimal * 1000000));
                 amountOfUSDC = amountOfUSDC.add(sharesToSell.mul(adjustedPrice).div(new bn_js_1.default(Math.pow(10, constants_1.BASE_DECIMALS))));
                 ixs.push(yield this.program.methods
@@ -304,7 +307,8 @@ class Trade {
                     orderBook: (0, pda_1.getOrderBookPDA)(this.program.programId, marketId),
                     marketAta: (0, pda_1.getTokenATA)(marketPDA, constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID),
                     bidOrder: (0, pda_1.getOrderPDA)(this.program.programId, new web3_js_1.PublicKey(order.authority), marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
-                    askOrder: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, marketId, (0, helpers_1.getOrderDirection)(orderDirection))
+                    askOrder: (0, pda_1.getOrderPDA)(this.program.programId, this.program.provider.publicKey, marketId, (0, helpers_1.getOrderDirection)(orderDirection)),
+                    customer: customer.address
                 })
                     .instruction());
             }

package/dist/types/customer.d.ts

@@ -7,6 +7,8 @@ export type Customer = {
     feeBps: number;
     isVerified: boolean;
     address: string;
+    marketFeeBps: number;
+    payoutFeeBps: number;
 };
 export type CreateCustomerArgs = {
     id: number;
@@ -14,4 +16,6 @@ export type CreateCustomerArgs = {
     authority: PublicKey;
     feeRecipient: PublicKey;
     feeBps: number;
+    marketFeeBps: number;
+    payoutFeeBps: number;
 };

package/dist/types/idl_triad_protocol.json

@@ -474,6 +474,129 @@
             ],
             "args": []
         },
+        {
+            "name": "close_idle_market",
+            "discriminator": [249, 217, 214, 137, 20, 38, 112, 154],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "squads",
+                    "writable": true,
+                    "address": "Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4"
+                },
+                {
+                    "name": "market",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [109, 97, 114, 107, 101, 116]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_id"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "mint"
+                },
+                {
+                    "name": "market_to_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "market"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "squads_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "squads"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
+                {
+                    "name": "order_book",
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [111, 114, 100, 101, 114, 95, 98, 111, 111, 107]
+                            },
+                            {
+                                "kind": "arg",
+                                "path": "market_id"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "token_program"
+                },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "market_id",
+                    "type": "u64"
+                }
+            ]
+        },
         {
             "name": "close_order_book",
             "discriminator": [219, 134, 73, 219, 180, 7, 94, 206],
@@ -1194,6 +1317,10 @@
                     "name": "order_book",
                     "writable": true
                 },
+                {
+                    "name": "customer",
+                    "writable": true
+                },
                 {
                     "name": "ask_order",
                     "writable": true
@@ -1289,6 +1416,10 @@
                     "name": "order_book",
                     "writable": true
                 },
+                {
+                    "name": "customer",
+                    "writable": true
+                },
                 {
                     "name": "order",
                     "writable": true
@@ -2014,6 +2145,48 @@
             ],
             "args": []
         },
+        {
+            "name": "update_customer",
+            "discriminator": [158, 118, 103, 177, 241, 229, 169, 124],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "customer",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [99, 117, 115, 116, 111, 109, 101, 114]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "customer.id",
+                                "account": "Customer"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                }
+            ],
+            "args": [
+                {
+                    "name": "args",
+                    "type": {
+                        "defined": {
+                            "name": "UpdateCustomerArgs"
+                        }
+                    }
+                }
+            ]
+        },
         {
             "name": "update_market_end",
             "discriminator": [10, 188, 22, 219, 206, 83, 67, 31],
@@ -2591,6 +2764,16 @@
             "code": 6027,
             "name": "InvalidQuestion",
             "msg": "Invalid Question"
+        },
+        {
+            "code": 6028,
+            "name": "MarketNotIdle",
+            "msg": "Market Not Idle"
+        },
+        {
+            "code": 6029,
+            "name": "OrderBookStillExists",
+            "msg": "Order Book still exists"
         }
     ],
     "types": [
@@ -2998,6 +3181,14 @@
                     {
                         "name": "fee_bps",
                         "type": "u16"
+                    },
+                    {
+                        "name": "market_fee_bps",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "payout_fee_bps",
+                        "type": "u16"
                     }
                 ]
             }
@@ -3139,10 +3330,18 @@
                         "name": "is_verified",
                         "type": "bool"
                     },
+                    {
+                        "name": "market_fee_bps",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "payout_fee_bps",
+                        "type": "u16"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 29]
+                            "array": ["u8", 25]
                         }
                     }
                 ]
@@ -4317,6 +4516,26 @@
                 ]
             }
         },
+        {
+            "name": "UpdateCustomerArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "market_fee_bps",
+                        "type": {
+                            "option": "u16"
+                        }
+                    },
+                    {
+                        "name": "payout_fee_bps",
+                        "type": {
+                            "option": "u16"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "VerificationLevel",
             "docs": [

package/dist/types/index.d.ts

@@ -156,12 +156,14 @@ export type CreateMarketArgs = {
     poolId?: number;
 };
 export type CreateMarketPythArgs = {
-    marketId: number;
-    resolveIn: number;
-    customer: PublicKey;
-    poolId: number;
-    feedId: string;
-    direction: 'Above' | 'Below';
+    markets: {
+        marketId: number;
+        resolveIn: number;
+        customer: PublicKey;
+        poolId: number;
+        feedId: string;
+        direction: 'Above' | 'Below';
+    }[];
 };
 export type CreatePoolArgs = {
     poolId: number;
@@ -180,10 +182,12 @@ export type CreatePoolArgs = {
     feedId?: string;
 };
 export type UpdateMarketWinningDirectionArgs = {
-    marketId: number;
-    winningDirection: WinningDirectionEncoded;
-    poolId?: number;
-    withPayout?: boolean;
+    markets: {
+        marketId: number;
+        winningDirection: WinningDirectionEncoded;
+        poolId?: number;
+        withPayout?: boolean;
+    }[];
 };
 export type UpdateMarketPayoutArgs = {
     marketId: number;

package/dist/types/trade.d.ts

@@ -35,10 +35,12 @@ export type CancelAskOrderArgs = {
 export type MarketBidOrderArgs = {
     marketId: number;
     amount: number;
+    customerId: number;
     orderDirection: OrderDirectionEncoded;
 };
 export type MarketAskOrderArgs = {
     marketId: number;
     shares: number;
+    customerId: number;
     orderDirection: OrderDirectionEncoded;
 };

package/dist/types/triad_protocol.d.ts

@@ -707,6 +707,187 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'closeIdleMarket';
+            discriminator: [249, 217, 214, 137, 20, 38, 112, 154];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'squads';
+                    writable: true;
+                    address: 'Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4';
+                },
+                {
+                    name: 'market';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [109, 97, 114, 107, 101, 116];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'marketId';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'mint';
+                },
+                {
+                    name: 'marketToAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'market';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'squadsAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'squads';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
+                {
+                    name: 'orderBook';
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [111, 114, 100, 101, 114, 95, 98, 111, 111, 107];
+                            },
+                            {
+                                kind: 'arg';
+                                path: 'marketId';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'tokenProgram';
+                },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'marketId';
+                    type: 'u64';
+                }
+            ];
+        },
         {
             name: 'closeOrderBook';
             discriminator: [219, 134, 73, 219, 180, 7, 94, 206];
@@ -1670,6 +1851,10 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
+                {
+                    name: 'customer';
+                    writable: true;
+                },
                 {
                     name: 'askOrder';
                     writable: true;
@@ -1794,6 +1979,10 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
+                {
+                    name: 'customer';
+                    writable: true;
+                },
                 {
                     name: 'order';
                     writable: true;
@@ -2862,6 +3051,48 @@ export type TriadProtocol = {
             ];
             args: [];
         },
+        {
+            name: 'updateCustomer';
+            discriminator: [158, 118, 103, 177, 241, 229, 169, 124];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'customer';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [99, 117, 115, 116, 111, 109, 101, 114];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'customer.id';
+                                account: 'customer';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'updateCustomerArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'updateMarketEnd';
             discriminator: [10, 188, 22, 219, 206, 83, 67, 31];
@@ -3537,6 +3768,16 @@ export type TriadProtocol = {
             code: 6027;
             name: 'invalidQuestion';
             msg: 'Invalid Question';
+        },
+        {
+            code: 6028;
+            name: 'marketNotIdle';
+            msg: 'Market Not Idle';
+        },
+        {
+            code: 6029;
+            name: 'orderBookStillExists';
+            msg: 'Order Book still exists';
         }
     ];
     types: [
@@ -3944,6 +4185,14 @@ export type TriadProtocol = {
                     {
                         name: 'feeBps';
                         type: 'u16';
+                    },
+                    {
+                        name: 'marketFeeBps';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'payoutFeeBps';
+                        type: 'u16';
                     }
                 ];
             };
@@ -4085,10 +4334,18 @@ export type TriadProtocol = {
                         name: 'isVerified';
                         type: 'bool';
                     },
+                    {
+                        name: 'marketFeeBps';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'payoutFeeBps';
+                        type: 'u16';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 29];
+                            array: ['u8', 25];
                         };
                     }
                 ];
@@ -5263,6 +5520,26 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'updateCustomerArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'marketFeeBps';
+                        type: {
+                            option: 'u16';
+                        };
+                    },
+                    {
+                        name: 'payoutFeeBps';
+                        type: {
+                            option: 'u16';
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'verificationLevel';
             docs: [

package/dist/utils/feeCalculator.d.ts

@@ -2,32 +2,42 @@
  * Calculate dynamic fee based on price
  * Returns fee in basis points (bps)
  */
-export declare function calculateDynamicFeeBps(price: number, feeBps: number): number;
+export declare function calculateDynamicFeeBps(price: number, feeBps: number, customerMarketFeeBps: number): number;
+/**
+ * Calculate tiered fixed fee based on entry amount (USDC)
+ */
+export declare function calculateFixedFee(amount: number): number;
 /**
  * Apply dynamic fee to price for buy orders (adds fee)
  */
-export declare function applyBuyFee(price: number, feeBps: number): number;
+export declare function applyBuyFee(price: number, feeBps: number, customerMarketFeeBps: number): number;
 /**
  * Apply dynamic fee to price for sell orders (subtracts fee)
  */
-export declare function applySellFee(price: number, feeBps: number): number;
+export declare function applySellFee(price: number, feeBps: number, customerMarketFeeBps: number): number;
 /**
  * Simulate a buy order with given amount and price
  */
-export declare function simulateBuyOrder(amount: number, price: number, feeBps: number): {
+export declare function simulateBuyOrder(amount: number, price: number, feeBps: number, customerMarketFeeBps: number): {
     entryPrice: number;
     effectivePrice: number;
     sharesReceived: number;
     feeAmount: number;
     feePercentage: number;
+    fixedFee: number;
+    volumeFee: number;
+    realEntryPrice: number;
 };
 /**
  * Simulate a sell order with given shares and price
  */
-export declare function simulateSellOrder(shares: number, price: number, feeBps: number): {
+export declare function simulateSellOrder(shares: number, price: number, feeBps: number, customerMarketFeeBps: number): {
     entryPrice: number;
     effectivePrice: number;
     sharesReceived: number;
     feeAmount: number;
     feePercentage: number;
+    fixedFee: number;
+    volumeFee: number;
+    realEntryPrice: number;
 };

package/dist/utils/feeCalculator.js

@@ -1,23 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateDynamicFeeBps = void 0;
+exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateFixedFee = exports.calculateDynamicFeeBps = void 0;
 /**
  * Calculate dynamic fee based on price
  * Returns fee in basis points (bps)
  */
-function calculateDynamicFeeBps(price, feeBps) {
+function calculateDynamicFeeBps(price, feeBps, customerMarketFeeBps) {
     const internalPrice = price * Math.pow(10, 6);
     if (internalPrice < 900000) {
-        return feeBps;
+        return feeBps + customerMarketFeeBps;
     }
-    return Math.floor(((990000 - internalPrice) * 1900) / price);
+    return Math.max(Math.floor(((990000 - internalPrice) * 1900) / internalPrice), 90);
 }
 exports.calculateDynamicFeeBps = calculateDynamicFeeBps;
+/**
+ * Calculate tiered fixed fee based on entry amount (USDC)
+ */
+function calculateFixedFee(amount) {
+    const internalAmount = Math.floor(amount * 1000000);
+    if (internalAmount >= 100000000) {
+        return 2.5;
+    }
+    else if (internalAmount >= 50000000) {
+        return 1.5;
+    }
+    else if (internalAmount >= 20000000) {
+        return 0.75;
+    }
+    else if (internalAmount >= 5000000) {
+        return 0.3;
+    }
+    else {
+        return 0.15;
+    }
+}
+exports.calculateFixedFee = calculateFixedFee;
 /**
  * Apply dynamic fee to price for buy orders (adds fee)
  */
-function applyBuyFee(price, feeBps) {
-    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps);
+function applyBuyFee(price, feeBps, customerMarketFeeBps) {
+    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps, customerMarketFeeBps);
     const internalPrice = Math.floor(price * 1000000);
     const effectiveInternalPrice = Math.floor((internalPrice * (10000 + dynamicFeeBps)) / 10000);
     const clampedPrice = Math.min(effectiveInternalPrice, 999999);
@@ -27,8 +49,8 @@ exports.applyBuyFee = applyBuyFee;
 /**
  * Apply dynamic fee to price for sell orders (subtracts fee)
  */
-function applySellFee(price, feeBps) {
-    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps);
+function applySellFee(price, feeBps, customerMarketFeeBps) {
+    const dynamicFeeBps = calculateDynamicFeeBps(price, feeBps, customerMarketFeeBps);
     const internalPrice = Math.floor(price * 1000000);
     const effectiveInternalPrice = Math.floor((internalPrice * (10000 - dynamicFeeBps)) / 10000);
     const clampedPrice = Math.max(effectiveInternalPrice, 1);
@@ -38,36 +60,44 @@ exports.applySellFee = applySellFee;
 /**
  * Simulate a buy order with given amount and price
  */
-function simulateBuyOrder(amount, price, feeBps) {
-    const effectivePrice = applyBuyFee(price, feeBps);
-    const sharesReceived = amount / effectivePrice;
+function simulateBuyOrder(amount, price, feeBps, customerMarketFeeBps) {
+    const fixedFee = calculateFixedFee(amount);
+    const amountAfterFixedFee = amount - fixedFee;
+    const effectivePrice = applyBuyFee(price, feeBps, customerMarketFeeBps);
+    const sharesReceived = amountAfterFixedFee / effectivePrice;
     const valueAtOriginalPrice = sharesReceived * price;
     const feeAmount = amount - valueAtOriginalPrice;
-    const feePercentage = (feeAmount / amount) * 100;
     return {
         entryPrice: price,
         effectivePrice,
         sharesReceived,
         feeAmount,
-        feePercentage
+        feePercentage: (feeAmount / amount) * 100,
+        fixedFee,
+        volumeFee: feeAmount - fixedFee,
+        realEntryPrice: amount / sharesReceived
     };
 }
 exports.simulateBuyOrder = simulateBuyOrder;
 /**
  * Simulate a sell order with given shares and price
  */
-function simulateSellOrder(shares, price, feeBps) {
-    const effectivePrice = applySellFee(price, feeBps);
-    const amountReceived = shares * effectivePrice;
+function simulateSellOrder(shares, price, feeBps, customerMarketFeeBps) {
+    const effectivePrice = applySellFee(price, feeBps, customerMarketFeeBps);
+    const amountToReceiveBeforeFixed = shares * effectivePrice;
     const valueAtOriginalPrice = shares * price;
+    const fixedFee = calculateFixedFee(valueAtOriginalPrice);
+    const amountReceived = amountToReceiveBeforeFixed - fixedFee;
     const feeAmount = valueAtOriginalPrice - amountReceived;
-    const feePercentage = (feeAmount / valueAtOriginalPrice) * 100;
     return {
         entryPrice: price,
         effectivePrice,
         sharesReceived: shares,
         feeAmount,
-        feePercentage
+        feePercentage: (feeAmount / valueAtOriginalPrice) * 100,
+        fixedFee,
+        volumeFee: feeAmount - fixedFee,
+        realEntryPrice: amountReceived / shares
     };
 }
 exports.simulateSellOrder = simulateSellOrder;

package/dist/utils/helpers.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-import { BN, IdlAccounts } from '@coral-xyz/anchor';
+import { BN, IdlAccounts, Program } from '@coral-xyz/anchor';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Pool, BookOrder } from '../types';
 import { Stake, StakeVault, Unstake } from '../types/stake';
 import { Customer } from '../types/customer';
@@ -29,3 +29,4 @@ export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDir
 export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey, balance: BN) => Predictor;
 export declare const getPriceFeedAccountForProgram: (priceFeedId: string) => PublicKey;
 export declare const getFeedIdFromHex: (input?: string) => PublicKey | null;
+export declare const getCustomerById: (program: Program<TriadProtocol>, customerId: number) => Promise<Customer>;

package/dist/utils/helpers.js

@@ -1,9 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-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.formatOrder = 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");
+const pda_1 = require("./pda");
 const constants_1 = require("./constants");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc, 32);
@@ -145,6 +155,8 @@ const formatCustomer = (account, publicKey) => {
         name: account.name,
         feeRecipient: account.feeRecipient.toString(),
         feeBps: account.feeBps,
+        marketFeeBps: account.marketFeeBps,
+        payoutFeeBps: account.payoutFeeBps,
         isVerified: account.isVerified,
         address: publicKey.toString()
     };
@@ -289,3 +301,9 @@ const getFeedIdFromHex = (input) => {
     return new web3_js_1.PublicKey(feedId);
 };
 exports.getFeedIdFromHex = getFeedIdFromHex;
+const getCustomerById = (program, customerId) => __awaiter(void 0, void 0, void 0, function* () {
+    const customerPDA = (0, pda_1.getCustomerPDA)(program.programId, customerId);
+    const customer = yield program.account.customer.fetch(customerPDA, program.provider.connection.commitment);
+    return (0, exports.formatCustomer)(customer, customerPDA);
+});
+exports.getCustomerById = getCustomerById;

package/package.json

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