Add support for Yul compilation and verification #2521
Conversation
kuzdogan
left a comment
kuzdogan
left a comment
There was a problem hiding this comment.
Overall looks good thank you!
Requested some changes
| language: 'Yul', | ||
| output: outputMetadata, | ||
| settings: { | ||
| ...metadataSettings, |
There was a problem hiding this comment.
Small thing, this should exclude outputSelection, it's not in metadata.settings: https://docs.soliditylang.org/en/latest/metadata.html
Same change needed in Vyper metadata generation
There was a problem hiding this comment.
I feel like this should be in server instead? It isn't used anywhere in lib-sourcify, and we also don't refer to this in Readme as reference example
|
|
||
| /** | ||
| * Converts libraries from the solc JSON input format to the metadata format. | ||
| * jsonInput format: { "contracts/1_Storage.sol": { Journal: "0x..." } } | ||
| * metadata format: { "contracts/1_Storage.sol:Journal": "0x..." } | ||
| */ | ||
| export function convertLibrariesToMetadataFormat( | ||
| libraries?: Libraries, | ||
| ): MetadataCompilerSettings['libraries'] { | ||
| if (!libraries) { | ||
| return undefined; | ||
| } | ||
|
|
There was a problem hiding this comment.
Isn't this a duplicate of this code?
sourcify/packages/lib-sourcify/src/Validation/SolidityMetadataContract.ts
Lines 320 to 327 in a1f21e7
There was a problem hiding this comment.
It's the opposite code, now I created another function so it's more clear. Let me know if it is more understandable now
| if (!abi) { | ||
| throw new Error("No ABI found in compilation output"); | ||
| return; | ||
| } |
There was a problem hiding this comment.
Let's check if the language is Yul here but still throw otherwise
| args?: any[], | ||
| ): Promise<DeploymentInfo> { | ||
| const contractFactory = new ContractFactory(abi, bytecode, signer); | ||
| const contractFactory = new ContractFactory(abi || [], bytecode, signer); |
There was a problem hiding this comment.
We should set abi to be undefined above as a type, if we expect it to be undefined
| * metadata format: { "contracts/1_Storage.sol:Journal": "0x..." } | ||
| * jsonInput format: { "contracts/1_Storage.sol": { Journal: "0x..." } } | ||
| */ | ||
| export function convertLibrariesFromMetadataFormat( |
There was a problem hiding this comment.
Can you rename this to convertLibrariesToStdJsonFormat? It's confusing
See #2517
Notice: