Sovereign bridge implementation #330

ignasirv · 2024-09-16T08:30:38Z

Create Bridge and GlobalExitRootManager contracts for Sovereign chains + tests.
BridgeL2SovereignChain.sol : extends from PolygonZkEVMBridgeV2 with the features of:

Set a bridgeManager address
Functions to remap and undo remap of token addresses by sovereign token addresses
Overrided mint/burn functions from BridgeV2 to handle that new remapping

GlobalExitRootManagerL2SovereignChain.sol : extends from PolygonZkEVMGlobalExitRootL2 with the features of:

New function insertGlobalExitRoot only callable by coinbase to update the GER of a Sovereign Chain

contracts/interfaces/IBasePolygonZkEVMGlobalExitRoot.sol

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

contracts/v2/PolygonZkEVMBridgeV2.sol

contracts/v2/PolygonZkEVMGlobalExitRootV2.sol

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

contracts/v2/PolygonZkEVMGlobalExitRootV2.sol

invocamanman · 2024-09-25T19:40:35Z

jsut run the coverage:
function setMultipleSovereignTokenAddress remains untested, even tho will be veery easy to do it so

migrateLegacyToken remains untested as wel which i think it's a critical funciton and we should test it!!!

invocamanman · 2024-09-25T19:40:55Z

also we shoudl update the 1_create genesis deployment script to be able to put a flag "sovereign" and deploy these contracts

invocamanman · 2024-10-01T18:32:11Z

Ger implementation shoould write blockHashes right?¿ probably from AggLayer or L1, to mirror the behaviour of Current Global exit root

Even tho in the zkResidency we though to change that to an index to help us retrieve all the improted GERs, but that depends a lot on what impementaiton we will follow to do that.
For now i wioudl say that you can set block hashes instead of timestamp

invocamanman · 2024-10-01T18:33:50Z

overall LGTM ^^ but we should do a proper review ^^

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

deployment/v2/1_createGenesis.ts

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

invocamanman · 2024-10-07T04:50:03Z

As an added comment i think the docker does not work since the bytecode of hte new bridge contract is too big.

Warning: Contract code size is 31141 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
  --> contracts/v2/sovereignChains/BridgeL2SovereignChain.sol:15:1:

We should reduce the bytecode size, the eaisest way is to put it on exceptions on harhdat and lower the optimizer runs by default

krlosMata

😸

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

krlosMata

😸

Add more testing Refactor function overrite Refactor GlobalExitRoot contracts for dovereign chains First testing iteration sovereign chains Review fixes Review fixes II Review fixes III Full testing coverage for sovereign contracts Added sovereign bridge features - Batch call function implementation to remap multiple tokens - Allow migrating legacy to updated tokens natively - Added weth mapped address are initializer Refactor migrateLegacyToken function Coverage tests + fix 1_genesis script + typos Fix sovereign chain deployment at docker and removed struct Add remove ger function at sovereign GER contracts Review comment and add override at initialize function Refactor gerManagerSovereigns Create batch for pessimistic networks

Update bridge at create rollup for vanilla clients Review update

invocamanman · 2024-10-28T18:45:54Z

contracts/v2/PolygonZkEVMBridgeV2.sol

@@ -608,7 +619,7 @@ contract PolygonZkEVMBridgeV2 is
        address destinationAddress,
        uint256 amount,
        bytes calldata metadata
