@triadxyz/triad-protocol 4.1.0 → 4.1.2

package/dist/customer.d.ts

@@ -1,4 +1,3 @@
-/// <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/index.d.ts

@@ -1,4 +1,3 @@
-/// <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';

package/dist/index.js

@@ -41,7 +41,6 @@ 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);
@@ -286,7 +285,7 @@ class TriadProtocol {
             const ixs = [];
             let feedPDA = null;
             if (isPyth) {
-                feedPDA = (0, pyth_solana_receiver_1.getPriceFeedAccountForProgram)(0, feedId);
+                feedPDA = (0, helpers_2.getPriceFeedAccountForProgram)(feedId);
             }
             const poolPDA = (0, pda_1.getPoolPDA)(this.program.programId, poolId);
             ixs.push(yield this.program.methods
@@ -488,7 +487,7 @@ class TriadProtocol {
         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);
+            const feedPDA = (0, helpers_2.getPriceFeedAccountForProgram)(feedId);
             ixs.push(yield this.program.methods
                 .createMarketPyth({
                 marketId: new bn_js_1.default(marketId),

package/dist/poseidon.d.ts

@@ -1,4 +1,3 @@
-/// <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,4 +1,3 @@
-/// <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,4 +1,3 @@
-/// <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,4 +1,3 @@
-/// <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/utils/constants.d.ts

@@ -12,3 +12,4 @@ export declare const PRICE_FEED: {
     SOL: string;
     ETH: string;
 };
+export declare const DEFAULT_PUSH_ORACLE_PROGRAM_ID: PublicKey;

package/dist/utils/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.DEFAULT_PUSH_ORACLE_PROGRAM_ID = 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');
@@ -15,3 +15,4 @@ exports.PRICE_FEED = {
     SOL: '0xef0d8b6fda2ceba41da15d4095d1da392a0d2f8ed0c6c7bc0f4cfac8c280b56d',
     ETH: '0xff61491a931112ddf1bd8147cd1b641375f79f5825126d665480874634fd0ace'
 };
+exports.DEFAULT_PUSH_ORACLE_PROGRAM_ID = new web3_js_1.PublicKey('pythWSnswVUd12oZpeFP8e9CVaEqJg25g1Vtc2biRsT');

package/dist/utils/helpers.d.ts

@@ -27,4 +27,5 @@ 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 getPriceFeedAccountForProgram: (priceFeedId: string) => PublicKey;
 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.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;
+exports.getFeedIdFromHex = exports.getPriceFeedAccountForProgram = 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");
@@ -258,6 +258,21 @@ const formatPredictor = (account, publicKey, balance) => {
     };
 };
 exports.formatPredictor = formatPredictor;
+const getPriceFeedAccountForProgram = (priceFeedId) => {
+    let buffer = null;
+    if (typeof priceFeedId == 'string') {
+        buffer = priceFeedId.startsWith('0x')
+            ? Buffer.from(priceFeedId.slice(2), 'hex')
+            : Buffer.from(priceFeedId, 'hex');
+    }
+    if (buffer.length != 32) {
+        throw new Error('Feed ID should be 32 bytes long');
+    }
+    const shardBuffer = Buffer.alloc(2);
+    shardBuffer.writeUint16LE(0, 0);
+    return web3_js_1.PublicKey.findProgramAddressSync([shardBuffer, buffer], constants_1.DEFAULT_PUSH_ORACLE_PROGRAM_ID)[0];
+};
+exports.getPriceFeedAccountForProgram = getPriceFeedAccountForProgram;
 const getFeedIdFromHex = (input) => {
     let feedId = new Uint8Array(32);
     if (!input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triadxyz/triad-protocol",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -33,7 +33,6 @@
   "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",