v0.6.2-testnet (#281)

Author: nxqbao

.gitmodules

@@ -1,3 +1,11 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/prb-test"]
+	branch = release-v0
+	path = lib/prb-test
+	url = https://github.com/PaulRBerg/prb-test
+[submodule "lib/prb-math"]
+	path = lib/prb-math
+	url = https://github.com/PaulRBerg/prb-math
+	branch = release-v4

README.md

@@ -24,6 +24,13 @@ The collections of smart contracts that power the Ronin Delegated Proof of Stake
   $ yarn --frozen-lockfile
   ```
 
+- Install foundry libs
+
+    ```
+    $ git submodule add -b release-v0 https://github.com/PaulRBerg/prb-test lib/prb-test
+    $ git submodule add -b release-v4 https://github.com/PaulRBerg/prb-math lib/prb-math
+    ```
+
 - Compile contracts
 
   ```shell

contracts/extensions/GovernanceAdmin.sol

@@ -144,8 +144,8 @@ abstract contract GovernanceAdmin is
   /**
    * @dev Override `CoreGovernance-_getTotalWeights`.
    */
-  function _getTotalWeights() internal view virtual override returns (uint256) {
-    bytes4 _selector = IRoninTrustedOrganization.totalWeights.selector;
+  function _getTotalWeight() internal view virtual override returns (uint256) {
+    bytes4 _selector = IRoninTrustedOrganization.totalWeight.selector;
     (bool _success, bytes memory _returndata) = getContract(ContractType.RONIN_TRUSTED_ORGANIZATION).staticcall(
       abi.encodeWithSelector(
         // TransparentUpgradeableProxyV2.functionDelegateCall.selector,

contracts/extensions/bridge-operator-governance/BridgeManager.sol

@@ -75,9 +75,8 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
     uint96[] memory voteWeights
   ) payable BridgeManagerCallbackRegister(callbackRegisters) {
     NONCE_SLOT.store(1);
-    NUMERATOR_SLOT.store(num);
-    DENOMINATOR_SLOT.store(denom);
 
+    _setThreshold(num, denom);
     _setContract(ContractType.BRIDGE, bridgeContract);
 
     DOMAIN_SEPARATOR = keccak256(
@@ -167,21 +166,21 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
   /**
    * @inheritdoc IBridgeManager
    */
-  function getTotalWeights() public view returns (uint256) {
+  function getTotalWeight() public view returns (uint256) {
     return TOTAL_WEIGHTS_SLOT.load();
   }
 
   /**
    * @inheritdoc IBridgeManager
    */
-  function getGovernorWeights(address[] calldata governors) external view returns (uint256[] memory weights) {
+  function getGovernorWeights(address[] calldata governors) external view returns (uint96[] memory weights) {
     weights = _getGovernorWeights(governors);
   }
 
   /**
    * @inheritdoc IBridgeManager
    */
-  function getGovernorWeight(address governor) external view returns (uint256 weight) {
+  function getGovernorWeight(address governor) external view returns (uint96 weight) {
     weight = _getGovernorWeight(governor);
   }
 
@@ -197,7 +196,7 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
   /**
    * @inheritdoc IBridgeManager
    */
-  function totalBridgeOperators() external view returns (uint256) {
+  function totalBridgeOperator() external view returns (uint256) {
     return _getBridgeOperatorSet().length();
   }
 
@@ -260,7 +259,7 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
   function getFullBridgeOperatorInfos()
     external
     view
-    returns (address[] memory governors, address[] memory bridgeOperators, uint256[] memory weights)
+    returns (address[] memory governors, address[] memory bridgeOperators, uint96[] memory weights)
   {
     governors = _getGovernors();
     bridgeOperators = getBridgeOperatorOf(governors);
@@ -270,7 +269,7 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
   /**
    * @inheritdoc IBridgeManager
    */
-  function getBridgeOperatorWeight(address bridgeOperator) external view returns (uint256 weight) {
+  function getBridgeOperatorWeight(address bridgeOperator) external view returns (uint96 weight) {
     mapping(address => address) storage _governorOf = _getGovernorOf();
     mapping(address => BridgeOperatorInfo) storage _governorToBridgeOperatorInfo = _getGovernorToBridgeOperatorInfo();
     weight = _governorToBridgeOperatorInfo[_governorOf[bridgeOperator]].voteWeight;
@@ -467,9 +466,9 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
    * @param governors An array containing the addresses of governors.
    * @return weights An array containing the vote weights of the corresponding governors.
    */
-  function _getGovernorWeights(address[] memory governors) internal view returns (uint256[] memory weights) {
+  function _getGovernorWeights(address[] memory governors) internal view returns (uint96[] memory weights) {
     uint256 length = governors.length;
-    weights = new uint256[](length);
+    weights = new uint96[](length);
     mapping(address => BridgeOperatorInfo) storage _governorToBridgeOperatorInfo = _getGovernorToBridgeOperatorInfo();
     for (uint256 i; i < length; ) {
       weights[i] = _governorToBridgeOperatorInfo[governors[i]].voteWeight;
@@ -486,10 +485,9 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
    * @notice The input array `governors` must contain unique addresses to avoid duplicate calculations.
    */
   function _sumGovernorsWeight(address[] memory governors) internal view nonDuplicate(governors) returns (uint256 sum) {
-    uint256 length = _getBridgeOperatorSet().length();
     mapping(address => BridgeOperatorInfo) storage _governorToBridgeOperatorInfo = _getGovernorToBridgeOperatorInfo();
 
-    for (uint256 i; i < length; ) {
+    for (uint256 i; i < governors.length; ) {
       sum += _governorToBridgeOperatorInfo[governors[i]].voteWeight;
 
       unchecked {
@@ -514,7 +512,7 @@ abstract contract BridgeManager is IQuorum, IBridgeManager, BridgeManagerCallbac
    * @param governor The address of the governor to get the vote weight for.
    * @return voteWeight The vote weight of the specified governor.
    */
-  function _getGovernorWeight(address governor) internal view returns (uint256) {
+  function _getGovernorWeight(address governor) internal view returns (uint96) {
     return _getGovernorToBridgeOperatorInfo()[governor].voteWeight;
   }
 

contracts/extensions/bridge-operator-governance/BridgeManagerCallbackRegister.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
 import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import { IBridgeManagerCallbackRegister } from "../../interfaces/bridge/IBridgeManagerCallbackRegister.sol";
 import { IBridgeManagerCallback } from "../../interfaces/bridge/IBridgeManagerCallback.sol";
-import { IdentityGuard } from "../../utils/IdentityGuard.sol";
+import { TransparentUpgradeableProxyV2, IdentityGuard } from "../../utils/IdentityGuard.sol";
 
 /**
  * @title BridgeManagerCallbackRegister
@@ -107,19 +107,23 @@ abstract contract BridgeManagerCallbackRegister is IdentityGuard, IBridgeManager
     uint256 length = registers.length;
     if (length == 0) return;
 
-    bool[] memory statuses = new bool[](length);
+    bool[] memory successes = new bool[](length);
     bytes[] memory returnDatas = new bytes[](length);
     bytes memory callData = abi.encodePacked(callbackFnSig, inputs);
+    bytes memory proxyCallData = abi.encodeCall(TransparentUpgradeableProxyV2.functionDelegateCall, (callData));
 
     for (uint256 i; i < length; ) {
-      (statuses[i], returnDatas[i]) = registers[i].call(callData);
+      (successes[i], returnDatas[i]) = registers[i].call(callData);
+      if (!successes[i]) {
+        (successes[i], returnDatas[i]) = registers[i].call(proxyCallData);
+      }
 
       unchecked {
         ++i;
       }
     }
 
-    emit Notified(callData, registers, statuses, returnDatas);
+    emit Notified(callData, registers, successes, returnDatas);
   }
 
   /**

contracts/extensions/collections/HasProxyAdmin.sol

@@ -6,7 +6,7 @@ import "../../utils/CommonErrors.sol";
 
 abstract contract HasProxyAdmin {
   // bytes32(uint256(keccak256("eip1967.proxy.admin")) - 1));
-  bytes32 internal constant _ADMIN_SLOT = 0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
+  bytes32 private constant _ADMIN_SLOT = 0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103;
 
   modifier onlyAdmin() {
     _requireAdmin();
@@ -16,7 +16,7 @@ abstract contract HasProxyAdmin {
   /**
    * @dev Returns proxy admin.
    */
-  function _getAdmin() internal view returns (address) {
+  function _getAdmin() internal view virtual returns (address) {
     return StorageSlot.getAddressSlot(_ADMIN_SLOT).value;
   }
 

contracts/extensions/sequential-governance/CoreGovernance.sol

@@ -293,7 +293,7 @@ abstract contract CoreGovernance is SignatureConsumer, VoteStatusConsumer, Chain
   /**
    * @dev Returns total weight from validators.
    */
-  function _getTotalWeights() internal view virtual returns (uint256);
+  function _getTotalWeight() internal view virtual returns (uint256);
 
   /**
    * @dev Returns minimum vote to pass a proposal.

contracts/extensions/sequential-governance/governance-proposal/CommonGovernanceProposal.sol

@@ -29,7 +29,7 @@ abstract contract CommonGovernanceProposal is CoreGovernance {
     if (!(_supports.length != 0 && _supports.length == _signatures.length)) revert ErrLengthMismatch(msg.sig);
 
     uint256 _minimumForVoteWeight = _getMinimumVoteWeight();
-    uint256 _minimumAgainstVoteWeight = _getTotalWeights() - _minimumForVoteWeight + 1;
+    uint256 _minimumAgainstVoteWeight = _getTotalWeight() - _minimumForVoteWeight + 1;
 
     address _lastSigner;
     address _signer;

contracts/extensions/sequential-governance/governance-proposal/GovernanceProposal.sol

@@ -67,7 +67,7 @@ abstract contract GovernanceProposal is CoreGovernance, CommonGovernanceProposal
       revert ErrInvalidProposal(proposalHash, vote[_proposal.chainId][_proposal.nonce].hash);
 
     uint256 _minimumForVoteWeight = _getMinimumVoteWeight();
-    uint256 _minimumAgainstVoteWeight = _getTotalWeights() - _minimumForVoteWeight + 1;
+    uint256 _minimumAgainstVoteWeight = _getTotalWeight() - _minimumForVoteWeight + 1;
     Signature memory _emptySignature;
     _castVote(
       _proposal,

contracts/extensions/sequential-governance/governance-relay/CommonGovernanceRelay.sol

@@ -61,7 +61,7 @@ abstract contract CommonGovernanceRelay is CoreGovernance {
 
     ProposalVote storage _vote = vote[_proposal.chainId][_proposal.nonce];
     uint256 _minimumForVoteWeight = _getMinimumVoteWeight();
-    uint256 _totalForVoteWeight = _sumWeights(_forVoteSigners);
+    uint256 _totalForVoteWeight = _sumWeight(_forVoteSigners);
     if (_totalForVoteWeight >= _minimumForVoteWeight) {
       if (_totalForVoteWeight == 0) revert ErrInvalidVoteWeight(msg.sig);
       _vote.status = VoteStatus.Approved;
@@ -70,8 +70,8 @@ abstract contract CommonGovernanceRelay is CoreGovernance {
       return;
     }
 
-    uint256 _minimumAgainstVoteWeight = _getTotalWeights() - _minimumForVoteWeight + 1;
-    uint256 _totalAgainstVoteWeight = _sumWeights(_againstVoteSigners);
+    uint256 _minimumAgainstVoteWeight = _getTotalWeight() - _minimumForVoteWeight + 1;
+    uint256 _totalAgainstVoteWeight = _sumWeight(_againstVoteSigners);
     if (_totalAgainstVoteWeight >= _minimumAgainstVoteWeight) {
       if (_totalAgainstVoteWeight == 0) revert ErrInvalidVoteWeight(msg.sig);
       _vote.status = VoteStatus.Rejected;
@@ -85,5 +85,5 @@ abstract contract CommonGovernanceRelay is CoreGovernance {
   /**
    * @dev Returns the weight of the governor list.
    */
-  function _sumWeights(address[] memory _governors) internal view virtual returns (uint256);
+  function _sumWeight(address[] memory _governors) internal view virtual returns (uint256);
 }