-
Notifications
You must be signed in to change notification settings - Fork 254
fix/verify-contract: - fall back to source-based extraction if there's a mismatch in ABI #1878
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
jadijadi
wants to merge
4
commits into
main
Choose a base branch
from
jadi/continue-on-missing-data
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
4 commits
Select commit
Hold shift + click to select a range
04dffe2
feat/verify: using deployment ABI first, fall back to source-based ex…
jadijadi 00a61fe
feat/verify: adding stable-testnet to verify-contract networks
jadijadi 47fb806
changeset
jadijadi 0f17755
Fixing a legacy typo in function names
jadijadi 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,5 @@ | ||
| --- | ||
| "@layerzerolabs/verify-contract": minor | ||
| --- | ||
|
|
||
| Verify contract checks deployment ABI first, but fall back to source-based extraction if there's a mismatch |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import { COLORS, RecordLogger, anonymizeValue, createRecordLogger } from '../com | |
| import { tryCreateScanContractUrl } from '../common/url' | ||
| import { DeploymentSchema } from '../common/schema' | ||
| import { extractSolcInputFromMetadata } from './schema' | ||
| import { encodeContructorArguments, getContructorABIFromSource } from '../common/abi' | ||
| import { encodeConstructorArguments, getConstructorABIFromSource } from '../common/abi' | ||
| import type { | ||
| VerificationArtifact, | ||
| VerificationResult, | ||
|
|
@@ -100,7 +100,10 @@ export const verifyNonTarget = async ( | |
| typeof contract.constructorArguments === 'string' | ||
| ? contract.constructorArguments | ||
| : // For decoded constructor arguments we'll need to try and encoded them using the contract source | ||
| encodeContructorArguments(getContructorABIFromSource(source.content), contract.constructorArguments) | ||
| encodeConstructorArguments( | ||
| getConstructorABIFromSource(source.content), | ||
| contract.constructorArguments | ||
| ) | ||
|
|
||
| // Deployment metadata contains solcInput, just a bit rearranged | ||
| const solcInput = extractSolcInputFromMetadata(deployment.metadata) | ||
|
|
@@ -254,7 +257,26 @@ export const verifyTarget = async ( | |
| const licenseType = findLicenseType(source.content) | ||
|
|
||
| // Constructor arguments need to come ABI-encoded but without the 0x | ||
| const constructorArguments = encodeContructorArguments(deployment.abi, deployment.args) | ||
| // Try using deployment ABI first, but fall back to source-based extraction if there's a mismatch | ||
| let constructorArguments: string | undefined | ||
| try { | ||
| constructorArguments = encodeConstructorArguments(deployment.abi, deployment.args) | ||
| } catch (error) { | ||
| // If encoding fails due to argument mismatch, try extracting constructor from source | ||
| // This handles cases where the ABI is incomplete but source code has the full signature | ||
| try { | ||
| const sourceBasedAbi = getConstructorABIFromSource(source.content) | ||
| constructorArguments = encodeConstructorArguments(sourceBasedAbi, deployment.args) | ||
| } catch (sourceError) { | ||
| // If both fail, log a warning and skip this contract | ||
| logger.warn( | ||
| `Skipping contract ${contractName} in ${fileName} on network ${networkName} due to constructor encoding error: ${error}. ` + | ||
| `Tried fallback to source-based extraction but that also failed: ${sourceError}` | ||
| ) | ||
|
Comment on lines
+272
to
+275
|
||
|
|
||
| return [] | ||
| } | ||
| } | ||
|
|
||
| // Deployment metadata contains solcInput, just a bit rearranged | ||
| const solcInput = extractSolcInputFromMetadata(deployment.metadata) | ||
|
|
||
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.
Codex network API URL missing required /api path
The
codexnetwork'sapiUrlis configured as'https://explorer.codex.xyz/'but is missing the/apipath that all other custom explorer URLs in this file include (e.g.,'https://explorer.ebi.xyz/api','https://explorer.gravity.xyz/api'). Since the verification code sends requests directly to this URL, contract verification attempts on the Codex network will fail because requests will be sent to the wrong endpoint.