@triadxyz/triad-protocol 1.1.8-beta → 1.2.0-beta

package/dist/local-test.js

@@ -23,7 +23,59 @@ const keypair = web3_js_1.Keypair.fromSecretKey(new Uint8Array(JSON.parse(file.t
 const connection = new web3_js_1.Connection(rpc_file.toString(), 'confirmed');
 const wallet = new anchor_1.Wallet(keypair);
 const triadProtocol = new _1.default(connection, wallet);
-const markets = [{ name: 'Triad', marketId: 0 }];
+const markets = [
+// { name: 'Triad', marketId: 0 },
+// { name: 'PYTH', marketId: 1 },
+// { name: 'DRIFT', marketId: 2 },
+// { name: 'SYMMETRY', marketId: 3 },
+// { name: 'ORE', marketId: 4 },
+// { name: 'COLETA', marketId: 5 },
+// { name: 'UNDEADS', marketId: 6 }
+];
+const questions = [
+    {
+        name: 'Pyth',
+        marketId: 1,
+        question: "$PYTH's market cap exceed $1.5B by the end of October?",
+        startTime: 1728415578,
+        endTime: 1730394000
+    },
+    {
+        name: 'Drift',
+        marketId: 2,
+        question: 'Drift surpass $33M in volume on prediction markets by the end of October?',
+        startTime: 1728415578,
+        endTime: 1730394000
+    },
+    {
+        name: 'Symmetry',
+        marketId: 3,
+        question: "Symmetry's TVL exceed $5.5M by the end of October?",
+        startTime: 1728415578,
+        endTime: 1730394000
+    },
+    {
+        name: 'Ore',
+        marketId: 4,
+        question: 'ORE surpass 20k on-chain miners by the end of October?',
+        startTime: 1728415578,
+        endTime: 1730394000
+    },
+    {
+        name: 'Coleta',
+        marketId: 5,
+        question: 'COLETA PFP reach 500 SOL in total volume by the end of October (based on Tensor)?',
+        startTime: 1728415578,
+        endTime: 1730394000
+    },
+    {
+        name: 'Undeads',
+        marketId: 6,
+        question: 'The Undeads reach more than 1,600 holders by the end of October?',
+        startTime: 1728415578,
+        endTime: 1730394000
+    }
+];
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
@@ -78,8 +130,9 @@ const getAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     const markets = yield triadProtocol.trade.getAllMarkets();
     console.log(markets);
 });
+getAllMarkets();
 const getMarket = () => __awaiter(void 0, void 0, void 0, function* () {
-    const market = yield triadProtocol.trade.getMarketById(0);
+    const market = yield triadProtocol.trade.getMarketById(2);
     console.log(market);
 });
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -95,62 +148,66 @@ 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());
-    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({
-            marketId: 0,
-            amount: order.amount,
-            direction: order.direction,
-            token: 'So11111111111111111111111111111111111111112',
-            comment: `hype/flop bot ${order.amount} - ${order.direction}`
-        }, {
-            skipPreflight: true
-        });
-        console.log(response);
-    }
+const getOrders = (walletAddress) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = (yield triadProtocol.program.account.userTrade.all()).find((userTrade) => userTrade.account.authority.toBase58() === walletAddress.toBase58());
+    console.log(response.account);
 });
