@triadxyz/triad-protocol 1.9.8-beta → 2.0.0-beta

package/dist/utils/constants.d.ts

@@ -1,13 +1,10 @@
 import { PublicKey } from '@solana/web3.js';
-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 TRIAD_ADMIN: PublicKey;
 export declare const SOL_MINT: PublicKey;
 export declare const TICKET_CORE_COLLECTION: PublicKey;
-export declare const VALENT_SPIN_NAME = "valent";
-export declare const WHEEL_MINT: PublicKey;
 export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const POSEIDON_CORE_COLLECTION: PublicKey;
 export declare const TICKET_COLLECTION_SYMBOL = "PTCKT";

package/dist/utils/constants.js

@@ -1,16 +1,13 @@
 "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.TICKET_CORE_COLLECTION = exports.SOL_MINT = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = 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.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.VALENT_SPIN_NAME = 'valent';
-exports.WHEEL_MINT = new web3_js_1.PublicKey('tCMraBSGHeMcQS76hNnBhnfbMzrtnnT3nbt3vAnSCE2');
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er632dvn878qkpdcnvq5ZUspSm');
 exports.TICKET_COLLECTION_SYMBOL = 'PTCKT';

package/dist/utils/helpers.d.ts

@@ -1,13 +1,15 @@
 import { Stake, StakeVault } from './../types/stake';
 import { Market, Order, OrderDirection, OrderSide, OrderStatus, OrderType, UserTrade } from '../types/trade';
 import { PublicKey } from '@solana/web3.js';
+import { IdlAccounts } from '@coral-xyz/anchor';
+import { TriadProtocol } from '../types/triad_protocol';
 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, authority?: string) => Order;
-export declare const formatUserTrade: (account: any, publicKey: PublicKey) => UserTrade;
+export declare const formatStakeVault: (stakeVault: IdlAccounts<TriadProtocol>['stakeVault']) => StakeVault;
+export declare const formatStake: (stake: IdlAccounts<TriadProtocol>['stakeV2']) => Stake;
+export declare const formatMarket: (account: IdlAccounts<TriadProtocol>['marketV2'], address: PublicKey) => Market;
+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 calculateStakeRewards: (stake: Stake) => number;
 export declare const getTokenProgram: (mint: PublicKey) => PublicKey;
 export declare const getOrderDirection: (direction: {

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "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.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatOrder = exports.formatUserTrade = 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");
@@ -79,14 +79,26 @@ const formatMarket = (account, address) => {
         marketFeeAvailable: account.marketFeeAvailable.toString(),
         marketFeeClaimed: account.marketFeeClaimed.toString(),
         winningDirection: trade_1.WinningDirection[Object.keys(account.winningDirection)[0].toUpperCase()],
-        marketLiquidityAtStart: account.marketLiquidityAtStart.toString() > 0
+        marketLiquidityAtStart: account.marketLiquidityAtStart.toNumber() > 0
             ? account.marketLiquidityAtStart.toString()
             : '0',
         payoutFee: account.payoutFee,
-        customer: account.customer ? account.customer.toString() : 'Triad'
+        customer: account.customerId === 0 ? 'Triad' : account.customerId.toString()
     };
 };
 exports.formatMarket = formatMarket;
