-
Notifications
You must be signed in to change notification settings - Fork 128
upgrade foundry deps to v1.4.3 #1358
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AmadiMichael
wants to merge
6
commits into
main
Choose a base branch
from
amadi/foundry-1.4.3-upgrade
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
622934f
upgrade foundry deps to v1.4.3
AmadiMichael f71e1da
fix failing fmt check
AmadiMichael cdf0436
fix failing test
AmadiMichael 7a06f01
fix failing test
AmadiMichael 9b708fd
remove remappings.txt, improve comment
AmadiMichael 4ff0f71
Merge branch 'main' of https://github.com/ethereum-optimism/superchai…
AmadiMichael File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| { | ||
| "lib/base-contracts": { | ||
| "rev": "7cca28be0f94134f9de1c6f409779b57d5f269b7" | ||
| }, | ||
| "lib/forge-std": { | ||
| "rev": "3b20d60d14b343ee4f908cb8079495c07f5e8981" | ||
| }, | ||
| "lib/openzeppelin-contracts": { | ||
| "rev": "fd81a96f01cc42ef1c9a5399364968d0e07e9e90" | ||
| }, | ||
| "lib/optimism": { | ||
| "branch": { | ||
| "name": "develop", | ||
| "rev": "a10fd5259a3af9a465955b035e16f516327d51d5" | ||
| } | ||
| }, | ||
| "lib/safe-contracts": { | ||
| "rev": "186a21a74b327f17fc41217a927dea7064f74604" | ||
| }, | ||
| "lib/solady": { | ||
| "rev": "513f581675374706dbe947284d6b12d19ce35a2a" | ||
| }, | ||
| "lib/solmate": { | ||
| "rev": "e8f96f25d48fe702117ce76c79228ca4f20206cb" | ||
| }, | ||
| "lib/superchain-registry": { | ||
| "rev": "58b8ea0b875dcab6e7132a2d388c5c098ee6fac3" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,22 +9,30 @@ fs_permissions = [{ access = "read-write", path = "./" }] | |
| gas_limit = "18446744073709551615" # max allowable value, which is max uint64 | ||
| ffi = true # Enable FFI for reading lib/superchain-registry files in scripts SignFromJson.s.sol, NestedSignFromJson.s.sol within tasks | ||
| no_match_coverage = 'src/template/boilerplate/|script/|src/JsonTxBuilderBase.sol|test' | ||
| # Temporarily disabled for Foundry v1.4.3 upgrade. Protection prevents address(this) usage in scripts to avoid accidental misuse. | ||
| # See https://github.com/foundry-rs/foundry/issues/10289. Will be removed in a future PR. | ||
| script_execution_protection = false | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is also a good thing to explain or link to docs about for reviewers in the PR description
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done here 9b708fd
AmadiMichael marked this conversation as resolved.
|
||
|
|
||
| remappings = [ | ||
| '@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts/', | ||
| '@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts', | ||
| '@base-contracts/=lib/base-contracts/', | ||
| '@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/', | ||
| '@rari-capital/solmate/=lib/solmate', | ||
| '@eth-optimism-superchain-registry/=lib/superchain-registry/', | ||
| '@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/', | ||
| '@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib/', | ||
| 'ds-test/=lib/optimism/packages/contracts-bedrock/lib/forge-std/lib/ds-test/src', | ||
| 'forge-std/=lib/forge-std/src/' | ||
| "@openzeppelin/contracts-upgradeable/=lib/optimism/packages/contracts-bedrock/lib/openzeppelin-contracts-upgradeable/contracts/", | ||
| "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/", | ||
| "@base-contracts/=lib/base-contracts/", | ||
| "@eth-optimism-bedrock/=lib/optimism/packages/contracts-bedrock/", | ||
| "@rari-capital/solmate/=lib/solmate/", | ||
| "@eth-optimism-superchain-registry/=lib/superchain-registry/", | ||
| "@solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/", | ||
| "@lib-keccak/=lib/optimism/packages/contracts-bedrock/lib/lib-keccak/contracts/lib/", | ||
| "ds-test/=lib/optimism/packages/contracts-bedrock/lib/forge-std/lib/ds-test/src/", | ||
| "forge-std/=lib/forge-std/src/", | ||
| "solady/=lib/optimism/packages/contracts-bedrock/lib/solady/src/", | ||
| "safe-contracts/=lib/optimism/packages/contracts-bedrock/lib/safe-contracts/contracts/" | ||
| ] | ||
|
|
||
| [lint] | ||
| exclude_lints = ["unused-import", "unsafe-cheatcode", "unsafe-typecast", "asm-keccak256", "unaliased-plain-import", "mixed-case-variable", "pascal-case-struct", "mixed-case-function", "screaming-snake-case-const", "unwrapped-modifier-logic", "named-struct-fields"] | ||
|
|
||
| [profile.ci] | ||
| deny_warnings = true | ||
| deny = "warnings" | ||
|
|
||
| [profile.ci.rpc_endpoints] | ||
| mainnet = "https://ci-mainnet-l1-archive.optimism.io" | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should explain what this file is in the PR description. Also, do we still need the gitmodules file with this, or should it be deleted?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done