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

package/dist/types/idl_triad_protocol.json

@@ -1,5 +1,5 @@
 {
-    "address": "7nGGR51pBSUrpMPYVf9LWnNwaApz7N9VaJfDAJrihXts",
+    "address": "D6CzYj9FxGa8HeQeF1JYu9hDakEuEeMJkSG2awGPuCXG",
     "metadata": {
         "name": "triad_protocol",
         "version": "0.1.4",
@@ -125,19 +125,7 @@
                 },
                 {
                     "name": "user_trade",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "signer"
-                            }
-                        ]
-                    }
+                    "writable": true
                 },
                 {
                     "name": "market",
@@ -232,11 +220,6 @@
                     "writable": true,
                     "signer": true
                 },
-                {
-                    "name": "payer",
-                    "writable": true,
-                    "signer": true
-                },
                 {
                     "name": "referral",
                     "writable": true
@@ -257,6 +240,22 @@
                         ]
                     }
                 },
+                {
+                    "name": "user_trade",
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "const",
+                                "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
+                            },
+                            {
+                                "kind": "account",
+                                "path": "signer"
+                            }
+                        ]
+                    }
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -282,6 +281,10 @@
                     "writable": true,
                     "signer": true
                 },
+                {
+                    "name": "user",
+                    "writable": true
+                },
                 {
                     "name": "user_trade",
                     "writable": true,
@@ -330,6 +333,10 @@
                         ]
                     }
                 },
+                {
+                    "name": "mint",
+                    "writable": true
+                },
                 {
                     "name": "fee_vault",
                     "writable": true,
@@ -340,52 +347,16 @@
                                 "value": [102, 101, 101, 95, 118, 97, 117, 108, 116]
                             },
                             {
-                                "kind": "account",
-                                "path": "market"
+                                "kind": "arg",
+                                "path": "args.market_id"
                             }
                         ]
                     }
                 },
-                {
-                    "name": "fee_vault_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": "mint",
-                    "writable": true
-                },
                 {
                     "name": "token_program",
                     "address": "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
                 },
-                {
-                    "name": "associated_token_program",
-                    "address": "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"
-                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -413,19 +384,7 @@
                 },
                 {
                     "name": "user_trade",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [117, 115, 101, 114, 95, 116, 114, 97, 100, 101]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "signer"
-                            }
-                        ]
-                    }
+                    "writable": true
                 },
                 {
                     "name": "market",
@@ -433,19 +392,7 @@
                 },
                 {
                     "name": "fee_vault",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "const",
-                                "value": [102, 101, 101, 95, 118, 97, 117, 108, 116]
-                            },
-                            {
-                                "kind": "account",
-                                "path": "market"
-                            }
-                        ]
-                    }
+                    "writable": true
                 },
                 {
                     "name": "mint",
@@ -453,31 +400,7 @@
                 },
                 {
                     "name": "user_from_ata",
-                    "writable": true,
-                    "pda": {
-                        "seeds": [
-                            {
-                                "kind": "account",
-                                "path": "signer"
-                            },
-                            {
-                                "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
-                            ]
-                        }
-                    }
+                    "writable": true
                 },
                 {
                     "name": "market_to_ata",
@@ -1467,7 +1390,7 @@
                     },
                     {
                         "name": "total_volume",
-                        "docs": ["Total trading volume (in TRD)"],
+                        "docs": ["Total trading volume (in TRD) for all resolutions"],
                         "type": "u64"
                     },
                     {
@@ -1497,7 +1420,7 @@
                     {
                         "name": "fee_bps",
                         "docs": [
-                            "Fees applied to trades (in basis points, e.g., 300 = 3%) but 2.869 for the protocol; 0.1 NFT Holders; 0.031 Market"
+                            "Fees applied to trades (in basis points, e.g., 1.131% fee)"
                         ],
                         "type": "u16"
                     },
@@ -1519,10 +1442,48 @@
                         "name": "market_price",
                         "type": "u64"
                     },
+                    {
+                        "name": "resolved_questions",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": {
+                                        "name": "ResolvedQuestion"
+                                    }
+                                },
+                                4
+                            ]
+                        }
+                    },
+                    {
+                        "name": "current_question_id",
+                        "docs": [
+                            "Index of the current week in the weekly_results array initialized with default values"
+                        ],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "current_question_start",
+                        "docs": [
+                            "Start timestamp of the current week if 7 days have passed since the start of the week"
+                        ],
+                        "type": "i64"
+                    },
+                    {
+                        "name": "current_question_end",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "current_question",
+                        "docs": ["The question or prediction topic for the current week"],
+                        "type": {
+                            "array": ["u8", 120]
+                        }
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 224]
+                            "array": ["u8", 232]
                         }
                     }
                 ]
