Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0 by ericglau · Pull Request #747 · OpenZeppelin/contracts-wizard

ericglau · 2025-12-01T15:16:28Z

Overview

In Solidity ERC-20's Cross-Chain Bridging section, adds an ERC-7866 Native option to use ERC20Crosschain. When this is selected, it also shows a sub-option Allow Link Overrides which defaults to false.

Both the ERC-7866 Native (ERC20Crosschain) and Custom (ERC20Bridgeable) bridging options will require access control.

ERC-7866 Native requires OpenZeppelin Contracts 5.6.0.

Breaking Changes

Custom bridging option now requires access control to allow privileged roles to update the token bridge address after deployment.

Rationale: Tokens may want to update their bridge address to use a BridgeERC7802, which requires the token address as a constructor argument to set an immutable variable. This implies the token must be deployed before the bridge.

New Features

ERC-7786 Native (ERC20Crosschain) embeds an ERC-7786 based bridge directly in the token contract. This option requires access control to manage crosschain links.

Allow Link Overrides: When enabled, privileged roles can replace previously registered crosschain links. Defaults to false.

…e setter

coderabbitai · 2025-12-01T15:16:35Z

Walkthrough

This PR adds support for ERC-7786 native cross-chain bridging option across OpenZeppelin Wizard for ERC20, stablecoin, and Real World Asset contracts. It introduces a new crossChainLinkAllowOverride option, updates access control requirements to include the new bridging type, adds tokenBridge state management with setter functions, updates UI controls, and expands test coverage. It also updates build configuration to enable IR-based compilation and switches OpenZeppelin contracts dependency to the master branch.

Changes

Cohort / File(s)	Summary
Changesets `\.changeset/ninety-ears-slide\.md`, `\.changeset/sad-cases-yawn\.md`	Documents patch version bump and breaking/feature changes: ERC-7786 native bridging support, custom bridging now requires access control, new `updateTokenBridgeAddress()` function, and constructor parameter reordering.
Descriptions & Schemas `packages/common/src/ai/descriptions/solidity\.ts`, `packages/mcp/src/solidity/schemas\.ts`, `packages/ui/api/ai-assistant/function-definitions/solidity\.ts`	Updated ERC20 descriptions to document ERC-7786 native option, added `crossChainLinkAllowOverride` field to schemas, and expanded `crossChainBridging` option set to include `'erc7786native'`.
Core ERC20 Logic `packages/core/solidity/src/erc20\.ts`	Extended cross-chain bridging options to include `'erc7786native'`, added `crossChainLinkAllowOverride` option flag, updated `isAccessControlRequired` logic, introduced `addERC20Crosschain` pathway, and enriched custom bridging with tokenBridge state management and setter functions.
ERC20 Generation & Stablecoin Logic `packages/core/solidity/src/generate/erc20\.ts`, `packages/core/solidity/src/generate/stablecoin\.ts`, `packages/core/solidity/src/stablecoin\.ts`	Added `crossChainLinkAllowOverride` to ERC20 and stablecoin option generators with appropriate defaults, and refactored `isAccessControlRequired` to delegate to ERC20's implementation.
Build Configuration `packages/core/solidity/hardhat\.config\.js`, `packages/core/solidity/package\.json`, `packages/core/solidity/remappings\.txt`, `packages/core/solidity/src/environments/hardhat/(package\.json\|upgradeable/package\.json)`, `packages/uniswap-hooks/remappings\.txt`	Added `viaIR: true` to hardhat optimizer settings, updated `@openzeppelin/contracts` dependency from `^5.5.0` to git master branch across multiple locations, and updated remappings to include `@openzeppelin/contracts/contracts/` path.
Test Snapshots `packages/core/solidity/src/erc20\.test\.ts\.md`, `packages/core/solidity/src/zip-foundry\.test\.ts\.md`	Updated contract inheritance order to include `OwnableUpgradeable`, added `setTokenBridge()` setter function with `onlyOwner` guard, adjusted constructor/initializer signatures to accept `initialOwner`, and modified parameter ordering in initialization sequences.
ERC20 Tests `packages/core/solidity/src/erc20\.test\.ts`	Added test cases for ERC-7786 native bridging variants with combinations including `allowOverride`, ownable, roles, managed, and upgradeable patterns.
UI Controls `packages/ui/src/solidity/ERC20Controls\.svelte`, `packages/ui/src/solidity/StablecoinControls\.svelte`, `packages/ui/src/solidity/RealWorldAssetControls\.svelte`	Added conditional `showAllowOverride` reactive flag, introduced "ERC-7786 Native" radio option under Cross-Chain Bridging, and conditionally renders "Allow Link Overrides" checkbox when ERC-7786 native is selected.
MCP Tools & Tests `packages/mcp/src/solidity/tools/(erc20\|stablecoin\|rwa)\.(ts\|test\.ts)`	Added `crossChainLinkAllowOverride` parameter to tool handlers and propagated into options objects; added corresponding test cases validating the new option combinations.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~30 minutes

