[r4r] fix(BEP-171): fix bug that SLASH_CHANNELID cannot be suspended …

…in order for consensus not to be affected (#212) * fix: bug that SLASH_CHANNELID cannot be suspended in order for call from consensus not to be affected * chores: modify event * feat: it will felony on BSC even suspended
bnb-chain · Dec 8, 2022 · ec157d3 · ec157d3
1 parent 3652c9c
commit ec157d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/contracts/SlashIndicator.sol b/contracts/SlashIndicator.sol
@@ -36,6 +36,8 @@ contract SlashIndicator is ISlashIndicator,System,IParamSubscriber, IApplication
   event unKnownResponse(uint32 code);
   event crashResponse();
 
+  event failedFelony(address indexed validator, uint256 slashCount, bytes failReason);
+
   struct Indicator {
     uint256 height;
     uint256 count;
@@ -98,7 +100,9 @@ contract SlashIndicator is ISlashIndicator,System,IParamSubscriber, IApplication
     if (indicator.count % felonyThreshold == 0) {
       indicator.count = 0;
       IBSCValidatorSet(VALIDATOR_CONTRACT_ADDR).felony(validator);
-      ICrossChain(CROSS_CHAIN_CONTRACT_ADDR).sendSynPackage(SLASH_CHANNELID, encodeSlashPackage(validator), 0);
+      try ICrossChain(CROSS_CHAIN_CONTRACT_ADDR).sendSynPackage(SLASH_CHANNELID, encodeSlashPackage(validator), 0) {} catch (bytes memory reason) {
+        emit failedFelony(validator, indicator.count, reason);
+      }
     } else if (indicator.count % misdemeanorThreshold == 0) {
       IBSCValidatorSet(VALIDATOR_CONTRACT_ADDR).misdemeanor(validator);
     }

diff --git a/contracts/SlashIndicator.template b/contracts/SlashIndicator.template
@@ -36,6 +36,8 @@ contract SlashIndicator is ISlashIndicator,System,IParamSubscriber, IApplication
   event unKnownResponse(uint32 code);
   event crashResponse();
 
+  event failedFelony(address indexed validator, uint256 slashCount, bytes failReason);
+
   struct Indicator {
     uint256 height;
     uint256 count;
@@ -103,7 +105,9 @@ contract SlashIndicator is ISlashIndicator,System,IParamSubscriber, IApplication
     if (indicator.count % felonyThreshold == 0) {
       indicator.count = 0;
       IBSCValidatorSet(VALIDATOR_CONTRACT_ADDR).felony(validator);
-      ICrossChain(CROSS_CHAIN_CONTRACT_ADDR).sendSynPackage(SLASH_CHANNELID, encodeSlashPackage(validator), 0);
+      try ICrossChain(CROSS_CHAIN_CONTRACT_ADDR).sendSynPackage(SLASH_CHANNELID, encodeSlashPackage(validator), 0) {} catch (bytes memory reason) {
+        emit failedFelony(validator, indicator.count, reason);
+      }
     } else if (indicator.count % misdemeanorThreshold == 0) {
       IBSCValidatorSet(VALIDATOR_CONTRACT_ADDR).misdemeanor(validator);
     }