Merge branch 'master' into requestNewKeep-acl

implementation/contracts/deposit/DepositRedemption.sol

@@ -37,7 +37,15 @@ library DepositRedemption {
         IBondedECDSAKeep _keep = IBondedECDSAKeep(_d.keepAddress);
 
         _tbtcToken.approve(_d.keepAddress, _d.signerFee());
-        _keep.distributeERC20ToMembers(_tbtcTokenAddress, _d.signerFee());
+        _keep.distributeERC20Reward(_tbtcTokenAddress, _d.signerFee());
+    }
+
+    /// @notice Closes keep associated with the deposit.
+    /// @dev Should be called when the keep is no longer needed and the signing
+    /// group can disband.
+    function closeKeep(DepositUtils.Deposit storage _d) internal {
+        IBondedECDSAKeep _keep = IBondedECDSAKeep(_d.keepAddress);
+        _keep.closeKeep();
     }
 
     /// @notice Approves digest for signing by a keep.
@@ -317,8 +325,9 @@ library DepositRedemption {
 
         require((_d.utxoSize().sub(_fundingOutputValue)) <= _d.latestRedemptionFee, "Incorrect fee amount");
 
-        // Transfer TBTC to signers
+        // Transfer TBTC to signers and close the keep.
         distributeSignerFee(_d);
+        closeKeep(_d);
 
         _d.distributeFeeRebate();
 

implementation/contracts/deposit/DepositUtils.sol

@@ -373,6 +373,7 @@ library DepositUtils {
     function seizeSignerBonds(Deposit storage _d) internal returns (uint256) {
         uint256 _preCallBalance = address(this).balance;
         IBondedECDSAKeep _keep = IBondedECDSAKeep(_d.keepAddress);
+        _keep.closeKeep();
         _keep.seizeSignerBonds();
         uint256 _postCallBalance = address(this).balance;
         require(_postCallBalance > _preCallBalance, "No funds received, unexpected");
@@ -396,13 +397,13 @@ library DepositUtils {
     }
 
     /// @notice             Pushes ether held by the deposit to the signer group.
-    /// @dev                Useful for returning bonds to the group, or otherwise paying them.
+    /// @dev                Ether is returned to signing group members bonds.
     /// @param  _ethValue   The amount of ether to send.
     /// @return             True if successful, otherwise revert.
     function pushFundsToKeepGroup(Deposit storage _d, uint256 _ethValue) internal returns (bool) {
         require(address(this).balance >= _ethValue, "Not enough funds to send");
         IBondedECDSAKeep _keep = IBondedECDSAKeep(_d.keepAddress);
-        _keep.distributeETHToMembers.value(_ethValue)();
+        _keep.returnPartialSignerBonds.value(_ethValue)();
         return true;
     }
 

implementation/contracts/test/keep/ECDSAKeepStub.sol

@@ -25,11 +25,19 @@ contract ECDSAKeepStub is IBondedECDSAKeep {
         emit SignatureRequested(_digest);
     }
 
+    function returnPartialSignerBonds() external payable {
+    // solium-disable-previous-line no-empty-blocks
+    }
+
     function distributeETHToMembers() external payable {
+    // solium-disable-previous-line no-empty-blocks
+    }
 
+    function distributeERC20Reward(address _asset, uint256 _value) external {
+    // solium-disable-previous-line no-empty-blocks
     }
 
-    function distributeERC20ToMembers(address _asset, uint256 _value) external {
+    function distributeETHReward() external payable{
     // solium-disable-previous-line no-empty-blocks
     }
 
@@ -54,6 +62,11 @@ contract ECDSAKeepStub is IBondedECDSAKeep {
             msg.sender.transfer(address(this).balance);
         }
     }
+
+    function closeKeep() external {
+    // solium-disable-previous-line no-empty-blocks
+    }
+
     // Functions to set data for tests.
 
     function setPublicKey(bytes memory _publicKey) public {

implementation/package.json

@@ -23,7 +23,7 @@
   "author": "Satoshi Nakamoto 🤪",
   "license": "MIT",
   "dependencies": {
-    "@keep-network/keep-ecdsa": "0.8.0",
+    "@keep-network/keep-ecdsa": "0.9.0",
     "@summa-tx/bitcoin-spv-sol": "^2.2.0",
     "@summa-tx/relay-sol": "^1.1.0",
     "@truffle/hdwallet-provider": "^1.0.26",