Key areas requiring close attention:
- Core logic changes in packages/core/solidity/src/erc20.ts: new addERC20Crosschain bridging pathway, updated addCustomBridging with storage-based tokenBridge management, and access control logic updates.
- Snapshot updates with inheritance reordering and parameter sequence changes in erc20.test.ts.md and zip-foundry.test.ts.md — verify no behavioral regressions and that test assertions align with new public signatures.
- OpenZeppelin contracts dependency change from semver ^5.5.0 to git master branch — assess implications for reproducibility and stability across build environments.
- Test coverage: verify new ERC-7786 native test cases exercise all combinations (allowOverride, access control, upgradeable variants) and that existing tests remain unbroken.

Possibly related PRs

Add Polkadot Solidity tab #650: Related through overlapping UI/code-generation surface modifications — both update ERC20/Stablecoin/RWA control files and function definitions to introduce or refine cross-chain bridging feature conditioning (superchain/erc7786native variants and option propagation patterns).

🚥 Pre-merge checks | ✅ 2 | ❌ 1

❌ Failed checks (1 warning)

Check name	Status	Explanation	Resolution
Docstring Coverage	⚠️ Warning	Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%.	You can run `@coderabbitai generate docstrings` to improve docstring coverage.

✅ Passed checks (2 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately reflects the main changes: adding an ERC-7786 based crosschain bridge option for ERC-20 and updating to use Contracts 5.6.0 (via master branch).
Description check	✅ Passed	The PR description clearly explains the addition of ERC-7786 Native bridging option, breaking changes to custom bridging requiring access control, and the Allow Link Overrides feature, all of which are reflected in the changeset.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

socket-security · 2025-12-01T15:20:21Z

All alerts resolved. Learn more about Socket for GitHub.

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring alerts on:

ansi-styles@6.2.3
@fhevm/host-contracts@0.9.0
@fhevm/solidity@0.9.1
@fhevm/mock-utils@0.3.0-1
@fhevm/hardhat-plugin@0.3.0-1

View full report

frangio · 2025-12-04T16:42:16Z

packages/core/solidity/src/erc20.ts

+    args: [
+      { name: 'gateway', type: 'address' },
+      { name: 'counterpart', type: 'bytes memory' },
+      { name: 'allowOverride', type: 'bool' },


I don't think this should be an argument in the public function. The contract has to hardcode a value IIUC. CC @Amxx

From @Amxx: allowOverride should be false by default so that links are immutable once set.

Also consider adding a comment explaining the choice of false and when to consider changing it.

Added an option for this with default as false.

frangio · 2025-12-04T16:43:28Z

I think "ERC-7786 Native" instead of "Embedded" is a clearer and more compelling name.

Open to other suggestions involving ERC-7786.

socket-security · 2025-12-04T23:19:00Z

Review the following changes in direct dependencies. Learn more about Socket for GitHub.

Diff	Package	Supply Chain Security	Vulnerability	Quality	Maintenance	License
	@fhevm/solidity@0.9.1
	@fhevm/hardhat-plugin@0.3.0-1

View full report

Amxx · 2025-12-08T16:22:09Z

packages/core/solidity/src/erc20.test.ts.md

+    import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
    ␊
-    contract MyToken is ERC20, ERC20Bridgeable, ERC20Permit {␊
+    contract MyToken is ERC20, ERC20Bridgeable, Ownable, ERC20Permit {␊


What would it take to join the ERC20XXX inheritance and have Ownable at the end. Not really an issue, but it would be cleaner if we could achieve that easily

I started to do this but realized that would make it have a different order than the parent initializer calls. We document that the parent initializer calls should be in linearization order, and the Upgrades Plugins would give a warning if they are not.

We should aim to eventually stabilize and reorganize these, but it may require a larger change in how the code is generated in order to do this properly.

Opened #750 to track this as an enhancement request.

packages/core/solidity/src/erc20.ts

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>

ericglau · 2025-12-22T16:50:05Z

Leaving as Draft to avoid merging until 5.6.0 final version is released.

pasevin

LGTM!

ericglau added 13 commits November 26, 2025 17:35

Add ERC20Crosschain in core using unreleased

30e25db

Add snapshot tests

bb07448

Use contract scoped Link

5828060

Add todo

dd6d841

Add access controlled setLink

38334ec

Require access control for custom bridge, add access controlled bridg…

fd985af

…e setter

Add to UI

d37b000

Rename native to embedded

6d8447c

Fix format/lint

d2609d9

Add embedded to stablecoin/rwa

a43688f

Update AI functions

b8b4683

Update descriptions

d2d7659

Merge remote-tracking branch 'upstream/master' into erc20crosschain

66adab5

ericglau added 3 commits December 1, 2025 10:25

Use openzeppelin-contracts master

9bfda55

Merge branch 'master' into erc20crosschain

5780d15

Add changesets

784650f

frangio reviewed Dec 4, 2025

View reviewed changes

ericglau added 4 commits December 4, 2025 17:01

temp use master for package lock

f65d9b8

Add option to specify allowOverride

dbb8ec1

Rename Embedded to ERC-7786 Native

8dce592

Show allow overrides option in stablecoin/rwa

3b8f6d3

ericglau requested a review from frangio December 4, 2025 23:20

ericglau added 4 commits December 4, 2025 18:25

Lint/format

ef3f688

temporarily add remapping for master to fix hooks test

28553d9

Update snapshots, changeset for param order

b7ee734

Fix typo in temporary package json changes

2015fd8

Amxx reviewed Dec 8, 2025

View reviewed changes

packages/core/solidity/src/erc20.ts Outdated Show resolved Hide resolved

Amxx reviewed Dec 8, 2025

View reviewed changes

packages/core/solidity/src/erc20.ts Outdated Show resolved Hide resolved

ericglau and others added 2 commits December 8, 2025 11:30

Apply suggestions from code review

6059260

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>

run format:write

59529ab

Amxx approved these changes Dec 8, 2025

View reviewed changes

ericglau added 4 commits December 8, 2025 13:17

Validate token bridge arg

56e0bb7

Update snapshots

f31ab91

Use Contracts 5.6.0-rc.0

327f542

Update snapshots, tests, versions, locks for 5.6.0-rc.0

cef03b5

ericglau changed the title ~~Add ERC-20 option for embedding ERC-7786 based crosschain bridge~~ Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0 Dec 19, 2025

ericglau added 4 commits December 19, 2025 11:48

Merge branch 'master' into erc20crosschain

6de0d63

Fix hooks tests

b06b65a

Reduce number of combinations for Solidity generation tests

49b6b7d

Update changelog to 5.6.0-rc.0

f28ff61

ericglau changed the title ~~Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0~~ Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0-rc.0 Dec 19, 2025

ericglau enabled auto-merge (squash) December 19, 2025 23:30

ericglau disabled auto-merge December 20, 2025 01:43

ericglau mentioned this pull request Dec 22, 2025

Set Wizard target version to 5.6.0-rc0 OpenZeppelin/docs#106

Closed

ericglau marked this pull request as draft December 22, 2025 16:49

pasevin approved these changes Jan 6, 2026

View reviewed changes

ericglau added 2 commits February 25, 2026 14:54

Update to OpenZeppelin Contracts 5.6.0

8bef912

Merge remote-tracking branch 'upstream/master' into erc20crosschain

42bc743

ericglau changed the title ~~Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0-rc.0~~ Add ERC-20 option for embedding ERC-7786 based crosschain bridge, use Contracts 5.6.0 Feb 25, 2026

ericglau marked this pull request as ready for review February 25, 2026 20:15

Update confidential snapshots

e3452b4

ericglau merged commit 32ff02c into OpenZeppelin:master Feb 25, 2026
21 checks passed

ericglau deleted the erc20crosschain branch February 25, 2026 20:31

github-actions bot locked and limited conversation to collaborators Feb 25, 2026

Conversation

ericglau commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Breaking Changes

New Features

Uh oh!

coderabbitai bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Estimated code review effort

Possibly related PRs

❌ Failed checks (1 warning)

Uh oh!

socket-security bot commented Dec 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

frangio Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

frangio Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

frangio Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

ericglau Dec 4, 2025

Choose a reason for hiding this comment

Uh oh!

frangio commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

socket-security bot commented Dec 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Amxx Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ericglau Dec 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

ericglau commented Dec 22, 2025

Uh oh!

pasevin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ericglau commented Dec 1, 2025 •

edited

Loading

coderabbitai bot commented Dec 1, 2025 •

edited

Loading

socket-security bot commented Dec 1, 2025 •

edited

Loading

frangio Dec 4, 2025 •

edited

Loading

frangio commented Dec 4, 2025 •

edited

Loading

socket-security bot commented Dec 4, 2025 •

edited

Loading

Amxx Dec 8, 2025 •

edited

Loading

ericglau Dec 8, 2025 •

edited

Loading