diff --git a/l1-contracts/foundry.toml b/l1-contracts/foundry.toml index 2051dd070..be0511889 100644 --- a/l1-contracts/foundry.toml +++ b/l1-contracts/foundry.toml @@ -1,12 +1,15 @@ [profile.default] -src = 'contracts' -out = 'out' -libs = ['node_modules', '../lib'] -cache_path = 'cache-forge' -test = 'test/foundry' +src = "contracts" +out = "out" +libs = ["node_modules", "../lib"] +cache_path = "cache-forge" +test = "test/foundry" solc_version = "0.8.24" evm_version = "cancun" ignored_error_codes = ["missing-receive-ether", "code-size"] ignored_warnings_from = ["test", "contracts/dev-contracts"] - -# See more config options https://github.com/foundry-rs/foundry/tree/master/crates/config +remappings = [ + "forge-std/=../lib/forge-std/src/", + "murky/=../lib/murky/src/", + "foundry-test/=test/foundry/", +] diff --git a/l1-contracts/remappings.txt b/l1-contracts/remappings.txt deleted file mode 100644 index 1b0710cf5..000000000 --- a/l1-contracts/remappings.txt +++ /dev/null @@ -1,7 +0,0 @@ -@ensdomains/=../node_modules/@ensdomains/ -ds-test/=../lib/forge-std/lib/ds-test/src/ -eth-gas-reporter/=../node_modules/eth-gas-reporter/ -forge-std/=../lib/forge-std/src/ -hardhat/=../node_modules/hardhat/ -murky/=../lib/murky/src/ -foundry-test/=test/foundry/ diff --git a/l2-contracts/foundry.toml b/l2-contracts/foundry.toml index fcf297c30..d34805bfe 100644 --- a/l2-contracts/foundry.toml +++ b/l2-contracts/foundry.toml @@ -2,11 +2,12 @@ src = "contracts" out = "out" libs = ["lib"] +cache_path = "cache-forge" +evm_version = "paris" remappings = [ "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/", "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", ] -evm_version = "paris" [profile.default.zksync] zksolc = "1.5.0" diff --git a/system-contracts/foundry.toml b/system-contracts/foundry.toml index 0ab0a20d7..ee3885489 100644 --- a/system-contracts/foundry.toml +++ b/system-contracts/foundry.toml @@ -2,10 +2,12 @@ src = "contracts-preprocessed" out = "out" libs = ["lib"] -evm_version = 'paris' +cache_path = "cache-forge" +evm_version = "paris" remappings = [ "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/", "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/", ] + [profile.default.zksync] zksolc = "1.5.0"