flash-sdk 2.5.6 → 2.6.2

package/dist/PerpetualsClient.d.ts

@@ -47,9 +47,9 @@ export declare class PerpetualsClient {
     };
     private postSendTxCallback?;
     private prioritizationFee;
-    private useCustomOracle;
+    private useExtOracleAccount;
     private txConfirmationCommitment;
-    constructor(provider: AnchorProvider, programId: PublicKey, composabilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, opts: PerpClientOptions, useCustomOracle?: boolean);
+    constructor(provider: AnchorProvider, programId: PublicKey, composabilityProgramId: PublicKey, fbNftRewardProgramId: PublicKey, opts: PerpClientOptions, useExtOracleAccount?: boolean);
     setPrioritizationFee: (fee: number) => void;
     loadAddressLookupTable: (poolConfig: PoolConfig) => Promise<void>;
     findProgramAddress: (label: string, extraSeeds?: any) => {
@@ -71,8 +71,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -332,8 +332,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -592,8 +592,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -855,8 +855,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -1117,8 +1117,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -1377,8 +1377,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -1670,8 +1670,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -1930,8 +1930,8 @@ export declare class PerpetualsClient {
         isVirtual: boolean;
         distributeRewards: boolean;
         oracle: {
-            oracleAccount: PublicKey;
-            customOracleAccount: PublicKey;
+            intOracleAccount: PublicKey;
+            extOracleAccount: PublicKey;
             oracleType: {
                 none?: Record<string, never>;
                 custom?: Record<string, never>;
@@ -2379,7 +2379,15 @@ export declare class PerpetualsClient {
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;
-    reimburse: (poolName: string, tokenMint: PublicKey, amountIn: BN, poolConfig: PoolConfig) => Promise<{
+    reimburse: (tokenMint: PublicKey, amountIn: BN, poolConfig: PoolConfig) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    setCustomOraclePrice: (tokenMint: PublicKey, price: BN, expo: number, conf: BN, ema: BN, publishTime: BN, poolConfig: PoolConfig) => Promise<{
+        instructions: TransactionInstruction[];
+        additionalSigners: Signer[];
+    }>;
+    setInternalOraclePrice: (tokenMint: PublicKey, price: BN, expo: number, conf: BN, ema: BN, publishTime: BN, poolConfig: PoolConfig) => Promise<{
         instructions: TransactionInstruction[];
         additionalSigners: Signer[];
     }>;

package/dist/PerpetualsClient.js

@@ -77,8 +77,8 @@ var constants_1 = require("./constants");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var getNftAccounts_1 = require("./utils/getNftAccounts");
 var PerpetualsClient = (function () {
-    function PerpetualsClient(provider, programId, composabilityProgramId, fbNftRewardProgramId, opts, useCustomOracle) {
-        if (useCustomOracle === void 0) { useCustomOracle = false; }
+    function PerpetualsClient(provider, programId, composabilityProgramId, fbNftRewardProgramId, opts, useExtOracleAccount) {
+        if (useExtOracleAccount === void 0) { useExtOracleAccount = false; }
         var _this = this;
         var _a;
         this.addressLookupTables = [];
@@ -559,9 +559,9 @@ var PerpetualsClient = (function () {
                                 position: positionAccount,
                                 market: marketPk,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.program.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -1695,9 +1695,9 @@ var PerpetualsClient = (function () {
                                     position: positionAccount,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     systemProgram: web3_js_1.SystemProgram.programId,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -1806,7 +1806,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyOracleAccountMetas.push({
-                                    pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -1828,18 +1828,18 @@ var PerpetualsClient = (function () {
                                     perpetuals: swapPoolConfig.perpetuals,
                                     swapPool: swapPoolConfig.poolAddress,
                                     receivingCustody: swapInCustodyConfig.custodyAccount,
-                                    receivingCustodyOracleAccount: this.useCustomOracle ? swapInCustodyConfig.customOracleAddress : swapInCustodyConfig.oracleAddress,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? swapInCustodyConfig.extOracleAccount : swapInCustodyConfig.intOracleAccount,
                                     receivingCustodyTokenAccount: swapInCustodyConfig.tokenAccount,
                                     dispensingCustody: swapOutCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: this.useCustomOracle ? swapOutCustodyConfig.customOracleAddress : swapOutCustodyConfig.oracleAddress,
+                                    dispensingCustodyOracleAccount: this.useExtOracleAccount ? swapOutCustodyConfig.extOracleAccount : swapOutCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: swapOutCustodyConfig.tokenAccount,
                                     positionPool: positionPoolConfig.poolAddress,
                                     position: positionAccount,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     systemProgram: web3_js_1.SystemProgram.programId,
@@ -1930,9 +1930,9 @@ var PerpetualsClient = (function () {
                                     position: positionAccount,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2027,7 +2027,7 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                             custodyOracleAccountMetas.push({
-                                pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                 isSigner: false,
                                 isWritable: false,
                             });
@@ -2047,18 +2047,18 @@ var PerpetualsClient = (function () {
                                 perpetuals: swapPoolConfig.perpetuals,
                                 swapPool: swapPoolConfig.poolAddress,
                                 receivingCustody: swapInCustodyConfig.custodyAccount,
-                                receivingCustodyOracleAccount: this.useCustomOracle ? swapInCustodyConfig.customOracleAddress : swapInCustodyConfig.oracleAddress,
+                                receivingCustodyOracleAccount: this.useExtOracleAccount ? swapInCustodyConfig.extOracleAccount : swapInCustodyConfig.intOracleAccount,
                                 receivingCustodyTokenAccount: swapInCustodyConfig.tokenAccount,
                                 dispensingCustody: swapOutCustodyConfig.custodyAccount,
-                                dispensingCustodyOracleAccount: this.useCustomOracle ? swapOutCustodyConfig.customOracleAddress : swapOutCustodyConfig.oracleAddress,
+                                dispensingCustodyOracleAccount: this.useExtOracleAccount ? swapOutCustodyConfig.extOracleAccount : swapOutCustodyConfig.intOracleAccount,
                                 dispensingCustodyTokenAccount: swapOutCustodyConfig.tokenAccount,
                                 positionPool: positionPoolConfig.poolAddress,
                                 position: positionAccount,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2232,7 +2232,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyOracleAccountMetas.push({
-                                    pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2252,10 +2252,10 @@ var PerpetualsClient = (function () {
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     receivingCustody: userInputCustodyConfig.custodyAccount,
-                                    receivingCustodyOracleAccount: this.useCustomOracle ? userInputCustodyConfig.customOracleAddress : userInputCustodyConfig.oracleAddress,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? userInputCustodyConfig.extOracleAccount : userInputCustodyConfig.intOracleAccount,
                                     receivingCustodyTokenAccount: userInputCustodyConfig.tokenAccount,
                                     dispensingCustody: userOutputCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: this.useCustomOracle ? userOutputCustodyConfig.customOracleAddress : userOutputCustodyConfig.oracleAddress,
+                                    dispensingCustodyOracleAccount: this.useExtOracleAccount ? userOutputCustodyConfig.extOracleAccount : userOutputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: userOutputCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2362,9 +2362,9 @@ var PerpetualsClient = (function () {
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2469,7 +2469,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyOracleAccountMetas.push({
-                                    pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2487,18 +2487,18 @@ var PerpetualsClient = (function () {
                                     perpetuals: poolConfigSwap.perpetuals,
                                     swapPool: poolConfigSwap.poolAddress,
                                     receivingCustody: inputCustodyConfig.custodyAccount,
-                                    receivingCustodyOracleAccount: this.useCustomOracle ? inputCustodyConfig.customOracleAddress : inputCustodyConfig.oracleAddress,
+                                    receivingCustodyOracleAccount: this.useExtOracleAccount ? inputCustodyConfig.extOracleAccount : inputCustodyConfig.intOracleAccount,
                                     receivingCustodyTokenAccount: inputCustodyConfig.tokenAccount,
                                     dispensingCustody: outputCustodyConfig.custodyAccount,
-                                    dispensingCustodyOracleAccount: this.useCustomOracle ? outputCustodyConfig.customOracleAddress : outputCustodyConfig.oracleAddress,
+                                    dispensingCustodyOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
                                     dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
                                     positionPool: poolConfigPosition.poolAddress,
                                     position: positionPubKey,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2594,9 +2594,9 @@ var PerpetualsClient = (function () {
                                     position: positionPubKey,
                                     market: marketAccount,
                                     targetCustody: targetCustodyConfig.custodyAccount,
-                                    targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                    targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                     collateralCustody: collateralCustodyConfig.custodyAccount,
-                                    collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                    collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                     collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                     eventAuthority: this.eventAuthority.publicKey,
                                     tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2690,7 +2690,7 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                             custodyOracleAccountMetas.push({
-                                pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                 isSigner: false,
                                 isWritable: false,
                             });
@@ -2709,18 +2709,18 @@ var PerpetualsClient = (function () {
                                 perpetuals: poolConfigSwap.perpetuals,
                                 swapPool: poolConfigSwap.poolAddress,
                                 receivingCustody: inputCusotdyConfig.custodyAccount,
-                                receivingCustodyOracleAccount: this.useCustomOracle ? inputCusotdyConfig.customOracleAddress : inputCusotdyConfig.oracleAddress,
+                                receivingCustodyOracleAccount: this.useExtOracleAccount ? inputCusotdyConfig.extOracleAccount : inputCusotdyConfig.intOracleAccount,
                                 receivingCustodyTokenAccount: inputCusotdyConfig.tokenAccount,
                                 dispensingCustody: outputCustodyConfig.custodyAccount,
-                                dispensingCustodyOracleAccount: this.useCustomOracle ? outputCustodyConfig.customOracleAddress : outputCustodyConfig.oracleAddress,
+                                dispensingCustodyOracleAccount: this.useExtOracleAccount ? outputCustodyConfig.extOracleAccount : outputCustodyConfig.intOracleAccount,
                                 dispensingCustodyTokenAccount: outputCustodyConfig.tokenAccount,
                                 positionPool: poolConfigPosition.poolAddress,
                                 position: positionAccount,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
@@ -2772,9 +2772,9 @@ var PerpetualsClient = (function () {
                                 position: positionPubKey,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -2827,9 +2827,9 @@ var PerpetualsClient = (function () {
                                 position: positionPubKey,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -2884,7 +2884,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyOracleAccountMetas.push({
-                                    pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -2959,7 +2959,7 @@ var PerpetualsClient = (function () {
                                 perpetuals: poolConfig.perpetuals,
                                 pool: poolConfig.poolAddress,
                                 custody: payTokenCustodyConfig.custodyAccount,
-                                custodyOracleAccount: this.useCustomOracle ? payTokenCustodyConfig.customOracleAddress : payTokenCustodyConfig.oracleAddress,
+                                custodyOracleAccount: this.useExtOracleAccount ? payTokenCustodyConfig.extOracleAccount : payTokenCustodyConfig.intOracleAccount,
                                 custodyTokenAccount: payTokenCustodyConfig.tokenAccount,
                                 lpTokenMint: poolConfig.lpTokenMint,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -3020,7 +3020,7 @@ var PerpetualsClient = (function () {
                                     isWritable: false,
                                 });
                                 custodyOracleAccountMetas.push({
-                                    pubkey: this.useCustomOracle ? custody.customOracleAddress : custody.oracleAddress,
+                                    pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                     isSigner: false,
                                     isWritable: false,
                                 });
@@ -3083,7 +3083,7 @@ var PerpetualsClient = (function () {
                                     perpetuals: poolConfig.perpetuals,
                                     pool: poolConfig.poolAddress,
                                     custody: recieveTokenCustodyConfig.custodyAccount,
-                                    custodyOracleAccount: this.useCustomOracle ? recieveTokenCustodyConfig.customOracleAddress : recieveTokenCustodyConfig.oracleAddress,
+                                    custodyOracleAccount: this.useExtOracleAccount ? recieveTokenCustodyConfig.extOracleAccount : recieveTokenCustodyConfig.intOracleAccount,
                                     custodyTokenAccount: recieveTokenCustodyConfig.tokenAccount,
                                     lpTokenMint: poolConfig.lpTokenMint,
                                     eventAuthority: this.eventAuthority.publicKey,
@@ -4040,9 +4040,9 @@ var PerpetualsClient = (function () {
                                 position: positionAccount,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 eventAuthority: this.eventAuthority.publicKey,
                                 program: this.programId,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
@@ -4131,9 +4131,9 @@ var PerpetualsClient = (function () {
                                 position: positionAccount.publicKey,
                                 market: marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                targetOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                targetOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 collateralCustodyTokenAccount: collateralCustodyConfig.tokenAccount,
                                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
                                 eventAuthority: this.eventAuthority.publicKey,
@@ -4180,9 +4180,9 @@ var PerpetualsClient = (function () {
                                 position: position.publicKey,
                                 market: marketConfig.marketAccount,
                                 targetCustody: targetCustodyConfig.custodyAccount,
-                                custodyOracleAccount: this.useCustomOracle ? targetCustodyConfig.customOracleAddress : targetCustodyConfig.oracleAddress,
+                                custodyOracleAccount: this.useExtOracleAccount ? targetCustodyConfig.extOracleAccount : targetCustodyConfig.intOracleAccount,
                                 collateralCustody: collateralCustodyConfig.custodyAccount,
-                                collateralOracleAccount: this.useCustomOracle ? collateralCustodyConfig.customOracleAddress : collateralCustodyConfig.oracleAddress,
+                                collateralOracleAccount: this.useExtOracleAccount ? collateralCustodyConfig.extOracleAccount : collateralCustodyConfig.intOracleAccount,
                                 ixSysvar: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY
                             })
                                 .view()];
@@ -4280,7 +4280,7 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
-        this.reimburse = function (poolName, tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+        this.reimburse = function (tokenMint, amountIn, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
             var custodyAccountMetas, custodyOracleAccountMetas, markets, _i, _a, custody, _b, _c, market, instructions, additionalSigners, custodyConfig, reimburse, _d, _e, err_26;
             var _f;
             return __generator(this, function (_g) {
@@ -4297,7 +4297,7 @@ var PerpetualsClient = (function () {
                                 isWritable: false,
                             });
                             custodyOracleAccountMetas.push({
-                                pubkey: custody.customOracleAddress,
+                                pubkey: this.useExtOracleAccount ? custody.extOracleAccount : custody.intOracleAccount,
                                 isSigner: false,
                                 isWritable: false,
                             });
@@ -4327,9 +4327,9 @@ var PerpetualsClient = (function () {
                         return [4, (0, spl_token_1.getAssociatedTokenAddress)(tokenMint, this.provider.wallet.publicKey)];
                     case 2: return [4, _e.apply(_d, [(_f.fundingAccount = _g.sent(),
                                 _f.perpetuals = poolConfig.perpetuals,
-                                _f.pool = this.getPoolKey(poolName),
-                                _f.custody = this.getCustodyKey(poolName, tokenMint),
-                                _f.custodyOracleAccount = this.useCustomOracle ? custodyConfig.customOracleAddress : custodyConfig.oracleAddress,
+                                _f.pool = poolConfig.poolAddress,
+                                _f.custody = custodyConfig.custodyAccount,
+                                _f.custodyOracleAccount = this.useExtOracleAccount ? custodyConfig.extOracleAccount : custodyConfig.intOracleAccount,
                                 _f.custodyTokenAccount = custodyConfig.tokenAccount,
                                 _f.tokenProgram = spl_token_1.TOKEN_PROGRAM_ID,
                                 _f.program = poolConfig.programId,
@@ -4352,6 +4352,95 @@ var PerpetualsClient = (function () {
                 }
             });
         }); };
+        this.setCustomOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, custodyConfig, setCustomOraclePrice, err_27;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        instructions = [];
+                        additionalSigners = [];
+                        custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(tokenMint); });
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setCustomOraclePrice({
+                                price: price,
+                                expo: expo,
+                                conf: conf,
+                                ema: ema,
+                                publishTime: publishTime,
+                            })
+                                .accounts({
+                                admin: this.provider.wallet.publicKey,
+                                multisig: poolConfig.multisig,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                custody: custodyConfig.custodyAccount,
+                                intOracleAccount: custodyConfig.intOracleAccount,
+                                extOracleAccount: custodyConfig.extOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setCustomOraclePrice = _a.sent();
+                        instructions.push(setCustomOraclePrice);
+                        return [3, 4];
+                    case 3:
+                        err_27 = _a.sent();
+                        console.log("perpClient setCustomOracleAccount error:: ", err_27);
+                        throw err_27;
+                    case 4: return [2, {
+                            instructions: __spreadArray([], instructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
+        this.setInternalOraclePrice = function (tokenMint, price, expo, conf, ema, publishTime, poolConfig) { return __awaiter(_this, void 0, void 0, function () {
+            var instructions, additionalSigners, custodyConfig, setInternalOraclePrice, err_28;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        instructions = [];
+                        additionalSigners = [];
+                        custodyConfig = poolConfig.custodies.find(function (i) { return i.mintKey.equals(tokenMint); });
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4, this.program.methods
+                                .setInternalOraclePrice({
+                                price: price,
+                                expo: expo,
+                                conf: conf,
+                                ema: ema,
+                                publishTime: publishTime,
+                            })
+                                .accounts({
+                                authority: poolConfig.backupOracle,
+                                perpetuals: poolConfig.perpetuals,
+                                pool: poolConfig.poolAddress,
+                                custody: custodyConfig.custodyAccount,
+                                intOracleAccount: custodyConfig.intOracleAccount,
+                                extOracleAccount: custodyConfig.extOracleAccount,
+                                systemProgram: web3_js_1.SystemProgram.programId,
+                            })
+                                .instruction()];
+                    case 2:
+                        setInternalOraclePrice = _a.sent();
+                        instructions.push(setInternalOraclePrice);
+                        return [3, 4];
+                    case 3:
+                        err_28 = _a.sent();
+                        console.log("perpClient setInternalOracleAccount error:: ", err_28);
+                        throw err_28;
+                    case 4: return [2, {
+                            instructions: __spreadArray([], instructions, true),
+                            additionalSigners: additionalSigners
+                        }];
+                }
+            });
+        }); };
         this.provider = provider;
         (0, anchor_1.setProvider)(provider);
         this.program = new anchor_1.Program(perpetuals_1.IDL, programId);
@@ -4365,7 +4454,7 @@ var PerpetualsClient = (function () {
         this.perpetuals = this.findProgramAddress("perpetuals");
         this.eventAuthority = this.findProgramAddress("__event_authority");
         this.prioritizationFee = (opts === null || opts === void 0 ? void 0 : opts.prioritizationFee) || 0;
-        this.useCustomOracle = useCustomOracle;
+        this.useExtOracleAccount = useExtOracleAccount;
         this.postSendTxCallback = opts === null || opts === void 0 ? void 0 : opts.postSendTxCallback;
         this.txConfirmationCommitment = (_a = opts === null || opts === void 0 ? void 0 : opts.txConfirmationCommitment) !== null && _a !== void 0 ? _a : 'processed';
         anchor_1.BN.prototype.toJSON = function () {

package/dist/PoolConfig.d.ts

@@ -13,8 +13,8 @@ export interface CustodyConfig {
     tokenPrecision: number;
     isStable: boolean;
     isVirtual: boolean;
-    oracleAddress: PublicKey;
-    customOracleAddress: PublicKey;
+    intOracleAccount: PublicKey;
+    extOracleAccount: PublicKey;
     pythTicker: string;
     pythPriceId: string;
 }

package/dist/PoolConfig.js

@@ -138,7 +138,7 @@ var PoolConfig = (function () {
         var custodies;
         try {
             custodies = poolConfig['custodies'].map(function (i, index) {
-                return __assign(__assign({}, i), { custodyId: i.custodyId, custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), oracleAddress: new web3_js_1.PublicKey(i.oracleAddress), customOracleAddress: new web3_js_1.PublicKey(i.customOracleAddress), usdPrecision: i.usdPrecision, tokenPrecision: i.tokenPrecision });
+                return __assign(__assign({}, i), { custodyId: i.custodyId, custodyAccount: new web3_js_1.PublicKey(i.custodyAccount), tokenAccount: new web3_js_1.PublicKey(i.tokenAccount), mintKey: new web3_js_1.PublicKey(i.mintKey), intOracleAccount: new web3_js_1.PublicKey(i.intOracleAddress), extOracleAccount: new web3_js_1.PublicKey(i.extOracleAddress), usdPrecision: i.usdPrecision, tokenPrecision: i.tokenPrecision });
             });
         }
         catch (error) {