@triadxyz/triad-protocol 0.7.7-beta.devnet → 1.0.1-beta

package/dist/local-test.js

@@ -13,30 +13,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const index_1 = __importDefault(require("./index"));
+const _1 = __importDefault(require("./"));
 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/triad.json');
-const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc-devnet.txt');
+const file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/id.json');
+const rpc_file = fs_1.default.readFileSync('/Users/dannpl/.config/solana/rpc.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');
 const wallet = new anchor_1.Wallet(keypair);
-const triadProtocol = new index_1.default(connection, wallet);
-const markets = [
-    { 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 triadProtocol = new _1.default(connection, wallet);
+const markets = [{ name: 'Triad', marketId: 0 }];
 const ordersHypeAndFloopBot = [
     {
         marketId: 0,
-        amount: 100000,
+        amount: 0,
         direction: {
             flop: {}
         },
@@ -51,6 +42,14 @@ const updateStakeVault = () => __awaiter(void 0, void 0, void 0, function* () {
     });
     console.log(response);
 });
+const updateStakeVaultStatus = () => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield triadProtocol.stake.updateStakeVault({
+        wallet: wallet.publicKey,
+        amount: new anchor_1.BN(0),
+        status: false
+    });
+    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;
@@ -74,11 +73,11 @@ 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(1);
     console.log(market);
 });
-getMarket();
 const initializeAllMarkets = () => __awaiter(void 0, void 0, void 0, function* () {
     for (const market of markets) {
         try {
@@ -134,15 +133,16 @@ const runBot = () => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 const initializeQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
-    const currentTime = Math.floor(Date.now() / 1000) + 10; // Current time in seconds
+    const currentTime = Math.floor(Date.now() / 1000); // Current time in seconds
     const response = yield triadProtocol.trade.initializeQuestion({
-        marketId: 1,
-        question: 'FUCK OFF?',
+        marketId: 0,
+        question: 'Will Triad send the project to the Radar Hackathon?',
         startTime: currentTime,
-        endTime: currentTime + 24 * 60 * 60
+        endTime: 1728320400
     });
     console.log(response);
 });
+initializeQuestion();
 const resolveQuestion = () => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield triadProtocol.trade.resolveQuestion(0);
     console.log(response);

package/dist/stake.js

@@ -99,7 +99,6 @@ class Stake {
             for (const stake of response) {
                 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,

package/dist/trade.d.ts

@@ -78,7 +78,6 @@ export default class Trade {
             } & {
                 flop: Record<string, never>;
             });
-            pnl: BN;
             padding: number[];
         }[];
         padding: number[];

package/dist/trade.js

@@ -21,7 +21,7 @@ const sendVersionedTransaction_1 = __importDefault(require("./utils/sendVersione
 const sendTransactionWithOptions_1 = __importDefault(require("./utils/sendTransactionWithOptions"));
 class Trade {
     constructor(program, provider) {
-        this.mint = constants_1.TRD_MINT_DEVNET;
+        this.mint = constants_1.TRD_MINT;
         this.provider = provider;
         this.program = program;
     }

package/dist/types/idl_triad_protocol.json

@@ -1,5 +1,5 @@
 {
-    "address": "4YWv2Ex8WjFGyXmYELD6Xqs1ZsuQujVUzZxbvdvM2tCj",
+    "address": "TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss",
     "metadata": {
         "name": "triad_protocol",
         "version": "0.1.4",
@@ -1089,6 +1089,51 @@
                 }
             ],
             "args": []
+        },
+        {
+            "name": "withdraw_v1",
+            "discriminator": [212, 118, 210, 5, 187, 1, 117, 222],
+            "accounts": [
+                {
+                    "name": "signer",
+                    "writable": true,
+                    "signer": true
+                },
+                {
+                    "name": "ticker",
+                    "writable": true
+                },
+                {
+                    "name": "vault",
+                    "writable": true
+                },
+                {
+                    "name": "user_position",
+                    "writable": true
+                },
+                {
+                    "name": "vault_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "user_token_account",
+                    "writable": true
+                },
+                {
+                    "name": "system_program",
+                    "address": "11111111111111111111111111111111"
+                },
+                {
+                    "name": "token_program",
+                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+                }
+            ],
+            "args": [
+                {
+                    "name": "position_index",
+                    "type": "u8"
+                }
+            ]
         }
     ],
     "accounts": [
@@ -1108,13 +1153,25 @@
             "name": "StakeVault",
             "discriminator": [192, 112, 65, 125, 129, 151, 173, 226]
         },
+        {
+            "name": "Ticker",
+            "discriminator": [214, 74, 184, 188, 214, 64, 251, 53]
+        },
         {
             "name": "User",
             "discriminator": [159, 117, 95, 227, 239, 151, 58, 236]
         },
+        {
+            "name": "UserPosition",
+            "discriminator": [251, 248, 209, 245, 83, 234, 17, 27]
+        },
         {
             "name": "UserTrade",
             "discriminator": [149, 190, 47, 218, 136, 9, 222, 222]
+        },
+        {
+            "name": "Vault",
+            "discriminator": [211, 8, 232, 43, 2, 152, 117, 119]
         }
     ],
     "events": [
@@ -1422,7 +1479,7 @@
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 56]
+                            "array": ["u8", 60]
                         }
                     }
                 ]
