@triadxyz/triad-protocol 4.2.0 → 4.2.2

package/dist/utils/helpers.d.ts

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

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