@triadxyz/triad-protocol 1.6.8-beta-dev → 1.6.8-beta

package/dist/utils/constants.d.ts

@@ -3,7 +3,6 @@ export declare const STAKE_VAULT_NAME = "Triad Share 1";
 export declare const TRD_DECIMALS = 6;
 export declare const VERIFIER: PublicKey;
 export declare const TRD_MINT: PublicKey;
-export declare const USDC_MINT_DEVNET: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;

package/dist/utils/constants.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.WHEEL_MINT = exports.VALENT_SPIN_NAME = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.USDC_MINT_DEVNET = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.WHEEL_MINT = exports.VALENT_SPIN_NAME = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TRD_DECIMALS = 6;
 exports.VERIFIER = new web3_js_1.PublicKey('42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
-exports.USDC_MINT_DEVNET = new web3_js_1.PublicKey('4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
 exports.SOL_MINT = new web3_js_1.PublicKey('So11111111111111111111111111111111111111112');
 exports.TICKET_CORE_COLLECTION = new web3_js_1.PublicKey('BaqopH1VXYUCT6VsojbTibVcd3k5jpGGT6296HFb6fVa');

package/dist/utils/helpers.d.ts

@@ -1,40 +1,11 @@
 import { Stake, StakeVault } from './../types/stake';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
+import { Market, Order, UserTrade } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
 export declare const formatStakeVault: (stakeVault: any) => StakeVault;
 export declare const formatStake: (stake: any) => Stake;
 export declare const formatMarket: (account: any, address: PublicKey) => Market;
-export declare const formatOrder: (order: any, account: PublicKey, authority: PublicKey) => Order;
-export declare const formatUserTrade: (account: any, user: PublicKey) => UserTrade;
+export declare const formatOrder: (order: any) => Order;
+export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
 export declare const calculateStakeRewards: (stake: Stake, multiplier: number) => number;
-export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
-export declare const getOrderDirection: (direction: {
-    hype: {};
-} | {
-    flop: {};
-}) => OrderDirection;
-export declare const getOrderType: (type: {
-    limit: {};
-} | {
-    market: {};
-}) => OrderType;
-export declare const getOrderSide: (side: {
-    bid: {};
-} | {
-    ask: {};
-}) => OrderSide;
-export declare const getOrderStatus: (status: {
-    init: {};
-} | {
-    open: {};
-} | {
-    closed: {};
-} | {
-    claimed: {};
-} | {
-    liquidated: {};
-} | {
-    waiting: {};
-}) => OrderStatus;

package/dist/utils/helpers.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
-const spl_token_1 = require("@solana/spl-token");
-const spl_token_2 = require("@solana/spl-token");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc, 32);
     buffer.write(value);
@@ -74,45 +72,40 @@ const formatMarket = (account, address) => {
         marketStart: account.marketStart.toString(),
         marketEnd: account.marketEnd.toString(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        creatorFeeAvailable: account.creatorFeeAvailable.toString(),
-        creatorFeeClaimed: account.creatorFeeClaimed.toString(),
+        nftHoldersFeeAvailable: account.nftHoldersFeeAvailable.toString(),
+        nftHoldersFeeClaimed: account.nftHoldersFeeClaimed.toString(),
         marketFeeAvailable: account.marketFeeAvailable.toString(),
         marketFeeClaimed: account.marketFeeClaimed.toString(),
-        customerId: account.customerId ? account.customerId.toString() : null,
         winningDirection: trade_1.WinningDirection[Object.keys(account.winningDirection)[0].toUpperCase()],
-        marketLiquidityAtStart: account.marketLiquidityAtStart.toString()
+        marketLiquidityAtStart: account.marketLiquidityAtStart.toString() > 0
+            ? account.marketLiquidityAtStart.toString()
+            : '500000000'
     };
 };
 exports.formatMarket = formatMarket;
-const formatOrder = (order, account, authority) => {
+const formatOrder = (order) => {
     return {
         ts: order.ts.toString(),
         orderId: order.orderId.toString(),
-        filledShares: order.filledShares.toString(),
+        questionId: order.questionId.toString(),
         marketId: order.marketId.toString(),
-        status: (0, exports.getOrderStatus)(order.status),
+        status: order.status,
         price: order.price.toString(),
-        amount: order.amount.toString(),
-        shares: order.shares.toString(),
-        orderType: (0, exports.getOrderType)(order.orderType),
-        direction: (0, exports.getOrderDirection)(order.orderDirection),
-        userNonce: order.userNonce.toString(),
-        orderSide: (0, exports.getOrderSide)(order.orderSide),
-        authority: authority.toString(),
-        account: account.toString(),
-        poseidon: order.poseidon ? order.poseidon.toString() : null,
-        linkedOrderId: order.linkedOrderId ? order.linkedOrderId.toString() : null
+        totalAmount: order.totalAmount.toString(),
+        totalShares: order.totalShares.toString(),
+        orderType: order.orderType,
+        direction: order.direction,
+        userNonce: order.userNonce.toString()
     };
 };
 exports.formatOrder = formatOrder;
-const formatUserTrade = (account, user) => {
+const formatUserTrade = (account, publicKey) => {
     return {
-        user: user.toString(),
-        authority: account.authority.toString(),
+        user: publicKey.toString(),
         totalDeposits: account.totalDeposits.toString(),
         totalWithdraws: account.totalWithdraws.toString(),
         openedOrders: account.openedOrders.toString(),
-        orders: account.orders.map((order) => (0, exports.formatOrder)(order, user, account.authority)),
+        orders: account.orders.map((order) => (0, exports.formatOrder)(order)),
         nonce: account.nonce.toString(),
         isSubUser: account.isSubUser
     };
@@ -125,7 +118,7 @@ const calculateStakeRewards = (stake, multiplier) => {
         return 0;
     const collectionsMultiplier = multiplier * 150;
     const maxRank = 1633;
-    const rank = 480;
+    const rank = 963;
     const rankWeight = (maxRank - rank + 1) / maxRank;
     const userStakedAmount = stake.mint === constants_1.TRD_MINT.toBase58()
         ? stake.amount
@@ -140,51 +133,3 @@ const calculateStakeRewards = (stake, multiplier) => {
     return (rewards + stake.available) / Math.pow(10, constants_1.TRD_DECIMALS);
 };
 exports.calculateStakeRewards = calculateStakeRewards;
-const getTokenProgram = (mint) => {
-    if (mint.toBase58() === constants_1.TRD_MINT.toBase58()) {
-        return spl_token_2.TOKEN_2022_PROGRAM_ID;
-    }
-    return spl_token_1.TOKEN_PROGRAM_ID;
-};
-exports.getTokenProgram = getTokenProgram;
-const getOrderDirection = (direction) => {
-    if (Object.keys(direction)[0] === 'hype') {
-        return trade_1.OrderDirection.HYPE;
-    }
-    return trade_1.OrderDirection.FLOP;
-};
-exports.getOrderDirection = getOrderDirection;
-const getOrderType = (type) => {
-    if (Object.keys(type)[0] === 'limit') {
-        return trade_1.OrderType.LIMIT;
-    }
-    return trade_1.OrderType.MARKET;
-};
-exports.getOrderType = getOrderType;
-const getOrderSide = (side) => {
-    if (Object.keys(side)[0] === 'bid') {
-        return trade_1.OrderSide.BID;
-    }
-    return trade_1.OrderSide.ASK;
-};
-exports.getOrderSide = getOrderSide;
-const getOrderStatus = (status) => {
-    let currentStatus = Object.keys(status)[0];
-    switch (currentStatus) {
-        case 'init':
-            return trade_1.OrderStatus.INIT;
-        case 'open':
-            return trade_1.OrderStatus.OPEN;
-        case 'closed':
-            return trade_1.OrderStatus.CLOSED;
-        case 'claimed':
-            return trade_1.OrderStatus.CLAIMED;
-        case 'liquidated':
-            return trade_1.OrderStatus.LIQUIDATED;
-        case 'waiting':
-            return trade_1.OrderStatus.WAITING;
-        default:
-            throw new Error('Invalid order status');
-    }
-};
-exports.getOrderStatus = getOrderStatus;

package/package.json

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