@triadxyz/triad-protocol 4.1.8 → 4.2.0

package/dist/customer.d.ts

@@ -2,7 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { CreateCustomerArgs } from './types/customer';
+import { CreateCustomerArgs, UpdateCustomerArgs } from './types/customer';
 export default class Customer {
     private program;
     private rpcOptions;
@@ -29,5 +29,12 @@ 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>;
+    /**
+     * Update Customer
+     * @param args.customerId - The ID of the customer
+     * @param args.marketFeeBps - The market fee in basis points of the customer
+     * @param args.payoutFeeBps - The payout fee in basis points of the customer
+     */
+    updateCustomer({ customerId, marketFeeBps, payoutFeeBps }: UpdateCustomerArgs): 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,42 @@ 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
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
+    /**
+     * Update Customer
+     * @param args.customerId - The ID of the customer
+     * @param args.marketFeeBps - The market fee in basis points of the customer
+     * @param args.payoutFeeBps - The payout fee in basis points of the customer
+     */
+    updateCustomer({ customerId, marketFeeBps, payoutFeeBps }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [
+                yield this.program.methods
+                    .updateCustomer({
+                    customerId,
+                    marketFeeBps: marketFeeBps ? marketFeeBps : null,
+                    payoutFeeBps: payoutFeeBps ? payoutFeeBps : null
+                })
                     .accounts({
                     signer: this.program.provider.publicKey
                 })

package/dist/index.d.ts

@@ -190,4 +190,33 @@ export default class TriadProtocol {
      * @param amount - Amount to burn
      */
     burnTriad(amount: number): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Create and Resolve Pyth Market
+     * @param toResolve - Market to resolve
+     * @param toResolve.marketId - Market ID
+     * @param toResolve.winningDirection - Winning direction
+     * @param toResolve.poolId - Pool ID
+     * @param toResolve.withPayout - Whether to update market payout
+     * @param market - Market to create
+     * @param market.marketId - Market ID
+     * @param market.resolveIn - Time to add for resolver the market in seconds
+     * @param market.direction - Direction of the market
+     * @param market.customer - The customer of the market
+     * @param market.poolId - The ID of the pool
+     */
+    createAndResolvePythMarket(toResolve: UpdateMarketWinningDirectionArgs['markets'][0], market: CreateMarketPythArgs['markets'][0]): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Create and Resolve Market
+     * @param toResolve - Market to resolve
+     * @param toResolve.marketId - Market ID
+     * @param toResolve.winningDirection - Winning direction
+     * @param toResolve.withPayout - Whether to update market payout
+     * @param market - Market to create
+     * @param market.marketId - Market ID
+     * @param market.resolveIn - Time to add for resolver the market in seconds
+     * @param market.direction - Direction of the market
+     * @param market.customer - The customer of the market
+     * @param market.poolId - The ID of the pool
+     */
+    createAndResolveMarket(toResolve: UpdateMarketWinningDirectionArgs['markets'][0], market: CreateMarketArgs['markets'][0], customer: PublicKey): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/index.js

@@ -32,6 +32,7 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const bs58_1 = __importDefault(require("bs58"));
 const helpers_1 = require("./utils/helpers");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
+const types_1 = require("./types");
 const constants_1 = require("./utils/constants");
 const helpers_2 = require("./utils/helpers");
 const pda_1 = require("./utils/pda");
@@ -577,5 +578,139 @@ class TriadProtocol {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Create and Resolve Pyth Market
+     * @param toResolve - Market to resolve
+     * @param toResolve.marketId - Market ID
+     * @param toResolve.winningDirection - Winning direction
+     * @param toResolve.poolId - Pool ID
+     * @param toResolve.withPayout - Whether to update market payout
+     * @param market - Market to create
+     * @param market.marketId - Market ID
+     * @param market.resolveIn - Time to add for resolver the market in seconds
+     * @param market.direction - Direction of the market
+     * @param market.customer - The customer of the market
+     * @param market.poolId - The ID of the pool
+     */
+    createAndResolvePythMarket(toResolve, market) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            const marketInfo = yield this.getMarketById(toResolve.marketId);
+            if (marketInfo.winningDirection === types_1.WinningDirection.NONE) {
+                ixs.push(yield this.program.methods
+                    .updateMarketWinningDirection(toResolve.winningDirection)
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    pool: toResolve.poolId
+                        ? (0, pda_1.getPoolPDA)(this.program.programId, toResolve.poolId)
+                        : null,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, toResolve.marketId)
+                })
+                    .instruction());
+                if (toResolve.withPayout) {
+                    ixs.push(yield this.program.methods
+                        .updateMarketPayout(true)
+                        .accounts({
+                        signer: this.program.provider.publicKey,
+                        market: (0, pda_1.getMarketPDA)(this.program.programId, toResolve.marketId)
+                    })
+                        .instruction());
+                }
+            }
+            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: market.poolId
+                    ? (0, pda_1.getPoolPDA)(this.program.programId, market.poolId)
+                    : null,
+                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);
+        });
+    }
+    /**
+     * Create and Resolve Market
+     * @param toResolve - Market to resolve
+     * @param toResolve.marketId - Market ID
+     * @param toResolve.winningDirection - Winning direction
+     * @param toResolve.withPayout - Whether to update market payout
+     * @param market - Market to create
+     * @param market.marketId - Market ID
+     * @param market.resolveIn - Time to add for resolver the market in seconds
+     * @param market.direction - Direction of the market
+     * @param market.customer - The customer of the market
+     * @param market.poolId - The ID of the pool
+     */
+    createAndResolveMarket(toResolve, market, customer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            const marketInfo = yield this.getMarketById(toResolve.marketId);
+            if (marketInfo.winningDirection === types_1.WinningDirection.NONE) {
+                ixs.push(yield this.program.methods
+                    .updateMarketWinningDirection(toResolve.winningDirection)
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    pool: toResolve.poolId
+                        ? (0, pda_1.getPoolPDA)(this.program.programId, toResolve.poolId)
+                        : null,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, toResolve.marketId)
+                })
+                    .instruction());
+                if (toResolve.withPayout) {
+                    ixs.push(yield this.program.methods
+                        .updateMarketPayout(true)
+                        .accounts({
+                        signer: this.program.provider.publicKey,
+                        market: (0, pda_1.getMarketPDA)(this.program.programId, toResolve.marketId)
+                    })
+                        .instruction());
+                }
+            }
+            ixs.push(yield this.program.methods
+                .createMarket({
+                marketId: new bn_js_1.default(market.marketId),
+                question: (0, helpers_1.encodeString)(market.question, 80),
+                marketStart: new bn_js_1.default(market.startTime),
+                marketEnd: new bn_js_1.default(market.endTime),
+                feeBps: market.feeBps,
+                payoutFee: market.payoutFee,
+                preMarketEndTs: new bn_js_1.default(0),
+                preOrdersAvailable: new bn_js_1.default(0)
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                pool: toResolve.poolId
+                    ? (0, pda_1.getPoolPDA)(this.program.programId, toResolve.poolId)
+                    : null,
+                customer
+            })
+                .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);
+        });
+    }
 }
 exports.default = TriadProtocol;

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,11 @@ export type CreateCustomerArgs = {
     authority: PublicKey;
     feeRecipient: PublicKey;
     feeBps: number;
+    marketFeeBps: number;
+    payoutFeeBps: number;
+};
+export type UpdateCustomerArgs = {
+    customerId: number;
+    marketFeeBps?: number;
+    payoutFeeBps?: number;
 };

