@triadxyz/triad-protocol 4.0.5 → 4.0.7

package/README.md

@@ -111,4 +111,4 @@ The documentation will be available in the `docs/` folder.
 
 ## 📄 License
 
-MIT
+ISC

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,12 +1,14 @@
+/// <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';
 import Trade from './trade';
 import Customer from './customer';
+import { PythSolanaReceiver } from '@pythnetwork/pyth-solana-receiver';
 export * from './types';
 export * from './types/predictor';
 export * from './types/stake';
@@ -27,6 +29,7 @@ export default class TriadProtocol {
     predictor: Predictor;
     trade: Trade;
     customer: Customer;
+    pythSolanaReceiver: PythSolanaReceiver;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
     /**
      * Get User Orders
@@ -102,6 +105,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 +166,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({ markets, customer, poolId }: 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);
@@ -58,6 +59,7 @@ class TriadProtocol {
         if (!this.rpcOptions.payer) {
             this.rpcOptions.payer = this.wallet.publicKey;
         }
+        this.pythSolanaReceiver = new pyth_solana_receiver_1.PythSolanaReceiver({ connection, wallet });
         this.provider = new anchor_1.AnchorProvider(this.connection, this.wallet, {
             commitment: this.rpcOptions.commitment || 'confirmed'
         });
@@ -268,6 +270,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,6 +285,7 @@ class TriadProtocol {
                 throw new Error('Pool question must be less than 80 characters');
             }
             const ixs = [];
+            const feedPDA = this.pythSolanaReceiver.getPriceFeedAccountAddress(0, feedId);
             const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
             ixs.push(yield this.program.methods
                 .createPool({
@@ -282,7 +293,7 @@ class TriadProtocol {
                 question: (0, helpers_1.encodeString)(question, 80),
                 isFast,
                 isPyth,
-                feedId
+                feed: feedPDA
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
@@ -462,5 +473,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({ markets, customer, poolId }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ixs = [];
+            let poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
+            for (const market of markets) {
+                ixs.push(yield this.program.methods
+                    .createMarketPyth({
+                    marketId: new bn_js_1.default(market.marketId),
+                    resolveIn: new bn_js_1.default(market.resolveIn)
+                })
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                    pool: poolPDA,
+                    customer
+                })
+                    .instruction());
+                ixs.push(yield this.program.methods
+                    .createOrderBook(new bn_js_1.default(market.marketId))
+                    .accounts({
+                    signer: this.program.provider.publicKey,
+                    market: (0, pda_1.getMarketPDA)(this.program.programId, market.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

@@ -1241,7 +1241,31 @@
                 },
                 {
                     "name": "buyer_ata",
-                    "writable": true
+                    "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
+                            ]
+                        }
+                    }
                 },
                 {
                     "name": "seller_ata",
@@ -1273,7 +1297,31 @@
                 },
                 {
                     "name": "market_ata",
-                    "writable": true
+                    "writable": true,
+                    "pda": {
+                        "seeds": [
+                            {
+                                "kind": "account",
+                                "path": "market"
+                            },
+                            {
+                                "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": "token_program",
@@ -2846,6 +2894,10 @@
                     {
                         "name": "fee_recipient",
                         "type": "pubkey"
+                    },
+                    {
+                        "name": "fee_bps",
+                        "type": "u16"
                     }
                 ]
             }
@@ -2932,7 +2984,7 @@
                         "type": "bool"
                     },
                     {
-                        "name": "feed_id",
+                        "name": "feed",
                         "type": {
                             "option": "pubkey"
                         }
@@ -3681,10 +3733,8 @@
                         "type": "bool"
                     },
                     {
-                        "name": "feed_id",
-                        "type": {
-                            "array": ["u8", 32]
-                        }
+                        "name": "feed",
+                        "type": "pubkey"
                     },
                     {
                         "name": "padding",

package/dist/types/index.d.ts

@@ -150,6 +150,14 @@ export type CreateMarketArgs = {
     customer: PublicKey;
     poolId?: number;
 };
+export type CreateMarketPythArgs = {
+    markets: {
+        marketId: number;
+        resolveIn: number;
+    }[];
+    customer: PublicKey;
+    poolId: number;
+};
 export type CreatePoolArgs = {
     poolId: number;
     question?: string;
@@ -164,7 +172,7 @@ export type CreatePoolArgs = {
     }[];
     isFast?: boolean;
     isPyth?: boolean;
-    feedId?: PublicKey;
+    feedId: string;
 };
 export type UpdateMarketWinningDirectionArgs = {
     marketId: number;

package/dist/types/triad_protocol.d.ts

@@ -1718,6 +1718,59 @@ export type TriadProtocol = {
                 {
                     name: 'buyerAta';
                     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: 'sellerAta';
@@ -1779,6 +1832,59 @@ export type TriadProtocol = {
                 {
                     name: 'marketAta';
                     writable: true;
+                    pda: {
+                        seeds: [
+                            {
+                                kind: 'account';
+                                path: 'market';
+                            },
+                            {
+                                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: 'tokenProgram';
@@ -3705,6 +3811,10 @@ export type TriadProtocol = {
                     {
                         name: 'feeRecipient';
                         type: 'pubkey';
+                    },
+                    {
+                        name: 'feeBps';
+                        type: 'u16';
                     }
                 ];
             };
@@ -3791,7 +3901,7 @@ export type TriadProtocol = {
                         type: 'bool';
                     },
                     {
-                        name: 'feedId';
+                        name: 'feed';
                         type: {
                             option: 'pubkey';
                         };
@@ -4540,10 +4650,8 @@ export type TriadProtocol = {
                         type: 'bool';
                     },
                     {
-                        name: 'feedId';
-                        type: {
-                            array: ['u8', 32];
-                        };
+                        name: 'feed';
+                        type: 'pubkey';
                     },
                     {
                         name: 'padding';

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "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",