add check to _jailValidator

bnb-chain · Jan 3, 2024 · 348af6b · 348af6b
1 parent 64c57dc
commit 348af6b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/contracts/BC_fusion/StakeHub.sol b/contracts/BC_fusion/StakeHub.sol
@@ -8,6 +8,7 @@ import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "./System.sol";
 import "./lib/Utils.sol";
 import "./interface/IBSCValidatorSet.sol";
+import "./interface/ICrossChain.sol";
 import "./interface/IGovToken.sol";
 import "./interface/IStakeCredit.sol";
 
@@ -1015,7 +1016,11 @@ contract StakeHub is System, Initializable {
     function _jailValidator(Validator storage valInfo, uint256 jailUntil) internal {
         // keep the last eligible validator
         bool isLast = (numOfJailed >= _validatorSet.length() - 1);
-        if (isLast) {
+        // 0x08 is the staking channel id. If this channel is closed, then BC-fusion is finished and we should keep the last eligible validator here
+        if (
+            !ICrossChain(CROSS_CHAIN_CONTRACT_ADDR).registeredContractChannelMap(VALIDATOR_CONTRACT_ADDR, 0x08)
+                && isLast
+        ) {
             emit ValidatorEmptyJailed(valInfo.operatorAddress);
             return;
         }

diff --git a/contracts/BC_fusion/interface/ICrossChain.sol b/contracts/BC_fusion/interface/ICrossChain.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity 0.8.17;
+
+interface ICrossChain {
+  function registeredContractChannelMap(address, uint8) external view returns (bool);
+}