@@ -1607,7 +1664,7 @@
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 180]
+                            "array": ["u8", 200]
                         }
                     }
                 ]
@@ -1672,10 +1729,7 @@
                     },
                     {
                         "name": "price",
-                        "docs": [
-                            "The price of the order (in TRD)",
-                            "precision: PRICE_PRECISION (e.g., 1_000_000 = 1 TRD)"
-                        ],
+                        "docs": ["The price of the order (in TRD)"],
                         "type": "u64"
                     },
                     {
@@ -1704,13 +1758,6 @@
                             }
                         }
                     },
-                    {
-                        "name": "pnl",
-                        "docs": [
-                            "The amount of pnl settled in this market since opening the position (in TRD)"
-                        ],
-                        "type": "i64"
-                    },
                     {
                         "name": "padding",
                         "type": {
@@ -1853,6 +1900,38 @@
                 ]
             }
         },
+        {
+            "name": "Position",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "amount",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "entry_price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "is_long",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "is_open",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "pnl",
+                        "type": "i64"
+                    }
+                ]
+            }
+        },
         {
             "name": "PriceUpdate",
             "type": {
@@ -2263,6 +2342,46 @@
                 ]
             }
         },
+        {
+            "name": "Ticker",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "init_ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "updated_ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "bump",
+                        "type": "u8"
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "name": "protocol_program_id",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "price",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "vault",
+                        "type": "pubkey"
+                    }
+                ]
+            }
+        },
         {
             "name": "UpdateStakeVaultArgs",
             "type": {
@@ -2339,6 +2458,59 @@
                 ]
             }
         },
+        {
+            "name": "UserPosition",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "bump",
+                        "type": "u8"
+                    },
+                    {
+                        "name": "total_deposited",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "total_withdrawn",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "lp_share",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "total_positions",
+                        "type": "u16"
+                    },
+                    {
+                        "name": "ticker",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "positions",
+                        "type": {
+                            "array": [
+                                {
+                                    "defined": {
+                                        "name": "Position"
+                                    }
+                                },
+                                3
+                            ]
+                        }
+                    }
+                ]
+            }
+        },
         {
             "name": "UserTrade",
             "type": {
@@ -2395,6 +2567,70 @@
                 ]
             }
         },
+        {
+            "name": "Vault",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "bump",
+                        "type": "u8"
+                    },
+                    {
+                        "name": "authority",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "name",
+                        "type": "string"
+                    },
+                    {
+                        "name": "token_account",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "ticker_address",
+                        "type": "pubkey"
+                    },
+                    {
+                        "name": "total_deposited",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "total_withdrawn",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "init_ts",
+                        "type": "i64"
+                    },
+                    {
+                        "name": "net_deposits",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "net_withdraws",
+                        "type": "u128"
+                    },
+                    {
+                        "name": "long_balance",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "short_balance",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "long_positions_opened",
+                        "type": "u64"
+                    },
+                    {
+                        "name": "short_positions_opened",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "WinningDirection",
             "type": {

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: '4YWv2Ex8WjFGyXmYELD6Xqs1ZsuQujVUzZxbvdvM2tCj';
+    address: 'TRDwq3BN4mP3m9KsuNUWSN6QDff93VKGSwE95Jbr9Ss';
     metadata: {
         name: 'triadProtocol';
         version: '0.1.4';
@@ -1530,6 +1530,51 @@ export type TriadProtocol = {
                 }
             ];
             args: [];
+        },
+        {
+            name: 'withdrawV1';
+            discriminator: [212, 118, 210, 5, 187, 1, 117, 222];
+            accounts: [
+                {
+                    name: 'signer';
+                    writable: true;
+                    signer: true;
+                },
+                {
+                    name: 'ticker';
+                    writable: true;
+                },
+                {
+                    name: 'vault';
+                    writable: true;
+                },
+                {
+                    name: 'userPosition';
+                    writable: true;
+                },
+                {
+                    name: 'vaultTokenAccount';
+                    writable: true;
+                },
+                {
+                    name: 'userTokenAccount';
+                    writable: true;
+                },
+                {
+                    name: 'systemProgram';
+                    address: '11111111111111111111111111111111';
+                },
+                {
+                    name: 'tokenProgram';
+                    address: 'TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA';
+                }
+            ];
+            args: [
+                {
+                    name: 'positionIndex';
+                    type: 'u8';
+                }
+            ];
         }
     ];
     accounts: [
@@ -1549,13 +1594,25 @@ export type TriadProtocol = {
             name: 'stakeVault';
             discriminator: [192, 112, 65, 125, 129, 151, 173, 226];
         },
+        {
+            name: 'ticker';
+            discriminator: [214, 74, 184, 188, 214, 64, 251, 53];
+        },
         {
             name: 'user';
             discriminator: [159, 117, 95, 227, 239, 151, 58, 236];
         },
+        {
+            name: 'userPosition';
+            discriminator: [251, 248, 209, 245, 83, 234, 17, 27];
+        },
         {
             name: 'userTrade';
             discriminator: [149, 190, 47, 218, 136, 9, 222, 222];
+        },
+        {
+            name: 'vault';
+            discriminator: [211, 8, 232, 43, 2, 152, 117, 119];
         }
     ];
     events: [
@@ -1863,7 +1920,7 @@ export type TriadProtocol = {
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 56];
+                            array: ['u8', 60];
                         };
                     }
                 ];
