@triadxyz/triad-protocol 0.7.0-beta.devnet → 0.7.2-beta.devnet

package/dist/local-test.js

@@ -36,7 +36,7 @@ const markets = [
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
-        amount: 100,
+        amount: 1000,
         direction: {
             hype: {}
         },
@@ -47,7 +47,7 @@ const ordersHypeAndFloopBot = [
     },
     {
         marketId: 0,
-        amount: 300,
+        amount: 10000,
         direction: {
             flop: {}
         },
@@ -183,7 +183,6 @@ 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);
     return response.account.orders.map((order) => order.orderId.toNumber());
 });
 const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -200,6 +199,7 @@ const openOrder = () => __awaiter(void 0, void 0, void 0, function* () {
         console.log(response);
     }
 });
+openOrder();
 const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const order of yield getOrders()) {
         try {
@@ -209,7 +209,9 @@ const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
             });
             console.log(response);
         }
-        catch (_a) { }
+        catch (e) {
+            console.log(e);
+        }
     }
 });
 const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -223,4 +225,3 @@ const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
         yield closeOrder();
     }
 });
-openOrder();

package/dist/trade.js

@@ -29,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);
         });
     }
     /**
@@ -92,6 +48,8 @@ class Trade {
      */
     initializeMarket({ marketId, name }, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const feeVaultPDA = (0, trade_1.getFeeVaultPDA)(this.program.programId, marketId);
             const method = this.program.methods
                 .initializeMarket({
                 marketId: new bn_js_1.default(marketId),
@@ -171,10 +129,12 @@ class Trade {
     closeOrder({ marketId, orderId }, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const marketPDA = (0, trade_1.getMarketPDA)(this.program.programId, marketId);
+            const userTradePDA = (0, trade_1.getUserTradePDA)(this.program.programId, this.provider.publicKey);
             const method = this.program.methods.closeOrder(new bn_js_1.default(orderId)).accounts({
                 signer: this.provider.publicKey,
                 market: marketPDA,
-                mint: this.mint
+                mint: this.mint,
+                userTrade: userTradePDA
             });
             if (options === null || options === void 0 ? void 0 : options.microLamports) {
                 method.postInstructions([

package/dist/types/idl_triad_protocol.json

@@ -1,5 +1,5 @@
 {
-    "address": "D6CzYj9FxGa8HeQeF1JYu9hDakEuEeMJkSG2awGPuCXG",
+    "address": "4YWv2Ex8WjFGyXmYELD6Xqs1ZsuQujVUzZxbvdvM2tCj",
     "metadata": {
         "name": "triad_protocol",
         "version": "0.1.4",
@@ -353,10 +353,42 @@
                         ]
                     }
                 },
+                {
+                    "name": "fee_ata",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "fee_vault"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "token_program"
+                            },
+                            {
+                                "kind": "account",
+                                "path": "mint"
+                            }
+                        ],
+                        "program": {
+                            "kind": "const",
+                            "value": [
+                                140, 151, 37, 143, 78, 36, 137, 241, 187, 61, 16, 41, 20, 142,
+                                13, 131, 11, 90, 19, 153, 218, 255, 16, 132, 4, 142, 123, 216,
+                                219, 233, 248, 89
+                            ]
+                        }
+                    }
+                },
                 {
                     "name": "token_program",
                     "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
                 },
+                {
+                    "name": "associated_token_program",
+                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -1434,25 +1466,16 @@
                         "docs": ["Whether the market is currently active for trading"],
                         "type": "bool"
                     },
-                    {
-                        "name": "is_official",
-                        "type": "bool"
-                    },
                     {
                         "name": "market_price",
                         "type": "u64"
                     },
                     {
-                        "name": "resolved_questions",
+                        "name": "previous_resolved_question",
                         "type": {
-                            "array": [
-                                {
-                                    "defined": {
-                                        "name": "ResolvedQuestion"
-                                    }
-                                },
-                                4
-                            ]
+                            "defined": {
+                                "name": "ResolvedQuestion"
+                            }
                         }
                     },
                     {
@@ -1477,13 +1500,13 @@
                         "name": "current_question",
                         "docs": ["The question or prediction topic for the current week"],
                         "type": {
-                            "array": ["u8", 120]
+                            "array": ["u8", 80]
                         }
                     },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 232]
+                            "array": ["u8", 180]
                         }
                     }
                 ]
@@ -1782,7 +1805,7 @@
                         "name": "question",
                         "docs": ["The question or prediction topic for this week"],
                         "type": {
-                            "array": ["u8", 120]
+                            "array": ["u8", 80]
                         }
                     },
                     {
@@ -1831,7 +1854,7 @@
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 100]
+                            "array": ["u8", 64]
                         }
                     }
                 ]

package/dist/types/trade.d.ts

@@ -21,7 +21,28 @@ export type Market = {
     isActive: boolean;
     marketPrice: string;
     isOfficial: boolean;
+    resolvedQuestions: ResolvedQuestion[];
+    currentQuestionId: string;
+    currentQuestionStart: string;
+    currentQuestionEnd: string;
+    currentQuestion: string;
 };
