@triadxyz/triad-protocol 0.6.9-beta.devnet → 0.7.1-beta.devnet

package/dist/index.d.ts

@@ -14,12 +14,12 @@ export default class TriadProtocolClient {
      * Get User by wallet
      * @param wallet - User wallet
      */
-    getUser(wallet: PublicKey): Promise<import("./types/stake").UserResponse>;
+    getUser(wallet: PublicKey): Promise<import("./types").User>;
     /**
      * Get User by wallet
      * @param wallet - User wallet
      */
-    getUsers(): Promise<import("./types/stake").UserResponse[]>;
+    getUsers(): Promise<import("./types").User[]>;
     /**
      * Check if user exists
      * @param username - User name

package/dist/index.js

@@ -17,6 +17,7 @@ const web3_js_1 = require("@solana/web3.js");
 const idl_triad_protocol_json_1 = __importDefault(require("./types/idl_triad_protocol.json"));
 const trade_1 = __importDefault(require("./trade"));
 const helpers_1 = require("./utils/helpers");
+const pda_1 = require("./utils/pda");
 const stake_1 = __importDefault(require("./stake"));
 class TriadProtocolClient {
     constructor(connection, wallet) {
@@ -31,9 +32,8 @@ class TriadProtocolClient {
      */
     getUser(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
-            const UserPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
-            const response = yield this.program.account.user.fetch(UserPDA);
-            return (0, helpers_1.formatUser)(response);
+            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
+            return (0, helpers_1.formatUser)(yield this.program.account.user.fetch(userPDA));
         });
     }
     /**
@@ -55,7 +55,7 @@ class TriadProtocolClient {
     hasUser(wallet) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.program.account.user.fetch((0, helpers_1.getUserAddressSync)(this.program.programId, wallet));
+                yield this.program.account.user.fetch((0, pda_1.getUserPDA)(this.program.programId, wallet));
                 return true;
             }
             catch (_a) {
@@ -104,7 +104,6 @@ class TriadProtocolClient {
             })
                 .accounts({
                 signer: wallet,
-                payer: wallet,
                 referral
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {

package/dist/local-test.js

@@ -24,19 +24,19 @@ const connection = new web3_js_1.Connection(rpc_file.toString(), 'confirmed');
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new index_1.default(connection, wallet);
 const markets = [
-    { name: 'JUPITER/TRD', marketId: 0 },
-    { name: 'DRIFT/TRD', marketId: 1 },
-    { name: 'PYTH/TRD', marketId: 2 },
-    { name: 'UNDEAD/TRD', marketId: 3 },
-    { name: 'MADLADS/TRD', marketId: 4 },
-    { name: 'DEGODS/TRD', marketId: 5 },
-    { name: 'ISLANDDAO/TRD', marketId: 6 },
-    { name: 'COLOSSEUM/TRD', marketId: 7 }
+    { name: 'Jupiter', marketId: 0 },
+    { name: 'Drift', marketId: 1 },
+    { name: 'Pyth', marketId: 2 },
+    { name: 'Undead', marketId: 3 },
+    { name: 'MadLads', marketId: 4 },
+    { name: 'DeGods', marketId: 5 },
+    { name: 'IslandDAO', marketId: 6 },
+    { name: 'Colosseum', marketId: 7 }
 ];
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 100,
         direction: {
             hype: {}
         },
@@ -47,7 +47,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 300,
         direction: {
             flop: {}
         },
@@ -58,29 +58,29 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 429,
         direction: {
             hype: {}
         },
         orderType: {
-            market: {}
+            limit: {}
         },
         limitPrice: 0.8
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 249,
         direction: {
             flop: {}
         },
         orderType: {
-            market: {}
+            limit: {}
         },
         limitPrice: 0.2
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             hype: {}
         },
@@ -90,7 +90,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             flop: {}
         },
@@ -100,7 +100,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             flop: {}
         },
@@ -110,7 +110,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             hype: {}
         },
@@ -120,7 +120,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             hype: {}
         },
@@ -130,7 +130,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: Math.floor(Math.random() * 2),
+        amount: 369,
         direction: {
             hype: {}
         },
@@ -184,7 +184,7 @@ const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* (
 });
 const getOrders = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = (yield triadProtocol.program.account.userTrade.all()).find((userTrade) => userTrade.account.authority.toBase58() === wallet.publicKey.toBase58());
-    console.log(response.account.orders.map((order) => order.orderId.toNumber()));
+    console.log(response);
     return response.account.orders.map((order) => order.orderId.toNumber());
 });
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -195,6 +195,8 @@ const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
             orderType: order.orderType,
             comment: `hype/flop bot ${order.amount} - ${order.direction}`,
             limitPrice: order.limitPrice
+        }, {
+            skipPreflight: true
         });
         console.log(response);
     }
@@ -218,7 +220,7 @@ const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
             yield closeOrder();
         }
         yield openOrder();
+        yield new Promise((resolve) => setTimeout(resolve, 40000));
         yield closeOrder();
-        yield new Promise((resolve) => setTimeout(resolve, 5000));
     }
 });

package/dist/stake.d.ts

@@ -3,7 +3,7 @@ import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';
 import { RpcOptions } from './types';
-import { UpdateStakeVaultArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
+import { UpdateStakeVaultArgs, StakeNftArgs, RequestWithdrawArgs, WithdrawArgs, Stake as StakeResponse, ClaimStakeRewardsArgs, StakeTokenArgs, UpdateBoostArgs } from './types/stake';
 export default class Stake {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -12,7 +12,7 @@ export default class Stake {
     /**
      * Get all Stake Vaults
      */
