@triadxyz/triad-protocol 0.6.2-beta.devnet → 0.6.4-beta.devnet

package/dist/local-test.js

@@ -17,7 +17,7 @@ const index_1 = __importDefault(require("./index"));
 const anchor_1 = require("@coral-xyz/anchor");
 const axios_1 = __importDefault(require("axios"));
 const web3_js_1 = require("@solana/web3.js");
-const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/dan-builder.json');
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
 const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc-devnet.txt');
 const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.toString())));
 const connection = new web3_js_1.Connection(rpc_file.toString(), 'confirmed');
@@ -33,48 +33,6 @@ const markets = [
     { name: 'ISLANDDAO/TRD', marketId: 6 },
     { name: 'COLOSSEUM/TRD', marketId: 7 }
 ];
-const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.stake.updateStakeVault({
-        wallet: wallet.publicKey
-    });
-    console.log(response);
-});
-const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = (yield axios_1.default.get('https://api.triadfi.co/boost'))
-        .data;
-    const stakes = yield triadProtocol.stake.getStakes();
-    const update = [];
-    for (const stake of stakes) {
-        if (update.length >= 10) {
-            break;
-        }
-        if (response.includes(stake.mint) && !stake.boost) {
-            update.push({ name: stake.name, wallet: stake.authority });
-        }
-    }
-    const updateBoostResponse = yield triadProtocol.stake.updateBoost({
-        wallet: wallet.publicKey,
-        nfts: update
-    });
-    console.log(updateBoostResponse);
-});
-const getMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
-    const response = yield triadProtocol.trade.getMarkets();
-    console.log(response);
-});
-const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
-    for (const market of markets) {
-        try {
-            const response = yield triadProtocol.trade.initializeMarket(market, {
-                skipPreflight: true
-            });
-            console.log(`Initialized market ${market.name}:`, response);
-        }
-        catch (error) {
-            console.error(`Error initializing market ${market.name}:`, error);
-        }
-    }
-});
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
@@ -129,8 +87,85 @@ const ordersHypeAndFloopBot = [
         orderType: {
             market: {}
         }
+    },
+    {
+        marketId: 0,
+        amount: 123,
+        direction: {
+            flop: {}
+        },
+        orderType: {
+            market: {}
+        }
+    },
+    {
+        marketId: 0,
+        amount: 12003,
+        direction: {
+            flop: {}
+        },
+        orderType: {
+            market: {}
+        }
+    },
+    {
+        marketId: 0,
+        amount: 12003,
+        direction: {
+            hype: {}
+        },
+        orderType: {
+            market: {}
+        }
     }
 ];
+const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.updateStakeVault({
+        wallet: wallet.publicKey
+    });
+    console.log(response);
+});
+const updateBoost = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = (yield axios_1.default.get('https://api.triadfi.co/boost'))
+        .data;
+    const stakes = yield triadProtocol.stake.getStakes();
+    const update = [];
+    for (const stake of stakes) {
+        if (update.length >= 10) {
+            break;
+        }
+        if (response.includes(stake.mint) && !stake.boost) {
+            update.push({ name: stake.name, wallet: stake.authority });
+        }
+    }
+    const updateBoostResponse = yield triadProtocol.stake.updateBoost({
+        wallet: wallet.publicKey,
+        nfts: update
+    });
+    console.log(updateBoostResponse);
+});
+const getMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.trade.getMarkets();
+    console.log(response);
+});
+const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const market of markets) {
+        try {
+            const response = yield triadProtocol.trade.initializeMarket(market, {
+                skipPreflight: true
+            });
+            console.log(`Initialized market ${market.name}:`, response);
+        }
+        catch (error) {
+            console.error(`Error initializing market ${market.name}:`, error);
+        }
+    }
+});
+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()));
+    return response.account.orders.map((order) => order.orderId.toNumber());
+});
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of ordersHypeAndFloopBot) {
         const response = yield triadProtocol.trade.openOrder(0, {
@@ -139,10 +174,19 @@ 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);
     }
 });
-openOrder();
+const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const order of yield getOrders()) {
+        try {
+            const response = yield triadProtocol.trade.closeOrder({
+                marketId: 0,
+                orderId: order
+            });
+            console.log(response);
+        }
+        catch (_a) { }
+    }
+});

package/dist/trade.d.ts

@@ -3,6 +3,7 @@ import { TriadProtocol } from './types/triad_protocol';
 import { PublicKey } from '@solana/web3.js';
 import { Market, OrderDirection, OrderType } from './types/trade';
 import { RpcOptions } from './types';
+import BN from 'bn.js';
 export default class Trade {
     program: Program<TriadProtocol>;
     provider: AnchorProvider;
@@ -23,6 +24,82 @@ export default class Trade {
         marketId: number;
         name: string;
     }, options?: RpcOptions): Promise<string>;
+    getUserTrade(): Promise<{
+        bump: number;
+        authority: PublicKey;
+        totalDeposits: BN;
+        totalWithdraws: BN;
+        openOrders: number;
+        hasOpenOrder: boolean;
+        orders: {
+            ts: BN;
+            orderId: 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;
+            } & {
+                market: Record<string, never>;
+            }) | ({
+                market?: never;
+            } & {
+                limit: Record<string, never>;
+            });
+            direction: ({
+                flop?: never;
+            } & {
+                hype: Record<string, never>;
+            }) | ({
+                hype?: never;
+            } & {
+                flop: Record<string, never>;
+            });
+            settledPnl: BN;
+            padding: number[];
+        }[];
+        position: BN;
+        padding: number[];
+    }>;
     openOrder(marketId: number, args: {
         amount: number;
         direction: OrderDirection;

package/dist/trade.js

@@ -109,6 +109,12 @@ class Trade {
             return method.rpc({ skipPreflight: options === null || options === void 0 ? void 0 : options.skipPreflight });
         });
     }
+    getUserTrade() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userTradePDA = (0, helpers_1.getUserTradeAddressSync)(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);
@@ -130,9 +136,7 @@ class Trade {
                 amount: new bn_js_1.default(args.amount * Math.pow(10, constants_1.TRD_DECIMALS)),
                 direction: args.direction,
                 orderType: args.orderType,
-                limitPrice: args.limitPrice
-                    ? new bn_js_1.default(args.limitPrice * Math.pow(10, constants_1.TRD_DECIMALS))
-                    : undefined,
+                limitPrice: new bn_js_1.default(args.limitPrice * Math.pow(10, constants_1.TRD_DECIMALS)),
                 comment: (0, helpers_1.encodeString)(args.comment, 64)
             })
                 .accounts({

package/package.json

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