@triadxyz/triad-protocol 3.1.0-beta → 3.1.2-beta

package/dist/utils/constants.d.ts

@@ -1,11 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const TRD_DECIMALS = 6;
 export declare const USDC_MINT: PublicKey;
 export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
-export declare const SOL_MINT: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;
-export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;
+export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const TICKET_COLLECTION_SYMBOL = "PTCKT";
+export declare const BASE_DECIMALS = 6;
 export declare const BOOK_ORDER_NULL = 61;

package/dist/utils/constants.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BOOK_ORDER_NULL = exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.POSEIDON_COLLECTION_SYMBOL = exports.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = exports.TRD_DECIMALS = void 0;
+exports.BOOK_ORDER_NULL = exports.BASE_DECIMALS = exports.TICKET_COLLECTION_SYMBOL = exports.POSEIDON_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.TICKET_CORE_COLLECTION = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.USDC_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
-exports.TRD_DECIMALS = 6;
 exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
 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');
-exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
+exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.TICKET_COLLECTION_SYMBOL = 'PTCKT';
+exports.BASE_DECIMALS = 6;
 exports.BOOK_ORDER_NULL = 61;

package/dist/utils/helpers.d.ts

@@ -1,7 +1,7 @@
 import { PublicKey } from '@solana/web3.js';
 import { IdlAccounts } from '@coral-xyz/anchor';
-import { Stake, StakeVault, Unstake } from './../types/stake';
-import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Pool, BookOrder, Refer, Customer } from '../types';
+import { OrderDirectionEncoded, OrderTypeEncoded, OrderSideEncoded, OrderStatusEncoded, Stake, StakeVault, Unstake } from './../types';
+import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade, Pool, BookOrder, Customer } from '../types';
 import { TriadProtocol } from '../types/triad_protocol';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
@@ -13,37 +13,12 @@ export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV
 export declare const formatUserTrade: (account: IdlAccounts<TriadProtocol>['userTrade'], publicKey: PublicKey) => UserTrade;
 export declare const formatOrder: (order: IdlAccounts<TriadProtocol>['userTrade']['orders'][number], authority?: string) => Order;
 export declare const formatBookOrder: (order: IdlAccounts<TriadProtocol>['orderBook']['hypeOrders'][number] | IdlAccounts<TriadProtocol>['orderBook']['flopOrders'][number]) => BookOrder;
+export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
 export declare const calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
-export declare const getOrderDirection: (direction: {
-    hype: {};
-} | {
-    flop: {};
-}) => OrderDirection;
-export declare const getOrderDirectionFromNumber: (direction: number) => OrderDirection;
-export declare const getOrderSideFromNumber: (side: number) => OrderSide;
-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;
-export declare const formatRefer: (account: IdlAccounts<TriadProtocol>['refer']) => Refer;
-export declare const formatCustomer: (account: IdlAccounts<TriadProtocol>['customer'], publicKey: PublicKey) => Customer;
+export declare const getOrderDirection: (orderDirection: OrderDirectionEncoded) => OrderDirection;
+export declare const getOrderDirectionFromNumber: (orderDirection: number) => OrderDirection;
+export declare const getOrderSideFromNumber: (orderSide: number) => OrderSide;
+export declare const getOrderType: (orderType: OrderTypeEncoded) => OrderType;
+export declare const getOrderSide: (orderSide: OrderSideEncoded) => OrderSide;
+export declare const getOrderStatus: (status: OrderStatusEncoded) => OrderStatus;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatCustomer = exports.formatRefer = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatBookOrder = exports.formatOrder = exports.formatUserTrade = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatUserTrade = 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");
@@ -12,8 +12,7 @@ const encodeString = (value, alloc = 32) => {
 };
 exports.encodeString = encodeString;
 const decodeString = (bytes) => {
-    const buffer = Buffer.from(bytes);
-    return buffer.toString('utf8').trim();
+    return Buffer.from(bytes).toString('utf8').trim();
 };
 exports.decodeString = decodeString;
 const formatStakeVault = (stakeVault) => {
@@ -148,6 +147,18 @@ const formatBookOrder = (order) => {
     };
 };
 exports.formatBookOrder = formatBookOrder;
