@triadxyz/triad-protocol 4.0.7 → 4.0.9

package/dist/index.d.ts

@@ -8,7 +8,6 @@ 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';
@@ -29,7 +28,6 @@ export default class TriadProtocol {
     predictor: Predictor;
     trade: Trade;
     customer: Customer;
-    pythSolanaReceiver: PythSolanaReceiver;
     constructor(connection: Connection, wallet: Wallet, rpcOptions: RpcOptions);
     /**
      * Get User Orders
@@ -174,5 +172,5 @@ export default class TriadProtocol {
      * @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>;
+    createMarketPyth({ marketId, resolveIn, customer, poolId, feedId }: CreateMarketPythArgs): Promise<string | import("@solana/web3.js").VersionedTransaction>;
 }

package/dist/index.js

@@ -59,7 +59,6 @@ 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'
         });
@@ -285,19 +284,23 @@ class TriadProtocol {
                 throw new Error('Pool question must be less than 80 characters');
             }
             const ixs = [];
-            const feedPDA = this.pythSolanaReceiver.getPriceFeedAccountAddress(0, feedId);
+            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,
-                feed: feedPDA
+                isPyth
             })
                 .accounts({
                 signer: this.program.provider.publicKey,
-                customer
+                priceUpdate: feedPDA,
+                customer,
+                feed: (0, helpers_1.getFeedIdFromHex)(feedId)
             })
                 .instruction());
             for (const market of markets) {
@@ -481,31 +484,31 @@ class TriadProtocol {
      * @param args.customer - The customer of the market
      * @param args.poolId - The ID of the pool
      */
-    createMarketPyth({ markets, customer, poolId }) {
+    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);
-            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());
-            }
+            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);
         });
     }

package/dist/types/idl_triad_protocol.json

@@ -889,6 +889,10 @@
                     "writable": true,
                     "optional": true
                 },
+                {
+                    "name": "feed",
+                    "writable": true
+                },
                 {
                     "name": "system_program",
                     "address": "11111111111111111111111111111111"
@@ -2982,12 +2986,6 @@
                     {
                         "name": "is_pyth",
                         "type": "bool"
-                    },
-                    {
-                        "name": "feed",
-                        "type": {
-                            "option": "pubkey"
-                        }
                     }
                 ]
             }
@@ -3286,6 +3284,10 @@
                     {
                         "name": "resolved_ts",
                         "type": "i64"
+                    },
+                    {
+                        "name": "pyth_price",
+                        "type": "u64"
                     }
                 ]
             }
@@ -3449,10 +3451,14 @@
                         "name": "pre_market_end_ts",
                         "type": "i64"
                     },
+                    {
+                        "name": "pyth_price",
+                        "type": "u64"
+                    },
                     {
                         "name": "padding",
                         "type": {
-                            "array": ["u8", 24]
+                            "array": ["u8", 16]
                         }
                     }
                 ]
@@ -3763,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;
@@ -151,12 +154,11 @@ export type CreateMarketArgs = {
     poolId?: number;
 };
 export type CreateMarketPythArgs = {
-    markets: {
-        marketId: number;
-        resolveIn: number;
-    }[];
+    marketId: number;
+    resolveIn: number;
     customer: PublicKey;
     poolId: number;
+    feedId: string;
 };
 export type CreatePoolArgs = {
     poolId: number;
@@ -172,7 +174,7 @@ export type CreatePoolArgs = {
     }[];
     isFast?: boolean;
     isPyth?: boolean;
-    feedId: string;
+    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';
@@ -3899,12 +3903,6 @@ export type TriadProtocol = {
                     {
                         name: 'isPyth';
                         type: 'bool';
-                    },
-                    {
-                        name: 'feed';
-                        type: {
-                            option: 'pubkey';
-                        };
                     }
                 ];
             };
@@ -4203,6 +4201,10 @@ export type TriadProtocol = {
                     {
                         name: 'resolvedTs';
                         type: 'i64';
+                    },
+                    {
+                        name: 'pythPrice';
+                        type: 'u64';
                     }
                 ];
             };
@@ -4366,10 +4368,14 @@ export type TriadProtocol = {
                         name: 'preMarketEndTs';
                         type: 'i64';
                     },
+                    {
+                        name: 'pythPrice';
+                        type: 'u64';
+                    },
                     {
                         name: 'padding';
                         type: {
-                            array: ['u8', 24];
+                            array: ['u8', 16];
                         };
                     }
                 ];
@@ -4680,6 +4686,14 @@ export type TriadProtocol = {
                     {
                         name: 'authority';
                         type: 'pubkey';
+                    },
+                    {
+                        name: 'isFast';
+                        type: 'bool';
+                    },
+                    {
+                        name: 'isPyth';
+                        type: 'bool';
                     }
                 ];
             };

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.7",
+  "version": "4.0.9",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",