@@ -2046,7 +2103,7 @@ export type TriadProtocol = {
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 180];
+                            array: ['u8', 200];
                         };
                     }
                 ];
@@ -2111,10 +2168,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'price';
-                        docs: [
-                            'The price of the order (in TRD)',
-                            'precision: PRICE_PRECISION (e.g., 1_000_000 = 1 TRD)'
-                        ];
+                        docs: ['The price of the order (in TRD)'];
                         type: 'u64';
                     },
                     {
@@ -2143,13 +2197,6 @@ export type TriadProtocol = {
                             };
                         };
                     },
-                    {
-                        name: 'pnl';
-                        docs: [
-                            'The amount of pnl settled in this market since opening the position (in TRD)'
-                        ];
-                        type: 'i64';
-                    },
                     {
                         name: 'padding';
                         type: {
@@ -2292,6 +2339,38 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'position';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'amount';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'entryPrice';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'ts';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'isLong';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'isOpen';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'pnl';
+                        type: 'i64';
+                    }
+                ];
+            };
+        },
         {
             name: 'priceUpdate';
             type: {
@@ -2702,6 +2781,46 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'ticker';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'initTs';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'updatedTs';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'bump';
+                        type: 'u8';
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'name';
+                        type: 'string';
+                    },
+                    {
+                        name: 'protocolProgramId';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'price';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'vault';
+                        type: 'pubkey';
+                    }
+                ];
+            };
+        },
         {
             name: 'updateStakeVaultArgs';
             type: {
@@ -2778,6 +2897,59 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'userPosition';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'ts';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'bump';
+                        type: 'u8';
+                    },
+                    {
+                        name: 'totalDeposited';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'totalWithdrawn';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'lpShare';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'totalPositions';
+                        type: 'u16';
+                    },
+                    {
+                        name: 'ticker';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'positions';
+                        type: {
+                            array: [
+                                {
+                                    defined: {
+                                        name: 'position';
+                                    };
+                                },
+                                3
+                            ];
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'userTrade';
             type: {
@@ -2834,6 +3006,70 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'vault';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'bump';
+                        type: 'u8';
+                    },
+                    {
+                        name: 'authority';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'name';
+                        type: 'string';
+                    },
+                    {
+                        name: 'tokenAccount';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'tickerAddress';
+                        type: 'pubkey';
+                    },
+                    {
+                        name: 'totalDeposited';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'totalWithdrawn';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'initTs';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'netDeposits';
+                        type: 'u128';
+                    },
+                    {
+                        name: 'netWithdraws';
+                        type: 'u128';
+                    },
+                    {
+                        name: 'longBalance';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'shortBalance';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'longPositionsOpened';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'shortPositionsOpened';
+                        type: 'u64';
+                    }
+                ];
+            };
+        },
         {
             name: 'winningDirection';
             type: {

package/dist/utils/constants.d.ts

@@ -4,4 +4,3 @@ export declare const TRD_DECIMALS = 6;
 export declare const VERIFIER: PublicKey;
 export declare const TRD_MINT: PublicKey;
 export declare const TRIAD_ADMIN: PublicKey;
-export declare const TRD_MINT_DEVNET: PublicKey;

package/dist/utils/constants.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TRD_MINT_DEVNET = exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
+exports.TRIAD_ADMIN = exports.TRD_MINT = exports.VERIFIER = exports.TRD_DECIMALS = exports.STAKE_VAULT_NAME = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.STAKE_VAULT_NAME = 'Triad Share 1';
 exports.TRD_DECIMALS = 6;
 exports.VERIFIER = new web3_js_1.PublicKey('42n6BHufivUKrb5Bi6tXbMZvM8NHovrDLX1Rt5w2a919');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
 exports.TRIAD_ADMIN = new web3_js_1.PublicKey('82ppCojm3yrEKgdpH8B5AmBJTU1r1uAWXFWhxvPs9UCR');
-exports.TRD_MINT_DEVNET = new web3_js_1.PublicKey('9ti9L1a4ynpTj4gbGQLkYmZh7495nvLEgWtw5mtUkGQj');

package/package.json

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