-
Notifications
You must be signed in to change notification settings - Fork 7
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
Use absolute path to disambiguate contract names #219
Merged
Merged
Conversation
This file contains 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
…rification/kontrol into noah/contract-name-fix
The |
…rification/kontrol into noah/contract-name-fix
…rification/kontrol into noah/contract-name-fix
nwatson22
commented
Dec 7, 2023
…rification/kontrol into noah/contract-name-fix
nwatson22
requested review from
spencerhaoxiao,
tothtamas28,
palinatolmach and
anvacaru
December 7, 2023 20:19
anvacaru
reviewed
Dec 17, 2023
anvacaru
reviewed
Dec 17, 2023
Co-authored-by: Andrei Văcaru <16517508+anvacaru@users.noreply.github.com>
nwatson22
commented
Dec 20, 2023
anvacaru
approved these changes
Dec 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes #178
Replaces references to contracts done by name with a name qualified by the full path of the contract, e.g. contract
Initializable
inopenzeppelin-contracts-upgradeable/contracts/proxy/utils/Initializable.sol
would get the nameopenzeppelin-contracts-upgradeable%contracts%proxy%utils%Initializable
.%
is used as a separator because the names of the contracts become directory names when the proofs are saved to disk. In generated K files the K escaping would convert this toS2KopennzeppelinZSubcontractsZSubupgradeableZModcontractsZModproxyZModutilsZModInitializable-CONTRACT
.When there is a duplicate name,
solc
will disambiguate the files in theout
directory by adding their paths as subdirectories. Ourfoundry.contracts
function previously would just not import these. This changes is to recursively import.json
s directly under a.sol
directory.Because of this issue of the duplicates not being imported because they're in subdirectories, I don't know how to reproduce the runtime error
Project contains duplicated contract names that may clash in K definitions: {contract_name}
in master. However, I've added contracts with duplicate names undersrc/tests/integration/test-data/foundry/src/
to demonstrate that duplicate test names can be imported with the new system.