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

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: '7nGGR51pBSUrpMPYVf9LWnNwaApz7N9VaJfDAJrihXts';
+    address: 'D6CzYj9FxGa8HeQeF1JYu9hDakEuEeMJkSG2awGPuCXG';
     metadata: {
         name: 'triadProtocol';
         version: '0.1.4';
@@ -190,18 +190,6 @@ export type TriadProtocol = {
                 {
                     name: 'userTrade';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'signer';
-                            }
-                        ];
-                    };
                 },
                 {
                     name: 'market';
@@ -354,11 +342,6 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
-                {
-                    name: 'payer';
-                    writable: true;
-                    signer: true;
-                },
                 {
                     name: 'referral';
                     writable: true;
@@ -379,6 +362,22 @@ export type TriadProtocol = {
                         ];
                     };
                 },
+                {
+                    name: 'userTrade';
+                    writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'const';
+                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
+                            },
+                            {
+                                kind: 'account';
+                                path: 'signer';
+                            }
+                        ];
+                    };
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -404,6 +403,10 @@ export type TriadProtocol = {
                     writable: true;
                     signer: true;
                 },
+                {
+                    name: 'user';
+                    writable: true;
+                },
                 {
                     name: 'userTrade';
                     writable: true;
@@ -452,6 +455,10 @@ export type TriadProtocol = {
                         ];
                     };
                 },
+                {
+                    name: 'mint';
+                    writable: true;
+                },
                 {
                     name: 'feeVault';
                     writable: true;
@@ -462,81 +469,16 @@ export type TriadProtocol = {
                                 value: [102, 101, 101, 95, 118, 97, 117, 108, 116];
                             },
                             {
-                                kind: 'account';
-                                path: 'market';
+                                kind: 'arg';
+                                path: 'args.market_id';
                             }
                         ];
                     };
                 },
-                {
-                    name: 'feeVaultAta';
-                    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: 'mint';
-                    writable: true;
-                },
                 {
                     name: 'tokenProgram';
                     address: 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb';
                 },
