@drift-labs/sdk 2.19.0 → 2.20.0-beta.1

package/lib/adminClient.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -38,7 +42,7 @@ class AdminClient extends driftClient_1.DriftClient {
         if (stateAccountRPCResponse.value !== null) {
             throw new Error('Clearing house already initialized');
         }
-        const [driftStatePublicKey] = await pda_1.getDriftStateAccountPublicKeyAndNonce(this.program.programId);
+        const [driftStatePublicKey] = await (0, pda_1.getDriftStateAccountPublicKeyAndNonce)(this.program.programId);
         const initializeTx = await this.program.transaction.initialize({
             accounts: {
                 admin: this.wallet.publicKey,
@@ -55,10 +59,10 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
         const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
-        const spotMarket = await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex);
-        const spotMarketVault = await pda_1.getSpotMarketVaultPublicKey(this.program.programId, spotMarketIndex);
-        const insuranceFundVault = await pda_1.getInsuranceFundVaultPublicKey(this.program.programId, spotMarketIndex);
-        const nameBuffer = userName_1.encodeName(name);
+        const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
+        const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
+        const insuranceFundVault = await (0, pda_1.getInsuranceFundVaultPublicKey)(this.program.programId, spotMarketIndex);
+        const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeTx = await this.program.transaction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, activeStatus, nameBuffer, {
             accounts: {
                 admin: this.wallet.publicKey,
@@ -83,8 +87,8 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async initializeSerumFulfillmentConfig(marketIndex, serumMarket, serumProgram) {
-        const serumOpenOrders = pda_1.getSerumOpenOrdersPublicKey(this.program.programId, serumMarket);
-        const serumFulfillmentConfig = pda_1.getSerumFulfillmentConfigPublicKey(this.program.programId, serumMarket);
+        const serumOpenOrders = (0, pda_1.getSerumOpenOrdersPublicKey)(this.program.programId, serumMarket);
+        const serumFulfillmentConfig = (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
         const tx = await this.program.transaction.initializeSerumFulfillmentConfig(marketIndex, {
             accounts: {
                 admin: this.wallet.publicKey,
@@ -105,8 +109,8 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async initializePerpMarket(priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, activeStatus = true, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, currentPerpMarketIndex);
-        const nameBuffer = userName_1.encodeName(name);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, currentPerpMarketIndex);
+        const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeMarketTx = await this.program.transaction.initializePerpMarket(baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, activeStatus, nameBuffer, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -129,9 +133,9 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async moveAmmPrice(perpMarketIndex, baseAssetReserve, quoteAssetReserve, sqrtK) {
-        const marketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         if (sqrtK == undefined) {
-            sqrtK = utils_1.squareRootBN(baseAssetReserve.mul(quoteAssetReserve));
+            sqrtK = (0, utils_1.squareRootBN)(baseAssetReserve.mul(quoteAssetReserve));
         }
         const tx = await this.program.transaction.moveAmmPrice(baseAssetReserve, quoteAssetReserve, sqrtK, {
             accounts: {
@@ -148,7 +152,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.wallet.publicKey,
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
             },
         });
@@ -160,16 +164,16 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.wallet.publicKey,
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
     async moveAmmToPrice(perpMarketIndex, targetPrice) {
         const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
-        const [direction, tradeSize, _] = trade_1.calculateTargetPriceTrade(perpMarket, targetPrice, new anchor_1.BN(1000), 'quote', undefined //todo
+        const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(perpMarket, targetPrice, new anchor_1.BN(1000), 'quote', undefined //todo
         );
-        const [newQuoteAssetAmount, newBaseAssetAmount] = amm_1.calculateAmmReservesAfterSwap(perpMarket.amm, 'quote', tradeSize, amm_1.getSwapDirection('quote', direction));
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(perpMarket.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         const tx = await this.program.transaction.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, perpMarket.amm.sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -181,7 +185,7 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async repegAmmCurve(newPeg, perpMarketIndex) {
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
         const tx = await this.program.transaction.repegAmmCurve(newPeg, {
             accounts: {
@@ -196,7 +200,7 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async updatePerpMarketAmmOracleTwap(perpMarketIndex) {
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.rpc.updatePerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -208,7 +212,7 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async resetPerpMarketAmmOracleTwap(perpMarketIndex) {
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.rpc.resetPerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -224,7 +228,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 sourceVault,
                 driftSigner: this.getSignerPublicKey(),
                 quoteSpotMarket: spotMarket.pubkey,
@@ -252,7 +256,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -261,7 +265,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -272,7 +276,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -281,7 +285,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -292,36 +296,36 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async updatePerpMarketName(perpMarketIndex, name) {
-        const nameBuffer = userName_1.encodeName(name);
+        const nameBuffer = (0, userName_1.encodeName)(name);
         const tx = await this.program.transaction.updatePerpMarketName(nameBuffer, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async updateSpotMarketName(spotMarketIndex, name) {
-        const nameBuffer = userName_1.encodeName(name);
+        const nameBuffer = (0, userName_1.encodeName)(name);
         return await this.program.rpc.updateSpotMarketName(nameBuffer, {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
     async updatePerpMarketMaxSpread(perpMarketIndex, maxSpread) {
-        const perpMarketPublicKey = await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex);
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.rpc.updatePerpMarketMaxSpread(maxSpread, {
             accounts: {
                 admin: this.wallet.publicKey,
@@ -389,7 +393,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -400,7 +404,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -411,7 +415,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -422,7 +426,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -433,7 +437,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -454,7 +458,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 oracle: oracle,
             },
         });
@@ -466,7 +470,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -477,7 +481,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -486,7 +490,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -495,7 +499,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -504,7 +508,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -513,7 +517,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
                 oracle: oracle,
             },
         });
@@ -523,7 +527,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -541,7 +545,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -570,7 +574,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -579,7 +583,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }
@@ -588,7 +592,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx);
@@ -599,7 +603,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -610,7 +614,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -621,7 +625,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -658,7 +662,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -676,7 +680,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -685,7 +689,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -694,7 +698,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -712,7 +716,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await pda_1.getPerpMarketPublicKey(this.program.programId, perpMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }
@@ -721,7 +725,7 @@ class AdminClient extends driftClient_1.DriftClient {
             accounts: {
                 admin: this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await pda_1.getSpotMarketPublicKey(this.program.programId, spotMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
     }

package/lib/config.d.ts

@@ -1,7 +1,7 @@
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
-declare type DriftConfig = {
+type DriftConfig = {
     ENV: DriftEnv;
     PYTH_ORACLE_MAPPING_ADDRESS: string;
     DRIFT_PROGRAM_ID: string;
@@ -12,7 +12,7 @@ declare type DriftConfig = {
     SPOT_MARKETS: SpotMarketConfig[];
     MARKET_LOOKUP_TABLE: string;
 };
-export declare type DriftEnv = 'devnet' | 'mainnet-beta';
+export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;
 };

package/lib/constants/perpMarkets.d.ts

@@ -1,7 +1,7 @@
 import { OracleSource } from '../';
 import { DriftEnv } from '../';
 import { PublicKey } from '@solana/web3.js';
-export declare type PerpMarketConfig = {
+export type PerpMarketConfig = {
     fullName?: string;
     category?: string[];
     symbol: string;

package/lib/constants/spotMarkets.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
-export declare type SpotMarketConfig = {
+export type SpotMarketConfig = {
     symbol: string;
     marketIndex: number;
     oracle: PublicKey;

package/lib/dlob/DLOB.d.ts

@@ -4,7 +4,7 @@ import { MarketType, BN, DriftClient, Order, SpotMarketAccount, PerpMarketAccoun
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeType, TriggerOrderNode } from '..';
 import { DLOBOrders } from './DLOBOrders';
-export declare type MarketNodeLists = {
+export type MarketNodeLists = {
     restingLimit: {
         ask: NodeList<'restingLimit'>;
         bid: NodeList<'restingLimit'>;
@@ -26,12 +26,12 @@ export declare type MarketNodeLists = {
         below: NodeList<'trigger'>;
     };
 };
-declare type OrderBookCallback = () => void;
-export declare type NodeToFill = {
+type OrderBookCallback = () => void;
+export type NodeToFill = {
     node: DLOBNode;
-    makerNode?: DLOBNode;
+    makerNodes: DLOBNode[];
 };
-export declare type NodeToTrigger = {
+export type NodeToTrigger = {
     node: TriggerOrderNode;
 };
 export declare class DLOB {
@@ -61,6 +61,7 @@ export declare class DLOB {
     updateRestingLimitOrdersForMarketType(slot: number, marketTypeStr: MarketTypeStr): void;
     getOrder(orderId: number, userAccount: PublicKey): Order | undefined;
     findNodesToFill(marketIndex: number, fallbackBid: BN | undefined, fallbackAsk: BN | undefined, slot: number, ts: number, marketType: MarketType, oraclePriceData: OraclePriceData, stateAccount: StateAccount, marketAccount: PerpMarketAccount | SpotMarketAccount): NodeToFill[];
+    mergeNodesToFill(restingLimitOrderNodesToFill: NodeToFill[], takingOrderNodesToFill: NodeToFill[]): NodeToFill[];
     findRestingLimitOrderNodesToFill(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid: BN | undefined): NodeToFill[];
     findTakingNodesToFill(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, isAmmPaused: boolean, minAuctionDuration: number, fallbackAsk: BN | undefined, fallbackBid?: BN | undefined): NodeToFill[];
     findTakingNodesCrossingMakerNodes(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, takerNodeGenerator: Generator<DLOBNode>, makerNodeGeneratorFn: (marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, fallbackPrice?: BN) => Generator<DLOBNode>, doesCross: (takerPrice: BN | undefined, makerPrice: BN) => boolean, fallbackPrice?: BN): NodeToFill[];