fix: update slash logic to avoid malicious slash (#444)

bnb-chain · Dec 13, 2023 · a964f98 · a964f98
1 parent 5d9b19a
commit a964f98
Show file tree

Hide file tree

Showing 12 changed files with 214 additions and 138 deletions.
diff --git a/abi/slashindicator.abi b/abi/slashindicator.abi
@@ -170,7 +170,7 @@
   },
   {
     "type": "function",
-    "name": "INIT_MALICIOUS_VOTE_SLASH_SCOPE",
+    "name": "INIT_FELONY_SLASH_SCOPE",
     "inputs": [],
     "outputs": [
       {
@@ -479,6 +479,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "felonySlashScope",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "felonyThreshold",
@@ -630,19 +643,6 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
-  {
-    "type": "function",
-    "name": "maliciousVoteSlashScope",
-    "inputs": [],
-    "outputs": [
-      {
-        "name": "",
-        "type": "uint256",
-        "internalType": "uint256"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "misdemeanorThreshold",

diff --git a/abi/stakehub.abi b/abi/stakehub.abi
@@ -5,7 +5,7 @@
   },
   {
     "type": "function",
-    "name": "BREATH_BLOCK_INTERVAL",
+    "name": "BREATHE_BLOCK_INTERVAL",
     "inputs": [],
     "outputs": [
       {
@@ -136,6 +136,44 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "consensusExpiration",
+    "inputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "consensusToOperator",
+    "inputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "createValidator",
@@ -396,44 +434,6 @@
     ],
     "stateMutability": "view"
   },
-  {
-    "type": "function",
-    "name": "getOperatorAddressByConsensusAddress",
-    "inputs": [
-      {
-        "name": "consensusAddress",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  },
-  {
-    "type": "function",
-    "name": "getOperatorAddressByVoteAddress",
-    "inputs": [
-      {
-        "name": "voteAddress",
-        "type": "bytes",
-        "internalType": "bytes"
-      }
-    ],
-    "outputs": [
-      {
-        "name": "",
-        "type": "address",
-        "internalType": "address"
-      }
-    ],
-    "stateMutability": "view"
-  },
   {
     "type": "function",
     "name": "getValidatorBasicInfo",
@@ -667,7 +667,7 @@
     "name": "maliciousVoteSlash",
     "inputs": [
       {
-        "name": "_voteAddr",
+        "name": "voteAddress",
         "type": "bytes",
         "internalType": "bytes"
       }
@@ -688,6 +688,19 @@
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "maxFelonyBetweenBreatheBlock",
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "minDelegationBNBChange",
@@ -888,6 +901,44 @@
     "outputs": [],
     "stateMutability": "nonpayable"
   },
+  {
+    "type": "function",
+    "name": "voteExpiration",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "voteToOperator",
+    "inputs": [
+      {
+        "name": "",
+        "type": "bytes",
+        "internalType": "bytes"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "address",
+        "internalType": "address"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "event",
     "name": "Claimed",
@@ -1276,6 +1327,11 @@
     "name": "AlreadySlashed",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "ConsensusAddressExpired",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "DelegationAmountTooSmall",
@@ -1344,7 +1400,7 @@
   },
   {
     "type": "error",
-    "name": "NoMoreFelonyToday",
+    "name": "NoMoreFelonyAllowed",
     "inputs": []
   },
   {
@@ -1434,6 +1490,11 @@
     "name": "ValidatorNotJailed",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "VoteAddressExpired",
+    "inputs": []
+  },
   {
     "type": "error",
     "name": "ZeroShares",

diff --git a/contracts/BC_fusion/StakeCredit.sol b/contracts/BC_fusion/StakeCredit.sol
@@ -69,7 +69,7 @@ contract StakeCredit is System, Initializable, ReentrancyGuardUpgradeable, ERC20
      * @notice only accept BNB from `StakeHub`
      */
     receive() external payable onlyStakeHub {
-        uint256 index = block.timestamp / IStakeHub(STAKE_HUB_ADDR).BREATH_BLOCK_INTERVAL();
+        uint256 index = block.timestamp / IStakeHub(STAKE_HUB_ADDR).BREATHE_BLOCK_INTERVAL();
         totalPooledBNBRecord[index] = totalPooledBNB;
         rewardRecord[index] += msg.value;
         totalPooledBNB += msg.value;
@@ -182,7 +182,7 @@ contract StakeCredit is System, Initializable, ReentrancyGuardUpgradeable, ERC20
         uint256 _commission = (bnbAmount * uint256(commissionRate)) / COMMISSION_RATE_BASE;
         uint256 _reward = bnbAmount - _commission;
 
-        uint256 index = block.timestamp / IStakeHub(STAKE_HUB_ADDR).BREATH_BLOCK_INTERVAL();
+        uint256 index = block.timestamp / IStakeHub(STAKE_HUB_ADDR).BREATHE_BLOCK_INTERVAL();
         totalPooledBNBRecord[index] = totalPooledBNB;
         rewardRecord[index] += _reward;
         totalPooledBNB += _reward;