Merge pull request #382 from primitivefinance/fix/swap-pool-check

feat: move checkPool to revert early
primitivefinance · May 18, 2023 · e440fce · e440fce
2 parents 7ee0484 + fad94ed
commit e440fce
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contracts/Portfolio.sol b/contracts/Portfolio.sol
@@ -398,6 +398,9 @@ abstract contract PortfolioVirtual is Objective {
         _preLock();
         if (_currentMulticall == false) _deposit();
 
+        // --- Checks --- //
+        if (!checkPool(args.poolId)) revert NonExistentPool(args.poolId);
+
         PortfolioPool storage pool = pools[args.poolId];
 
         // Scale amounts from native token decimals to WAD.
@@ -427,9 +430,6 @@ abstract contract PortfolioVirtual is Objective {
             info.tokenOutput = pool.pair.tokenAsset;
         }
 
-        // --- Checks --- //
-        if (!checkPool(args.poolId)) revert NonExistentPool(args.poolId);
-
         (bool success, int256 invariant) =
             _beforeSwapEffects(args.poolId, args.sellAsset);
         if (!success) revert PoolExpired();