temp: make BridgeManager is Proxy

ronin-chain · Jan 24, 2024 · 1d0e9ab · 1d0e9ab
1 parent 3d56a22
commit 1d0e9ab
Show file tree

Hide file tree

Showing 25 changed files with 161 additions and 2,046 deletions.
diff --git a/script/contracts/MainchainBridgeManagerDeploy.s.sol b/script/contracts/MainchainBridgeManagerDeploy.s.sol
@@ -9,24 +9,24 @@ import { Migration } from "../Migration.s.sol";
 import { MainchainGatewayV3Deploy } from "./MainchainGatewayV3Deploy.s.sol";
 
 contract MainchainBridgeManagerDeploy is Migration {
-  function _defaultArguments() internal virtual override returns (bytes memory args) {
-    ISharedArgument.BridgeManagerParam memory param = config.sharedArguments().mainchainBridgeManager;
+  // function _defaultArguments() internal virtual override returns (bytes memory args) {
+    // ISharedArgument.BridgeManagerParam memory param = config.sharedArguments().mainchainBridgeManager;
 
-    args = abi.encode(
-      param.num,
-      param.denom,
-      param.roninChainId,
-      param.bridgeContract,
-      param.callbackRegisters,
-      param.bridgeOperators,
-      param.governors,
-      param.voteWeights,
-      param.targetOptions,
-      param.targets
-    );
-  }
+    // args = abi.encode(
+    //   param.num,
+    //   param.denom,
+    //   param.roninChainId,
+    //   param.bridgeContract,
+    //   param.callbackRegisters,
+    //   param.bridgeOperators,
+    //   param.governors,
+    //   param.voteWeights,
+    //   param.targetOptions,
+    //   param.targets
+    // );
+  // }
 
   function run() public virtual returns (MainchainBridgeManager) {
-    return MainchainBridgeManager(_deployImmutable(Contract.MainchainBridgeManager.key()));
+    return MainchainBridgeManager(_deployProxy(Contract.MainchainBridgeManager.key(), EMPTY_ARGS));
   }
 }
diff --git a/src/extensions/bridge-operator-governance/BridgeManager.sol b/src/extensions/bridge-operator-governance/BridgeManager.sol
@@ -36,7 +36,7 @@ abstract contract BridgeManager is IBridgeManager, HasContracts, BridgeManagerQu
   /**
    * @inheritdoc IBridgeManager
    */