package/dist/types/idl_triad_protocol.json

@@ -1317,6 +1317,10 @@
                     "name": "order_book",
                     "writable": true
                 },
+                {
+                    "name": "customer",
+                    "writable": true
+                },
                 {
                     "name": "ask_order",
                     "writable": true
@@ -1412,6 +1416,10 @@
                     "name": "order_book",
                     "writable": true
                 },
+                {
+                    "name": "customer",
+                    "writable": true
+                },
                 {
                     "name": "order",
                     "writable": true
@@ -2137,6 +2145,47 @@
             ],
             "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": "arg",
+                                "path": "args.customer_id"
+                            }
+                        ]
+                    }
+                },
+                {
+                    "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],
@@ -3131,6 +3180,14 @@
                     {
                         "name": "fee_bps",
                         "type": "u16"
+                    },
+                    {
+                        "name": "market_fee_bps",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "payout_fee_bps",
+                        "type": "u16"
                     }
                 ]
             }
@@ -3272,10 +3329,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]
                         }
                     }
                 ]
@@ -4450,6 +4515,30 @@
                 ]
             }
         },
+        {
+            "name": "UpdateCustomerArgs",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "customer_id",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "market_fee_bps",
+                        "type": {
+                            "option": "u16"
+                        }
+                    },
+                    {
+                        "name": "payout_fee_bps",
+                        "type": {
+                            "option": "u16"
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "VerificationLevel",
             "docs": [

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

@@ -1851,6 +1851,10 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
+                {
+                    name: 'customer';
+                    writable: true;
+                },
                 {
                     name: 'askOrder';
                     writable: true;
@@ -1975,6 +1979,10 @@ export type TriadProtocol = {
                     name: 'orderBook';
                     writable: true;
                 },
+                {
+                    name: 'customer';
+                    writable: true;
+                },
                 {
                     name: 'order';
                     writable: true;
@@ -3043,6 +3051,47 @@ 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: 'arg';
+                                path: 'args.customer_id';
+                            }
+                        ];
+                    };
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                }
+            ];
+            args: [
+                {
+                    name: 'args';
+                    type: {
+                        defined: {
+                            name: 'updateCustomerArgs';
+                        };
+                    };
+                }
+            ];
+        },
         {
             name: 'updateMarketEnd';
             discriminator: [10, 188, 22, 219, 206, 83, 67, 31];
@@ -4135,6 +4184,14 @@ export type TriadProtocol = {
                     {
                         name: 'feeBps';
                         type: 'u16';
+                    },
+                    {
+                        name: 'marketFeeBps';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'payoutFeeBps';
+                        type: 'u16';
                     }
                 ];
             };
