@0dotxyz/p0-ts-sdk 2.2.3-alpha.0 → 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) {
@@ -20579,8 +20587,8 @@ function activePairsFromIndex(configured, liabTagByBank, liabSet, collSet) {
   return validGroups.flat().map((p) => p.orig);
 }
 function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, allBanks) {
-  const liabBaseSet = new Set(activeLiabilities.map((b) => b.toBase58()));
-  const collBaseSet = new Set(activeCollateral.map((b) => b.toBase58()));
+  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) {
@@ -20590,10 +20598,15 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
   for (const p of emodePairs) {
     for (const c of p.collateralBanks) allCollateralBankStrs.add(c.toBase58());
   }
-  const basePairs = activePairsFromIndex(configured, liabTagByBank, liabBaseSet, collBaseSet);
+  const basePairs = activePairsFromIndex(
+    configured,
+    liabTagByBank,
+    activeLiabilitiesSet,
+    activeCollateralSet
+  );
   const baseOn = basePairs.length > 0;
   const existingTags = new Set(
-    Array.from(liabBaseSet).map((l) => liabTagMapAll.get(l)).filter((t) => !!t)
+    Array.from(activeLiabilitiesSet).map((l) => liabTagMapAll.get(l)).filter((t) => !!t)
   );
   function minWeight(ps) {
     let m = ps[0].assetWeightInit;
@@ -20611,7 +20624,7 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
     return 1 /* ExtendEmode */;
   }
   function simulate(bankStr, action) {
-    const L = new Set(liabBaseSet), C = new Set(collBaseSet);
+    const L = new Set(activeLiabilitiesSet), C = new Set(activeCollateralSet);
     switch (action) {
       case "borrow":
         L.add(bankStr);
@@ -20667,16 +20680,16 @@ function computeEmodeImpacts(emodePairs, activeLiabilities, activeCollateral, al
   for (const bank of allBanks) {
     const key = bank.toBase58();
     const impact = {};
-    if (!collBaseSet.has(key)) {
+    if (!activeCollateralSet.has(key)) {
       impact.borrowImpact = simulate(key, "borrow");
     }
-    if (allCollateralBankStrs.has(key) && !collBaseSet.has(key) && !liabBaseSet.has(key)) {
+    if (allCollateralBankStrs.has(key) && !activeCollateralSet.has(key) && !activeLiabilitiesSet.has(key)) {
       impact.supplyImpact = simulate(key, "supply");
     }
-    if (liabBaseSet.has(key)) {
+    if (activeLiabilitiesSet.has(key)) {
       impact.repayAllImpact = simulate(key, "repay");
     }
-    if (collBaseSet.has(key)) {
+    if (activeCollateralSet.has(key)) {
       impact.withdrawAllImpact = simulate(key, "withdraw");
     }
     result[key] = impact;
@@ -36106,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,
@@ -54096,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: [] };
@@ -54759,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
     );
   }
   /**
@@ -55830,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;