63-align stake withdrawal interface

Author: Mark Brivvins

contracts/Endorsement.sol

@@ -79,13 +79,6 @@ abstract contract Endorsement is
     /** A map targetAddress => stake with the total stake by target */
     mapping(address => uint) public totalStake;
 
-    event WithdrawStake(
-        address indexed _from,
-        address indexed _to,
-        uint256 _value,
-        string _transactionId
-    );
-
     // Oracle related:
 
     /**
@@ -239,16 +232,6 @@ abstract contract Endorsement is
         _triggerEndorse(msg.sender, target, amount, transactionId);
     }
 
-    function withdrawStake(
-        address target,
-        uint256 amount,
-        string memory transactionId
-    ) public virtual {
-        require(msg.sender == tx.origin, "should be a user");
-
-        _withdrawStake(msg.sender, target, amount, transactionId);
-    }
-
     function _withdrawStake(
         address source,
         address target,
@@ -272,6 +255,19 @@ abstract contract Endorsement is
         emit WithdrawStake(source, target, amount, transactionId);
     }
 
+    /**
+     * @inheritdoc EndorsementInterface
+     */
+    function withdrawStake(
+        address target,
+        uint256 amount,
+        string memory transactionId
+    ) public override virtual {
+        require(msg.sender == tx.origin, "should be a user");
+
+        _withdrawStake(msg.sender, target, amount, transactionId);
+    }
+
     /**
      * @dev This is called via oracle to forward an endorse call from a proxy contract. The caller must have the
      *      PROXY_ENDORSER_ROLE.

contracts/EndorsementInterface.sol

@@ -24,6 +24,20 @@ interface EndorsementInterface {
         string memory transactionId
     ) external;
 
+    /**
+     * @notice Reduces or removes part of the caller's existing staked endorsement for a target.
+     *         A WithdrawStake event is emitted once the stake is withdrawn.
+     * @param target the endorsed entity (address is just used as an id here)
+     * @param amount the stake amount to withdraw
+     * @param transactionId an id representing the "business transaction" for which the stake withdrawal was made; this is
+     *        _not_ necessarily an Ethereum transaction id.
+     */
+    function withdrawStake(
+        address target,
+        uint256 amount,
+        string memory transactionId
+    ) external;
+
     // Events that might be emitted during the endorsement process.
 
     /** A new staked endorsement was created. */
@@ -34,6 +48,14 @@ interface EndorsementInterface {
         string _transactionId
     );
 
+    /** Existing staked endorsement was reduced or removed. */
+    event WithdrawStake(
+        address indexed _from,
+        address indexed _to,
+        uint256 _value,
+        string _transactionId
+    );
+
     /** A first-level previous endorser was rewarded */
     event RewardPreviousEndorserLevel1(address endorser, uint256 reward);
 

contracts/UTTProxy.sol

@@ -126,6 +126,14 @@ contract UTTProxy is Initializable, OwnableUpgradeable, ChainlinkClient, Endorse
         });
     }
 
+    function withdrawStake(
+        address,
+        uint256,
+        string memory
+    ) external pure override {
+        revert("UTTProxy: withdrawStake not supported");
+    }
+
     function fulfill(
         bytes32 _requestId
     ) external recordChainlinkFulfillment(_requestId) {