@velocity-exchange/sdk 0.1.0 → 0.2.1

package/lib/browser/tx/txHandler.js

@@ -39,24 +39,24 @@ const RECENT_BLOCKHASH_STALE_TIME_MS = 2000; // Reuse blockhashes within this ti
  */
 class TxHandler {
     constructor(props) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         this.blockHashToLastValidBlockHeightLookup = {};
         this.returnBlockHeightsWithSignedTxCallbackData = false;
-        this.blockhashCommitment = config_1.DEFAULT_CONFIRMATION_OPTS.commitment;
+        this.blockhashCommitment = (_a = config_1.DEFAULT_CONFIRMATION_OPTS.commitment) !== null && _a !== void 0 ? _a : 'confirmed';
         this.getProps = (wallet, confirmationOpts) => [wallet !== null && wallet !== void 0 ? wallet : this.wallet, confirmationOpts !== null && confirmationOpts !== void 0 ? confirmationOpts : this.confirmationOptions];
         this.connection = props.connection;
         this.wallet = props.wallet;
         this.confirmationOptions = props.confirmationOptions;
         this.blockhashCommitment =
-            (_e = (_d = (_b = (_a = props.confirmationOptions) === null || _a === void 0 ? void 0 : _a.preflightCommitment) !== null && _b !== void 0 ? _b : (_c = props === null || props === void 0 ? void 0 : props.connection) === null || _c === void 0 ? void 0 : _c.commitment) !== null && _d !== void 0 ? _d : this.blockhashCommitment) !== null && _e !== void 0 ? _e : 'confirmed';
-        this.blockHashFetcher = ((_f = props === null || props === void 0 ? void 0 : props.config) === null || _f === void 0 ? void 0 : _f.blockhashCachingEnabled)
-            ? new cachedBlockhashFetcher_1.CachedBlockhashFetcher(this.connection, this.blockhashCommitment, (_j = (_h = (_g = props === null || props === void 0 ? void 0 : props.config) === null || _g === void 0 ? void 0 : _g.blockhashCachingConfig) === null || _h === void 0 ? void 0 : _h.retryCount) !== null && _j !== void 0 ? _j : BLOCKHASH_FETCH_RETRY_COUNT, (_m = (_l = (_k = props === null || props === void 0 ? void 0 : props.config) === null || _k === void 0 ? void 0 : _k.blockhashCachingConfig) === null || _l === void 0 ? void 0 : _l.retrySleepTimeMs) !== null && _m !== void 0 ? _m : BLOCKHASH_FETCH_RETRY_SLEEP, (_q = (_p = (_o = props === null || props === void 0 ? void 0 : props.config) === null || _o === void 0 ? void 0 : _o.blockhashCachingConfig) === null || _p === void 0 ? void 0 : _p.staleCacheTimeMs) !== null && _q !== void 0 ? _q : RECENT_BLOCKHASH_STALE_TIME_MS)
+            (_f = (_e = (_c = (_b = props.confirmationOptions) === null || _b === void 0 ? void 0 : _b.preflightCommitment) !== null && _c !== void 0 ? _c : (_d = props === null || props === void 0 ? void 0 : props.connection) === null || _d === void 0 ? void 0 : _d.commitment) !== null && _e !== void 0 ? _e : this.blockhashCommitment) !== null && _f !== void 0 ? _f : 'confirmed';
+        this.blockHashFetcher = ((_g = props === null || props === void 0 ? void 0 : props.config) === null || _g === void 0 ? void 0 : _g.blockhashCachingEnabled)
+            ? new cachedBlockhashFetcher_1.CachedBlockhashFetcher(this.connection, this.blockhashCommitment, (_k = (_j = (_h = props === null || props === void 0 ? void 0 : props.config) === null || _h === void 0 ? void 0 : _h.blockhashCachingConfig) === null || _j === void 0 ? void 0 : _j.retryCount) !== null && _k !== void 0 ? _k : BLOCKHASH_FETCH_RETRY_COUNT, (_o = (_m = (_l = props === null || props === void 0 ? void 0 : props.config) === null || _l === void 0 ? void 0 : _l.blockhashCachingConfig) === null || _m === void 0 ? void 0 : _m.retrySleepTimeMs) !== null && _o !== void 0 ? _o : BLOCKHASH_FETCH_RETRY_SLEEP, (_r = (_q = (_p = props === null || props === void 0 ? void 0 : props.config) === null || _p === void 0 ? void 0 : _p.blockhashCachingConfig) === null || _q === void 0 ? void 0 : _q.staleCacheTimeMs) !== null && _r !== void 0 ? _r : RECENT_BLOCKHASH_STALE_TIME_MS)
             : new baseBlockhashFetcher_1.BaseBlockhashFetcher(this.connection, this.blockhashCommitment);
         // #Optionals
         this.returnBlockHeightsWithSignedTxCallbackData =
-            (_s = (_r = props.opts) === null || _r === void 0 ? void 0 : _r.returnBlockHeightsWithSignedTxCallbackData) !== null && _s !== void 0 ? _s : false;
-        this.onSignedCb = (_t = props.opts) === null || _t === void 0 ? void 0 : _t.onSignedCb;
-        this.preSignedCb = (_u = props.opts) === null || _u === void 0 ? void 0 : _u.preSignedCb;
+            (_t = (_s = props.opts) === null || _s === void 0 ? void 0 : _s.returnBlockHeightsWithSignedTxCallbackData) !== null && _t !== void 0 ? _t : false;
+        this.onSignedCb = (_u = props.opts) === null || _u === void 0 ? void 0 : _u.onSignedCb;
+        this.preSignedCb = (_v = props.opts) === null || _v === void 0 ? void 0 : _v.preSignedCb;
     }
     getWallet() {
         return this.wallet;
@@ -80,6 +80,18 @@ class TxHandler {
     async getLatestBlockhashForTransaction() {
         return this.blockHashFetcher.getLatestBlockhash();
     }
+    /**
+     * Resolves a usable recent blockhash, preferring a caller-provided one and
+     * otherwise fetching the latest. Throws if no blockhash can be obtained,
+     * since a transaction cannot be built or signed without one.
+     */
+    async resolveRecentBlockhash(recentBlockhash) {
+        const resolved = recentBlockhash !== null && recentBlockhash !== void 0 ? recentBlockhash : (await this.getLatestBlockhashForTransaction());
+        if (!resolved) {
+            throw new Error('TxHandler: failed to fetch a recent blockhash');
+        }
+        return resolved;
+    }
     /**
      * Applies recent blockhash and signs a given transaction
      * @param tx
@@ -96,14 +108,12 @@ class TxHandler {
         }
         [wallet, confirmationOpts] = this.getProps(wallet, confirmationOpts);
         tx.feePayer = wallet.publicKey;
-        recentBlockhash = recentBlockhash
-            ? recentBlockhash
-            : await this.getLatestBlockhashForTransaction();
-        tx.recentBlockhash = recentBlockhash.blockhash;
-        this.addHashAndExpiryToLookup(recentBlockhash);
+        const resolvedBlockhash = await this.resolveRecentBlockhash(recentBlockhash);
+        tx.recentBlockhash = resolvedBlockhash.blockhash;
+        this.addHashAndExpiryToLookup(resolvedBlockhash);
         const signedTx = await this.signTx(tx, additionalSigners);
         // @ts-ignore
-        signedTx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+        signedTx.SIGNATURE_BLOCK_AND_EXPIRY = resolvedBlockhash;
         return signedTx;
     }
     isVersionedTransaction(tx) {
@@ -117,16 +127,21 @@ class TxHandler {
             return bs58_1.default.encode(Buffer.from(signedTx.signatures[0]));
         }
         else {
-            return bs58_1.default.encode(Buffer.from(signedTx.signature));
+            const signature = signedTx.signature;
+            if (!signature) {
+                throw new Error('TxHandler: cannot derive txSig from an unsigned legacy transaction');
+            }
+            return bs58_1.default.encode(Buffer.from(signature));
         }
     }
     getBlockhashFromSignedTx(signedTx) {
-        if (this.isVersionedTransaction(signedTx)) {
-            return signedTx.message.recentBlockhash;
-        }
-        else {
-            return signedTx.recentBlockhash;
+        const blockHash = this.isVersionedTransaction(signedTx)
+            ? signedTx.message.recentBlockhash
+            : signedTx.recentBlockhash;
+        if (!blockHash) {
+            throw new Error('TxHandler: signed transaction is missing a recentBlockhash');
         }
+        return blockHash;
     }
     async signTx(tx, additionalSigners, wallet) {
         var _a;
@@ -180,7 +195,7 @@ class TxHandler {
             if (this.onSignedCb) {
                 this.onSignedCb(txData);
             }
-            return;
+            return [];
         }
         const signedTxData = txData.map((tx) => {
             const lastValidBlockHeight = this.blockHashToLastValidBlockHeightLookup[tx.blockHash];
@@ -200,7 +215,7 @@ class TxHandler {
      * @returns
      */
     async getProcessedTransactionParams(txBuildingProps) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         const baseTxParams = {
             computeUnits: (_a = txBuildingProps === null || txBuildingProps === void 0 ? void 0 : txBuildingProps.txParams) === null || _a === void 0 ? void 0 : _a.computeUnits,
             computeUnitsPrice: (_b = txBuildingProps === null || txBuildingProps === void 0 ? void 0 : txBuildingProps.txParams) === null || _b === void 0 ? void 0 : _b.computeUnitsPrice,
@@ -216,11 +231,10 @@ class TxHandler {
                 });
             },
             processConfig: {
-                useSimulatedComputeUnits: txBuildingProps.txParams.useSimulatedComputeUnits,
-                computeUnitsBufferMultiplier: txBuildingProps.txParams.computeUnitsBufferMultiplier,
-                useSimulatedComputeUnitsForCUPriceCalculation: txBuildingProps.txParams
-                    .useSimulatedComputeUnitsForCUPriceCalculation,
-                getCUPriceFromComputeUnits: txBuildingProps.txParams.getCUPriceFromComputeUnits,
+                useSimulatedComputeUnits: (_c = txBuildingProps.txParams) === null || _c === void 0 ? void 0 : _c.useSimulatedComputeUnits,
+                computeUnitsBufferMultiplier: (_d = txBuildingProps.txParams) === null || _d === void 0 ? void 0 : _d.computeUnitsBufferMultiplier,
+                useSimulatedComputeUnitsForCUPriceCalculation: (_e = txBuildingProps.txParams) === null || _e === void 0 ? void 0 : _e.useSimulatedComputeUnitsForCUPriceCalculation,
+                getCUPriceFromComputeUnits: (_f = txBuildingProps.txParams) === null || _f === void 0 ? void 0 : _f.getCUPriceFromComputeUnits,
             },
             processParams: {
                 connection: this.connection,
@@ -270,8 +284,7 @@ class TxHandler {
      * @returns
      */
     async buildBulkTransactions(props) {
-        var _a;
-        const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        const recentBlockhash = await this.resolveRecentBlockhash(props === null || props === void 0 ? void 0 : props.recentBlockhash);
         return await Promise.all(props.instructions.map((ix) => {
             if (!ix)
                 return undefined;
@@ -292,7 +305,6 @@ class TxHandler {
      * @returns
      */
     async buildTransaction(props) {
-        var _a;
         const { txVersion, txParams, connection: _connection, preFlightCommitment: _preFlightCommitment, fetchAllMarketLookupTableAccounts, forceVersionedTransaction, instructions, } = props;
         let { lookupTables } = props;
         const marketLookupTables = await fetchAllMarketLookupTableAccounts();
@@ -339,7 +351,9 @@ class TxHandler {
         // # Create Tx Instructions
         const allIx = [];
         const computeUnits = baseTxParams === null || baseTxParams === void 0 ? void 0 : baseTxParams.computeUnits;
-        if (computeUnits > 0 && !hasSetComputeUnitLimitIx) {
+        if (computeUnits !== undefined &&
+            computeUnits > 0 &&
+            !hasSetComputeUnitLimitIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: computeUnits,
             }));
@@ -350,13 +364,15 @@ class TxHandler {
                 microLamports: 0,
             }));
         }
-        else if (computeUnitsPrice > 0 && !hasSetComputeUnitPriceIx) {
+        else if (computeUnitsPrice !== undefined &&
+            computeUnitsPrice > 0 &&
+            !hasSetComputeUnitPriceIx) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,
             }));
         }
         allIx.push(...instructionsToUse);
-        const recentBlockhash = (_a = props === null || props === void 0 ? void 0 : props.recentBlockhash) !== null && _a !== void 0 ? _a : (await this.getLatestBlockhashForTransaction());
+        const recentBlockhash = await this.resolveRecentBlockhash(props === null || props === void 0 ? void 0 : props.recentBlockhash);
         // # Create and return Transaction
         if (txVersion === 'legacy') {
             if (forceVersionedTransaction) {
@@ -399,17 +415,15 @@ class TxHandler {
      */
     async getPreparedAndSignedLegacyTransactionMap(txsMap, wallet, commitment, recentBlockhash) {
         var _a, _b;
-        recentBlockhash = recentBlockhash
-            ? recentBlockhash
-            : await this.getLatestBlockhashForTransaction();
-        this.addHashAndExpiryToLookup(recentBlockhash);
+        const resolvedBlockhash = await this.resolveRecentBlockhash(recentBlockhash);
+        this.addHashAndExpiryToLookup(resolvedBlockhash);
         for (const tx of Object.values(txsMap)) {
             if (!tx)
                 continue;
-            tx.recentBlockhash = recentBlockhash.blockhash;
+            tx.recentBlockhash = resolvedBlockhash.blockhash;
             tx.feePayer = (_a = wallet === null || wallet === void 0 ? void 0 : wallet.publicKey) !== null && _a !== void 0 ? _a : (_b = this.wallet) === null || _b === void 0 ? void 0 : _b.publicKey;
             // @ts-ignore
-            tx.SIGNATURE_BLOCK_AND_EXPIRY = recentBlockhash;
+            tx.SIGNATURE_BLOCK_AND_EXPIRY = resolvedBlockhash;
         }
         return this.getSignedTransactionMap(txsMap, wallet);
     }
@@ -429,7 +443,7 @@ class TxHandler {
             acc[key] = undefined;
             return acc;
         }, {});
-        const filteredTxEntries = txsToSignEntries.filter(([_, tx]) => !!tx);
+        const filteredTxEntries = txsToSignEntries.filter((entry) => !!entry[1]);
         // Extra handling for legacy transactions
         for (const [_key, tx] of filteredTxEntries) {
             if (this.isLegacyTransaction(tx)) {

package/lib/browser/tx/txParamProcessor.d.ts

@@ -10,8 +10,11 @@ export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
     static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
     lowerBoundCu?: number, simulatedTx?: SimulatedTransactionResponse): Promise<{
-        success: boolean;
+        success: true;
         computeUnits: number;
+    } | {
+        success: false;
+        computeUnits: undefined;
     }>;
     static process(props: {
         baseTxParams: BaseTxParams;

package/lib/browser/tx/txParamProcessor.js

@@ -32,6 +32,9 @@ class TransactionParamProcessor {
                 throw (_b = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _b === void 0 ? void 0 : _b.err;
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
+            if (computeUnits === undefined) {
+                throw new Error('TransactionParamProcessor: simulation did not return units consumed');
+            }
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
             let bufferedComputeUnits = Math.ceil(Math.min(computeUnits * bufferMultiplier, MAX_COMPUTE_UNITS));
             // If a lower bound CU is passed then enforce it
@@ -81,6 +84,9 @@ class TransactionParamProcessor {
                 throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but getComputeUnitPriceFromUnitsToUse helper method is undefined`);
             }
             const simulatedComputeUnits = finalTxParams.computeUnits;
+            if (simulatedComputeUnits === undefined) {
+                throw new Error(`encountered useSimulatedComputeUnitsForFees=true, but simulated compute units are unavailable (simulation likely failed)`);
+            }
             const computeUnitPrice = processConfig.getCUPriceFromComputeUnits(simulatedComputeUnits);
             console.debug(`🔧:: Adjusting compute unit price for simulated compute unit budget :: ${finalTxParams.computeUnitsPrice}=>${computeUnitPrice}`);
             finalTxParams.computeUnitsPrice = computeUnitPrice;

package/lib/browser/tx/types.d.ts

@@ -9,7 +9,7 @@ export declare enum ConfirmationStrategy {
 }
 export type TxSigAndSlot = {
     txSig: TransactionSignature;
-    slot: number;
+    slot: number | undefined;
 };
 export interface TxSender {
     wallet: IWallet;

package/lib/browser/tx/whileValidTxSender.d.ts

@@ -9,12 +9,7 @@ type ResolveReference = {
     resolve?: () => void;
 };
 export declare class WhileValidTxSender extends BaseTxSender {
-    connection: Connection;
-    wallet: IWallet;
-    opts: ConfirmOptions;
-    timeout: number;
     retrySleep: number;
-    additionalConnections: Connection[];
     timoutCount: number;
     untilValid: Map<string, {
         blockhash: string;
@@ -27,7 +22,7 @@ export declare class WhileValidTxSender extends BaseTxSender {
         wallet: IWallet;
         opts?: ConfirmOptions;
         retrySleep?: number;
-        additionalConnections?: any;
+        additionalConnections?: Connection[];
         additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
         confirmationStrategy?: ConfirmationStrategy;
         txHandler?: TxHandler;

package/lib/browser/tx/whileValidTxSender.js

@@ -60,6 +60,9 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
     async prepareTx(tx, additionalSigners, opts, preSigned) {
         var _a;
         let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to fetch latest blockhash for transaction');
+        }
         // handle tx
         let signedTx = tx;
         if (!preSigned) {
@@ -72,12 +75,22 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             latestBlockhash = tx.SIGNATURE_BLOCK_AND_EXPIRY;
         }
         // handle subclass-specific side effects
-        const txSig = bs58_1.default.encode((signedTx === null || signedTx === void 0 ? void 0 : signedTx.signature) || ((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature));
+        const signature = (signedTx === null || signedTx === void 0 ? void 0 : signedTx.signature) || ((_a = signedTx.signatures[0]) === null || _a === void 0 ? void 0 : _a.signature);
+        if (!signature) {
+            throw new Error('WhileValidTxSender: signed transaction is missing a signature');
+        }
+        const txSig = bs58_1.default.encode(signature);
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to resolve latest blockhash for transaction');
+        }
         this.untilValid.set(txSig, latestBlockhash);
         return signedTx;
     }
     async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
         let latestBlockhash = await this.txHandler.getLatestBlockhashForTransaction();
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to fetch latest blockhash for transaction');
+        }
         let signedTx;
         if (preSigned) {
             signedTx = tx;
@@ -100,17 +113,24 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
             additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
                 tx.sign([kp]);
             });
-            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners, latestBlockhash);
+            signedTx = await this.txHandler.signVersionedTx(tx, additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : [], latestBlockhash);
         }
         if (opts === undefined) {
             opts = this.opts;
         }
-        const txSig = bs58_1.default.encode(signedTx.signatures[0]);
+        const signature = signedTx.signatures[0];
+        if (!signature) {
+            throw new Error('WhileValidTxSender: signed transaction is missing a signature');
+        }
+        const txSig = bs58_1.default.encode(signature);
+        if (!latestBlockhash) {
+            throw new Error('WhileValidTxSender: failed to resolve latest blockhash for transaction');
+        }
         this.untilValid.set(txSig, latestBlockhash);
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const startTime = this.getTimestamp();
         const txid = await this.connection.sendRawTransaction(rawTransaction, opts);
         (_a = this.txSigCache) === null || _a === void 0 ? void 0 : _a.set(txid, false);
@@ -143,16 +163,18 @@ class WhileValidTxSender extends baseTxSender_1.BaseTxSender {
         try {
             const result = await this.confirmTransaction(txid, opts.commitment);
             (_b = this.txSigCache) === null || _b === void 0 ? void 0 : _b.set(txid, true);
-            await this.checkConfirmationResultForError(txid, result === null || result === void 0 ? void 0 : result.value);
-            if (((_c = result === null || result === void 0 ? void 0 : result.value) === null || _c === void 0 ? void 0 : _c.err) && this.throwOnTransactionError) {
-                // Fallback error handling if there's a problem reporting the error in checkConfirmationResultForError
-                throw new web3_js_1.SendTransactionError({
-                    action: 'send',
-                    signature: txid,
-                    transactionMessage: `Transaction Failed`,
-                });
+            if (result) {
+                await this.checkConfirmationResultForError(txid, result.value);
+                if (((_c = result.value) === null || _c === void 0 ? void 0 : _c.err) && this.throwOnTransactionError) {
+                    // Fallback error handling if there's a problem reporting the error in checkConfirmationResultForError
+                    throw new web3_js_1.SendTransactionError({
+                        action: 'send',
+                        signature: txid,
+                        transactionMessage: `Transaction Failed`,
+                    });
+                }
+                slot = result.context.slot;
             }
-            slot = (_d = result === null || result === void 0 ? void 0 : result.context) === null || _d === void 0 ? void 0 : _d.slot;
             // eslint-disable-next-line no-useless-catch
         }
         catch (e) {

package/lib/browser/types.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 /// <reference types="node" />
 /// <reference types="node" />
 /**
@@ -720,38 +719,6 @@ export type DeleteUserRecord = {
     subAccountId: number;
     keeper: PublicKey | null;
 };
-export type InsuranceFundSwapRecord = {
-    rebalanceConfig: PublicKey;
-    inIfTotalSharesBefore: BN;
-    outIfTotalSharesBefore: BN;
-    inIfUserSharesBefore: BN;
-    outIfUserSharesBefore: BN;
-    inIfTotalSharesAfter: BN;
-    outIfTotalSharesAfter: BN;
-    inIfUserSharesAfter: BN;
-    outIfUserSharesAfter: BN;
-    ts: BN;
-    inAmount: BN;
-    outAmount: BN;
-    outOraclePrice: BN;
-    outOraclePriceTwap: BN;
-    inVaultAmountBefore: BN;
-    outVaultAmountBefore: BN;
-    inFundVaultAmountAfter: BN;
-    outFundVaultAmountAfter: BN;
-    inMarketIndex: number;
-    outMarketIndex: number;
-};
-export type TransferProtocolIfSharesToRevenuePoolRecord = {
-    ts: BN;
-    marketIndex: number;
-    amount: BN;
-    shares: BN;
-    ifVaultAmountBefore: BN;
-    protocolSharesBefore: BN;
-    protocolSharesAfter: BN;
-    transferAmount: BN;
-};
 export type LPSwapRecord = {
     ts: BN;
     slot: BN;
@@ -833,13 +800,15 @@ export type StateAccount = {
     hotLpCache: PublicKey;
     hotLpSwap: PublicKey;
     hotLpSettle: PublicKey;
-    hotIfRebalance: PublicKey;
     hotFeatureFlag: PublicKey;
     hotFuel: PublicKey;
     hotUserFlag: PublicKey;
     hotVaultDeposit: PublicKey;
     hotMmOracleCrank: PublicKey;
     hotAmmSpreadAdjust: PublicKey;
+    hotFeeWithdraw: PublicKey;
+    protocolFeeRecipientPerp: PublicKey;
+    protocolFeeRecipientSpot: PublicKey;
     exchangeStatus: number;
     whitelistMint: PublicKey;
     discountMint: PublicKey;
@@ -882,8 +851,12 @@ export type PerpMarketAccount = {
     nextFillRecordId: BN;
     nextFundingRateRecordId: BN;
     pnlPool: PoolBalance;
+    protocolFeePool: PoolBalance;
+    feeLedger: FeeLedger;
     liquidatorFee: number;
     ifLiquidationFee: number;
+    protocolLiquidationFee: number;
+    feePoolBufferTarget: BN;
     imfFactor: number;
     unrealizedPnlImfFactor: number;
     unrealizedPnlMaxImbalance: BN;
@@ -921,8 +894,6 @@ export type PerpMarketAccount = {
     quoteBreakEvenAmountShort: BN;
     totalSocialLoss: BN;
     maxOpenInterest: BN;
-    totalExchangeFee: BN;
-    totalLiquidationFee: BN;
     cumulativeFundingRateLong: BN;
     cumulativeFundingRateShort: BN;
     lastFundingRate: BN;
@@ -930,7 +901,6 @@ export type PerpMarketAccount = {
     lastFundingRateShort: BN;
     lastFundingRateTs: BN;
     netUnsettledFundingPnl: BN;
-    lastFundingOracleTwap: BN;
     orderStepSize: BN;
     orderTickSize: BN;
 };
@@ -969,11 +939,13 @@ export type SpotMarketAccount = {
         unstakingPeriod: BN;
         lastRevenueSettleTs: BN;
         revenueSettlePeriod: BN;
-        totalFactor: number;
-        userFactor: number;
+        ifFeeFactor: number;
     };
     revenuePool: PoolBalance;
+    protocolFeePool: PoolBalance;
     ifLiquidationFee: number;
+    protocolLiquidationFee: number;
+    protocolFeeFactor: number;
     decimals: number;
     optimalUtilization: number;
     optimalBorrowRate: number;
@@ -1016,11 +988,20 @@ export type SpotMarketAccount = {
     minBorrowRate: number;
     tokenProgramFlag: number;
     poolId: number;
+    feeAdjustment: number;
 };
 export type PoolBalance = {
     scaledBalance: BN;
     marketIndex: number;
 };
+export type FeeLedger = {
+    totalExchangeFee: BN;
+    totalLiquidationFee: BN;
+    pendingProtocolFee: BN;
+    pendingIfFee: BN;
+    ammProtocolFeesReceived: BN;
+    pendingAmmProvision: BN;
+};
 export type AMM = {
     feePool: PoolBalance;
     baseAssetReserve: BN;
@@ -1049,6 +1030,7 @@ export type AMM = {
     ammSpreadAdjustment: number;
     ammInventorySpreadAdjustment: number;
     referencePriceOffsetDeadbandPct: number;
+    fundingBiasSensitivity: number;
 };
 export type MarketStats = {
     lastMarkPriceTwap: BN;
@@ -1072,6 +1054,7 @@ export type MarketStats = {
     lastOracleNormalisedPrice: BN;
     lastReferencePriceOffset: number;
     lastOracleValid: boolean;
+    lastFundingOracleTwap: BN;
     historicalOracleData: HistoricalOracleData;
 };
 export type PerpPosition = {
@@ -1110,7 +1093,6 @@ export type UserStatsAccount = {
     referrerStatus: number;
     authority: PublicKey;
     ifStakedQuoteAssetAmount: BN;
-    ifStakedGovTokenAmount: BN;
     delegatePermissions: number;
 };
 export type UserAccount = {
@@ -1161,7 +1143,6 @@ export type Order = {
     marketIndex: number;
     price: BN;
     baseAssetAmount: BN;
-    quoteAssetAmount: BN;
     baseAssetAmountFilled: BN;
     quoteAssetAmountFilled: BN;
     direction: PositionDirection;
@@ -1276,7 +1257,7 @@ export type OptionalOrderParams = {
 export type ModifyOrderParams = {
     [Property in keyof OrderParams]?: OrderParams[Property] | null;
 } & {
-    policy?: ModifyOrderPolicy;
+    policy?: ModifyOrderPolicy | null;
 };
 export declare enum ModifyOrderPolicy {
     MustModify = 1,
@@ -1378,7 +1359,8 @@ export type FeeStructure = {
     feeTiers: FeeTier[];
     fillerRewardStructure: OrderFillerRewardStructure;
     flatFillerFee: BN;
-    referrerRewardEpochUpperBound: BN;
+    ammFeeNumerator: number;
+    ifFeeNumerator: number;
 };
 export type FeeTier = {
     feeNumerator: number;
@@ -1486,32 +1468,6 @@ export type SignedTxData = {
     lastValidBlockHeight?: number;
     blockHash: string;
 };
-export type IfRebalanceConfigAccount = {
-    pubkey: PublicKey;
-    totalInAmount: BN;
-    currentInAmount: BN;
-    currentOutAmount: BN;
-    currentOutAmountTransferred: BN;
-    epochStartTs: BN;
-    epochInAmount: BN;
-    epochMaxInAmount: BN;
-    epochDuration: BN;
-    outMarketIndex: number;
-    inMarketIndex: number;
-    maxSlippageBps: number;
-    swapMode: number;
-    status: number;
-};
-export type IfRebalanceConfigParams = {
-    totalInAmount: BN;
-    epochMaxInAmount: BN;
-    epochDuration: BN;
-    outMarketIndex: number;
-    inMarketIndex: number;
-    maxSlippageBps: number;
-    swapMode: number;
-    status: number;
-};
 export interface SignedMsgOrderParams {
     /**
      * The encoded order params that were signed (borsh encoded then hexified).

package/lib/browser/types.js

@@ -290,12 +290,12 @@ exports.SettlePnlMode = SettlePnlMode;
 SettlePnlMode.TRY_SETTLE = { trySettle: {} };
 SettlePnlMode.MUST_SETTLE = { mustSettle: {} };
 function isVariant(object, type) {
-    return object.hasOwnProperty(type);
+    return Object.prototype.hasOwnProperty.call(object, type);
 }
 exports.isVariant = isVariant;
 function isOneOfVariant(object, types) {
     return types.reduce((result, type) => {
-        return result || object.hasOwnProperty(type);
+        return result || Object.prototype.hasOwnProperty.call(object, type);
     }, false);
 }
 exports.isOneOfVariant = isOneOfVariant;