-                {
-                    name: 'associatedTokenProgram';
-                    address: 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL';
-                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -565,18 +507,6 @@ export type TriadProtocol = {
                 {
                     name: 'userTrade';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [117, 115, 101, 114, 95, 116, 114, 97, 100, 101];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'signer';
-                            }
-                        ];
-                    };
                 },
                 {
                     name: 'market';
@@ -585,18 +515,6 @@ export type TriadProtocol = {
                 {
                     name: 'feeVault';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'const';
-                                value: [102, 101, 101, 95, 118, 97, 117, 108, 116];
-                            },
-                            {
-                                kind: 'account';
-                                path: 'market';
-                            }
-                        ];
-                    };
                 },
                 {
                     name: 'mint';
@@ -605,59 +523,6 @@ export type TriadProtocol = {
                 {
                     name: 'userFromAta';
                     writable: true;
-                    pda: {
-                        seeds: [
-                            {
-                                kind: 'account';
-                                path: 'signer';
-                            },
-                            {
-                                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: 'marketToAta';
@@ -1937,7 +1802,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'totalVolume';
-                        docs: ['Total trading volume (in TRD)'];
+                        docs: ['Total trading volume (in TRD) for all resolutions'];
                         type: 'u64';
                     },
                     {
@@ -1966,9 +1831,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'feeBps';
-                        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'
-                        ];
+                        docs: ['Fees applied to trades (in basis points, e.g., 1.131% fee)'];
                         type: 'u16';
                     },
                     {
@@ -1985,6 +1848,48 @@ export type TriadProtocol = {
                         name: 'isOfficial';
                         type: 'bool';
                     },
+                    {
+                        name: 'marketPrice';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'resolvedQuestions';
+                        type: {
+                            array: [
+                                {
+                                    defined: {
+                                        name: 'resolvedQuestion';
+                                    };
+                                },
+                                4
+                            ];
+                        };
+                    },
+                    {
+                        name: 'currentQuestionId';
+                        docs: [
+                            'Index of the current week in the weekly_results array initialized with default values'
+                        ];
+                        type: 'u64';
+                    },
+                    {
+                        name: 'currentQuestionStart';
+                        docs: [
+                            'Start timestamp of the current week if 7 days have passed since the start of the week'
+                        ];
+                        type: 'i64';
+                    },
+                    {
+                        name: 'currentQuestionEnd';
+                        type: 'i64';
+                    },
+                    {
+                        name: 'currentQuestion';
+                        docs: ['The question or prediction topic for the current week'];
+                        type: {
+                            array: ['u8', 120];
+                        };
+                    },
                     {
                         name: 'padding';
                         type: {
@@ -2011,20 +1916,6 @@ export type TriadProtocol = {
                             };
                         };
                     },
-                    {
-                        name: 'orderType';
-                        type: {
-                            defined: {
-                                name: 'orderType';
-                            };
-                        };
-                    },
-                    {
-                        name: 'limitPrice';
-                        type: {
-                            option: 'u64';
-                        };
-                    },
                     {
                         name: 'comment';
                         type: {
@@ -2049,6 +1940,10 @@ export type TriadProtocol = {
                         name: 'orderId';
                         type: 'u64';
                     },
+                    {
+                        name: 'questionId';
+                        type: 'u64';
+                    },
                     {
                         name: 'marketId';
                         type: 'u64';
@@ -2071,10 +1966,7 @@ export type TriadProtocol = {
                     },
                     {
                         name: 'totalAmount';
-                        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';
                     },
                     {
@@ -2082,19 +1974,6 @@ export type TriadProtocol = {
                         docs: ['The total number of shares to be purchased'];
                         type: 'u64';
                     },
-                    {
-                        name: 'filledAmount';
-                        docs: [
-                            'The amount of TRD that has been filled',
-                            'precision: QUOTE_PRECISION'
-                        ];
-                        type: 'u64';
-                    },
-                    {
-                        name: 'filledShares';
-                        docs: ['The number of shares that have been filled'];
-                        type: 'u64';
-                    },
                     {
                         name: 'orderType';
                         type: {
@@ -2112,17 +1991,16 @@ export type TriadProtocol = {
                         };
                     },
                     {
-                        name: 'settledPnl';
+                        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];
                         };
                     }
                 ];
@@ -2153,12 +2031,6 @@ export type TriadProtocol = {
                     {
                         name: 'open';
                     },
-                    {
-                        name: 'filled';
-                    },
-                    {
-                        name: 'canceled';
-                    },
                     {
                         name: 'closed';
                     }
@@ -2171,10 +2043,10 @@ export type TriadProtocol = {
                 kind: 'enum';
                 variants: [
                     {
-                        name: 'limit';
+                        name: 'market';
                     },
                     {
-                        name: 'market';
+                        name: 'limit';
                     }
                 ];
             };
@@ -2192,6 +2064,10 @@ export type TriadProtocol = {
                         name: 'marketId';
                         type: 'u64';
                     },
+                    {
+                        name: 'questionId';
+                        type: 'u64';
+                    },
                     {
                         name: 'orderId';
                         type: 'u64';
@@ -2228,18 +2104,10 @@ export type TriadProtocol = {
                         name: 'totalShares';
                         type: 'u64';
                     },
-                    {
-                        name: 'filledShares';
-                        type: 'u64';
-                    },
                     {
                         name: 'totalAmount';
                         type: 'u64';
                     },
-                    {
-                        name: 'filledAmount';
-                        type: 'u64';
-                    },
                     {
                         name: 'comment';
                         type: {
@@ -2254,9 +2122,19 @@ export type TriadProtocol = {
                             option: 'u64';
                         };
                     },
+                    {
+                        name: 'pnl';
+                        type: 'i64';
+                    },
                     {
                         name: 'timestamp';
                         type: 'i64';
+                    },
+                    {
+                        name: 'isQuestionWinner';
+                        type: {
+                            option: 'bool';
+                        };
                     }
                 ];
             };
@@ -2305,6 +2183,70 @@ export type TriadProtocol = {
                 ];
             };
         },
+        {
+            name: 'resolvedQuestion';
+            type: {
+                kind: 'struct';
+                fields: [
+                    {
+                        name: 'question';
+                        docs: ['The question or prediction topic for this week'];
+                        type: {
+                            array: ['u8', 120];
+                        };
+                    },
+                    {
+                        name: 'startTime';
+                        docs: ['Start timestamp of the week'];
+                        type: 'i64';
+                    },
+                    {
+                        name: 'endTime';
+                        docs: ['End timestamp of the week'];
+                        type: 'i64';
+                    },
+                    {
+                        name: 'hypeLiquidity';
+                        docs: ['Total liquidity for Hype (in TRD)'];
+                        type: 'u64';
+                    },
+                    {
+                        name: 'flopLiquidity';
+                        docs: ['Total liquidity for Flop (in TRD)'];
+                        type: 'u64';
+                    },
+                    {
+                        name: 'winningDirection';
+                        docs: ['The winning direction (Hype, Flop or None)'];
+                        type: {
+                            defined: {
+                                name: 'winningDirection';
+                            };
+                        };
+                    },
+                    {
+                        name: 'marketPrice';
+                        type: 'u64';
+                    },
+                    {
+                        name: 'finalHypePrice';
+                        docs: ['Final price for Hype outcome at the end of the week'];
+                        type: 'u64';
+                    },
+                    {
+                        name: 'finalFlopPrice';
+                        docs: ['Final price for Flop outcome at the end of the week'];
+                        type: 'u64';
+                    },
+                    {
+                        name: 'padding';
+                        type: {
+                            array: ['u8', 100];
+                        };
+                    }
+                ];
+            };
+        },
         {
             name: 'stakeNftArgs';
             type: {
@@ -2581,14 +2523,9 @@ export type TriadProtocol = {
                         type: 'u64';
                     },
                     {
-                        name: 'openOrders';
-                        docs: ['Number of open orders'];
-                        type: 'u8';
-                    },
-                    {
-                        name: 'hasOpenOrder';
-                        docs: ['Whether or not user has open order'];
-                        type: 'bool';
+                        name: 'openedOrders';
+                        docs: ['The number of orders the user has opened'];
+                        type: 'u64';
                     },
                     {
                         name: 'orders';
@@ -2603,18 +2540,31 @@ export type TriadProtocol = {
                             ];
                         };
                     },
-                    {
-                        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/utils/formatNumber.d.ts

@@ -0,0 +1,3 @@
+import { BN } from '@coral-xyz/anchor';
+declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
+export default formatNumber;

package/dist/utils/formatNumber.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const formatNumber = (number, decimals = 6) => {
+    return Number(number.toString()) / Math.pow(10, decimals);
+};
+exports.default = formatNumber;

package/dist/utils/{getRarity.d.ts → getRarityRank.d.ts}

@@ -1,5 +1,6 @@
-export declare const getRarityRank: (ranks: {
+declare const getRarityRank: (ranks: {
     onchainId: string;
     name: string;
     rarityRankHrtt: number;
 }[], onchainId: string, name: string) => number;
+export default getRarityRank;

package/dist/utils/{getRarity.js → getRarityRank.js}

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRarityRank = void 0;
 const getRarityRank = (ranks, onchainId, name) => {
     const item = ranks.find((entry) => entry.onchainId === onchainId || entry.name === name);
     return item ? item.rarityRankHrtt : 963;
 };
-exports.getRarityRank = getRarityRank;
+exports.default = getRarityRank;

package/dist/utils/helpers.d.ts

@@ -1,28 +1,7 @@
-import { COLLECTION_MUlTIPLIER, StakeResponse, StakeVaultResponse, UserResponse } from './../types/stake';
-import { PublicKey } from '@solana/web3.js';
-import BN from 'bn.js';
-export declare const getTickerAddressSync: (programId: PublicKey, tickerName: string) => PublicKey;
+import { Stake, StakeVault } from './../types/stake';
+import { User } from './../types';
 export declare const encodeString: (value: string, alloc?: number) => number[];
 export declare const decodeString: (bytes: number[]) => string;
-export declare const getMarketAddressSync: (programId: PublicKey, marketId: number) => PublicKey;
-export declare const getFeeVaultAddressSync: (programId: PublicKey, market: PublicKey) => PublicKey;
-export declare const getUserTradeAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
-export declare const getStakeVaultAddressSync: (programId: PublicKey, vaultName: string) => PublicKey;
-export declare const getStakeAddressSync: (programId: PublicKey, wallet: PublicKey, name: string) => PublicKey;
-export declare const getNFTRewardsAddressSync: (programId: PublicKey, stake: PublicKey) => PublicKey;
-export declare const getATASync: (address: PublicKey, Mint: PublicKey) => PublicKey;
-export declare const getUserAddressSync: (programId: PublicKey, wallet: PublicKey) => PublicKey;
-export declare const formatNumber: (number: bigint | BN, decimals?: number) => number;
-export declare const formatStakeVault: (stakeVault: any) => StakeVaultResponse;
-export declare const formatStake: (stake: any) => StakeResponse;
-export declare const formatUser: (user: any) => UserResponse;
-export declare const calculateTotalMultiplier: (collections: COLLECTION_MUlTIPLIER[], rank: {
-    max: number;
-    currentPosition: number;
-}) => number;
-export declare const calculateAPR: ({ rewards, rate, amount, baseRewards }: {
-    rewards: number;
-    rate: number;
-    amount: number;
-    baseRewards: number;
-}) => number;
+export declare const formatStakeVault: (stakeVault: any) => StakeVault;
+export declare const formatStake: (stake: any) => Stake;
+export declare const formatUser: (user: any) => User;