@triadxyz/triad-protocol 4.0.6 → 4.0.8

package/dist/customer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';
@@ -27,6 +28,7 @@ export default class Customer {
      * @param args.name - The name of the customer
      * @param args.authority - The authority of the customer
      * @param args.feeRecipient - The fee recipient of the customer
+     * @param args.feeBps - The fee in basis points of the customer
      */
-    createCustomer({ id, name, authority, feeRecipient }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    createCustomer({ id, name, authority, feeRecipient, feeBps }: CreateCustomerArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/customer.js

@@ -63,12 +63,13 @@ class Customer {
      * @param args.name - The name of the customer
      * @param args.authority - The authority of the customer
      * @param args.feeRecipient - The fee recipient of the customer
+     * @param args.feeBps - The fee in basis points of the customer
      */
-    createCustomer({ id, name, authority, feeRecipient }) {
+    createCustomer({ id, name, authority, feeRecipient, feeBps }) {
         return __awaiter(this, void 0, void 0, function* () {
             const ixs = [
                 yield this.program.methods
-                    .createCustomer({ id, name, authority, feeRecipient })
+                    .createCustomer({ id, name, authority, feeRecipient, feeBps })
                     .accounts({
                     signer: this.program.provider.publicKey
                 })

package/dist/index.d.ts

@@ -1,7 +1,8 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Connection, PublicKey } from '@solana/web3.js';
 import { AnchorProvider, Program, Wallet } from '@coral-xyz/anchor';
 import { TriadProtocol as TriadProtocolIDL } from './types/triad_protocol';
-import { RpcOptions, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs, UpdateMarketPayoutArgs, UpdateMarketQuestionArgs, UpdateMarketEndArgs } from './types';
+import { RpcOptions, CreateMarketArgs, CreatePoolArgs, UpdateMarketWinningDirectionArgs, UpdateMarketPayoutArgs, UpdateMarketQuestionArgs, UpdateMarketEndArgs, CreateMarketPythArgs } from './types';
 import Stake from './stake';
 import Poseidon from './poseidon';
 import Predictor from './predictor';
@@ -102,6 +103,14 @@ export default class TriadProtocol {
      * @param poolId - The ID of the pool
      * @param question - The question of the pool
      * @param markets - The markets of the pool
+     * @param customer - The customer of the pool
+     * @param startTime - The start time of the pool
+     * @param endTime - The end time of the pool
+     * @param feeBps - The fee in basis points of the pool
+     * @param payoutFee - The payout fee of the pool
+     * @param isFast - Whether the pool is fast
+     * @param isPyth - Whether the pool is pyth
+     * @param feedId - The feed ID of the pool
      */
     createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast, isPyth, feedId }: CreatePoolArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
     /**
@@ -155,4 +164,13 @@ export default class TriadProtocol {
      * @param question - Question
      */
     updatePoolQuestion(poolId: number, question: string): Promise<string | import("@solana/web3.js").VersionedTransaction>;
+    /**
+     * Create Market Pyth
+     * @param args.markets - Array of markets to create
+     * @param args.markets.marketId - Market ID
+     * @param args.markets.resolveIn - Time to add for resolver the market in seconds
+     * @param args.customer - The customer of the market
+     * @param args.poolId - The ID of the pool
+     */
+    createMarketPyth({ marketId, resolveIn, customer, poolId, feedId }: CreateMarketPythArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/index.js

@@ -41,6 +41,7 @@ const poseidon_1 = __importDefault(require("./poseidon"));
 const predictor_1 = __importDefault(require("./predictor"));
 const trade_1 = __importDefault(require("./trade"));
 const customer_1 = __importDefault(require("./customer"));
+const pyth_solana_receiver_1 = require("@pythnetwork/pyth-solana-receiver");
 __exportStar(require("./types"), exports);
 __exportStar(require("./types/predictor"), exports);
 __exportStar(require("./types/stake"), exports);
@@ -268,6 +269,14 @@ class TriadProtocol {
      * @param poolId - The ID of the pool
      * @param question - The question of the pool
      * @param markets - The markets of the pool
+     * @param customer - The customer of the pool
+     * @param startTime - The start time of the pool
+     * @param endTime - The end time of the pool
+     * @param feeBps - The fee in basis points of the pool
+     * @param payoutFee - The payout fee of the pool
+     * @param isFast - Whether the pool is fast
+     * @param isPyth - Whether the pool is pyth
+     * @param feedId - The feed ID of the pool
      */
     createPool({ poolId, question, markets, customer, startTime, endTime, feeBps, payoutFee, isFast, isPyth, feedId }) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -275,18 +284,23 @@ class TriadProtocol {
                 throw new Error('Pool question must be less than 80 characters');
             }
             const ixs = [];
+            let feedPDA = null;
+            if (isPyth) {
+                feedPDA = (0, pyth_solana_receiver_1.getPriceFeedAccountForProgram)(0, feedId);
+            }
             const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
             ixs.push(yield this.program.methods
                 .createPool({
                 poolId: new bn_js_1.default(poolId),
                 question: (0, helpers_1.encodeString)(question, 80),
                 isFast,
-                isPyth,
-                feedId
+                isPyth
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
-                customer
+                priceUpdate: feedPDA,
+                customer,
+                feed: (0, helpers_1.getFeedIdFromHex)(feedId)
             })
                 .instruction());
             for (const market of markets) {
@@ -462,5 +476,41 @@ class TriadProtocol {
             return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
         });
     }
+    /**
+     * Create Market Pyth
+     * @param args.markets - Array of markets to create
+     * @param args.markets.marketId - Market ID
+     * @param args.markets.resolveIn - Time to add for resolver the market in seconds
+     * @param args.customer - The customer of the market
+     * @param args.poolId - The ID of the pool
+     */
+    createMarketPyth({ marketId, resolveIn, customer, poolId, feedId }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            let poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            const feedPDA = (0, pyth_solana_receiver_1.getPriceFeedAccountForProgram)(0, feedId);
+            ixs.push(yield this.program.methods
+                .createMarketPyth({
+                marketId: new bn_js_1.default(marketId),
+                resolveIn: new bn_js_1.default(resolveIn)
+            })
+                .accounts({
+                signer: this.program.provider.publicKey,
+                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                pool: poolPDA,
+                customer,
+                priceUpdate: feedPDA
+            })
+                .instruction());
+            ixs.push(yield this.program.methods
+                .createOrderBook(new bn_js_1.default(marketId))
+                .accounts({
+                signer: this.program.provider.publicKey,
+                market: (0, pda_1.getMarketPDA)(this.program.programId, marketId)
+            })
+                .instruction());
+            return (0, sendVersionedTransaction_1.default)(this.program, ixs, this.rpcOptions);
+        });
+    }
 }
 exports.default = TriadProtocol;

package/dist/poseidon.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';

package/dist/predictor.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';

package/dist/stake.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { TriadProtocol } from './types/triad_protocol';

package/dist/trade.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="jito-ts/node_modules/@solana/web3.js" />
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TriadProtocol } from './types/triad_protocol';

package/dist/types/customer.d.ts

@@ -13,4 +13,5 @@ export type CreateCustomerArgs = {
     name: string;
     authority: PublicKey;
     feeRecipient: PublicKey;
+    feeBps: number;
 };

package/dist/types/idl_triad_protocol.json

@@ -889,6 +889,10 @@
                     "writable": true,
                     "optional": true
                 },
+                {
+                    "name": "feed",
+                    "writable": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -2894,6 +2898,10 @@
                     {
                         "name": "fee_recipient",
                         "type": "pubkey"
+                    },
+                    {
+                        "name": "fee_bps",
+                        "type": "u16"
                     }
                 ]
             }
@@ -2978,12 +2986,6 @@
                     {
                         "name": "is_pyth",
                         "type": "bool"
-                    },
-                    {
-                        "name": "feed_id",
-                        "type": {
-                            "option": "pubkey"
-                        }
                     }
                 ]
             }
@@ -3282,6 +3284,10 @@
                     {
                         "name": "resolved_ts",
                         "type": "i64"
+                    },
+                    {
+                        "name": "pyth_price",
+                        "type": "u64"
                     }
                 ]
             }