@@ -1545,20 +1506,6 @@
                             }
                         }
                     },
-                    {
-                        "name": "order_type",
-                        "type": {
-                            "defined": {
-                                "name": "OrderType"
-                            }
-                        }
-                    },
-                    {
-                        "name": "limit_price",
-                        "type": {
-                            "option": "u64"
-                        }
-                    },
                     {
                         "name": "comment",
                         "type": {
@@ -1583,6 +1530,10 @@
                         "name": "order_id",
                         "type": "u64"
                     },
+                    {
+                        "name": "question_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "market_id",
                         "type": "u64"
@@ -1605,10 +1556,7 @@
                     },
                     {
                         "name": "total_amount",
-                        "docs": [
-                            "The total amount of TRD committed to this order",
-                            "precision: QUOTE_PRECISION"
-                        ],
+                        "docs": ["The total amount of TRD committed to this order"],
                         "type": "u64"
                     },
                     {
@@ -1616,19 +1564,6 @@
                         "docs": ["The total number of shares to be purchased"],
                         "type": "u64"
                     },
-                    {
-                        "name": "filled_amount",
-                        "docs": [
-                            "The amount of TRD that has been filled",
-                            "precision: QUOTE_PRECISION"
-                        ],
-                        "type": "u64"
-                    },
-                    {
-                        "name": "filled_shares",
-                        "docs": ["The number of shares that have been filled"],
-                        "type": "u64"
-                    },
                     {
                         "name": "order_type",
                         "type": {
@@ -1646,17 +1581,16 @@
                         }
                     },
                     {
-                        "name": "settled_pnl",
+                        "name": "pnl",
                         "docs": [
-                            "The amount of pnl settled in this market since opening the position (in TRD)",
-                            "precision: QUOTE_PRECISION"
+                            "The amount of pnl settled in this market since opening the position (in TRD)"
                         ],
                         "type": "i64"
                     },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 16]
+                            "array": ["u8", 32]
                         }
                     }
                 ]
@@ -1687,12 +1621,6 @@
                     {
                         "name": "Open"
                     },
-                    {
-                        "name": "Filled"
-                    },
-                    {
-                        "name": "Canceled"
-                    },
                     {
                         "name": "Closed"
                     }
@@ -1705,10 +1633,10 @@
                 "kind": "enum",
                 "variants": [
                     {
-                        "name": "Limit"
+                        "name": "Market"
                     },
                     {
-                        "name": "Market"
+                        "name": "Limit"
                     }
                 ]
             }
@@ -1726,6 +1654,10 @@
                         "name": "market_id",
                         "type": "u64"
                     },
+                    {
+                        "name": "question_id",
+                        "type": "u64"
+                    },
                     {
                         "name": "order_id",
                         "type": "u64"
@@ -1762,18 +1694,10 @@
                         "name": "total_shares",
                         "type": "u64"
                     },
-                    {
-                        "name": "filled_shares",
-                        "type": "u64"
-                    },
                     {
                         "name": "total_amount",
                         "type": "u64"
                     },
-                    {
-                        "name": "filled_amount",
-                        "type": "u64"
-                    },
                     {
                         "name": "comment",
                         "type": {
@@ -1788,9 +1712,19 @@
                             "option": "u64"
                         }
                     },
+                    {
+                        "name": "pnl",
+                        "type": "i64"
+                    },
                     {
                         "name": "timestamp",
                         "type": "i64"
+                    },
+                    {
+                        "name": "is_question_winner",
+                        "type": {
+                            "option": "bool"
+                        }
                     }
                 ]
             }
@@ -1839,6 +1773,70 @@
                 ]
             }
         },
+        {
+            "name": "ResolvedQuestion",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "question",
+                        "docs": ["The question or prediction topic for this week"],
+                        "type": {
+                            "array": ["u8", 120]
+                        }
+                    },
+                    {
+                        "name": "start_time",
+                        "docs": ["Start timestamp of the week"],
+                        "type": "i64"
+                    },
+                    {
+                        "name": "end_time",
+                        "docs": ["End timestamp of the week"],
+                        "type": "i64"
+                    },
+                    {
+                        "name": "hype_liquidity",
+                        "docs": ["Total liquidity for Hype (in TRD)"],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "flop_liquidity",
+                        "docs": ["Total liquidity for Flop (in TRD)"],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "winning_direction",
+                        "docs": ["The winning direction (Hype, Flop or None)"],
+                        "type": {
+                            "defined": {
+                                "name": "WinningDirection"
+                            }
+                        }
+                    },
+                    {
+                        "name": "market_price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "final_hype_price",
+                        "docs": ["Final price for Hype outcome at the end of the week"],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "final_flop_price",
+                        "docs": ["Final price for Flop outcome at the end of the week"],
+                        "type": "u64"
+                    },
+                    {
+                        "name": "padding",
+                        "type": {
+                            "array": ["u8", 100]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "StakeNFTArgs",
             "type": {
@@ -2115,14 +2113,9 @@
                         "type": "u64"
                     },
                     {
-                        "name": "open_orders",
-                        "docs": ["Number of open orders"],
-                        "type": "u8"
-                    },
-                    {
-                        "name": "has_open_order",
-                        "docs": ["Whether or not user has open order"],
-                        "type": "bool"
+                        "name": "opened_orders",
+                        "docs": ["The number of orders the user has opened"],
+                        "type": "u64"
                     },
                     {
                         "name": "orders",
@@ -2137,18 +2130,31 @@
                             ]
                         }
                     },