@@ -4276,10 +4333,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];
                         };
                     }
                 ];
@@ -5454,6 +5519,30 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'updateCustomerArgs';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'customerId';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'marketFeeBps';
+                        type: {
+                            option: 'u16';
+                        };
+                    },
+                    {
+                        name: 'payoutFeeBps';
+                        type: {
+                            option: 'u16';
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'verificationLevel';
             docs: [

package/dist/utils/feeCalculator.d.ts

@@ -2,32 +2,34 @@
  * 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;
 /**
  * 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;
+    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;
+    realEntryPrice: number;
 };

package/dist/utils/feeCalculator.js

@@ -5,10 +5,10 @@ exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = ex
  * 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.max(Math.floor(((990000 - internalPrice) * 1900) / internalPrice), 90);
 }
@@ -16,8 +16,8 @@ exports.calculateDynamicFeeBps = calculateDynamicFeeBps;
 /**
  * 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 +27,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 +38,37 @@ exports.applySellFee = applySellFee;
 /**
  * Simulate a buy order with given amount and price
  */
-function simulateBuyOrder(amount, price, feeBps) {
-    const effectivePrice = applyBuyFee(price, feeBps);
+function simulateBuyOrder(amount, price, feeBps, customerMarketFeeBps) {
+    const effectivePrice = applyBuyFee(price, feeBps, customerMarketFeeBps);
     const sharesReceived = amount / 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,
+        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 amountReceived = amountToReceiveBeforeFixed;
     const feeAmount = valueAtOriginalPrice - amountReceived;
-    const feePercentage = (feeAmount / valueAtOriginalPrice) * 100;
     return {
         entryPrice: price,
         effectivePrice,
         sharesReceived: shares,
         feeAmount,
-        feePercentage
+        feePercentage: (feeAmount / valueAtOriginalPrice) * 100,
+        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.8",
+  "version": "4.2.0",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",