Reconcile merge with main 2

programs/marginfi/src/errors.rs

@@ -96,14 +96,14 @@ pub enum MarginfiError {
     IllegalAction,
     #[msg("Token22 Banks require mint account as first remaining account")] // 6046
     T22MintRequired,
-    #[msg("Staked SOL accounts can only deposit staked assets and borrow SOL")] // 6047
-    AssetTagMismatch,
-    #[msg("Stake pool validation failed: check the stake pool, mint, or sol pool")] // 6048
-    StakePoolValidationFailed,
-    #[msg("Invalid ATA for global fee account")] // 6049
+    #[msg("Invalid ATA for global fee account")] // 6047
     InvalidFeeAta,
-    #[msg("Use add pool permissionless instead")] // 6050
+    #[msg("Use add pool permissionless instead")] // 6048
     AddedStakedPoolManually,
+    #[msg("Staked SOL accounts can only deposit staked assets and borrow SOL")] // 6049
+    AssetTagMismatch,
+    #[msg("Stake pool validation failed: check the stake pool, mint, or sol pool")] // 6050
+    StakePoolValidationFailed,
 }
 
 impl From<MarginfiError> for ProgramError {

programs/marginfi/src/instructions/marginfi_group/configure_bank.rs

@@ -38,7 +38,8 @@ pub fn lending_pool_configure_bank(
         bank.configure(&bank_config)?;
 
         if bank_config.oracle.is_some() {
-            bank.config.validate_oracle_setup(ctx.remaining_accounts, None, None, None)?;
+            bank.config
+                .validate_oracle_setup(ctx.remaining_accounts, None, None, None)?;
         }
 
         emit!(LendingPoolBankConfigureEvent {

tests/01_initGroup.spec.ts

@@ -115,7 +115,7 @@ describe("Init group", () => {
     assertI80F48Approx(settingsAcc.assetWeightMaint, 0.9);
     assertBNEqual(settingsAcc.depositLimit, 1_000_000_000_000);
     assertBNEqual(settingsAcc.totalAssetValueInitLimit, 150_000_000);
-    assert.equal(settingsAcc.oracleMaxAge, 10);
+    assert.equal(settingsAcc.oracleMaxAge, 60);
     assert.deepEqual(settingsAcc.riskTier, { collateral: {} });
   });
 

tests/s02_addBank.spec.ts

@@ -114,7 +114,7 @@ describe("Init group and add banks with asset category flags", () => {
     assertI80F48Approx(settingsAcc.assetWeightMaint, 0.9);
     assertBNEqual(settingsAcc.depositLimit, 1_000_000_000_000);
     assertBNEqual(settingsAcc.totalAssetValueInitLimit, 150_000_000);
-    assert.equal(settingsAcc.oracleMaxAge, 10);
+    assert.equal(settingsAcc.oracleMaxAge, 60);
     assert.deepEqual(settingsAcc.riskTier, { collateral: {} });
   });
 
@@ -193,7 +193,8 @@ describe("Init group and add banks with asset category flags", () => {
     tx.recentBlockhash = await getBankrunBlockhash(bankrunContext);
     tx.sign(groupAdmin.wallet, bankKeypair);
     let result = await banksClient.tryProcessTransaction(tx);
-    assertBankrunTxFailed(result, "0x17a2");
+    // AddedStakedPoolManually
+    assertBankrunTxFailed(result, "0x17a0");
   });
 
   it("(attacker) Add bank (validator 0) with bad accounts + bad metadata - should fail", async () => {
@@ -270,7 +271,8 @@ describe("Init group and add banks with asset category flags", () => {
           tx.sign(users[0].wallet);
 
           let result = await banksClient.tryProcessTransaction(tx);
-          assertBankrunTxFailed(result, "0x17a0");
+          // StakePoolValidationFailed
+          assertBankrunTxFailed(result, "0x17a2");
         }
       }
     }
@@ -336,7 +338,8 @@ describe("Init group and add banks with asset category flags", () => {
         tx.sign(users[0].wallet);
 
         let result = await banksClient.tryProcessTransaction(tx);
-        assertBankrunTxFailed(result, "0x17a0");
+        // StakePoolValidationFailed
+        assertBankrunTxFailed(result, "0x17a2");
       }
     }
 

tests/s03_deposit.spec.ts

@@ -19,10 +19,7 @@ import {
   users,
   validators,
 } from "./rootHooks";
-import {
-  assertBankrunTxFailed,
-  assertKeysEqual,
-} from "./utils/genericTests";
+import { assertBankrunTxFailed, assertKeysEqual } from "./utils/genericTests";
 import { assert } from "chai";
 import { accountInit, depositIx } from "./utils/user-instructions";
 import { LST_ATA, USER_ACCOUNT } from "./utils/mocks";
@@ -129,7 +126,8 @@ describe("Deposit funds (included staked assets)", () => {
     tx.recentBlockhash = await getBankrunBlockhash(bankrunContext);
     tx.sign(user.wallet);
     let result = await banksClient.tryProcessTransaction(tx);
-    assertBankrunTxFailed(result, "0x179f");
+    // AssetTagMismatch
+    assertBankrunTxFailed(result, "0x17a1");
 
     // Verify the deposit failed and the entry does not exist
     const userAcc = await bankrunProgram.account.marginfiAccount.fetch(
@@ -214,7 +212,8 @@ describe("Deposit funds (included staked assets)", () => {
     tx.recentBlockhash = await getBankrunBlockhash(bankrunContext);
     tx.sign(user.wallet);
     let result = await banksClient.tryProcessTransaction(tx);
-    assertBankrunTxFailed(result, "0x179f");
+    // AssetTagMismatch
+    assertBankrunTxFailed(result, "0x17a1");
 
     // Verify the deposit failed and the entry does not exist
     const userAcc = await bankrunProgram.account.marginfiAccount.fetch(

tests/s04_borrow.spec.ts

@@ -109,7 +109,8 @@ describe("Deposit funds (included staked assets)", () => {
     tx.recentBlockhash = await getBankrunBlockhash(bankrunContext);
     tx.sign(user.wallet);
     let result = await banksClient.tryProcessTransaction(tx);
-    assertBankrunTxFailed(result, "0x179f");
+    // AssetTagMismatch
+    assertBankrunTxFailed(result, "0x17a1");
 
     // Verify the deposit worked and the entry does not exist
     const userAcc = await bankrunProgram.account.marginfiAccount.fetch(

tests/utils/types.ts

@@ -172,7 +172,7 @@ export const defaultStakedInterestSettings = (oracle: PublicKey) => {
     assetWeightMaint: bigNumberToWrappedI80F48(0.9),
     depositLimit: new BN(1_000_000_000_000), // 1000 SOL
     totalAssetValueInitLimit: new BN(150_000_000),
-    oracleMaxAge: 10,
+    oracleMaxAge: 60,
     riskTier: {
       collateral: undefined,
     },