+const formatUserTrade = (account, publicKey) => {
+    return {
+        user: publicKey.toString(),
+        totalDeposits: account.totalDeposits.toString(),
+        totalWithdraws: account.totalWithdraws.toString(),
+        orders: account.orders.map((order) => (0, exports.formatOrder)(order, account.authority.toString())),
+        nonce: account.nonce.toString(),
+        poseidon: account.poseidon ? account.poseidon.toString() : '',
+        isSubUser: account.isSubUser
+    };
+};
+exports.formatUserTrade = formatUserTrade;
 const formatOrder = (order, authority) => {
     return {
         ts: order.ts.toString(),
@@ -110,18 +122,6 @@ const formatOrder = (order, authority) => {
     };
 };
 exports.formatOrder = formatOrder;
-const formatUserTrade = (account, publicKey) => {
-    return {
-        user: publicKey.toString(),
-        totalDeposits: account.totalDeposits.toString(),
-        totalWithdraws: account.totalWithdraws.toString(),
-        orders: account.orders.map((order) => (0, exports.formatOrder)(order, account.authority.toString())),
-        nonce: account.nonce.toString(),
-        poseidon: account.poseidon ? account.poseidon.toString() : '',
-        isSubUser: account.isSubUser
-    };
-};
-exports.formatUserTrade = formatUserTrade;
 const calculateStakeRewards = (stake) => {
     if (stake.withdrawTs !== 0)
         return 0;

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

@@ -1,7 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const getUserPositionPDA: (programId: PublicKey, wallet: PublicKey, ticker: PublicKey) => PublicKey;
 export declare const getTokenATA: (address: PublicKey, Mint: PublicKey, program?: PublicKey) => PublicKey;
-export declare const getWheelPDA: (programId: PublicKey, name: string) => 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;
+export declare const getMarketPDA: (programId: PublicKey, marketId: number) => PublicKey;
+export declare const getCustomerPDA: (programId: PublicKey, customerId: 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/index.js

@@ -3,31 +3,31 @@ 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 = exports.getWheelPDA = exports.getTokenATA = exports.getUserPositionPDA = void 0;
+exports.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = 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");
-const getUserPositionPDA = (programId, wallet, ticker) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_position'), wallet.toBuffer(), ticker.toBuffer()], programId)[0];
-};
-exports.getUserPositionPDA = getUserPositionPDA;
 const getTokenATA = (address, Mint, program = spl_token_1.TOKEN_2022_PROGRAM_ID) => {
     return web3_js_1.PublicKey.findProgramAddressSync([address.toBytes(), program.toBytes(), Mint.toBytes()], new web3_js_1.PublicKey(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID))[0];
 };
 exports.getTokenATA = getTokenATA;
-const getWheelPDA = (programId, name) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('whell'), Buffer.from(name)], programId)[0];
+const getMarketPDA = (programId, marketId) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('market'), new bn_js_1.default(marketId).toArrayLike(Buffer, 'le', 8)], programId)[0];
 };
-exports.getWheelPDA = getWheelPDA;
-const getCollectionPDA = (programId, collectionSymbol) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('collection'), Buffer.from(collectionSymbol)], programId)[0];
+exports.getMarketPDA = getMarketPDA;
+const getCustomerPDA = (programId, customerId) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('customer'), new bn_js_1.default(customerId).toArrayLike(Buffer, 'le', 8)], 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.getCustomerPDA = getCustomerPDA;
+const getUserTradePDA = (programId, wallet) => {
+    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('user_trade'), wallet.toBuffer()], 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.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.getPoseidonPDA = getPoseidonPDA;
+exports.getSubUserTradePDA = getSubUserTradePDA;

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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,20 @@
+"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 +1,2 @@
 import { PublicKey } from '@solana/web3.js';
-export declare const getStakeVaultPDA: (programId: PublicKey, vaultName: string) => PublicKey;
 export declare const getStakePDA: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;

package/dist/utils/pda/stake.js

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

package/dist/utils/{sendTransactionWithOptions.d.ts → sendMethod.d.ts}

@@ -1,5 +1,5 @@
 import { RpcOptions } from '../types';
 import { MethodsBuilder } from '@coral-xyz/anchor/dist/cjs/program/namespace/methods';
 import { TriadProtocol } from '../types/triad_protocol';
-declare const sendTransactionWithOptions: (method: MethodsBuilder<TriadProtocol, any, any>, options?: RpcOptions) => Promise<string>;
-export default sendTransactionWithOptions;
+declare const sendMethod: (method: MethodsBuilder<TriadProtocol, any, any>, options?: RpcOptions) => Promise<string>;
+export default sendMethod;