+const formatCustomer = (account, publicKey) => {
+    return {
+        id: account.id,
+        authority: publicKey.toString(),
+        name: account.name,
+        feeRecipient: account.feeRecipient.toString(),
+        feeBps: account.feeBps,
+        isVerified: account.isVerified,
+        address: publicKey.toString()
+    };
+};
+exports.formatCustomer = formatCustomer;
 const calculateStakeRewards = (stake) => {
     const maxRank = 1633;
     const rank = 369;
@@ -170,38 +181,38 @@ const getTokenProgram = (mint) => {
     return spl_token_1.TOKEN_PROGRAM_ID;
 };
 exports.getTokenProgram = getTokenProgram;
-const getOrderDirection = (direction) => {
-    if (Object.keys(direction)[0] === 'hype') {
+const getOrderDirection = (orderDirection) => {
+    if (Object.keys(orderDirection)[0] === 'hype') {
         return types_1.OrderDirection.HYPE;
     }
     return types_1.OrderDirection.FLOP;
 };
 exports.getOrderDirection = getOrderDirection;
-const getOrderDirectionFromNumber = (direction) => {
-    if (direction === 0) {
+const getOrderDirectionFromNumber = (orderDirection) => {
+    if (orderDirection === 0) {
         return types_1.OrderDirection.HYPE;
     }
-    if (direction === 1) {
+    if (orderDirection === 1) {
         return types_1.OrderDirection.FLOP;
     }
 };
 exports.getOrderDirectionFromNumber = getOrderDirectionFromNumber;
-const getOrderSideFromNumber = (side) => {
-    if (side === 0) {
+const getOrderSideFromNumber = (orderSide) => {
+    if (orderSide === 0) {
         return types_1.OrderSide.BID;
     }
     return types_1.OrderSide.ASK;
 };
 exports.getOrderSideFromNumber = getOrderSideFromNumber;
-const getOrderType = (type) => {
-    if (Object.keys(type)[0] === 'limit') {
+const getOrderType = (orderType) => {
+    if (Object.keys(orderType)[0] === 'limit') {
         return types_1.OrderType.LIMIT;
     }
     return types_1.OrderType.MARKET;
 };
 exports.getOrderType = getOrderType;
-const getOrderSide = (side) => {
-    if (Object.keys(side)[0] === 'bid') {
+const getOrderSide = (orderSide) => {
+    if (Object.keys(orderSide)[0] === 'bid') {
         return types_1.OrderSide.BID;
     }
     return types_1.OrderSide.ASK;
@@ -227,25 +238,3 @@ const getOrderStatus = (status) => {
     }
 };
 exports.getOrderStatus = getOrderStatus;
-const formatRefer = (account) => {
-    return {
-        id: account.id.toNumber(),
-        authority: account.authority.toString(),
-        feeBps: account.feeBps,
-        feeClaimed: account.feeClaimed.toNumber(),
-        usersReferred: account.usersReferred.toNumber()
-    };
-};
-exports.formatRefer = formatRefer;
-const formatCustomer = (account, publicKey) => {
-    return {
-        id: account.id,
-        authority: publicKey.toString(),
-        name: account.name,
-        feeRecipient: account.feeRecipient.toString(),
-        feeBps: account.feeBps,
-        isVerified: account.isVerified,
-        address: publicKey.toString()
-    };
-};
-exports.formatCustomer = formatCustomer;

package/dist/utils/{pda/index.d.ts → pda.d.ts}

@@ -6,4 +6,7 @@ export declare const getCustomerPDA: (programId: PublicKey, customerId: number)
 export declare const getUserTradePDA: (programId: PublicKey, wallet: PublicKey) => PublicKey;
 export declare const getSubUserTradePDA: (programId: PublicKey, wallet: PublicKey, nonce: number) => PublicKey;
 export declare const getPoolPDA: (programId: PublicKey, poolId: number) => PublicKey;
-export declare const getReferPDA: (programId: PublicKey, refer: PublicKey) => PublicKey;
+export declare const getStakePDA: (programId: PublicKey, user: PublicKey) => PublicKey;
+export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
+export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;
+export declare const getPoseidonPDA: (programId: PublicKey, number: number) => PublicKey;

package/dist/utils/{pda/index.js → pda.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.getReferPDA = exports.getPoolPDA = exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
+exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = exports.getStakePDA = exports.getPoolPDA = exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getOrderBookPDA = exports.getMarketPDA = exports.getTokenATA = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const spl_token_1 = require("@solana/spl-token");
@@ -39,7 +39,19 @@ const getPoolPDA = (programId, poolId) => {
     return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('pool'), new bn_js_1.default(poolId).toArrayLike(Buffer, 'le', 8)], programId)[0];
 };
 exports.getPoolPDA = getPoolPDA;
-const getReferPDA = (programId, refer) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('refer'), refer.toBuffer()], programId)[0];
+const getStakePDA = (programId, user) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake_v3'), user.toBuffer()], programId)[0];
 };
-exports.getReferPDA = getReferPDA;
+exports.getStakePDA = getStakePDA;
+const getCollectionPDA = (programId, collectionSymbol) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('collection'), Buffer.from(collectionSymbol)], programId)[0];
+};
+exports.getCollectionPDA = getCollectionPDA;
+const getNftPDA = (programId, number) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('nft'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
+};
+exports.getNftPDA = getNftPDA;
+const getPoseidonPDA = (programId, number) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('poseidon'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
+};
+exports.getPoseidonPDA = getPoseidonPDA;

package/dist/utils/sendVersionedTransaction.js

@@ -33,7 +33,7 @@ const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccou
         payerKey: program.provider.publicKey
     }).compileToV0Message(addressLookupTableAccounts)), [], {
         skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
-        commitment: 'confirmed'
+        commitment: options === null || options === void 0 ? void 0 : options.commitment
     });
 });
 exports.default = sendVersionedTransaction;