-                    {
-                        "name": "position",
-                        "type": "i64"
-                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 64]
+                            "array": ["u8", 32]
                         }
                     }
                 ]
             }
+        },
+        {
+            "name": "WinningDirection",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "Hype"
+                    },
+                    {
+                        "name": "Flop"
+                    },
+                    {
+                        "name": "None"
+                    }
+                ]
+            }
         }
     ]
 }

package/dist/types/index.d.ts

@@ -8,3 +8,13 @@ export type CreateUserArgs = {
     name: string;
     referral?: PublicKey;
 };
+export type User = {
+    ts: number;
+    authority: string;
+    referral: string;
+    referred: number;
+    name: string;
+    swapsMade: number;
+    swaps: number;
+    staked: number;
+};

package/dist/types/stake.d.ts

@@ -64,14 +64,7 @@ export declare enum RARITY_WEIGHT {
     LEGENDARY = 5,
     MYTHIC = 6
 }
-export declare enum COLLECTION_MUlTIPLIER {
-    ALLIGATORS = 1.5,
-    COLETA = 1.5,
-    UNDEAD = 1.5,
-    UNDEAD_TRIADFI = 2.5,
-    PYTH = 1.5
-}
-export type StakeVaultResponse = {
+export type StakeVault = {
     name: string;
     collection: string;
     authority: string;
@@ -87,7 +80,7 @@ export type StakeVaultResponse = {
     initTs: number;
     endTs: number;
 };
-export type StakeResponse = {
+export type Stake = {
     name: string;
     stakeVault: string;
     authority: string;
@@ -100,13 +93,3 @@ export type StakeResponse = {
     available: number;
     amount: number;
 };
-export type UserResponse = {
-    ts: number;
-    authority: string;
-    referral: string;
-    referred: number;
-    name: string;
-    swapsMade: number;
-    swaps: number;
-    staked: number;
-};

package/dist/types/stake.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COLLECTION_MUlTIPLIER = exports.RARITY_WEIGHT = void 0;
+exports.RARITY_WEIGHT = void 0;
 var RARITY_WEIGHT;
 (function (RARITY_WEIGHT) {
     RARITY_WEIGHT[RARITY_WEIGHT["COMMON"] = 1] = "COMMON";
@@ -10,11 +10,3 @@ var RARITY_WEIGHT;
     RARITY_WEIGHT[RARITY_WEIGHT["LEGENDARY"] = 5] = "LEGENDARY";
     RARITY_WEIGHT[RARITY_WEIGHT["MYTHIC"] = 6] = "MYTHIC";
 })(RARITY_WEIGHT || (exports.RARITY_WEIGHT = RARITY_WEIGHT = {}));
-var COLLECTION_MUlTIPLIER;
-(function (COLLECTION_MUlTIPLIER) {
-    COLLECTION_MUlTIPLIER[COLLECTION_MUlTIPLIER["ALLIGATORS"] = 1.5] = "ALLIGATORS";
-    COLLECTION_MUlTIPLIER[COLLECTION_MUlTIPLIER["COLETA"] = 1.5] = "COLETA";
-    COLLECTION_MUlTIPLIER[COLLECTION_MUlTIPLIER["UNDEAD"] = 1.5] = "UNDEAD";
-    COLLECTION_MUlTIPLIER[COLLECTION_MUlTIPLIER["UNDEAD_TRIADFI"] = 2.5] = "UNDEAD_TRIADFI";
-    COLLECTION_MUlTIPLIER[COLLECTION_MUlTIPLIER["PYTH"] = 1.5] = "PYTH";
-})(COLLECTION_MUlTIPLIER || (exports.COLLECTION_MUlTIPLIER = COLLECTION_MUlTIPLIER = {}));

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 = {}));