GitFlow: back merge (#298)

Author: nxqbao

.gitignore

@@ -16,4 +16,7 @@ remix-compiler.config.js
 .yarnrc.yml
 logs/storage_layout_table.log
 cache_foundry
-out
+out
+.DS_Store
+
+dry-run/

.gitmodules

@@ -9,3 +9,6 @@
 	path = lib/prb-math
 	url = https://github.com/PaulRBerg/prb-math
 	branch = release-v4
+[submodule "lib/solady"]
+	path = lib/solady
+	url = https://github.com/vectorized/solady

README.md

@@ -56,11 +56,11 @@ This repo contains source code of contracts that will be either deployed on the
 
 - On mainchains:
   - Governance contract: `MainchainGovernanceAdmin`
-  - Bridge contract: `MainchainGatewayV2`
+  - Bridge contract: `MainchainGatewayV3`
   - Trusted orgs contract: `RoninTrustedOrganization`
 - On Ronin chain:
   - Governance contract: `RoninGovernanceAdmin`
-  - Bridge operation: `RoninGatewayV2`
+  - Bridge operation: `RoninGatewayV3`
   - Trusted orgs contract: `RoninTrustedOrganization`
   - DPoS contracts
 

contracts/extensions/GatewayV2.sol renamed to contracts/extensions/GatewayV3.sol

@@ -5,7 +5,7 @@ import "@openzeppelin/contracts/security/Pausable.sol";
 import "../interfaces/IQuorum.sol";
 import "./collections/HasProxyAdmin.sol";
 
-abstract contract GatewayV2 is HasProxyAdmin, Pausable, IQuorum {
+abstract contract GatewayV3 is HasProxyAdmin, Pausable, IQuorum {
   uint256 internal _num;
   uint256 internal _denom;
 

contracts/extensions/WithdrawalLimitation.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import "./GatewayV2.sol";
+import "./GatewayV3.sol";
 
-abstract contract WithdrawalLimitation is GatewayV2 {
+abstract contract WithdrawalLimitation is GatewayV3 {
   /// @dev Error of invalid percentage.
   error ErrInvalidPercentage();
 
@@ -50,7 +50,7 @@ abstract contract WithdrawalLimitation is GatewayV2 {
   uint256[50] private ______gap;
 
   /**
-   * @dev Override `GatewayV2-setThreshold`.
+   * @dev Override `GatewayV3-setThreshold`.
    *
    * Requirements:
    * - The high-tier vote weight threshold must equal to or larger than the normal threshold.

contracts/extensions/version-control/ConditionalImplementControl.sol

@@ -1,6 +1,7 @@
 /// SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
+import { HasContracts } from "../collections/HasContracts.sol";
 import { IConditionalImplementControl } from "../../interfaces/version-control/IConditionalImplementControl.sol";
 import { ErrorHandler } from "../../libraries/ErrorHandler.sol";
 import { AddressArrayUtils } from "../../libraries/AddressArrayUtils.sol";
@@ -10,7 +11,7 @@ import { ErrOnlySelfCall, IdentityGuard } from "../../utils/IdentityGuard.sol";
  * @title ConditionalImplementControl
  * @dev A contract that allows conditional version control of contract implementations.
  */
-abstract contract ConditionalImplementControl is IConditionalImplementControl, IdentityGuard {
+abstract contract ConditionalImplementControl is IConditionalImplementControl, IdentityGuard, HasContracts {
   using ErrorHandler for bool;
   using AddressArrayUtils for address[];
 
@@ -21,6 +22,9 @@ abstract contract ConditionalImplementControl is IConditionalImplementControl, I
    */
   bytes32 internal constant _IMPLEMENTATION_SLOT = 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc;
 
+  /// @dev value is equal to keccak256("@ronin.extensions.version-control.ConditionalImplementControl.calldatas.slot") - 1
+  bytes32 internal constant CALLDATAS_SLOT = 0x330d87be17f5b23d41285647e0e9b0e7124a778feb3f952590ed6a023ae02633;
+
   /**
    * @dev address of the proxy that delegates to this contract.
    * @notice immutable variables are directly stored in contract code.
@@ -99,11 +103,49 @@ abstract contract ConditionalImplementControl is IConditionalImplementControl, I
     _upgradeTo(NEW_IMPL);
   }
 
+  /**
+   * @dev See {IConditionalImplementControl-setCallDatas}.
+   */
+  function setCallDatas(bytes[] calldata args) external onlyAdmin onlyDelegateFromProxyStorage {
+    bytes[] storage callDatas = _callDatas();
+    uint256 length = args.length;
+    for (uint256 i; i < length; ) {
+      callDatas.push(args[i]);
+
+      unchecked {
+        ++i;
+      }
+    }
+  }
+
+  /**
+   * @dev Internal function to access the array of calldatas.
+   * @return callDatas the storage array of calldatas.
+   */
+  function _callDatas() internal pure returns (bytes[] storage callDatas) {
+    assembly ("memory-safe") {
+      callDatas.slot := CALLDATAS_SLOT
+    }
+  }
+
   function _upgradeTo(address newImplementation) internal {
     assembly ("memory-safe") {
       sstore(_IMPLEMENTATION_SLOT, newImplementation)
     }
     emit Upgraded(newImplementation);
+
+    bytes[] storage callDatas = _callDatas();
+    uint256 length = callDatas.length;
+    bool success;
+    bytes memory returnOrRevertData;
+    for (uint256 i; i < length; ) {
+      (success, returnOrRevertData) = newImplementation.delegatecall(callDatas[i]);
+      success.handleRevert(bytes4(callDatas[i]), returnOrRevertData);
+
+      unchecked {
+        ++i;
+      }
+    }
   }
 
   /**

contracts/interfaces/IMainchainGatewayV2.sol renamed to contracts/interfaces/IMainchainGatewayV3.sol

@@ -6,7 +6,7 @@ import "./consumers/SignatureConsumer.sol";
 import "./consumers/MappedTokenConsumer.sol";
 import "../libraries/Transfer.sol";
 
-interface IMainchainGatewayV2 is SignatureConsumer, MappedTokenConsumer {
+interface IMainchainGatewayV3 is SignatureConsumer, MappedTokenConsumer {
   /**
    * @dev Error indicating that a query was made for an approved withdrawal.
    */

contracts/interfaces/IRoninGatewayV2.sol renamed to contracts/interfaces/IRoninGatewayV3.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import "../libraries/Transfer.sol";
 import "./consumers/MappedTokenConsumer.sol";
 
-interface IRoninGatewayV2 is MappedTokenConsumer {
+interface IRoninGatewayV3 is MappedTokenConsumer {
   /**
    * @dev Error thrown when attempting to withdraw funds that have already been migrated.
    */

contracts/interfaces/bridge/IBridgeSlash.sol

@@ -18,7 +18,7 @@ interface IBridgeSlash is IBridgeSlashEvents {
     uint256 totalBallot,
     uint256 totalVote,
     uint256 period
-  ) external returns (bool slashed);
+  ) external;
 
   /**
    * @dev Returns the penalize durations for the specified bridge operators.

contracts/interfaces/version-control/IConditionalImplementControl.sol

@@ -14,4 +14,9 @@ interface IConditionalImplementControl {
    * @dev Executes the selfUpgrade function, upgrading to the new contract implementation.
    */
   function selfUpgrade() external;
+
+  /**
+   * @dev Set additional calldata to call when upgrading via `selfUpgrade`.
+   */
+  function setCallDatas(bytes[] calldata args) external;
 }