package/dist/utils/{sendTransactionWithOptions.js → sendMethod.js}

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
-const sendTransactionWithOptions = (method, options) => __awaiter(void 0, void 0, void 0, function* () {
+const sendMethod = (method, options) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         method.postInstructions([
             web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
@@ -32,4 +32,4 @@ const sendTransactionWithOptions = (method, options) => __awaiter(void 0, void 0
     }
     return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
 });
-exports.default = sendTransactionWithOptions;
+exports.default = sendMethod;

package/dist/utils/sendVersionedTransaction.d.ts

@@ -1,7 +1,8 @@
 import { TransactionInstruction } from '@solana/web3.js';
 import { RpcOptions } from '../types';
 import { AddressLookupTableAccount } from '@solana/web3.js';
-import { AnchorProvider } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { Keypair } from '@solana/web3.js';
-declare const sendVersionedTransaction: (provider: AnchorProvider, ixs: TransactionInstruction[], options?: RpcOptions, payer?: Keypair, addressLookupTableAccounts?: AddressLookupTableAccount[], verifier?: Keypair) => Promise<string>;
+import { TriadProtocol } from '../types/triad_protocol';
+declare const sendVersionedTransaction: (program: Program<TriadProtocol>, ixs: TransactionInstruction[], options?: RpcOptions, addressLookupTableAccounts?: AddressLookupTableAccount[], verifier?: Keypair) => Promise<string>;
 export default sendVersionedTransaction;

package/dist/utils/sendVersionedTransaction.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_js_1 = require("@solana/web3.js");
 const getPriorityFee_1 = __importDefault(require("./getPriorityFee"));
-const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTableAccounts, verifier) => __awaiter(void 0, void 0, void 0, function* () {
+const sendVersionedTransaction = (program, ixs, options, addressLookupTableAccounts, verifier) => __awaiter(void 0, void 0, void 0, function* () {
     if (options === null || options === void 0 ? void 0 : options.microLamports) {
         ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
             microLamports: options.microLamports
@@ -26,22 +26,18 @@ const sendVersionedTransaction = (provider, ixs, options, payer, addressLookupTa
             microLamports: priorityFee
         }));
     }
-    const { blockhash } = yield provider.connection.getLatestBlockhash();
+    const { blockhash } = yield program.provider.connection.getLatestBlockhash();
     const tx = new web3_js_1.VersionedTransaction(new web3_js_1.TransactionMessage({
         instructions: ixs,
         recentBlockhash: blockhash,
-        payerKey: provider.publicKey
+        payerKey: program.provider.publicKey
     }).compileToV0Message(addressLookupTableAccounts));
     let signers = [];
-    if (payer) {
-        tx.sign([payer]);
-        signers.push(payer);
-    }
     if (verifier) {
         tx.sign([verifier]);
         signers.push(verifier);
     }
-    return provider.sendAndConfirm(tx, signers, {
+    return program.provider.sendAndConfirm(tx, signers, {
         skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight,
         commitment: 'confirmed'
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "1.9.8-beta",
+  "version": "2.0.0-beta",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -23,11 +23,11 @@
     "blockchain",
     "protocol",
     "triad",
-    "trading protocols",
-    "dex",
-    "SPL 404"
+    "prediction markets",
+    "prediction markets on solana",
+    "only possible on solana"
   ],
-  "author": "Triad Labs",
+  "author": "Triad Markets",
   "license": "ISC",
   "dependencies": {
     "@coral-xyz/anchor": "0.30.1",

package/dist/utils/formatNumber.d.ts

@@ -1,3 +0,0 @@
-import { BN } from '@coral-xyz/anchor';
-declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
-export default formatNumber;

package/dist/utils/formatNumber.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const formatNumber = (number, decimals = 6) => {
-    return Number(number.toString()) / Math.pow(10, decimals);
-};
-exports.default = formatNumber;

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

@@ -1,5 +0,0 @@
-import { PublicKey } from '@solana/web3.js';
-export declare const getMarketPDA: (programId: PublicKey, marketId: number) => PublicKey;
-export declare const getCustomerPDA: (programId: PublicKey, customerId: 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

@@ -1,28 +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.getSubUserTradePDA = exports.getUserTradePDA = exports.getCustomerPDA = exports.getMarketPDA = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const bn_js_1 = __importDefault(require("bn.js"));
-const getMarketPDA = (programId, marketId) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('market'), new bn_js_1.default(marketId).toArrayLike(Buffer, 'le', 8)], programId)[0];
-};
-exports.getMarketPDA = getMarketPDA;
-const getCustomerPDA = (programId, customerId) => {
-    return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from('customer'), new bn_js_1.default(customerId).toArrayLike(Buffer, 'le', 8)], programId)[0];
-};
-exports.getCustomerPDA = getCustomerPDA;
-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;