@@ -3445,10 +3451,14 @@
                         "name": "pre_market_end_ts",
                         "type": "i64"
                     },
+                    {
+                        "name": "pyth_price",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 24]
+                            "array": ["u8", 16]
                         }
                     }
                 ]
@@ -3729,10 +3739,8 @@
                         "type": "bool"
                     },
                     {
-                        "name": "feed_id",
-                        "type": {
-                            "array": ["u8", 32]
-                        }
+                        "name": "feed",
+                        "type": "pubkey"
                     },
                     {
                         "name": "padding",
@@ -3761,6 +3769,14 @@
                     {
                         "name": "authority",
                         "type": "pubkey"
+                    },
+                    {
+                        "name": "is_fast",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "is_pyth",
+                        "type": "bool"
                     }
                 ]
             }

package/dist/types/index.d.ts

@@ -11,6 +11,8 @@ export type Pool = {
     id: number;
     question: string;
     authority: string;
+    isFast: boolean;
+    isPyth: boolean;
 };
 export type Market = {
     address: string;
@@ -43,6 +45,7 @@ export type Market = {
     customer: string;
     poolId: number;
     feeRecipient: string;
+    pythPrice: string;
 };
 export type Order = {
     address: string;
@@ -150,6 +153,13 @@ export type CreateMarketArgs = {
     customer: PublicKey;
     poolId?: number;
 };
+export type CreateMarketPythArgs = {
+    marketId: number;
+    resolveIn: number;
+    customer: PublicKey;
+    poolId: number;
+    feedId: string;
+};
 export type CreatePoolArgs = {
     poolId: number;
     question?: string;
@@ -164,7 +174,7 @@ export type CreatePoolArgs = {
     }[];
     isFast?: boolean;
     isPyth?: boolean;
-    feedId?: PublicKey;
+    feedId?: string;
 };
 export type UpdateMarketWinningDirectionArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -1238,6 +1238,10 @@ export type TriadProtocol = {
                     writable: true;
                     optional: true;
                 },
+                {
+                    name: 'feed';
+                    writable: true;
+                },
                 {
                     name: 'systemProgram';
                     address: '11111111111111111111111111111111';
@@ -3811,6 +3815,10 @@ export type TriadProtocol = {
                     {
                         name: 'feeRecipient';
                         type: 'pubkey';
+                    },
+                    {
+                        name: 'feeBps';
+                        type: 'u16';
                     }
                 ];
             };
@@ -3895,12 +3903,6 @@ export type TriadProtocol = {
                     {
                         name: 'isPyth';
                         type: 'bool';
-                    },
-                    {
-                        name: 'feedId';
-                        type: {
-                            option: 'pubkey';
-                        };
                     }
                 ];
             };
@@ -4199,6 +4201,10 @@ export type TriadProtocol = {
                     {
                         name: 'resolvedTs';
                         type: 'i64';
+                    },
+                    {
+                        name: 'pythPrice';
+                        type: 'u64';
                     }
                 ];
             };
