-
Notifications
You must be signed in to change notification settings - Fork 182
Add ERC-20 option for embedding ERC-7786 based crosschain bridge #747
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
ericglau
wants to merge
29
commits into
OpenZeppelin:master
Choose a base branch
from
ericglau:erc20crosschain
base: master
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
29 commits
Select commit
Hold shift + click to select a range
30e25db
Add ERC20Crosschain in core using unreleased
ericglau bb07448
Add snapshot tests
ericglau 5828060
Use contract scoped Link
ericglau dd6d841
Add todo
ericglau 38334ec
Add access controlled setLink
ericglau fd985af
Require access control for custom bridge, add access controlled bridg…
ericglau d37b000
Add to UI
ericglau 6d8447c
Rename native to embedded
ericglau d2609d9
Fix format/lint
ericglau a43688f
Add embedded to stablecoin/rwa
ericglau b8b4683
Update AI functions
ericglau d2d7659
Update descriptions
ericglau 66adab5
Merge remote-tracking branch 'upstream/master' into erc20crosschain
ericglau 9bfda55
Use openzeppelin-contracts master
ericglau 5780d15
Merge branch 'master' into erc20crosschain
ericglau 784650f
Add changesets
ericglau f65d9b8
temp use master for package lock
ericglau dbb8ec1
Add option to specify allowOverride
ericglau 8dce592
Rename Embedded to ERC-7786 Native
ericglau 3b8f6d3
Show allow overrides option in stablecoin/rwa
ericglau ef3f688
Lint/format
ericglau 28553d9
temporarily add remapping for master to fix hooks test
ericglau b7ee734
Update snapshots, changeset for param order
ericglau 2015fd8
Fix typo in temporary package json changes
ericglau c708432
Simplify generator for tests
ericglau 6059260
Apply suggestions from code review
ericglau 59529ab
run format:write
Amxx 56e0bb7
Validate token bridge arg
ericglau f31ab91
Update snapshots
ericglau 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 @@ | ||
| --- | ||
| '@openzeppelin/wizard-common': patch | ||
| --- | ||
|
|
||
| Solidity `erc20`, `stablecoin`, `realWorldAsset`: Support 'erc7786native' option for `crossChainBridging`. | ||
ericglau 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,7 @@ | ||
| --- | ||
| '@openzeppelin/wizard': patch | ||
| '@openzeppelin/contracts-mcp': patch | ||
| --- | ||
|
|
||
| Solidity `erc20`, `stablecoin`, `realWorldAsset`: Support 'erc7786native' option for `crossChainBridging`. | ||
| - **Breaking changes**: Solidity `erc20`, `stablecoin`, `realWorldAsset`: 'custom' option for `crossChainBridging` now requires access control, and adds a function to allow updating the token bridge address after deployment. Constructor/initializer parameter order changed due to access control requirement. |
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 |
|---|---|---|
|
|
@@ -66,6 +66,7 @@ module.exports = { | |
| enabled: true, | ||
| runs: 200, | ||
| }, | ||
| viaIR: true, | ||
| }, | ||
| }, | ||
| }; | ||
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 |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| @openzeppelin/community-contracts/=node_modules/@openzeppelin/community-contracts/contracts/ | ||
| @openzeppelin/contracts-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/ | ||
| @openzeppelin/contracts/=node_modules/@openzeppelin/contracts/contracts/ |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.