package/dist/utils/swap.js

@@ -13,11 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrice = exports.swap = void 0;
-const index_1 = require("./pda/index");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
-const constants_1 = require("./constants");
 const spl_token_1 = require("@solana/spl-token");
+const pda_1 = require("./pda");
+const constants_1 = require("./constants");
 const swap = ({ connection, wallet, inToken, outToken, amount }) => __awaiter(void 0, void 0, void 0, function* () {
     const token = TOKENS[inToken];
     if (!token) {
@@ -88,5 +88,5 @@ const TOKENS = {
     }
 };
 const getFeeAccount = () => {
-    return (0, index_1.getTokenATA)(new web3_js_1.PublicKey('Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4'), constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID);
+    return (0, pda_1.getTokenATA)(new web3_js_1.PublicKey('Hk1r2NUL4LbUhx1agg1w44tyZiNr72mbeLsg6suF5MA4'), constants_1.USDC_MINT, spl_token_1.TOKEN_PROGRAM_ID);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "3.1.0-beta",
+  "version": "3.1.2-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,6 +23,7 @@
     "blockchain",
     "protocol",
     "triad",
+    "Triad Markets",
     "prediction markets",
     "prediction markets on solana",
     "only possible on solana"

package/dist/types/poseidon.d.ts

@@ -1,18 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export type TransferPoseidonArgs = {
-    poseidonAsset: PublicKey;
-    ticketAsset: PublicKey;
-    ticketNumber: number;
-};
-export type WithdrawPoseidonArgs = {
-    poseidonAsset: PublicKey;
-    nft: number;
-};
-export type AddTraderPoseidonArgs = {
-    user: PublicKey;
-    poseidonAsset: PublicKey;
-};
-export type RemoveTraderPoseidonArgs = {
-    user: PublicKey;
-    poseidonAsset: PublicKey;
-};

package/dist/types/poseidon.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/stake.d.ts

@@ -1,35 +0,0 @@
-import BN from 'bn.js';
-export type UpdateStakeVaultArgs = {
-    amount?: BN;
-    isLocked?: boolean;
-};
-export type StakeVault = {
-    name: string;
-    collection: string;
-    authority: string;
-    slots: number;
-    amount: number;
-    isLocked: boolean;
-    tokenMint: string;
-    amountPaid: number;
-    nftStaked: number;
-    tokenDecimals: number;
-    tokenStaked: number;
-    week: number;
-    initTs: number;
-    endTs: number;
-};
-export type Stake = {
-    authority: string;
-    initTs: number;
-    checkedTs: number;
-    claimed: number;
-    available: number;
-    amount: number;
-};
-export type Unstake = {
-    address: string;
-    authority: string;
-    amount: number;
-    withdrawTs: number;
-};

package/dist/types/stake.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,4 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export declare const getCollectionPDA: (programId: PublicKey, collectionSymbol: string) => PublicKey;
-export declare const getNftPDA: (programId: PublicKey, number: number) => PublicKey;
-export declare const getPoseidonPDA: (programId: PublicKey, number: number) => PublicKey;

package/dist/utils/pda/poseidon.js

@@ -1,20 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPoseidonPDA = exports.getNftPDA = exports.getCollectionPDA = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const bn_js_1 = __importDefault(require("bn.js"));
-const getCollectionPDA = (programId, collectionSymbol) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('collection'), Buffer.from(collectionSymbol)], programId)[0];
-};
-exports.getCollectionPDA = getCollectionPDA;
-const getNftPDA = (programId, number) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('nft'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
-};
-exports.getNftPDA = getNftPDA;
-const getPoseidonPDA = (programId, number) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('poseidon'), new bn_js_1.default(number).toArrayLike(Buffer, 'le', 8)], programId)[0];
-};
-exports.getPoseidonPDA = getPoseidonPDA;

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

@@ -1,3 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export declare const getStakeV2PDA: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
-export declare const getStakePDA: (programId: PublicKey, user: PublicKey) => PublicKey;

package/dist/utils/pda/stake.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStakePDA = exports.getStakeV2PDA = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const getStakeV2PDA = (programId, wallet, name) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake'), wallet.toBuffer(), Buffer.from(name)], programId)[0];
-};
-exports.getStakeV2PDA = getStakeV2PDA;
-const getStakePDA = (programId, user) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('stake_v3'), user.toBuffer()], programId)[0];
-};
-exports.getStakePDA = getStakePDA;