@triadxyz/triad-protocol 1.5.4-beta → 1.5.6-beta

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateStakeRewards = exports.accountToMarketV1 = exports.formatMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
 const encodeString = (value, alloc = 32) => {
@@ -93,39 +93,34 @@ const formatMarket = (account, address) => {
     };
 };
 exports.formatMarket = formatMarket;
-const accountToMarketV1 = (account, address) => {
+const formatOrder = (order) => {
     return {
-        bump: account.bump,
-        address: address.toString(),
-        authority: account.authority.toString(),
-        marketId: account.marketId.toString(),
-        hypePrice: account.hypePrice.toString(),
-        flopPrice: account.flopPrice.toString(),
-        hypeLiquidity: account.hypeLiquidity.toString(),
-        flopLiquidity: account.flopLiquidity.toString(),
-        hypeShares: account.totalHypeShares.toString(),
-        flopShares: account.totalFlopShares.toString(),
-        volume: account.totalVolume.toString(),
-        mint: account.mint.toString(),
-        updateTs: account.updateTs.toString(),
-        openedOrders: account.openOrdersCount.toString(),
-        nextOrderId: account.nextOrderId.toString(),
-        feeBps: account.feeBps,
-        isAllowedToPayout: account.isActive,
-        marketStart: account.currentQuestionStart.toString(),
-        marketEnd: account.currentQuestionEnd.toString(),
-        question: Buffer.from(account.currentQuestion)
-            .toString()
-            .replace(/\0+$/, ''),
-        nftHoldersFeeAvailable: '0',
-        nftHoldersFeeClaimed: '0',
-        marketFeeAvailable: '0',
-        marketFeeClaimed: '0',
-        winningDirection: trade_1.WinningDirection[Object.keys(account.previousResolvedQuestion.winningDirection)[0].toUpperCase()],
-        marketLiquidityAtStart: '0'
+        ts: order.ts.toString(),
+        orderId: order.orderId.toString(),
+        questionId: order.questionId.toString(),
+        marketId: order.marketId.toString(),
+        status: order.status,
+        price: order.price.toString(),
+        totalAmount: order.totalAmount.toString(),
+        totalShares: order.totalShares.toString(),
+        orderType: order.orderType,
+        direction: order.direction,
+        userNonce: order.userNonce.toString()
+    };
+};
+exports.formatOrder = formatOrder;
+const formatUserTrade = (account, publicKey) => {
+    return {
+        user: publicKey.toString(),
+        totalDeposits: account.totalDeposits.toString(),
+        totalWithdraws: account.totalWithdraws.toString(),
+        openedOrders: account.openedOrders.toString(),
+        orders: account.orders.map((order) => (0, exports.formatOrder)(order)),
+        nonce: account.nonce.toString(),
+        isSubUser: account.isSubUser
     };
 };
-exports.accountToMarketV1 = accountToMarketV1;
+exports.formatUserTrade = formatUserTrade;
 const calculateStakeRewards = (stake, multiplier) => {
     if (stake.withdrawTs !== 0)
         return 0;

package/dist/utils/pda/trade.d.ts

@@ -1,3 +1,4 @@
 import { PublicKey } from '@solana/web3.js';
 export declare const getMarketPDA: (programId: PublicKey, marketId: number) => PublicKey;
 export declare const getUserTradePDA: (programId: PublicKey, wallet: PublicKey) => PublicKey;
+export declare const getSubUserTradePDA: (programId: PublicKey, wallet: PublicKey, nonce: number) => PublicKey;

package/dist/utils/pda/trade.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserTradePDA = exports.getMarketPDA = void 0;
+exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getMarketPDA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const getMarketPDA = (programId, marketId) => {
@@ -14,3 +14,11 @@ const getUserTradePDA = (programId, wallet) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_trade'), wallet.toBuffer()], programId)[0];
 };
 exports.getUserTradePDA = getUserTradePDA;
+const getSubUserTradePDA = (programId, wallet, nonce) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from('sub_user_trade'),
+        wallet.toBuffer(),
+        new bn_js_1.default(nonce).toArrayLike(Buffer, 'le', 8)
+    ], programId)[0];
+};
+exports.getSubUserTradePDA = getSubUserTradePDA;

package/dist/utils/swap.js

@@ -22,7 +22,7 @@ const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void
         throw new Error('Token not found');
     }
     const formattedAmountIn = amount * Math.pow(10, token.decimals);
-    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=30`);
+    const quoteResponse = yield axios_1.default.get(`https://quote-api.jup.ag/v6/quote?inputMint=${inToken}&outputMint=${constants_1.TRD_MINT.toBase58()}&amount=${formattedAmountIn}&slippageBps=60`);
     const { data: quoteData } = quoteResponse;
     const swapResponse = yield axios_1.default.post('https://quote-api.jup.ag/v6/swap-instructions', {
         userPublicKey: wallet,
@@ -35,9 +35,6 @@ const swap = ({ connection, wallet, inToken, amount }) => __awaiter(void 0, void
             deserializeInstruction(swapInstruction),
             web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: 500000
-            }),
-            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: yield getPriorityFee()
             })
         ],
         addressLookupTableAccounts: yield (0, exports.getAddressLookupTableAccounts)(connection, addressLookupTableAddresses),
@@ -73,15 +70,7 @@ const getAddressLookupTableAccounts = (connection, keys) => __awaiter(void 0, vo
     }, new Array());
 });
 exports.getAddressLookupTableAccounts = getAddressLookupTableAccounts;
-const getPriorityFee = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield axios_1.default.get('https://solanacompass.com/api/fees');
-    return response.data[15].priorityTx || 1000;
-});
 const TOKENS = {
-    oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp: {
-        mint: 'oreoU2P8bN6jkk3jbaiVxYnG1dCXcYxwhwyK9jSybcp',
-        decimals: 11
-    },
     So11111111111111111111111111111111111111112: {
         mint: 'So11111111111111111111111111111111111111112',
         decimals: 9

package/package.json

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

package/dist/local-test.d.ts

@@ -1 +0,0 @@
-export {};