@@ -4362,10 +4368,14 @@ export type TriadProtocol = {
                         name: 'preMarketEndTs';
                         type: 'i64';
                     },
+                    {
+                        name: 'pythPrice';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 24];
+                            array: ['u8', 16];
                         };
                     }
                 ];
@@ -4646,10 +4656,8 @@ export type TriadProtocol = {
                         type: 'bool';
                     },
                     {
-                        name: 'feedId';
-                        type: {
-                            array: ['u8', 32];
-                        };
+                        name: 'feed';
+                        type: 'pubkey';
                     },
                     {
                         name: 'padding';
@@ -4678,6 +4686,14 @@ export type TriadProtocol = {
                     {
                         name: 'authority';
                         type: 'pubkey';
+                    },
+                    {
+                        name: 'isFast';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'isPyth';
+                        type: 'bool';
                     }
                 ];
             };

package/dist/utils/constants.d.ts

@@ -7,3 +7,8 @@ export declare const POSEIDON_CORE_COLLECTION: PublicKey;
 export declare const POSEIDON_COLLECTION_SYMBOL = "$PSN";
 export declare const BASE_DECIMALS = 6;
 export declare const BOOK_ORDER_NULL = 61;
+export declare const PRICE_FEED: {
+    BTC: string;
+    SOL: string;
+    ETH: string;
+};

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BOOK_ORDER_NULL = exports.BASE_DECIMALS = exports.POSEIDON_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.TRIAD_ADMIN = exports.UNIT_MINT = exports.TRD_MINT = exports.USDC_MINT = void 0;
+exports.PRICE_FEED = exports.BOOK_ORDER_NULL = exports.BASE_DECIMALS = exports.POSEIDON_COLLECTION_SYMBOL = exports.POSEIDON_CORE_COLLECTION = exports.TRIAD_ADMIN = exports.UNIT_MINT = exports.TRD_MINT = exports.USDC_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
 exports.USDC_MINT = new web3_js_1.PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
 exports.TRD_MINT = new web3_js_1.PublicKey('t3DohmswhKk94PPbPYwA6ZKACyY3y5kbcqeQerAJjmV');
