pinned foundry/hardhat versions

Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>

Author: fusmanii

contracts/SpokePool.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.25;
+pragma solidity ^0.8.18;
 
 import "./MerkleLib.sol";
 import "./erc7683/ERC7683.sol";

foundry.toml

@@ -16,7 +16,6 @@ remappings = [
     "@matterlabs/=node_modules/@matterlabs/",
     "@openzeppelin/=node_modules/@openzeppelin/",
     "@scroll-tech/=node_modules/@scroll-tech/",
-    "@uma/=contracts/external/uma/",
     "@uniswap/=node_modules/@uniswap/",
     "arb-bridge-eth/=node_modules/arb-bridge-eth/",
     "arb-bridge-peripherals/=node_modules/arb-bridge-peripherals/",
@@ -28,9 +27,11 @@ remappings = [
 ]
 via_ir = true
 optimizer_runs = 800
-auto_detect_solc = true
+solc_version = "0.8.25"
 revert_strings = "strip"
 fs_permissions = [{ access = "read", path = "./"}]
+
+solc = "0.8.25"
 evm_version = "prague"
 
 [profile.zksync.zksync]

hardhat.config.ts

@@ -14,7 +14,6 @@ import "hardhat-gas-reporter";
 import "solidity-coverage";
 import "hardhat-deploy";
 import "@openzeppelin/hardhat-upgrades";
-import "hardhat-preprocessor";
 
 const getMnemonic = () => {
   // Publicly-disclosed mnemonic. This is required for hre deployments in test.
@@ -34,17 +33,6 @@ const getDefaultHardhatConfig = (chainId: number, isTestnet: boolean = false): a
   };
 };
 
-// Hardhat already resolves node_modules paths, so we only need to remap specific contracts where we need to apply a custom remapping rule.
-const customRemappings: [string, string][] = [["@uma", "contracts/external/uma/"]];
-
-function applyRemappings(line: string): string {
-  // split/join works on plain-string patterns and supports old Node versions
-  for (const [find, rep] of customRemappings) {
-    if (line.includes(find)) line = line.split(find).join(rep);
-  }
-  return line;
-}
-
 // Custom tasks to add to HRE.
 const tasks = [
   "enableL1TokenAcrossEcosystem",
@@ -101,27 +89,10 @@ const LARGEST_CONTRACT_COMPILER_SETTINGS = {
 
 const config: HardhatUserConfig = {
   solidity: {
-    compilers: [
-      DEFAULT_CONTRACT_COMPILER_SETTINGS,
-      {
-        ...DEFAULT_CONTRACT_COMPILER_SETTINGS,
-        version: "0.8.16",
-      },
-    ],
+    compilers: [DEFAULT_CONTRACT_COMPILER_SETTINGS],
     overrides: {
       "contracts/HubPool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
-      "contracts/Linea_SpokePool.sol": {
-        ...LARGE_CONTRACT_COMPILER_SETTINGS,
-        // NOTE: Linea only supports 0.8.19.
-        // See https://docs.linea.build/build-on-linea/ethereum-differences#evm-opcodes
-        // version: "0.8.19",
-      },
-      // "contracts/SpokePoolVerifier.sol": {
-      //   ...DEFAULT_CONTRACT_COMPILER_SETTINGS,
-      //   // NOTE: Linea only supports 0.8.19.
-      //   // See https://docs.linea.build/build-on-linea/ethereum-differences#evm-opcodes
-      //   version: "0.8.19",
-      // },
+      "contracts/Linea_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Universal_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Arbitrum_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Scroll_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
@@ -133,10 +104,6 @@ const config: HardhatUserConfig = {
       "contracts/Cher_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
       "contracts/Blast_SpokePool.sol": LARGEST_CONTRACT_COMPILER_SETTINGS,
       "contracts/Tatara_SpokePool.sol": LARGE_CONTRACT_COMPILER_SETTINGS,
-      "contracts/external/uma/**/*.sol": {
-        ...DEFAULT_CONTRACT_COMPILER_SETTINGS,
-        version: "0.8.16",
-      },
     },
   },
   zksolc: {
@@ -397,11 +364,6 @@ const config: HardhatUserConfig = {
   paths: {
     tests: "./test/evm/hardhat",
   },
-  // preprocess: {
-  //   eachLine: () => ({
-  //     transform: (line: string) => applyRemappings(line),
-  //   }),
-  // },
 };
 
 export default config;

package.json

@@ -77,7 +77,6 @@
     "@uma/contracts-node": "^0.4.17",
     "axios": "^1.7.4",
     "bs58": "^6.0.0",
-    "hardhat-preprocessor": "^0.1.5",
     "prettier-plugin-rust": "^0.1.9",
     "yargs": "^17.7.2",
     "zksync-web3": "^0.14.3"

yarn.lock

@@ -10358,13 +10358,6 @@ hardhat-gas-reporter@^1.0.4, hardhat-gas-reporter@^1.0.8:
     eth-gas-reporter "^0.2.24"
     sha1 "^1.1.1"
 
-hardhat-preprocessor@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/hardhat-preprocessor/-/hardhat-preprocessor-0.1.5.tgz#75b22641fd6a680739c995d03bd5f7868eb72144"
-  integrity sha512-j8m44mmPxpxAAd0G8fPHRHOas/INZdzptSur0TNJvMEGcFdLDhbHHxBcqZVQ/bmiW42q4gC60AP4CXn9EF018g==
-  dependencies:
-    murmur-128 "^0.2.1"
-
 hardhat-typechain@^0.3.5:
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/hardhat-typechain/-/hardhat-typechain-0.3.5.tgz#8e50616a9da348b33bd001168c8fda9c66b7b4af"