@triadxyz/triad-protocol 4.1.9 → 4.2.1

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/dist/utils/helpers.d.ts

@@ -1,5 +1,5 @@
 import { PublicKey } from '@solana/web3.js';
-import { BN, IdlAccounts, Program } from '@coral-xyz/anchor';
+import { 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';
@@ -26,7 +26,7 @@ export declare const getOrderStatus: (status: OrderStatusEncoded) => OrderStatus
 export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection) => OrderDirectionEncoded;
 export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
 export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;
-export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey, balance: BN) => Predictor;
+export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey) => 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

@@ -103,10 +103,7 @@ const formatMarket = (account, address) => {
         marketStart: account.marketStart.toString(),
         marketEnd: account.marketEnd.toString(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        payoutFeeAvailable: account.payoutFeeAvailable.toString(),
-        payoutFeeClaimed: account.payoutFeeClaimed.toString(),
-        marketFeeAvailable: account.marketFeeAvailable.toString(),
-        marketFeeClaimed: account.marketFeeClaimed.toString(),
+        feeGenerated: account.feeGenerated.toString(),
         winningDirection: types_1.WinningDirection[Object.keys(account.winningDirection)[0].toUpperCase()],
         marketLiquidityAtStart: account.marketLiquidityAtStart.toNumber() > 0
             ? account.marketLiquidityAtStart.toString()
@@ -262,13 +259,15 @@ const getOppositeOrderDirectionEncoded = (orderDirection) => {
     return { hype: {} };
 };
 exports.getOppositeOrderDirectionEncoded = getOppositeOrderDirectionEncoded;
-const formatPredictor = (account, publicKey, balance) => {
+const formatPredictor = (account, publicKey) => {
     return {
         address: publicKey.toBase58(),
-        authority: publicKey.toString(),
+        authority: account.authority.toString(),
         refer: account.refer.toString(),
         customerId: account.customerId,
-        balance: balance.toNumber() / 1e6
+        balance: account.balance.toNumber() / 1e6,
+        rewardsAvailable: account.rewardsAvailable.toNumber() / 1e6,
+        rewardsClaimed: account.rewardsClaimed.toNumber() / 1e6
     };
 };
 exports.formatPredictor = formatPredictor;

package/dist/utils/sendVersionedTransaction.js

@@ -8,12 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
-const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
 const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccounts) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -21,13 +17,9 @@ const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccou
             microLamports: options.microLamports
         }));
     }
-    if (!(options === null || options === void 0 ? void 0 : options.microLamports)) {
-        const priorityFee = yield (0, getPriorityFee_1.default)();
-        ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-            microLamports: priorityFee
-        }));
-    }
-    const { blockhash } = yield program.provider.connection.getLatestBlockhash();
+    const { blockhash } = yield program.provider.connection.getLatestBlockhash({
+        commitment: 'confirmed'
+    });
     if (program.provider.publicKey.toBase58() !== ((_a = options === null || options === void 0 ? void 0 : options.payer) === null || _a === void 0 ? void 0 : _a.toBase58())) {
         return new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
             instructions: ixs,

package/package.json

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