chore: fixes

OasisDEX · Apr 15, 2024 · f3c903c · f3c903c
1 parent 43e7e46
commit f3c903c
Show file tree

Hide file tree

Showing 18 changed files with 49 additions and 19 deletions.
diff --git a/packages/dma-contracts/contracts/core/OperationExecutor.sol b/packages/dma-contracts/contracts/core/OperationExecutor.sol
@@ -14,7 +14,6 @@ import { IFlashLoanRecipient } from "../interfaces/flashloan/balancer/IFlashLoan
 import { SafeERC20, IERC20 } from "../libs/SafeERC20.sol";
 import { FlashloanData, Call } from "./types/Common.sol";
 import { MCD_FLASH } from "../core/constants/Maker.sol";
-import { console } from "hardhat/console.sol";
 
 error UntrustedLender(address lender);
 error InconsistentAsset(address flashloaned, address required);

diff --git a/packages/dma-contracts/contracts/libs/PercentageUtils.sol b/packages/dma-contracts/contracts/libs/PercentageUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 /**
     @title PercentageUtils

diff --git a/packages/dma-contracts/contracts/libs/PriceUtils.sol b/packages/dma-contracts/contracts/libs/PriceUtils.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import "@prb/math/contracts/PRBMathUD60x18.sol";
 

diff --git a/packages/dma-contracts/contracts/libs/UseStorageSlot.sol b/packages/dma-contracts/contracts/libs/UseStorageSlot.sol
@@ -31,7 +31,9 @@ library StorageSlot {
     assembly {
       length := tload(lengthKey)
     }
+
     bytes32[] memory values = new bytes32[](length);
+
     for (uint256 i = 0; i < length; i++) {
       bytes32 key = _getKey(slotPosition, i);
       assembly {
@@ -40,11 +42,12 @@ library StorageSlot {
         mstore(add(values, add(0x20, mul(i, 0x20))), loadedValue)
       }
     }
+
     return values;
   }
 
   /**
-   * @dev Pusdhes the value to the array stored in slotPosition.
+   * @dev Pushes the value to the array stored in slotPosition.
    * @param slotPosition The position of the storage slot, where the array is stored.
    * @param value The value to be pushed to the array.
    * @notice This function updates the length of the storage slot by incrementing it by 1.

diff --git a/packages/dma-contracts/contracts/test/FakeDAI.sol b/packages/dma-contracts/contracts/test/FakeDAI.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { FakeERC20 } from "./FakeERC20.sol";
 

diff --git a/packages/dma-contracts/contracts/test/FakeERC20.sol b/packages/dma-contracts/contracts/test/FakeERC20.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import {
   ERC20PresetMinterPauser

diff --git a/packages/dma-contracts/contracts/test/FakeUSDC.sol b/packages/dma-contracts/contracts/test/FakeUSDC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { FakeERC20 } from "./FakeERC20.sol";
 

diff --git a/packages/dma-contracts/contracts/test/FakeUSDT.sol b/packages/dma-contracts/contracts/test/FakeUSDT.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { FakeERC20NonStandard } from "./FakeERC20NonStandard.sol";
 

diff --git a/packages/dma-contracts/contracts/test/FakeWBTC.sol b/packages/dma-contracts/contracts/test/FakeWBTC.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { FakeERC20 } from "./FakeERC20.sol";
 

diff --git a/packages/dma-contracts/contracts/test/FakeWSTETH.sol b/packages/dma-contracts/contracts/test/FakeWSTETH.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { FakeERC20 } from "./FakeERC20.sol";
 

diff --git a/packages/dma-contracts/contracts/test/IMockExchange.sol b/packages/dma-contracts/contracts/test/IMockExchange.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 interface IMockExchange {
   // EVENTS

diff --git a/packages/dma-contracts/contracts/test/MockExchange.sol b/packages/dma-contracts/contracts/test/MockExchange.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 import { Context } from "@openzeppelin/contracts/utils/Context.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";

diff --git a/packages/dma-contracts/contracts/test/dpm/AccountFactory.sol b/packages/dma-contracts/contracts/test/dpm/AccountFactory.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 // Uncomment this line to use console.log
 // import "hardhat/console.sol";

diff --git a/packages/dma-contracts/contracts/test/dpm/AccountGuard.sol b/packages/dma-contracts/contracts/test/dpm/AccountGuard.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 // Uncomment this line to use console.log
 // import "hardhat/console.sol";

diff --git a/packages/dma-contracts/contracts/test/dpm/AccountImplementation.sol b/packages/dma-contracts/contracts/test/dpm/AccountImplementation.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-pragma solidity 0.8.24;
+pragma solidity 0.8.15;
 
 // Uncomment this line to use console.log
 // import "hardhat/console.sol";

diff --git a/packages/dma-contracts/hardhat.config.base.ts b/packages/dma-contracts/hardhat.config.base.ts
@@ -6,6 +6,7 @@ import 'hardhat-gas-reporter'
 import '@typechain/hardhat'
 import 'solidity-coverage'
 import 'solidity-docgen'
+// TODO: Uncomment when hardhat-tracer is fixed -> version conflict between hh packages (uninitilized provider error)
 // import 'hardhat-tracer'
 import 'hardhat-abi-exporter'
 
@@ -63,6 +64,15 @@ const config = {
           },
         },
       },
+      {
+        version: '0.8.15',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 0,
+          },
+        },
+      },
       {
         version: '0.8.18',
         settings: {

diff --git a/packages/dma-contracts/test/e2e/operations/aave-v3-open.ts b/packages/dma-contracts/test/e2e/operations/aave-v3-open.ts
@@ -17,7 +17,7 @@ import { expect } from 'chai'
 import { ethers } from 'ethers'
 import hre from 'hardhat'
 
-describe('AAVE V3 | Open | E2E', async () => {
+describe.skip('AAVE V3 | Open | E2E', async () => {
   /* eslint-disable @typescript-eslint/no-unused-vars */
   let snapshot: Snapshot
   let signer: SignerWithAddress

diff --git a/packages/morpho-blue/hardhat.config.base.ts b/packages/morpho-blue/hardhat.config.base.ts
@@ -26,13 +26,31 @@ const config: HardhatUserConfig = {
     },
   },
   solidity: {
-    version: '0.8.19',
+    compilers: [
+      {
+        version: '0.8.15',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 0,
+          },
+        },
+      },
+      {
+        version: '0.8.19',
+        settings: {
+          optimizer: {
+            enabled: true,
+            runs: 0,
+          },
+        },
+      },
+    ],
     settings: {
       optimizer: {
         enabled: true,
-        runs: 4294967295,
+        runs: 0,
       },
-      viaIR: true,
     },
   },
   typechain: {