Deploy new set of bridge contract (#268)

* hotfix: initialize in gateway * add config and deployment * update deployments * update new deployment
axieinfinity · Aug 9, 2023 · 42aadc9 · 42aadc9
1 parent d042ae4
commit 42aadc9
Show file tree

Hide file tree

Showing 15 changed files with 3,621 additions and 405 deletions.
diff --git a/contracts/extensions/WithdrawalLimitation.sol b/contracts/extensions/WithdrawalLimitation.sol
@@ -201,7 +201,7 @@ abstract contract WithdrawalLimitation is GatewayV2 {
    *
    */
   function _setHighTierThresholds(address[] calldata _tokens, uint256[] calldata _thresholds) internal virtual {
-    if (_tokens.length == _thresholds.length) revert ErrLengthMismatch(msg.sig);
+    if (_tokens.length != _thresholds.length) revert ErrLengthMismatch(msg.sig);
 
     for (uint256 _i; _i < _tokens.length; ) {
       highTierThreshold[_tokens[_i]] = _thresholds[_i];

diff --git a/contracts/mainchain/MainchainGovernanceAdmin.sol b/contracts/mainchain/MainchainGovernanceAdmin.sol
@@ -22,6 +22,10 @@ contract MainchainGovernanceAdmin is AccessControlEnumerable, GovernanceRelay, G
     address _bridgeContract,
     address[] memory _relayers
   ) GovernanceAdmin(_roninChainId, _roninTrustedOrganizationContract, _bridgeContract, DEFAULT_EXPIRY_DURATION) {
+    round[5] = 1;
+    ProposalVote storage _latestProposalVote = vote[5][1];
+    _latestProposalVote.status = VoteStatus.Expired;
+
     _setupRole(DEFAULT_ADMIN_ROLE, _roleSetter);
     for (uint256 _i; _i < _relayers.length; ) {
       _grantRole(RELAYER_ROLE, _relayers[_i]);

diff --git a/deployments/goerli/MainchainGatewayV2Logic.json b/deployments/goerli/MainchainGatewayV2Logic.json
diff --git a/deployments/goerli/MainchainGatewayV2Proxy.json b/deployments/goerli/MainchainGatewayV2Proxy.json