+export type ResolvedQuestion = {
+    question: string;
+    startTime: string;
+    endTime: string;
+    hypeLiquidity: string;
+    flopLiquidity: string;
+    winningDirection: WinningDirection;
+    marketPrice: string;
+    finalHypePrice: string;
+    finalFlopPrice: string;
+};
+export declare enum WinningDirection {
+    Hype = "Hype",
+    Flop = "Flop",
+    None = "None"
+}
 export type OrderDirection = {
     hype: {};
 } | {

package/dist/types/trade.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.WinningDirection = void 0;
+var WinningDirection;
+(function (WinningDirection) {
+    WinningDirection["Hype"] = "Hype";
+    WinningDirection["Flop"] = "Flop";
+    WinningDirection["None"] = "None";
+})(WinningDirection || (exports.WinningDirection = WinningDirection = {}));

package/dist/types/triad_protocol.d.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/triad_protocol.json`.
  */
 export type TriadProtocol = {
-    address: 'D6CzYj9FxGa8HeQeF1JYu9hDakEuEeMJkSG2awGPuCXG';
+    address: '4YWv2Ex8WjFGyXmYELD6Xqs1ZsuQujVUzZxbvdvM2tCj';
     metadata: {
         name: 'triadProtocol';
         version: '0.1.4';
@@ -475,10 +475,71 @@ export type TriadProtocol = {
                         ];
                     };
                 },
+                {
+                    name: 'feeAta';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'feeVault';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'tokenProgram';
+                            },
+                            {
+                                kind: 'account';
+                                path: 'mint';
+                            }
+                        ];
+                        program: {
+                            kind: 'const';
+                            value: [
+                                140,
+                                151,
+                                37,
+                                143,
+                                78,
+                                36,
+                                137,
+                                241,
+                                187,
+                                61,
+                                16,
+                                41,
+                                20,
+                                142,
+                                13,
+                                131,
+                                11,
+                                90,
+                                19,
+                                153,
+                                218,
+                                255,
+                                16,
+                                132,
+                                4,
+                                142,
+                                123,
+                                216,
+                                219,
+                                233,
+                                248,
+                                89
+                            ];
+                        };
+                    };
+                },
                 {
                     name: 'tokenProgram';
                     address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
                 },
+                {
+                    name: 'associatedTokenProgram';
+                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -1844,25 +1905,16 @@ export type TriadProtocol = {
                         docs: ['Whether the market is currently active for trading'];
                         type: 'bool';
                     },
-                    {
-                        name: 'isOfficial';
-                        type: 'bool';
-                    },
                     {
                         name: 'marketPrice';
                         type: 'u64';
                     },
                     {
-                        name: 'resolvedQuestions';
+                        name: 'previousResolvedQuestion';
                         type: {
-                            array: [
-                                {
-                                    defined: {
-                                        name: 'resolvedQuestion';
-                                    };
-                                },
-                                4
-                            ];
+                            defined: {
+                                name: 'resolvedQuestion';
+                            };
                         };
                     },
                     {
@@ -1887,13 +1939,13 @@ export type TriadProtocol = {
                         name: 'currentQuestion';
                         docs: ['The question or prediction topic for the current week'];
                         type: {
-                            array: ['u8', 120];
+                            array: ['u8', 80];
                         };
                     },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 232];
+                            array: ['u8', 180];
                         };
                     }
                 ];
@@ -2192,7 +2244,7 @@ export type TriadProtocol = {
                         name: 'question';
                         docs: ['The question or prediction topic for this week'];
                         type: {
-                            array: ['u8', 120];
+                            array: ['u8', 80];
                         };
                     },
                     {
@@ -2241,7 +2293,7 @@ export type TriadProtocol = {
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 100];
+                            array: ['u8', 64];
                         };
                     }
                 ];

package/dist/utils/helpers.d.ts

@@ -1,7 +1,10 @@
 import { Stake, StakeVault } from './../types/stake';
 import { User } from './../types';
+import { Market } 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 formatUser: (user: any) => User;
+export declare const accountToMarket: (account: any, address: PublicKey) => Market;

package/dist/utils/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.accountToMarket = exports.formatUser = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+const trade_1 = require("../types/trade");
 const encodeString = (value, alloc = 32) => {
     const buffer = Buffer.alloc(alloc);
     buffer.fill(value);
@@ -62,3 +63,50 @@ const formatUser = (user) => {
     };
 };
 exports.formatUser = formatUser;
+const accountToMarket = (account, 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,
+        resolvedQuestions: account.resolvedQuestions.map(accountToResolvedQuestion),
+        currentQuestionId: account.currentQuestionId.toString(),
+        currentQuestionStart: account.currentQuestionStart.toString(),
+        currentQuestionEnd: account.currentQuestionEnd.toString(),
+        currentQuestion: Buffer.from(account.currentQuestion)
+            .toString()
+            .replace(/\0+$/, '')
+    };
+};
+exports.accountToMarket = accountToMarket;
+const accountToResolvedQuestion = (question) => {
+    return {
+        question: Buffer.from(question.question).toString().replace(/\0+$/, ''),
+        startTime: question.startTime.toString(),
+        endTime: question.endTime.toString(),
+        hypeLiquidity: question.hypeLiquidity.toString(),
+        flopLiquidity: question.flopLiquidity.toString(),
+        winningDirection: trade_1.WinningDirection[question.winningDirection],
+        marketPrice: question.marketPrice.toString(),
+        finalHypePrice: question.finalHypePrice.toString(),
+        finalFlopPrice: question.finalFlopPrice.toString()
+    };
+};

package/package.json

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