@@ -10,3 +10,8 @@ exports.POSEIDON_CORE_COLLECTION = new web3_js_1.PublicKey('69CLccefLRmvDSAJP7Er
 exports.POSEIDON_COLLECTION_SYMBOL = '$PSN';
 exports.BASE_DECIMALS = 6;
 exports.BOOK_ORDER_NULL = 61;
+exports.PRICE_FEED = {
+    BTC: '0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43',
+    SOL: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
+    ETH: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace'
+};

package/dist/utils/helpers.d.ts

@@ -27,3 +27,4 @@ export declare const getOrderDirectionEncoded: (orderDirection: OrderDirection)
 export declare const getOppositeOrderDirection: (orderDirection: OrderDirection) => OrderDirection;
 export declare const getOppositeOrderDirectionEncoded: (orderDirection: OrderDirectionEncoded) => OrderDirectionEncoded;
 export declare const formatPredictor: (account: IdlAccounts<TriadProtocol>['predictor'], publicKey: PublicKey, balance: BN) => Predictor;
+export declare const getFeedIdFromHex: (input?: string) => PublicKey | null;

package/dist/utils/helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
+exports.getFeedIdFromHex = exports.formatPredictor = exports.getOppositeOrderDirectionEncoded = exports.getOppositeOrderDirection = exports.getOrderDirectionEncoded = exports.getOrderStatus = exports.getOrderSide = exports.getOrderType = exports.getOrderSideFromNumber = exports.getOrderDirectionFromNumber = exports.getOrderDirection = exports.getTokenProgram = exports.calculateStakeRewards = exports.formatCustomer = exports.formatBookOrder = exports.formatOrder = exports.formatMarket = exports.formatPool = exports.formatUnstake = exports.formatStake = exports.formatStakeVault = exports.decodeString = exports.encodeString = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const spl_token_1 = require("@solana/spl-token");
 const types_1 = require("../types");
@@ -63,7 +63,9 @@ const formatPool = (account, address) => {
         address: address.toString(),
         id: account.id.toNumber(),
         question: Buffer.from(account.question).toString().replace(/\0+$/, ''),
-        authority: account.authority.toString()
+        authority: account.authority.toString(),
+        isFast: account.isFast,
+        isPyth: account.isPyth
     };
 };
 exports.formatPool = formatPool;
@@ -100,7 +102,8 @@ const formatMarket = (account, address) => {
         payoutFee: account.payoutFee,
         customer: account.customerId === 0 ? 'Triad' : account.customerId.toString(),
         poolId: account.poolId.toNumber(),
-        feeRecipient: account.feeRecipient.toString()
+        feeRecipient: account.feeRecipient.toString(),
+        pythPrice: account.pythPrice.toString()
     };
 };
 exports.formatMarket = formatMarket;
@@ -255,3 +258,17 @@ const formatPredictor = (account, publicKey, balance) => {
     };
 };
 exports.formatPredictor = formatPredictor;
+const getFeedIdFromHex = (input) => {
+    let feedId = new Uint8Array(32);
+    if (!input) {
+        return null;
+    }
+    if (input.length === 66) {
+        feedId = Uint8Array.from(Buffer.from(input.slice(2), 'hex'));
+    }
+    if (input.length === 64) {
+        feedId = Uint8Array.from(Buffer.from(input, 'hex'));
+    }
+    return new web3_js_1.PublicKey(feedId);
+};
+exports.getFeedIdFromHex = getFeedIdFromHex;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "4.0.6",
+  "version": "4.0.8",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -33,6 +33,7 @@
   "license": "ISC",
   "dependencies": {
     "@coral-xyz/anchor": "0.31.1",
+    "@pythnetwork/pyth-solana-receiver": "0.14.0",
     "@solana/spl-token": "0.4.14",
     "@solana/web3.js": "1.98.4",
     "axios": "1.13.6",