@triadxyz/triad-protocol 4.1.9 → 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;
@@ -30,4 +30,11 @@ export default class Customer {
      * @param args.feeBps - The fee in basis points of the customer
      */
     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

@@ -83,5 +83,28 @@ class Customer {
             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
+                })
+                    .instruction()
+            ];
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
 }
 exports.default = Customer;

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/types/customer.d.ts

@@ -19,3 +19,8 @@ export type CreateCustomerArgs = {
     marketFeeBps: number;
     payoutFeeBps: number;
 };
+export type UpdateCustomerArgs = {
+    customerId: number;
+    marketFeeBps?: number;
+    payoutFeeBps?: number;
+};

package/dist/types/idl_triad_protocol.json

@@ -2164,9 +2164,8 @@
                                 "value": [99, 117, 115, 116, 111, 109, 101, 114]
                             },
                             {
-                                "kind": "account",
-                                "path": "customer.id",
-                                "account": "Customer"
+                                "kind": "arg",
+                                "path": "args.customer_id"
                             }
                         ]
                     }
@@ -4521,6 +4520,10 @@
             "type": {
                 "kind": "struct",
                 "fields": [
+                    {
+                        "name": "customer_id",
+                        "type": "u16"
+                    },
                     {
                         "name": "market_fee_bps",
                         "type": {

package/dist/types/triad_protocol.d.ts

@@ -3070,9 +3070,8 @@ export type TriadProtocol = {
                                 value: [99, 117, 115, 116, 111, 109, 101, 114];
                             },
                             {
-                                kind: 'account';
-                                path: 'customer.id';
-                                account: 'customer';
+                                kind: 'arg';
+                                path: 'args.customer_id';
                             }
                         ];
                     };
@@ -5525,6 +5524,10 @@ export type TriadProtocol = {
             type: {
                 kind: 'struct';
                 fields: [
+                    {
+                        name: 'customerId';
+                        type: 'u16';
+                    },
                     {
                         name: 'marketFeeBps';
                         type: {

package/dist/utils/feeCalculator.d.ts

@@ -3,10 +3,6 @@
  * Returns fee in basis points (bps)
  */
 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)
  */
@@ -24,8 +20,6 @@ export declare function simulateBuyOrder(amount: number, price: number, feeBps:
     sharesReceived: number;
     feeAmount: number;
     feePercentage: number;
-    fixedFee: number;
-    volumeFee: number;
     realEntryPrice: number;
 };
 /**
@@ -37,7 +31,5 @@ export declare function simulateSellOrder(shares: number, price: number, feeBps:
     sharesReceived: number;
     feeAmount: number;
     feePercentage: number;
-    fixedFee: number;
-    volumeFee: number;
     realEntryPrice: number;
 };

package/dist/utils/feeCalculator.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateFixedFee = exports.calculateDynamicFeeBps = void 0;
+exports.simulateSellOrder = exports.simulateBuyOrder = exports.applySellFee = exports.applyBuyFee = exports.calculateDynamicFeeBps = void 0;
 /**
  * Calculate dynamic fee based on price
  * Returns fee in basis points (bps)
@@ -13,28 +13,6 @@ function calculateDynamicFeeBps(price, feeBps, customerMarketFeeBps) {
     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)
  */
@@ -61,10 +39,8 @@ exports.applySellFee = applySellFee;
  * Simulate a buy order with given amount and price
  */
 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 sharesReceived = amount / effectivePrice;
     const valueAtOriginalPrice = sharesReceived * price;
     const feeAmount = amount - valueAtOriginalPrice;
     return {
@@ -73,8 +49,6 @@ function simulateBuyOrder(amount, price, feeBps, customerMarketFeeBps) {
         sharesReceived,
         feeAmount,
         feePercentage: (feeAmount / amount) * 100,
-        fixedFee,
-        volumeFee: feeAmount - fixedFee,
         realEntryPrice: amount / sharesReceived
     };
 }
@@ -86,8 +60,7 @@ 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 amountReceived = amountToReceiveBeforeFixed;
     const feeAmount = valueAtOriginalPrice - amountReceived;
     return {
         entryPrice: price,
@@ -95,8 +68,6 @@ function simulateSellOrder(shares, price, feeBps, customerMarketFeeBps) {
         sharesReceived: shares,
         feeAmount,
         feePercentage: (feeAmount / valueAtOriginalPrice) * 100,
-        fixedFee,
-        volumeFee: feeAmount - fixedFee,
         realEntryPrice: amountReceived / shares
     };
 }

package/package.json

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