-  bytes32 public immutable DOMAIN_SEPARATOR;
+  bytes32 public  DOMAIN_SEPARATOR;
 
   function _getBridgeManagerStorage() private pure returns (BridgeManagerStorage storage $) {
     assembly {
@@ -49,7 +49,31 @@ abstract contract BridgeManager is IBridgeManager, HasContracts, BridgeManagerQu
     _;
   }
 
-  constructor(
+  // constructor(
+  //   uint256 num,
+  //   uint256 denom,
+  //   uint256 roninChainId,
+  //   address bridgeContract,
+  //   address[] memory callbackRegisters,
+  //   address[] memory bridgeOperators,
+  //   address[] memory governors,
+  //   uint96[] memory voteWeights
+  // ) payable BridgeManagerQuorum(num, denom) BridgeManagerCallbackRegister(callbackRegisters) {
+  //   // _setContract(ContractType.BRIDGE, bridgeContract);
+
+  //   // DOMAIN_SEPARATOR = keccak256(
+  //   //   abi.encode(
+  //   //     keccak256("EIP712Domain(string name,string version,bytes32 salt)"),
+  //   //     keccak256("BridgeAdmin"), // name hash
+  //   //     keccak256("2"), // version hash
+  //   //     keccak256(abi.encode("BRIDGE_ADMIN", roninChainId)) // salt
+  //   //   )
+  //   // );
+
+  //   // _addBridgeOperators(voteWeights, governors, bridgeOperators);
+  // }
+
+    function __init(
     uint256 num,
     uint256 denom,
     uint256 roninChainId,
@@ -58,7 +82,10 @@ abstract contract BridgeManager is IBridgeManager, HasContracts, BridgeManagerQu
     address[] memory bridgeOperators,
     address[] memory governors,
     uint96[] memory voteWeights
-  ) payable BridgeManagerQuorum(num, denom) BridgeManagerCallbackRegister(callbackRegisters) {
+  )  internal {
+    BridgeManagerQuorum.__init(num, denom);
+    BridgeManagerCallbackRegister.__init(callbackRegisters);
+
     _setContract(ContractType.BRIDGE, bridgeContract);
 
     DOMAIN_SEPARATOR = keccak256(

diff --git a/src/extensions/bridge-operator-governance/BridgeManagerCallbackRegister.sol b/src/extensions/bridge-operator-governance/BridgeManagerCallbackRegister.sol
@@ -19,7 +19,11 @@ abstract contract BridgeManagerCallbackRegister is IdentityGuard, IBridgeManager
    */
   bytes32 private constant CALLBACK_REGISTERS_SLOT = 0x5da136eb38f8d8e354915fc8a767c0dc81d49de5fb65d5477122a82ddd976240;
 
-  constructor(address[] memory callbackRegisters) payable {
+  // constructor(address[] memory callbackRegisters) payable {
+  // //   _registerCallbacks(callbackRegisters);
+  // }
+
+  function __init(address[] memory callbackRegisters) internal  {
     _registerCallbacks(callbackRegisters);
   }
 
@@ -33,9 +37,7 @@ abstract contract BridgeManagerCallbackRegister is IdentityGuard, IBridgeManager
   /**
    * @inheritdoc IBridgeManagerCallbackRegister
    */
-  function unregisterCallbacks(
-    address[] calldata registers
-  ) external onlySelfCall returns (bool[] memory unregistereds) {
+  function unregisterCallbacks(address[] calldata registers) external onlySelfCall returns (bool[] memory unregistereds) {
     unregistereds = _unregisterCallbacks(registers);
   }
 
@@ -51,9 +53,7 @@ abstract contract BridgeManagerCallbackRegister is IdentityGuard, IBridgeManager
    * @param registers The array of callback addresses to register.
    * @return registereds An array indicating the success status of each registration.
    */
-  function _registerCallbacks(
-    address[] memory registers
-  ) internal nonDuplicate(registers) returns (bool[] memory registereds) {
+  function _registerCallbacks(address[] memory registers) internal nonDuplicate(registers) returns (bool[] memory registereds) {
     uint256 length = registers.length;
     registereds = new bool[](length);
     if (length == 0) return registereds;
@@ -81,9 +81,7 @@ abstract contract BridgeManagerCallbackRegister is IdentityGuard, IBridgeManager
    * @param registers The array of callback addresses to unregister.
    * @return unregistereds An array indicating the success status of each unregistration.
    */
-  function _unregisterCallbacks(
-    address[] memory registers
-  ) internal nonDuplicate(registers) returns (bool[] memory unregistereds) {
+  function _unregisterCallbacks(address[] memory registers) internal nonDuplicate(registers) returns (bool[] memory unregistereds) {
     uint256 length = registers.length;
     unregistereds = new bool[](length);
     EnumerableSet.AddressSet storage _callbackRegisters = _getCallbackRegisters();

diff --git a/src/extensions/bridge-operator-governance/BridgeManagerQuorum.sol b/src/extensions/bridge-operator-governance/BridgeManagerQuorum.sol
@@ -21,7 +21,13 @@ abstract contract BridgeManagerQuorum is IQuorum, IdentityGuard {
     }
   }
 
-  constructor(uint256 num, uint256 denom) {
+  // constructor(uint256 num, uint256 denom) {
+  //   // BridgeManagerQuorumStorage storage $ = _getBridgeManagerQuorumStorage();
+  //   // $._nonce = 1;
+  //   // _setThreshold(num, denom);
+  // }
+
+  function __init(uint256 num, uint256 denom) internal {
     BridgeManagerQuorumStorage storage $ = _getBridgeManagerQuorumStorage();
     $._nonce = 1;
 

diff --git a/src/extensions/sequential-governance/CoreGovernance.sol b/src/extensions/sequential-governance/CoreGovernance.sol
@@ -63,10 +63,15 @@ abstract contract CoreGovernance is SignatureConsumer, VoteStatusConsumer, Chain
 
   uint256 internal _proposalExpiryDuration;
 
-  constructor(uint256 _expiryDuration) {
+  // constructor(uint256 _expiryDuration) {
+  //   // _setProposalExpiryDuration(_expiryDuration);
+  // }
+
+function __init(uint256 _expiryDuration)  internal {
     _setProposalExpiryDuration(_expiryDuration);
   }
 
+
   /**
    * @dev Creates new voting round by calculating the `_round` number of chain `_chainId`.
    * Increases the `_round` number if the previous one is not expired. Delete the previous proposal

diff --git a/src/extensions/sequential-governance/GlobalCoreGovernance.sol b/src/extensions/sequential-governance/GlobalCoreGovernance.sol
@@ -24,7 +24,12 @@ abstract contract GlobalCoreGovernance is CoreGovernance {
   /// @dev Emitted when the target options are updated
   event TargetOptionUpdated(GlobalProposal.TargetOption indexed targetOption, address indexed addr);
 
-  constructor(GlobalProposal.TargetOption[] memory targetOptions, address[] memory addrs) {
+  // constructor(GlobalProposal.TargetOption[] memory targetOptions, address[] memory addrs) {
+  //   // _updateTargetOption(GlobalProposal.TargetOption.BridgeManager, address(this));
+  //   // _updateManyTargetOption(targetOptions, addrs);
+  // }
+
+   function __init(GlobalProposal.TargetOption[] memory targetOptions, address[] memory addrs)  internal {
     _updateTargetOption(GlobalProposal.TargetOption.BridgeManager, address(this));
     _updateManyTargetOption(targetOptions, addrs);
   }

diff --git a/src/mainchain/MainchainBridgeManager.sol b/src/mainchain/MainchainBridgeManager.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import { CoreGovernance } from "../extensions/sequential-governance/CoreGovernance.sol";
 import { GlobalCoreGovernance, GlobalGovernanceRelay } from "../extensions/sequential-governance/governance-relay/GlobalGovernanceRelay.sol";
 import { GovernanceRelay } from "../extensions/sequential-governance/governance-relay/GovernanceRelay.sol";
@@ -10,10 +11,30 @@ import { Proposal } from "../libraries/Proposal.sol";
 import { GlobalProposal } from "../libraries/GlobalProposal.sol";
 import "../utils/CommonErrors.sol";
 
-contract MainchainBridgeManager is BridgeManager, GovernanceRelay, GlobalGovernanceRelay {
+contract MainchainBridgeManager is Initializable, BridgeManager, GovernanceRelay, GlobalGovernanceRelay {
   uint256 private constant DEFAULT_EXPIRY_DURATION = 1 << 255;
 
-  constructor(
+  constructor()
+  //   uint256 num,
+  //   uint256 denom,
+  //   uint256 roninChainId,
+  //   address bridgeContract,
+  //   address[] memory callbackRegisters,
+  //   address[] memory bridgeOperators,
+  //   address[] memory governors,
+  //   uint96[] memory voteWeights,
+  //   GlobalProposal.TargetOption[] memory targetOptions,
+  //   address[] memory targets
+  // )
+  //   payable
+  //   CoreGovernance(DEFAULT_EXPIRY_DURATION)
+  //   GlobalCoreGovernance(targetOptions, targets)
+  //   BridgeManager(num, denom, roninChainId, bridgeContract, callbackRegisters, bridgeOperators, governors, voteWeights)
+  {
+    _disableInitializers();
+  }
+
+  function initialize(
     uint256 num,
     uint256 denom,
     uint256 roninChainId,
@@ -24,12 +45,11 @@ contract MainchainBridgeManager is BridgeManager, GovernanceRelay, GlobalGoverna
     uint96[] memory voteWeights,
     GlobalProposal.TargetOption[] memory targetOptions,
     address[] memory targets
-  )
-    payable
-    CoreGovernance(DEFAULT_EXPIRY_DURATION)
-    GlobalCoreGovernance(targetOptions, targets)
-    BridgeManager(num, denom, roninChainId, bridgeContract, callbackRegisters, bridgeOperators, governors, voteWeights)
-  {}
+  ) external initializer {
+    CoreGovernance.__init(DEFAULT_EXPIRY_DURATION);
+    GlobalCoreGovernance.__init(targetOptions, targets);
+    BridgeManager.__init(num, denom, roninChainId, bridgeContract, callbackRegisters, bridgeOperators, governors, voteWeights);
+  }
 
   /**
    * @dev See `GovernanceRelay-_relayProposal`.

diff --git a/src/mocks/ronin/MockBridgeManager.sol b/src/mocks/ronin/MockBridgeManager.sol
@@ -4,11 +4,11 @@ pragma solidity ^0.8.0;
 import { RoleAccess, ContractType, AddressArrayUtils, IBridgeManager, BridgeManager } from "../../extensions/bridge-operator-governance/BridgeManager.sol";
 
 contract MockBridgeManager is BridgeManager {
-  constructor(
-    address[] memory bridgeOperators,
-    address[] memory governors,
-    uint96[] memory voteWeights
-  ) payable BridgeManager(0, 0, 0, address(0), _getEmptyAddressArray(), bridgeOperators, governors, voteWeights) {}
+  // constructor(
+  //   address[] memory bridgeOperators,
+  //   address[] memory governors,
+  //   uint96[] memory voteWeights
+  // ) payable BridgeManager(0, 0, 0, address(0), _getEmptyAddressArray(), bridgeOperators, governors, voteWeights) {}
 
   function _getEmptyAddressArray() internal pure returns (address[] memory arr) {}
 }
diff --git a/src/mocks/ronin/MockRoninBridgeManager.sol b/src/mocks/ronin/MockRoninBridgeManager.sol
@@ -5,31 +5,31 @@ import { RoninBridgeManager } from "../../ronin/gateway/RoninBridgeManager.sol";
 import { GlobalProposal } from "../../extensions/sequential-governance/governance-proposal/GovernanceProposal.sol";
 
 contract MockRoninBridgeManager is RoninBridgeManager {
-  constructor(
-    uint256 num,
-    uint256 denom,
-    uint256 roninChainId,
-    uint256 expiryDuration,
-    address bridgeContract,
-    address[] memory callbackRegisters,
-    address[] memory bridgeOperators,
-    address[] memory governors,
-    uint96[] memory voteWeights,
-    GlobalProposal.TargetOption[] memory targetOptions,
-    address[] memory targets
-  )
-    RoninBridgeManager(
-      num,
-      denom,
-      roninChainId,
-      expiryDuration,
-      bridgeContract,
-      callbackRegisters,
-      bridgeOperators,
-      governors,
-      voteWeights,
-      targetOptions,
-      targets
-    )
-  {}
+  // constructor(
+  //   uint256 num,
+  //   uint256 denom,
+  //   uint256 roninChainId,
+  //   uint256 expiryDuration,
+  //   address bridgeContract,
+  //   address[] memory callbackRegisters,
+  //   address[] memory bridgeOperators,
+  //   address[] memory governors,
+  //   uint96[] memory voteWeights,
+  //   GlobalProposal.TargetOption[] memory targetOptions,
+  //   address[] memory targets
+  // )
+  //   RoninBridgeManager(
+  //     num,
+  //     denom,
+  //     roninChainId,
+  //     expiryDuration,
+  //     bridgeContract,
+  //     callbackRegisters,
+  //     bridgeOperators,
+  //     governors,
+  //     voteWeights,
+  //     targetOptions,
+  //     targets
+  //   )
+  // {}
 }
diff --git a/src/ronin/gateway/RoninBridgeManager.sol b/src/ronin/gateway/RoninBridgeManager.sol
@@ -8,7 +8,8 @@ import { VoteStatusConsumer } from "../../interfaces/consumers/VoteStatusConsume
 import { ErrQueryForEmptyVote } from "../../utils/CommonErrors.sol";
 
 contract RoninBridgeManager is BridgeManager, GovernanceProposal, GlobalGovernanceProposal {
-  constructor(
+
+  function initialize(
     uint256 num,
     uint256 denom,
     uint256 roninChainId,
@@ -19,13 +20,12 @@ contract RoninBridgeManager is BridgeManager, GovernanceProposal, GlobalGovernan
     address[] memory governors,
     uint96[] memory voteWeights,
     GlobalProposal.TargetOption[] memory targetOptions,
-    address[] memory targets
-  )
-    payable
-    CoreGovernance(expiryDuration)
-    GlobalCoreGovernance(targetOptions, targets)
-    BridgeManager(num, denom, roninChainId, bridgeContract, callbackRegisters, bridgeOperators, governors, voteWeights)
-  {}
+    address[] memory targets) external
+ {
+    CoreGovernance.__init(expiryDuration);
+    GlobalCoreGovernance.__init(targetOptions, targets);
+    BridgeManager.__init(num, denom, roninChainId, bridgeContract, callbackRegisters, bridgeOperators, governors, voteWeights);
+  }
 
   /**
    * CURRENT NETWORK
@@ -101,10 +101,7 @@ contract RoninBridgeManager is BridgeManager, GovernanceProposal, GlobalGovernan
    * - The method caller is governor.
    *
    */
-  function castProposalVoteForCurrentNetwork(
-    Proposal.ProposalDetail calldata proposal,
-    Ballot.VoteType support
-  ) external onlyGovernor {
+  function castProposalVoteForCurrentNetwork(Proposal.ProposalDetail calldata proposal, Ballot.VoteType support) external onlyGovernor {
     _castProposalVoteForCurrentNetwork(msg.sender, proposal, support);
   }