fix: validator contract allows receiving core

coredao-org · Jun 5, 2023 · fb1689f · fb1689f
1 parent 33e8906
commit fb1689f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/contracts/ValidatorSet.sol b/contracts/ValidatorSet.sol
@@ -63,6 +63,7 @@ contract ValidatorSet is IValidatorSet, System, IParamSubscriber {
   event validatorMisdemeanor(address indexed validator, uint256 amount);
   event validatorFelony(address indexed validator, uint256 amount);
   event paramChange(string key, bytes value);
+  event received(address indexed from, uint256 amount);
 
   /*********************** init **************************/
   function init() external onlyNotInit {
@@ -86,6 +87,12 @@ contract ValidatorSet is IValidatorSet, System, IParamSubscriber {
     return currentValidatorSetMap[addr] != 0;
   }
 
+  receive() external payable {
+    if (msg.value != 0) {
+      emit received(msg.sender, msg.value);
+    }
+  }
+
   /// Add block reward on a validator 
   /// @dev This method is called by the golang consensus engine every block
   /// @param valAddr The validator address

diff --git a/contracts/ValidatorSet.template b/contracts/ValidatorSet.template
@@ -63,6 +63,7 @@ contract ValidatorSet is IValidatorSet, System, IParamSubscriber {
   event validatorMisdemeanor(address indexed validator, uint256 amount);
   event validatorFelony(address indexed validator, uint256 amount);
   event paramChange(string key, bytes value);
+  event received(address indexed from, uint256 amount);
 
   /*********************** init **************************/
   function init() external onlyNotInit {
@@ -86,6 +87,12 @@ contract ValidatorSet is IValidatorSet, System, IParamSubscriber {
     return currentValidatorSetMap[addr] != 0;
   }
 
+  receive() external payable {
+    if (msg.value != 0) {
+      emit received(msg.sender, msg.value);
+    }
+  }
+
   /// Add block reward on a validator 
   /// @dev This method is called by the golang consensus engine every block
   /// @param valAddr The validator address