@0dotxyz/p0-ts-sdk 2.2.2 → 2.2.3-alpha.1

package/dist/index.cjs

@@ -15629,12 +15629,20 @@ function makeEndFlashLoanIx(mfiProgram, accounts, remainingAccounts = []) {
   }).accountsPartial(optionalAccounts).remainingAccounts(remainingAccounts).instruction();
 }
 async function makeAccountTransferToNewAccountIx(mfProgram, accounts) {
-  const { oldMarginfiAccount, newMarginfiAccount, newAuthority, feePayer, ...optionalAccounts } = accounts;
+  const {
+    oldMarginfiAccount,
+    newMarginfiAccount,
+    newAuthority,
+    globalFeeWallet,
+    feePayer,
+    ...optionalAccounts
+  } = accounts;
   return mfProgram.methods.transferToNewAccount().accounts({
     oldMarginfiAccount,
     newMarginfiAccount,
     newAuthority,
-    globalFeeWallet: feePayer
+    globalFeeWallet,
+    feePayer
   }).accountsPartial(optionalAccounts).instruction();
 }
 async function makeGroupInitIx(mfProgram, accounts) {
@@ -19996,7 +20004,7 @@ function dtoToOraclePrice(dto) {
 }
 
 // src/services/price/utils/crankability.utils.ts
-async function checkBatchOracleCrankability(feedHashes, crossbarUrl = "https://integrator-crossbar.prod.mrgn.app") {
+async function checkBatchOracleCrankability(feedHashes, crossbarUrl = "https://crossbar.0.xyz") {
   const results = /* @__PURE__ */ new Map();
   if (feedHashes.length === 0) {
     return results;
@@ -20528,16 +20536,77 @@ function createActiveEmodePairFromPairs(pairs) {
     assetWeightInit: bestPair.assetWeightInit
   };
 }
+function indexConfiguredPairs(emodePairs) {
+  const configured = [];
+  const liabTagByBank = /* @__PURE__ */ new Map();
+  for (const p of emodePairs) {
+    if (p.collateralBankTag === 0 /* UNSET */ || p.liabilityBankTag === 0 /* UNSET */) {
+      continue;
+    }
+    const liabStr = p.liabilityBank.toBase58();
+    const liabTagStr = p.liabilityBankTag.toString();
+    configured.push({
+      orig: p,
+      liabStr,
+      liabTagStr,
+      collTagStr: p.collateralBankTag.toString(),
+      collStrs: p.collateralBanks.map((b) => b.toBase58())
+    });
+    liabTagByBank.set(liabStr, liabTagStr);
+  }
+  return { configured, liabTagByBank };
+}
+function activePairsFromIndex(configured, liabTagByBank, liabSet, collSet) {
+  const requiredTags = /* @__PURE__ */ new Set();
+  for (const liab of liabSet) {
+    const tag = liabTagByBank.get(liab);
+    if (!tag) return [];
+    requiredTags.add(tag);
+  }
+  const possible = configured.filter(
+    (p) => liabSet.has(p.liabStr) && p.collStrs.some((c) => collSet.has(c))
+  );
+  if (possible.length === 0) return [];
+  const byCollTag = {};
+  for (const p of possible) {
+    (byCollTag[p.collTagStr] ||= []).push(p);
+  }
+  const validGroups = [];
+  for (const group of Object.values(byCollTag)) {
+    const supports = new Set(group.map((p) => p.liabTagStr));
+    let coversAll = true;
+    for (const rt of requiredTags) {
+      if (!supports.has(rt)) {
+        coversAll = false;
+        break;
+      }
+    }
+    if (coversAll) validGroups.push(group);
+  }
+  if (validGroups.length === 0) return [];
+  return validGroups.flat().map((p) => p.orig);
+}
 function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, allBanks) {
-  const toKey = (k) => k.toBase58();
-  const basePairs = computeActiveEmodePairs(emodePairs, activeLiabilities, activeCollateral);
-  const baseOn = basePairs.length > 0;
-  const liabTagMap = /* @__PURE__ */ new Map();
+  const activeLiabilitiesSet = new Set(activeLiabilities.map((b) => b.toBase58()));
+  const activeCollateralSet = new Set(activeCollateral.map((b) => b.toBase58()));
+  const { configured, liabTagByBank } = indexConfiguredPairs(emodePairs);
+  const liabTagMapAll = /* @__PURE__ */ new Map();
   for (const p of emodePairs) {
-    liabTagMap.set(p.liabilityBank.toBase58(), p.liabilityBankTag.toString());
+    liabTagMapAll.set(p.liabilityBank.toBase58(), p.liabilityBankTag.toString());
   }
+  const allCollateralBankStrs = /* @__PURE__ */ new Set();
+  for (const p of emodePairs) {
+    for (const c of p.collateralBanks) allCollateralBankStrs.add(c.toBase58());
+  }
+  const basePairs = activePairsFromIndex(
+    configured,
+    liabTagByBank,
+    activeLiabilitiesSet,
+    activeCollateralSet
+  );
+  const baseOn = basePairs.length > 0;
   const existingTags = new Set(
-    activeLiabilities.map((l) => liabTagMap.get(l.toBase58())).filter((t) => !!t)
+    Array.from(activeLiabilitiesSet).map((l) => liabTagMapAll.get(l)).filter((t) => !!t)
   );
   function minWeight(ps) {
     let m = ps[0].assetWeightInit;
@@ -20554,27 +20623,26 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
     if (aMin.lt(bMin)) return 3 /* ReduceEmode */;
     return 1 /* ExtendEmode */;
   }
-  function simulate(bank, action) {
-    bank.equals(new web3_js.PublicKey("CCKtUs6Cgwo4aaQUmBPmyoApH2gUDErxNZCAntD6LYGh"));
-    let L = [...activeLiabilities], C = [...activeCollateral];
+  function simulate(bankStr, action) {
+    const L = new Set(activeLiabilitiesSet), C = new Set(activeCollateralSet);
     switch (action) {
       case "borrow":
-        if (!L.some((x) => x.equals(bank))) L.push(bank);
+        L.add(bankStr);
         break;
       case "repay":
-        L = L.filter((x) => !x.equals(bank));
+        L.delete(bankStr);
         break;
       case "supply":
-        if (!C.some((x) => x.equals(bank))) C.push(bank);
+        C.add(bankStr);
         break;
       case "withdraw":
-        C = C.filter((x) => !x.equals(bank));
+        C.delete(bankStr);
         break;
     }
-    const after = computeActiveEmodePairs(emodePairs, L, C);
+    const after = activePairsFromIndex(configured, liabTagByBank, L, C);
     let status = diffState(basePairs, after);
     if (action === "borrow") {
-      const tag = liabTagMap.get(bank.toBase58());
+      const tag = liabTagMapAll.get(bankStr);
       if (!tag) {
         status = baseOn ? 4 /* RemoveEmode */ : 5 /* InactiveEmode */;
       } else if (baseOn) {
@@ -20610,66 +20678,29 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
   }
   const result = {};
   for (const bank of allBanks) {
-    const key = toKey(bank);
+    const key = bank.toBase58();
     const impact = {};
-    if (!activeCollateral.some((x) => x.equals(bank))) {
-      impact.borrowImpact = simulate(bank, "borrow");
+    if (!activeCollateralSet.has(key)) {
+      impact.borrowImpact = simulate(key, "borrow");
     }
-    const collSet = new Set(emodePairs.flatMap((p) => p.collateralBanks.map((c) => c.toBase58())));
-    if (collSet.has(key) && !activeCollateral.some((x) => x.equals(bank)) && !activeLiabilities.some((x) => x.equals(bank))) {
-      impact.supplyImpact = simulate(bank, "supply");
+    if (allCollateralBankStrs.has(key) && !activeCollateralSet.has(key) && !activeLiabilitiesSet.has(key)) {
+      impact.supplyImpact = simulate(key, "supply");
     }
-    if (activeLiabilities.some((x) => x.equals(bank))) {
-      impact.repayAllImpact = simulate(bank, "repay");
+    if (activeLiabilitiesSet.has(key)) {
+      impact.repayAllImpact = simulate(key, "repay");
     }
-    if (activeCollateral.some((x) => x.equals(bank))) {
-      impact.withdrawAllImpact = simulate(bank, "withdraw");
+    if (activeCollateralSet.has(key)) {
+      impact.withdrawAllImpact = simulate(key, "withdraw");
     }
     result[key] = impact;
   }
   return result;
 }
 function computeActiveEmodePairs(emodePairs, activeLiabilities, activeCollateral) {
-  const configured = emodePairs.filter(
-    (p) => p.collateralBankTag !== 0 /* UNSET */ && p.liabilityBankTag !== 0 /* UNSET */
-  );
-  const liabTagByBank = /* @__PURE__ */ new Map();
-  for (const p of configured) {
-    liabTagByBank.set(p.liabilityBank.toBase58(), p.liabilityBankTag.toString());
-  }
-  const requiredTags = /* @__PURE__ */ new Set();
-  for (const liab of activeLiabilities) {
-    const tag = liabTagByBank.get(liab.toBase58());
-    if (!tag) {
-      return [];
-    }
-    requiredTags.add(tag);
-  }
-  const possible = configured.filter(
-    (p) => activeLiabilities.some((l) => l.equals(p.liabilityBank)) && p.collateralBanks.some((c) => activeCollateral.some((a) => a.equals(c)))
-  );
-  if (possible.length === 0) return [];
-  const byCollTag = {};
-  for (const p of possible) {
-    const ct = p.collateralBankTag.toString();
-    (byCollTag[ct] ||= []).push(p);
-  }
-  const validGroups = [];
-  for (const group of Object.values(byCollTag)) {
-    const supports = new Set(group.map((p) => p.liabilityBankTag.toString()));
-    let coversAll = true;
-    for (const rt of requiredTags) {
-      if (!supports.has(rt)) {
-        coversAll = false;
-        break;
-      }
-    }
-    if (coversAll) {
-      validGroups.push(group);
-    }
-  }
-  if (validGroups.length === 0) return [];
-  return validGroups.flat();
+  const { configured, liabTagByBank } = indexConfiguredPairs(emodePairs);
+  const liabSet = new Set(activeLiabilities.map((b) => b.toBase58()));
+  const collSet = new Set(activeCollateral.map((b) => b.toBase58()));
+  return activePairsFromIndex(configured, liabTagByBank, liabSet, collSet);
 }
 function computeBalanceUsdValue(params) {
   const {
@@ -36088,6 +36119,48 @@ async function makeCloseMarginfiAccountTx({
   );
   return closeTx;
 }
+async function makeAccountTransferToNewAccountTx({
+  connection,
+  program,
+  marginfiAccount,
+  newMarginfiAccount,
+  newAuthority,
+  feePayer,
+  feePayerKeypair
+}) {
+  const [feeStateKey] = web3_js.PublicKey.findProgramAddressSync(
+    [Buffer.from("feestate", "utf-8")],
+    program.programId
+  );
+  const feeState = await program.account.feeState.fetch(feeStateKey);
+  const transferIx = await instructions_default.makeAccountTransferToNewAccountIx(program, {
+    oldMarginfiAccount: marginfiAccount.address,
+    newMarginfiAccount: newMarginfiAccount.publicKey,
+    newAuthority,
+    globalFeeWallet: feeState.globalFeeWallet,
+    feePayer
+  });
+  const {
+    value: { blockhash }
+  } = await connection.getLatestBlockhashAndContext("confirmed");
+  const signers = [newMarginfiAccount];
+  if (feePayerKeypair) signers.push(feePayerKeypair);
+  const transferTx = addTransactionMetadata(
+    new web3_js.VersionedTransaction(
+      new web3_js.TransactionMessage({
+        instructions: [transferIx],
+        payerKey: feePayer,
+        recentBlockhash: blockhash
+      }).compileToV0Message([])
+    ),
+    {
+      signers,
+      addressLookupTables: [],
+      type: "TRANSFER_AUTH" /* TRANSFER_AUTH */
+    }
+  );
+  return transferTx;
+}
 async function makeCreateAccountTxWithProjection(props) {
   const [marginfiAccountAddress] = deriveMarginfiAccount(
     props.program.programId,
@@ -48776,7 +48849,8 @@ async function getHealthSimulationTransactions({
   authority,
   luts,
   includeCrankTx,
-  blockhash
+  blockhash,
+  crossbarUrl
 }) {
   const additionalTxs = [];
   const computeIx = web3_js.ComputeBudgetProgram.setComputeUnitLimit({
@@ -48788,7 +48862,8 @@ async function getHealthSimulationTransactions({
       marginfiAccount,
       bankMap,
       projectedActiveBanks,
-      program.provider
+      program.provider,
+      crossbarUrl
     );
   }
   const activeBanks = marginfiAccount.balances.filter((b) => b.active).map((b) => b.bankPk);
@@ -50481,11 +50556,14 @@ async function makeSmartCrankSwbFeedIx(params) {
   const { instructions: instructions2, luts } = await makeUpdateSwbFeedIx({
     swbPullOracles: oraclesToCrank,
     feePayer: params.marginfiAccount.authority,
-    connection: params.connection
+    connection: params.connection,
+    crossbarUrl: params.crossbarUrl
   });
   return { instructions: instructions2, luts };
 }
-async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider) {
+var DEFAULT_CROSSBAR_URL = "https://crossbar.0.xyz";
+var DEFAULT_FALLBACK_CROSSBAR_URL = "https://crossbar.switchboard.xyz";
+async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider, crossbarUrl) {
   const activeBanksPk = marginfiAccount.balances.filter((balance) => balance.active).map((balance) => balance.bankPk);
   const allActiveBanks = [
     ...(/* @__PURE__ */ new Set([
@@ -50504,7 +50582,8 @@ async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider
       const { instructions: instructions2, luts } = await makeUpdateSwbFeedIx({
         swbPullOracles: staleOracles.map((oracle) => ({ key: oracle })),
         feePayer: provider.publicKey,
-        connection: provider.connection
+        connection: provider.connection,
+        crossbarUrl
       });
       return { instructions: instructions2, luts };
     }
@@ -50534,16 +50613,26 @@ async function makeUpdateSwbFeedIx(props) {
   if (pullFeedInstances.length === 0) {
     return { instructions: [], luts: [] };
   }
-  const crossbarClient = new common.CrossbarClient(
-    process.env.NEXT_PUBLIC_SWITCHBOARD_CROSSSBAR_API || "https://integrator-crossbar.prod.mrgn.app"
-  );
-  const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
-    feeds: pullFeedInstances,
-    numSignatures: 1,
-    crossbarClient,
-    payer: props.feePayer
-  });
-  return { instructions: pullIx, luts };
+  const primaryUrl = props.crossbarUrl ?? DEFAULT_CROSSBAR_URL;
+  const fallbackUrl = props.fallbackCrossbarUrl ?? DEFAULT_FALLBACK_CROSSBAR_URL;
+  try {
+    const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
+      feeds: pullFeedInstances,
+      numSignatures: 1,
+      crossbarClient: new common.CrossbarClient(primaryUrl),
+      payer: props.feePayer
+    });
+    return { instructions: pullIx, luts };
+  } catch (primaryError) {
+    console.warn(`Primary crossbar endpoint failed (${primaryUrl}), trying fallback:`, primaryError);
+    const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
+      feeds: pullFeedInstances,
+      numSignatures: 1,
+      crossbarClient: new common.CrossbarClient(fallbackUrl),
+      payer: props.feePayer
+    });
+    return { instructions: pullIx, luts };
+  }
 }
 
 // src/services/price/actions/klend-reserve-refresh.ts
@@ -51034,7 +51123,7 @@ var fetchSwbOracleData = async (banks, opts) => {
   } else {
     crossbarResponse = await fetchSwbOraclePricesFromCrossbar(
       swbFeedIds,
-      opts.crossbarEndpoint || "https://34.97.218.183.sslip.io",
+      opts.crossbarEndpoint || "https://crossbar.0.xyz",
       "https://crossbar.switchboard.xyz"
     );
     birdeyeResponse = {};
@@ -54062,14 +54151,15 @@ var MarginfiAccount = class _MarginfiAccount {
    *
    * @see {@link makeAccountTransferToNewAccountIx} for implementation
    */
-  async makeAccountTransferToNewAccountIx(program, newMarginfiAccount, newAuthority) {
+  async makeAccountTransferToNewAccountIx(program, newMarginfiAccount, newAuthority, globalFeeWallet, feePayer) {
     const accountTransferToNewAccountIx = await instructions_default.makeAccountTransferToNewAccountIx(
       program,
       {
         oldMarginfiAccount: this.address,
         newMarginfiAccount,
         newAuthority,
-        feePayer: this.authority
+        globalFeeWallet,
+        feePayer
       }
     );
     return { instructions: [accountTransferToNewAccountIx], keys: [] };
@@ -54725,11 +54815,13 @@ var MarginfiAccountWrapper = class {
    * @param newMarginfiAccount - New account public key
    * @param newAuthority - New authority public key
    */
-  async makeAccountTransferToNewAccountIx(newMarginfiAccount, newAuthority) {
+  async makeAccountTransferToNewAccountIx(newMarginfiAccount, newAuthority, globalFeeWallet, feePayer) {
     return this.account.makeAccountTransferToNewAccountIx(
       this.client.program,
       newMarginfiAccount,
-      newAuthority
+      newAuthority,
+      globalFeeWallet,
+      feePayer
     );
   }
   /**
@@ -55535,6 +55627,8 @@ exports.Bank = Bank;
 exports.BankConfig = BankConfig;
 exports.BankConfigFlag = BankConfigFlag;
 exports.BankVaultType = BankVaultType;
+exports.DEFAULT_CROSSBAR_URL = DEFAULT_CROSSBAR_URL;
+exports.DEFAULT_FALLBACK_CROSSBAR_URL = DEFAULT_FALLBACK_CROSSBAR_URL;
 exports.DEFAULT_ORACLE_MAX_AGE = DEFAULT_ORACLE_MAX_AGE;
 exports.DISABLED_FLAG = DISABLED_FLAG;
 exports.EMPTY_HEALTH_CACHE = EMPTY_HEALTH_CACHE;
@@ -55794,6 +55888,7 @@ exports.isFlashloan = isFlashloan;
 exports.isV0Tx = isV0Tx;
 exports.isWeightedPrice = isWeightedPrice;
 exports.isWholePosition = isWholePosition;
+exports.makeAccountTransferToNewAccountTx = makeAccountTransferToNewAccountTx;
 exports.makeAddPermissionlessStakedBankIx = makeAddPermissionlessStakedBankIx;
 exports.makeBeginFlashLoanIx = makeBeginFlashLoanIx3;
 exports.makeBorrowIx = makeBorrowIx3;