-
Notifications
You must be signed in to change notification settings - Fork 3.9k
challenger: Load ABIs from the snapshots dir #10225
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
95a5fc2
challenger: Load ABIs from the snapshots dir
ajsutton f871f43
Move loader to snapshots and convert the remaining challenger contrac…
ajsutton 9d9d5f2
Update tests
ajsutton 4c196b4
Remove remaining references to bindings package.
ajsutton 9c386aa
Fix comment
ajsutton 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
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
tynes marked this conversation as resolved.
Show resolved
Hide resolved
|
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,6 @@ | ||
| #!/usr/bin/env bash | ||
| set -euo pipefail | ||
|
|
||
| NAME=${1:?Must specify release name} | ||
tynes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| git describe --tags --candidates=100 --match="${NAME}/*" | sed "s/${NAME}\///" | ||
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,40 @@ | ||
| package snapshots | ||
|
|
||
| import ( | ||
| "embed" | ||
| "fmt" | ||
| "path/filepath" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi" | ||
| ) | ||
|
|
||
| //go:embed abi | ||
tynes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| var abis embed.FS | ||
|
|
||
| func LoadDisputeGameFactoryABI() (*abi.ABI, error) { | ||
| return loadABI("DisputeGameFactory") | ||
| } | ||
| func LoadFaultDisputeGameABI() (*abi.ABI, error) { | ||
| return loadABI("FaultDisputeGame") | ||
| } | ||
| func LoadPreimageOracleABI() (*abi.ABI, error) { | ||
| return loadABI("PreimageOracle") | ||
| } | ||
| func LoadMIPSABI() (*abi.ABI, error) { | ||
| return loadABI("MIPS") | ||
| } | ||
| func LoadDelayedWETHABI() (*abi.ABI, error) { | ||
| return loadABI("DelayedWETH") | ||
| } | ||
|
|
||
| func loadABI(name string) (*abi.ABI, error) { | ||
| in, err := abis.Open(filepath.Join("abi", name+".json")) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to load ABI for contract %v: %w", name, err) | ||
| } | ||
| if parsed, err := abi.JSON(in); err != nil { | ||
| return nil, err | ||
| } else { | ||
| return &parsed, nil | ||
| } | ||
| } | ||
tynes marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 @@ | ||
| package snapshots | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/ethereum/go-ethereum/accounts/abi" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestLoadABIs(t *testing.T) { | ||
| tests := []struct { | ||
| contract string | ||
| method func() (*abi.ABI, error) | ||
| }{ | ||
| {"DisputeGameFactory", LoadDisputeGameFactoryABI}, | ||
| {"FaultDisputeGame", LoadFaultDisputeGameABI}, | ||
| {"PreimageOracle", LoadPreimageOracleABI}, | ||
| {"MIPS", LoadMIPSABI}, | ||
| {"DelayedWETH", LoadDelayedWETHABI}, | ||
| } | ||
| for _, test := range tests { | ||
| test := test | ||
| t.Run(test.contract, func(t *testing.T) { | ||
| actual, err := test.method() | ||
| require.NoError(t, err) | ||
| require.NotNil(t, actual) | ||
| }) | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.