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

package/dist/utils/constants.d.ts

@@ -3,6 +3,7 @@ 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,11 +1,12 @@
 "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.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.USDC_MINT_DEVNET = 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,12 +1,40 @@
 import { Stake, StakeVault } from './../types/stake';
-import { Market, Order, UserTrade } from '../types/trade';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, 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) => Order;
-export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
+export declare const formatOrder: (order: any, account: PublicKey, authority: PublicKey) => Order;
+export declare const formatUserTrade: (account: any, user: 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,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenProgram = exports.calculateStakeRewards = exports.formatUserTrade = exports.formatOrder = exports.formatMarket = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+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;
 const trade_1 = require("../types/trade");
 const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
@@ -74,40 +74,45 @@ const formatMarket = (account, address) => {
         marketStart: account.marketStart.toString(),
         marketEnd: account.marketEnd.toString(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        nftHoldersFeeAvailable: account.nftHoldersFeeAvailable.toString(),
-        nftHoldersFeeClaimed: account.nftHoldersFeeClaimed.toString(),
+        creatorFeeAvailable: account.creatorFeeAvailable.toString(),
+        creatorFeeClaimed: account.creatorFeeClaimed.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() > 0
-            ? account.marketLiquidityAtStart.toString()
-            : '500000000'
+        marketLiquidityAtStart: account.marketLiquidityAtStart.toString()
     };
 };
 exports.formatMarket = formatMarket;
-const formatOrder = (order) => {
+const formatOrder = (order, account, authority) => {
     return {
         ts: order.ts.toString(),
         orderId: order.orderId.toString(),
-        questionId: order.questionId.toString(),
+        filledShares: order.filledShares.toString(),
         marketId: order.marketId.toString(),
-        status: order.status,
+        status: (0, exports.getOrderStatus)(order.status),
         price: order.price.toString(),
-        totalAmount: order.totalAmount.toString(),
-        totalShares: order.totalShares.toString(),
-        orderType: order.orderType,
-        direction: order.direction,
-        userNonce: order.userNonce.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
     };
 };
 exports.formatOrder = formatOrder;
-const formatUserTrade = (account, publicKey) => {
+const formatUserTrade = (account, user) => {
     return {
-        user: publicKey.toString(),
+        user: user.toString(),
+        authority: account.authority.toString(),
         totalDeposits: account.totalDeposits.toString(),
         totalWithdraws: account.totalWithdraws.toString(),
         openedOrders: account.openedOrders.toString(),
-        orders: account.orders.map((order) => (0, exports.formatOrder)(order)),
+        orders: account.orders.map((order) => (0, exports.formatOrder)(order, user, account.authority)),
         nonce: account.nonce.toString(),
         isSubUser: account.isSubUser
     };
@@ -120,7 +125,7 @@ const calculateStakeRewards = (stake, multiplier) => {
         return 0;
     const collectionsMultiplier = multiplier * 150;
     const maxRank = 1633;
-    const rank = 963;
+    const rank = 480;
     const rankWeight = (maxRank - rank + 1) / maxRank;
     const userStakedAmount = stake.mint === constants_1.TRD_MINT.toBase58()
         ? stake.amount
@@ -142,3 +147,44 @@ const getTokenProgram = (mint) => {
     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.7-beta-dev",
+  "version": "1.6.8-beta-dev",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/dist/wheel.d.ts

@@ -1,62 +0,0 @@
-import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import { Keypair } from '@solana/web3.js';
-import { TriadProtocol } from './types/triad_protocol';
-import { RpcOptions } from './types';
-export default class Wheel {
-    private program;
-    private provider;
-    constructor(program: Program<TriadProtocol>, provider: AnchorProvider);
-    /**
-     * Add Whell Prize
-     * @param args.rangeMin - Range min to get prize
-     * @param args.rangeMax - Range max to get prize
-     * @param args.prize - Prize number it's indentifier
-     * @param args.availableQuantity - Amount available to get
-     * @param args.amount - Amount to send
-     *
-     * @param options - RPC options
-     *
-     */
-    addWheelPrize({ rangeMin, rangeMax, prize, availableQuantity, amount }: {
-        rangeMin: number;
-        rangeMax: number;
-        prize: number;
-        availableQuantity: number;
-        amount: number;
-    }, options?: RpcOptions): Promise<string>;
-    /**
-     * Claim Wheel Token
-     * @param amount - Amount of tokens to claim
-     * @param verifier - Verifier keypair
-     *
-     * @param options - RPC options
-     *
-     */
-    claimWheelToken(amount: number, verifier: Keypair, options?: RpcOptions): Promise<string>;
-    /**
-     * Spin Wheel
-     * @param args.isSol - Whether to pay with SOL or token
-     * @param args.verifier - Verifier keypair
-     * @param args.prize - Prize number
-     *
-     * @param options - RPC options
-     *
-     */
-    spinWheel(args: {
-        isSol: boolean;
-        prizes: number[];
-        verifier: Keypair;
-    }, options?: RpcOptions): Promise<string>;
-    /**
-     * Get Spin Wheel
-     *
-     */
-    getSpinWheel(amount: number): Promise<number[]>;
-    /**
-     * Swap Wheel Token
-     * @param amount - Amount of tokens to buy
-     * @param options - RPC options
-     *
-     */
-    swapWheelToken(amount: number, options?: RpcOptions): Promise<string>;
-}

package/dist/wheel.js

@@ -1,149 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        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 anchor_1 = require("@coral-xyz/anchor");
-const pda_1 = require("./utils/pda");
-const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersionedTransaction"));
-const constants_1 = require("./utils/constants");
-const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
-class Wheel {
-    constructor(program, provider) {
-        this.program = program;
-        this.provider = provider;
-    }
-    /**
-     * Add Whell Prize
-     * @param args.rangeMin - Range min to get prize
-     * @param args.rangeMax - Range max to get prize
-     * @param args.prize - Prize number it's indentifier
-     * @param args.availableQuantity - Amount available to get
-     * @param args.amount - Amount to send
-     *
-     * @param options - RPC options
-     *
-     */
-    addWheelPrize({ rangeMin, rangeMax, prize, availableQuantity, amount }, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
-                .addWheelPrize({
-                name: constants_1.VALENT_SPIN_NAME,
-                rangeMin: new anchor_1.BN(rangeMin),
-                rangeMax: new anchor_1.BN(rangeMax),
-                prize: new anchor_1.BN(prize),
-                availableQuantity: new anchor_1.BN(availableQuantity),
-                amount: new anchor_1.BN(amount)
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
-        });
-    }
-    /**
-     * Claim Wheel Token
-     * @param amount - Amount of tokens to claim
-     * @param verifier - Verifier keypair
-     *
-     * @param options - RPC options
-     *
-     */
-    claimWheelToken(amount, verifier, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const ix = yield this.program.methods
-                .claimWheelToken({
-                name: constants_1.VALENT_SPIN_NAME,
-                amount: new anchor_1.BN(amount * Math.pow(10, 6))
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                verifier: verifier.publicKey,
-                mint: constants_1.WHEEL_MINT
-            })
-                .instruction();
-            return (0, sendVersionedTransaction_1.default)(this.provider, [ix], options, undefined, [], verifier);
-        });
-    }
-    /**
-     * Spin Wheel
-     * @param args.isSol - Whether to pay with SOL or token
-     * @param args.verifier - Verifier keypair
-     * @param args.prize - Prize number
-     *
-     * @param options - RPC options
-     *
-     */
-    spinWheel(args, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const wheelPDA = (0, pda_1.getWheelPDA)(this.program.programId, constants_1.VALENT_SPIN_NAME);
-            let ixs = [];
-            for (const prize of args.prizes) {
-                ixs.push(yield this.program.methods
-                    .spinWheel({
-                    isSol: args.isSol,
-                    prize: new anchor_1.BN(prize)
-                })
-                    .accounts({
-                    signer: this.provider.wallet.publicKey,
-                    verifier: constants_1.VERIFIER,
-                    wheel: wheelPDA,
-                    mint: constants_1.WHEEL_MINT
-                })
-                    .instruction());
-            }
-            return (0, sendVersionedTransaction_1.default)(this.provider, ixs, options, undefined, [], args.verifier);
-        });
-    }
-    /**
-     * Get Spin Wheel
-     *
-     */
-    getSpinWheel(amount) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const [wheel] = yield this.program.account.wheel.all();
-            const prizes = [];
-            for (let i = 0; i < amount; i++) {
-                const randomNumber = Math.floor(Math.random() * 1000000) + 1;
-                const prize = wheel.account.prizes.find((p) => randomNumber >= p.rangeMin.toNumber() &&
-                    randomNumber <= p.rangeMax.toNumber() &&
-                    p.status.claimed);
-                if (!prize) {
-                    prizes.push(999);
-                }
-                prizes.push(prize.prize.toNumber());
-            }
-            return prizes;
-        });
-    }
-    /**
-     * Swap Wheel Token
-     * @param amount - Amount of tokens to buy
-     * @param options - RPC options
-     *
-     */
-    swapWheelToken(amount, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const method = this.program.methods
-                .swapWheelToken({
-                name: constants_1.VALENT_SPIN_NAME,
-                amount: new anchor_1.BN(amount)
-            })
-                .accounts({
-                signer: this.provider.wallet.publicKey,
-                mint: constants_1.WHEEL_MINT
-            });
-            return (0, sendTransactionWithOptions_1.default)(method, options);
-        });
-    }
-}
-exports.default = Wheel;