-    getStakeVaults(): Promise<import("./types/stake").StakeVaultResponse[]>;
+    getStakeVaults(): Promise<import("./types/stake").StakeVault[]>;
     /**
      * Get Stake Rewards
      */

package/dist/stake.js

@@ -8,13 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 web3_js_1 = require("@solana/web3.js");
 const helpers_1 = require("./utils/helpers");
+const stake_1 = require("./utils/pda/stake");
+const pda_1 = require("./utils/pda");
 const constants_1 = require("./utils/constants");
 const base64_js_1 = require("base64-js");
-const getRarity_1 = require("./utils/getRarity");
+const getRarityRank_1 = __importDefault(require("./utils/getRarityRank"));
 class Stake {
     constructor(program, provider) {
         this.stakeVaultName = constants_1.STAKE_VAULT_NAME;
@@ -35,8 +40,8 @@ class Stake {
      */
     getStakeRewards({ wallet, nftName, collections, rank }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nftName);
             const method = yield this.program.methods
                 .claimStakeRewards({
                 collections,
@@ -90,14 +95,14 @@ class Stake {
             const response = yield this.getUserStakes(wallet);
             const data = [];
             for (const stake of response) {
-                const getRank = (0, getRarity_1.getRarityRank)(ranks, stake.mint, stake.name);
+                const rank = (0, getRarityRank_1.default)(ranks, stake.mint, stake.name);
                 let available = 0;
                 yield new Promise((resolve) => setTimeout(resolve, 1000));
                 try {
                     available = yield this.getStakeRewards({
                         wallet,
                         nftName: stake.name,
-                        rank: getRank,
+                        rank,
                         collections
                     });
                 }
@@ -154,7 +159,7 @@ class Stake {
      */
     stakeToken({ name, wallet, amount }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
+            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             const method = this.program.methods
                 .stakeToken({
                 name,
@@ -213,9 +218,9 @@ class Stake {
      */
     requestWithdraw({ wallet, name, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
-            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
+            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
             const method = this.program.methods.requestWithdrawStake().accounts({
                 signer: wallet,
                 mint: mint,
@@ -242,9 +247,9 @@ class Stake {
      */
     withdrawStake({ wallet, name, mint }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const userPDA = (0, helpers_1.getUserAddressSync)(this.program.programId, wallet);
-            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, name);
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, wallet);
+            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, name);
             const method = this.program.methods.withdrawStake().accounts({
                 signer: wallet,
                 stake: stakePDA,
@@ -272,8 +277,8 @@ class Stake {
      */
     claimStakeRewards({ wallet, nftName, collections, rank }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const stakeVaultPDA = (0, helpers_1.getStakeVaultAddressSync)(this.program.programId, this.stakeVaultName);
-            const stakePDA = (0, helpers_1.getStakeAddressSync)(this.program.programId, wallet, nftName);
+            const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
+            const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, nftName);
             const method = this.program.methods
                 .claimStakeRewards({
                 collections,
@@ -306,12 +311,12 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [];
             for (const nft of nfts) {
-                const Stake = (0, helpers_1.getStakeAddressSync)(this.program.programId, new web3_js_1.PublicKey(nft.wallet), nft.name);
+                const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, new web3_js_1.PublicKey(nft.wallet), nft.name);
                 ixs.push(yield this.program.methods
                     .updateStakeBoost()
                     .accounts({
                     signer: wallet,
-                    stake: Stake
+                    stake: stakePDA
                 })
                     .instruction());
             }

package/dist/trade.d.ts

@@ -29,53 +29,31 @@ export default class Trade {
         authority: PublicKey;
         totalDeposits: BN;
         totalWithdraws: BN;
-        openOrders: number;
-        hasOpenOrder: boolean;
+        openedOrders: BN;
         orders: {
             ts: BN;
             orderId: BN;
+            questionId: BN;
             marketId: BN;
             status: ({
                 open?: never;
-                filled?: never;
-                canceled?: never;
                 closed?: never;
             } & {
                 init: Record<string, never>;
             }) | ({
                 init?: never;
-                filled?: never;
-                canceled?: never;
                 closed?: never;
             } & {
                 open: Record<string, never>;
             }) | ({
                 init?: never;
                 open?: never;
-                canceled?: never;
-                closed?: never;
-            } & {
-                filled: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                filled?: never;
-                closed?: never;
-            } & {
-                canceled: Record<string, never>;
-            }) | ({
-                init?: never;
-                open?: never;
-                filled?: never;
-                canceled?: never;
             } & {
                 closed: Record<string, never>;
             });
             price: BN;
             totalAmount: BN;
             totalShares: BN;
-            filledAmount: BN;
-            filledShares: BN;
             orderType: ({
                 limit?: never;
             } & {
@@ -94,10 +72,9 @@ export default class Trade {
             } & {
                 flop: Record<string, never>;
             });
-            settledPnl: BN;
+            pnl: BN;
             padding: number[];
         }[];
-        position: BN;
         padding: number[];
     }>;
     openOrder(marketId: number, args: {

package/dist/trade.js

@@ -16,6 +16,8 @@ const web3_js_1 = require("@solana/web3.js");
 const bn_js_1 = __importDefault(require("bn.js"));
 const constants_1 = require("./utils/constants");
 const helpers_1 = require("./utils/helpers");
+const trade_1 = require("./utils/pda/trade");
+const pda_1 = require("./utils/pda");
 class Trade {
     constructor(program, provider) {
         this.mint = constants_1.TRD_MINT_DEVNET;
@@ -27,59 +29,15 @@ class Trade {
      */
     getMarkets() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.program.account.market.all().then((markets) => markets.map(({ account, publicKey }) => ({
-                bump: account.bump,
-                address: publicKey.toString(),
-                authority: account.authority.toString(),
-                marketId: account.marketId.toString(),
-                name: account.name,
-                hypePrice: account.hypePrice.toString(),
-                flopPrice: account.flopPrice.toString(),
-                hypeLiquidity: account.hypeLiquidity.toString(),
-                flopLiquidity: account.flopLiquidity.toString(),
-                totalHypeShares: account.totalHypeShares.toString(),
-                totalFlopShares: account.totalFlopShares.toString(),
-                totalVolume: account.totalVolume.toString(),
-                mint: account.mint.toString(),
-                ts: account.ts.toString(),
-                updateTs: account.updateTs.toString(),
-                openOrdersCount: account.openOrdersCount.toString(),
-                nextOrderId: account.nextOrderId.toString(),
-                feeBps: account.feeBps,
-                feeVault: account.feeVault.toBase58(),
-                isActive: account.isActive,
-                marketPrice: account.marketPrice.toString(),
-                isOfficial: account.isOfficial
-            })));
+            return this.program.account.market
+                .all()
+                .then((markets) => markets.map(({ account, publicKey }) => (0, helpers_1.accountToMarket)(account, publicKey)));
         });
     }
     getMarketByAddress(address) {
         return __awaiter(this, void 0, void 0, function* () {
             const account = yield this.program.account.market.fetch(address);
-            return {
-                bump: account.bump,
-                address: address.toString(),
-                authority: account.authority.toString(),
-                marketId: account.marketId.toString(),
-                name: account.name,
-                hypePrice: account.hypePrice.toString(),
-                flopPrice: account.flopPrice.toString(),
-                hypeLiquidity: account.hypeLiquidity.toString(),
-                flopLiquidity: account.flopLiquidity.toString(),
-                totalHypeShares: account.totalHypeShares.toString(),
-                totalFlopShares: account.totalFlopShares.toString(),
-                totalVolume: account.totalVolume.toString(),
-                mint: account.mint.toString(),
-                ts: account.ts.toString(),
-                updateTs: account.updateTs.toString(),
-                openOrdersCount: account.openOrdersCount.toString(),
-                nextOrderId: account.nextOrderId.toString(),
-                feeBps: account.feeBps,
-                feeVault: account.feeVault.toBase58(),
-                isActive: account.isActive,
-                marketPrice: account.marketPrice.toString(),
-                isOfficial: account.isOfficial
-            };
+            return (0, helpers_1.accountToMarket)(account, address);
         });
     }
     /**
@@ -111,25 +69,27 @@ class Trade {
     }
     getUserTrade() {
         return __awaiter(this, void 0, void 0, function* () {
-            const userTradePDA = (0, helpers_1.getUserTradeAddressSync)(this.program.programId, this.provider.publicKey);
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
             return this.program.account.userTrade.fetch(userTradePDA);
         });
     }
     openOrder(marketId, args, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, helpers_1.getMarketAddressSync)(this.program.programId, marketId);
-            const feeVualtPDA = (0, helpers_1.getFeeVaultAddressSync)(this.program.programId, marketPDA);
-            const userTradePDA = (0, helpers_1.getUserTradeAddressSync)(this.program.programId, this.provider.publicKey);
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const feeVualtPDA = (0, trade_1.getFeeVaultPDA)(this.program.programId, marketId);
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
+            const userPDA = (0, pda_1.getUserPDA)(this.program.programId, this.provider.publicKey);
+            const userFromATA = (0, pda_1.getTokenATA)(this.provider.publicKey, this.mint);
             const ixs = [];
             try {
-                const userTradePDA = (0, helpers_1.getUserTradeAddressSync)(this.program.programId, this.provider.publicKey);
                 yield this.program.account.userTrade.fetch(userTradePDA);
             }
             catch (_a) {
                 ixs.push(yield this.program.methods
                     .createUserTrade()
                     .accounts({
-                    signer: this.provider.publicKey
+                    signer: this.provider.publicKey,
+                    user: userPDA
                 })
                     .instruction());
             }
@@ -137,14 +97,15 @@ class Trade {
                 .openOrder({
                 amount: new bn_js_1.default(args.amount * Math.pow(10, constants_1.TRD_DECIMALS)),
                 direction: args.direction,
-                orderType: args.orderType,
-                limitPrice: new bn_js_1.default(args.limitPrice * Math.pow(10, constants_1.TRD_DECIMALS)),
                 comment: (0, helpers_1.encodeString)(args.comment, 64)
             })
                 .accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
+                feeVault: feeVualtPDA,
+                userTrade: userTradePDA,
+                mint: this.mint,
+                userFromAta: userFromATA
             })
                 .instruction());
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
@@ -165,7 +126,7 @@ class Trade {
     }
     closeOrder({ marketId, orderId }, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const marketPDA = (0, helpers_1.getMarketAddressSync)(this.program.programId, marketId);
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
             const method = this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,