-openOrder();
-const closeOrder = () => __awaiter(void 0, void 0, void 0, function* () {
-    for (const order of yield getOrders()) {
+// const openOrder = async () => {
+//   for (const order of ordersHypeAndFloopBot) {
+//     const response = await triadProtocol.trade.openOrder(
+//       {
+//         marketId: 0,
+//         amount: order.amount,
+//         direction: order.direction as any,
+//         token: 'So11111111111111111111111111111111111111112',
+//         comment: `hype/flop bot ${order.amount} - ${order.direction}`
+//       },
+//       {
+//         skipPreflight: true
+//       }
+//     )
+//     console.log(response)
+//   }
+// }
+// const closeOrder = async () => {
+//   for (const order of await getOrders()) {
+//     try {
+//       const response = await triadProtocol.trade.closeOrder({
+//         marketId: 1,
+//         orderId: order
+//       })
+//       console.log(response)
+//     } catch (e) {
+//       console.log('Error closing order')
+//     }
+//   }
+// }
+// const runBot = async () => {
+//   while (true) {
+//     const hasOpenOrders = (await getOrders()).find((order) => order !== 0)
+//     if (hasOpenOrders) {
+//       await closeOrder()
+//     }
+//     await openOrder()
+//     await new Promise((resolve) => setTimeout(resolve, 40000))
+//   }
+// }
+const initializeQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
+    for (const question of questions) {
         try {
-            const response = yield triadProtocol.trade.closeOrder({
-                marketId: 1,
-                orderId: order
+            const response = yield triadProtocol.trade.initializeQuestion({
+                marketId: question.marketId,
+                question: question.question,
+                startTime: question.startTime,
+                endTime: question.endTime
+            }, {
+                skipPreflight: true
             });
             console.log(response);
         }
         catch (e) {
-            console.log('Error closing order');
-        }
-    }
-});
-const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
-    while (true) {
-        const hasOpenOrders = (yield getOrders()).find((order) => order !== 0);
-        if (hasOpenOrders) {
-            yield closeOrder();
+            console.log(e);
         }
-        yield openOrder();
-        yield new Promise((resolve) => setTimeout(resolve, 40000));
-    }
-});
-const initializeQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
-    const currentTime = Math.floor(Date.now() / 1000) + 10; // Current time in seconds
-    try {
-        const response = yield triadProtocol.trade.initializeQuestion({
-            marketId: 0,
-            question: 'Will Triad send the project to the Radar Hackathon?',
-            startTime: currentTime,
-            endTime: 1728320400
-        });
-        console.log(response);
-    }
-    catch (e) {
-        console.log(e);
     }
 });
 const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {

package/dist/stake.js

@@ -243,17 +243,24 @@ class Stake {
         return __awaiter(this, void 0, void 0, function* () {
             const stakes = (yield this.getUserStakes(wallet)).sort((a, b) => a.claimedTs - b.claimedTs);
             const ixs = [];
-            for (const stake of stakes) {
+            let tokenStakes = [];
+            let nftStakes = [];
+            stakes.forEach((stake) => {
                 if (stake.withdrawTs !== 0) {
-                    continue;
+                    return;
                 }
+                if (stake.mint === constants_1.TRD_MINT.toBase58()) {
+                    tokenStakes.push(stake);
+                    return;
+                }
+                nftStakes.push(stake);
+            });
+            let items = isToken ? tokenStakes : nftStakes;
+            for (const stake of items) {
                 const rank = (0, getRarityRank_1.default)(ranks, stake.mint, stake.name);
                 if (ixs.length >= 10) {
                     break;
                 }
-                if (isToken && stake.mint !== constants_1.TRD_MINT.toBase58()) {
-                    continue;
-                }
                 const stakeVaultPDA = (0, stake_1.getStakeVaultPDA)(this.program.programId, this.stakeVaultName);
                 const stakePDA = (0, stake_1.getStakePDA)(this.program.programId, wallet, stake.name);
                 ixs.push(yield this.program.methods

package/dist/types/idl_triad_protocol.json

@@ -1522,6 +1522,11 @@
             "code": 6040,
             "name": "MarketStillActive",
             "msg": "Market still active"
+        },
+        {
+            "code": 6041,
+            "name": "OrderNotOpen",
+            "msg": "Order not open"
         }
     ],
     "types": [
@@ -1743,7 +1748,7 @@
                     {
                         "name": "fee_bps",
                         "docs": [
-                            "Fees applied to trades (in basis points, e.g., 1.131% fee)"
+                            "Fees applied to trades (in basis points, e.g., 2.131% fee)"
                         ],
                         "type": "u16"
                     },
@@ -1791,6 +1796,10 @@
                             "array": ["u8", 80]
                         }
                     },
+                    {
+                        "name": "liquidity",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {

package/dist/types/trade.d.ts

@@ -39,9 +39,9 @@ export type ResolvedQuestion = {
     finalFlopPrice: string;
 };
 export declare enum WinningDirection {
-    Hype = "Hype",
-    Flop = "Flop",
-    None = "None"
+    HYPE = "Hype",
+    FLOP = "Flop",
+    NONE = "None"
 }
 export type OrderDirection = {
     hype: {};
@@ -53,11 +53,11 @@ export type OrderStatus = {
 } | {
     open: {};
 } | {
-    filled: {};
+    closed: {};
 } | {
-    canceled: {};
+    claimed: {};
 } | {
-    closed: {};
+    liquidated: {};
 };
 export type OrderType = {
     limit: {};

package/dist/types/trade.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WinningDirection = void 0;
 var WinningDirection;
 (function (WinningDirection) {
-    WinningDirection["Hype"] = "Hype";
-    WinningDirection["Flop"] = "Flop";
-    WinningDirection["None"] = "None";
+    WinningDirection["HYPE"] = "Hype";
+    WinningDirection["FLOP"] = "Flop";
+    WinningDirection["NONE"] = "None";
 })(WinningDirection || (exports.WinningDirection = WinningDirection = {}));

package/dist/types/triad_protocol.d.ts

@@ -2050,6 +2050,11 @@ export type TriadProtocol = {
             code: 6040;
             name: 'marketStillActive';
             msg: 'Market still active';
+        },
+        {
+            code: 6041;
+            name: 'orderNotOpen';
+            msg: 'Order not open';
         }
     ];
     types: [
@@ -2270,7 +2275,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'feeBps';
-                        docs: ['Fees applied to trades (in basis points, e.g., 1.131% fee)'];
+                        docs: ['Fees applied to trades (in basis points, e.g., 2.131% fee)'];
                         type: 'u16';
                     },
                     {
@@ -2317,6 +2322,10 @@ export type TriadProtocol = {
                             array: ['u8', 80];
                         };
                     },
+                    {
+                        name: 'liquidity';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {

package/dist/utils/helpers.js

@@ -97,13 +97,14 @@ const accountToMarket = (account, address) => {
 };
 exports.accountToMarket = accountToMarket;
 const accountToResolvedQuestion = (question) => {
+    console.log(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],
+        winningDirection: trade_1.WinningDirection[Object.keys(question.winningDirection)[0].toUpperCase()],
         marketPrice: question.marketPrice.toString(),
         finalHypePrice: question.finalHypePrice.toString(),
         finalFlopPrice: question.finalFlopPrice.toString()

package/package.json

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