-    ) external ifNotEmergencyState {
+    ) external virtual ifNotEmergencyState {


added virtural for no reason?¿

invocamanman · 2024-10-28T18:46:33Z

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

+     * @notice Updated bridge manager address
+     * @param _bridgeManager Bridge manager address
+     */
+    function setBridgeManager(


settes/getters usually go downside of the code

invocamanman · 2024-10-28T18:53:07Z

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol

+     */
+    event RemoveLastGlobalExitRoot(bytes32 indexed removedGlobalExitRoot);
+
+    modifier onlyGlobalExitRootUpdater() {


Following the rest of contrats convention, modifiers go after consturctor and initialization

invocamanman · 2024-10-28T18:55:01Z

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

+            // Set sovereign weth token or create new if not provided
+            if (_sovereignWETHAddress == address(0)) {
+                // Create a wrapped token for WETH, with salt == 0
+                WETHToken = _deployWrappedToken(


could check tha WETHisNotMIntable is false?¿

invocamanman · 2024-10-29T01:14:27Z

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

+                amount
+            );
+        } else {
+            // Claim wETH


invocamanman · 2024-10-29T01:14:34Z

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

+    ) internal override {
+        // If is not mintable transfer instead of mint
+        if (wrappedAddressIsNotMintable[address(tokenWrapped)]) {
+            // Transfer wETH


invocamanman · 2024-10-29T01:15:01Z

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol

+
+    /**
+     * @notice Mints tokens from wrapped token to proceed with the claim, if the token is not mintable it will be transferred
+     * note This function has been extracted to be able to override it by other contracts like Bridge2SovereignChain


Package-lock Small fix upgrade rollupManager pessimistic script

invocamanman · 2024-10-29T09:42:33Z

package.json

@@ -34,7 +34,7 @@
        "@nomicfoundation/hardhat-toolbox": "^3.0.0",
        "@openzeppelin/contracts": "4.8.2",
        "@openzeppelin/contracts-upgradeable": "4.8.2",
-        "@openzeppelin/contracts5": "npm:@openzeppelin/contracts@^5.0.0",
+        "@openzeppelin/contracts5": "npm:@openzeppelin/[email protected]",


Update deploy scripts with more checks Improve upgrade presimistic script

sonarcloud · 2024-11-05T10:08:48Z

Quality Gate passed

Issues
34 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
54.7% Duplication on New Code

See analysis details on SonarCloud

ignasirv requested review from invocamanman and krlosMata as code owners September 16, 2024 08:30

ignasirv requested a review from invocamanman September 16, 2024 08:30

ignasirv requested a review from laisolizq as a code owner September 16, 2024 08:30

ignasirv requested review from krlosMata and laisolizq September 16, 2024 08:30

cla-bot bot added the cla-signed label Sep 16, 2024

ignasirv force-pushed the feature/sovereign-bridge branch 4 times, most recently from 45319de to e7d1432 Compare September 16, 2024 14:23

invocamanman reviewed Sep 16, 2024

View reviewed changes

invocamanman reviewed Sep 17, 2024

View reviewed changes

ignasirv force-pushed the feature/sovereign-bridge branch from 3e47d79 to 0dc632d Compare September 17, 2024 14:53

ignasirv requested a review from invocamanman September 19, 2024 06:58

invocamanman reviewed Sep 19, 2024

View reviewed changes

ignasirv requested a review from invocamanman September 19, 2024 10:00

ignasirv force-pushed the feature/sovereign-bridge branch from ea3cb9f to a73bba5 Compare September 20, 2024 11:42

krlosMata requested changes Oct 2, 2024

View reviewed changes

contracts/v2/sovereignChains/GlobalExitRootManagerL2SovereignChain.sol Show resolved Hide resolved

invocamanman reviewed Oct 7, 2024

View reviewed changes

deployment/v2/1_createGenesis.ts Outdated Show resolved Hide resolved

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol Outdated Show resolved Hide resolved

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol Show resolved Hide resolved

ignasirv requested a review from invocamanman October 8, 2024 09:13

krlosMata approved these changes Oct 9, 2024

View reviewed changes

invocamanman reviewed Oct 10, 2024

View reviewed changes

contracts/v2/sovereignChains/BridgeL2SovereignChain.sol Outdated Show resolved Hide resolved

ignasirv force-pushed the feature/sovereign-bridge branch from 3059d25 to 3e8ba6f Compare October 10, 2024 09:12

Tq101510 mentioned this pull request Oct 10, 2024

SetBridgeManager for consistency Tq101510/Christina-vongphit#5

Open

Tq101510 mentioned this pull request Oct 10, 2024

SetBridgeManager for consistency base-org/brand-kit#34

Open

ignasirv requested review from invocamanman and krlosMata October 10, 2024 13:50

ignasirv force-pushed the feature/sovereign-bridge branch 3 times, most recently from 8a0f2c1 to 97609ea Compare October 14, 2024 08:41

krlosMata approved these changes Oct 14, 2024

View reviewed changes

ignasirv force-pushed the feature/sovereign-bridge branch from 52e4397 to 0225d15 Compare October 17, 2024 14:12

ignasirv and others added 3 commits October 21, 2024 10:58

finish injected batch data for pessimisic consensus

a612420

Internal audit fixes + new coverage

0440e6c

Update bridge at create rollup for vanilla clients Review update

ignasirv force-pushed the feature/sovereign-bridge branch from a649b0f to 0440e6c Compare October 21, 2024 08:58

ignasirv added 3 commits October 22, 2024 16:56

Add weth at genesis + other review improvements

8f5e753

Improve WETH comments at bridge contract

2a3ebd7

typos

29023ea

invocamanman reviewed Oct 28, 2024

View reviewed changes

invocamanman reviewed Oct 29, 2024

View reviewed changes

Review fixes

f1227e4

Package-lock Small fix upgrade rollupManager pessimistic script

invocamanman approved these changes Oct 29, 2024

View reviewed changes

ignasirv closed this Nov 5, 2024

ignasirv reopened this Nov 5, 2024

Remove system address from final genesis state

ddfd159

Update deploy scripts with more checks Improve upgrade presimistic script

ignasirv force-pushed the feature/sovereign-bridge branch from d096d19 to ddfd159 Compare November 5, 2024 10:08

ignasirv merged commit 63a89fe into feature/ongoingPP Nov 5, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sovereign bridge implementation #330

Sovereign bridge implementation #330

ignasirv commented Sep 16, 2024 •

edited

Loading

invocamanman commented Sep 25, 2024

invocamanman commented Sep 25, 2024

invocamanman commented Oct 1, 2024

invocamanman commented Oct 1, 2024

invocamanman commented Oct 7, 2024

krlosMata left a comment

krlosMata left a comment

invocamanman Oct 28, 2024

invocamanman Oct 28, 2024

invocamanman Oct 28, 2024

invocamanman Oct 28, 2024

invocamanman Oct 29, 2024

invocamanman Oct 29, 2024

invocamanman Oct 29, 2024

invocamanman Oct 29, 2024

sonarcloud bot commented Nov 5, 2024

Sovereign bridge implementation #330

Sovereign bridge implementation #330

Conversation

ignasirv commented Sep 16, 2024 • edited Loading

invocamanman commented Sep 25, 2024

invocamanman commented Sep 25, 2024

invocamanman commented Oct 1, 2024

invocamanman commented Oct 1, 2024

invocamanman commented Oct 7, 2024

krlosMata left a comment

Choose a reason for hiding this comment

krlosMata left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Nov 5, 2024

Quality Gate passed

ignasirv commented Sep 16, 2024 •

edited

Loading