Merge branch 'master' into base-liq-percent

keep-network · Mar 24, 2020 · 8ef9c4b · 8ef9c4b
2 parents b46d498 + f77577c
commit 8ef9c4b
Show file tree

Hide file tree

Showing 9 changed files with 73 additions and 36 deletions.
diff --git a/implementation/contracts/deposit/DepositUtils.sol b/implementation/contracts/deposit/DepositUtils.sol
@@ -382,9 +382,10 @@ library DepositUtils {
     /// @return     The amount seized in wei.
     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");
         return _postCallBalance.sub(_preCallBalance);

diff --git a/implementation/contracts/test/keep/ECDSAKeepStub.sol b/implementation/contracts/test/keep/ECDSAKeepStub.sol
@@ -1,74 +1,76 @@
 pragma solidity ^0.5.10;
 
-import {IBondedECDSAKeep} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
+import {
+    IBondedECDSAKeep
+} from "@keep-network/keep-ecdsa/contracts/api/IBondedECDSAKeep.sol";
 
 /// @notice Implementation of ECDSAKeep interface used in tests only
 /// @dev This is a stub used in tests, so we don't have to call actual ECDSAKeep
 contract ECDSAKeepStub is IBondedECDSAKeep {
     bytes publicKey;
-    bool success;
+    bool success = true;
     uint256 bondAmount = 10000;
 
     // Notification that the keep was requested to sign a digest.
-    event SignatureRequested(
-        bytes32 digest
-    );
+    event SignatureRequested(bytes32 digest);
 
     // Define fallback function so the contract can accept ether.
     function() external payable {}
 
+    // Functions implemented for IBondedECDSAKeep interface.
+
     function getPublicKey() external view returns (bytes memory) {
         return publicKey;
     }
 
-    function sign(bytes32 _digest) external {
-        emit SignatureRequested(_digest);
+    function checkBondAmount() external view returns (uint256) {
+        return bondAmount;
     }
 
-    function returnPartialSignerBonds() external payable {
-    // solium-disable-previous-line no-empty-blocks
+    function sign(bytes32 _digest) external {
+        emit SignatureRequested(_digest);
     }
 
-    function distributeETHToMembers() external payable {
-    // solium-disable-previous-line no-empty-blocks
+    function distributeETHReward() external payable {
+        // solium-disable-previous-line no-empty-blocks
     }
 
     function distributeERC20Reward(address _asset, uint256 _value) external {
-    // solium-disable-previous-line no-empty-blocks
+        // solium-disable-previous-line no-empty-blocks
     }
 
-    function distributeETHReward() external payable{
-    // solium-disable-previous-line no-empty-blocks
+    function seizeSignerBonds() external {
+        if (address(this).balance > 0) {
+            msg.sender.transfer(address(this).balance);
+        }
     }
 
-    // Functions implemented for IBondedECDSAKeep interface.
+    function returnPartialSignerBonds() external payable {
+        // solium-disable-previous-line no-empty-blocks
+    }
 
     function submitSignatureFraud(
         uint8,
         bytes32,
         bytes32,
         bytes32,
         bytes calldata
-    ) external returns (bool){
-        return success;
-    }
+    ) external returns (bool) {
+        require(success, "Signature is not fraudulent");
 
-    function checkBondAmount() external view returns (uint256){
-        return bondAmount;
-    }
-
-    function seizeSignerBonds() external {
-        if (address(this).balance > 0) {
-            msg.sender.transfer(address(this).balance);
-        }
+        return success;
     }
 
     function closeKeep() external {
-    // solium-disable-previous-line no-empty-blocks
+        // solium-disable-previous-line no-empty-blocks
     }
 
     // Functions to set data for tests.
 
+    function reset() public {
+        success = true;
+    }
+
     function setPublicKey(bytes memory _publicKey) public {
         publicKey = _publicKey;
     }

diff --git a/implementation/package-lock.json b/implementation/package-lock.json
diff --git a/implementation/test/DepositFraudTest.js b/implementation/test/DepositFraudTest.js
@@ -57,6 +57,7 @@ describe("DepositFraud", async function() {
 
   beforeEach(async () => {
     await testDeposit.reset()
+    await ecdsaKeepStub.reset()
     await testDeposit.setKeepAddress(ecdsaKeepStub.address)
   })
 
@@ -71,7 +72,7 @@ describe("DepositFraud", async function() {
       const block = await web3.eth.getBlock("latest")
       const blockTimestamp = block.timestamp
       fundingProofTimerStart = blockTimestamp - timer.toNumber() - 1 // has elapsed
-      await ecdsaKeepStub.setSuccess(true)
+
       await testDeposit.setState(states.AWAITING_BTC_FUNDING_PROOF)
 
       await ecdsaKeepStub.send(1000000, {from: owner})
@@ -441,7 +442,6 @@ describe("DepositFraud", async function() {
     before(async () => {
       await testDeposit.setState(states.ACTIVE)
       await ecdsaKeepStub.send(1000000, {from: owner})
-      await ecdsaKeepStub.setSuccess(true)
     })
 
     beforeEach(async () => {

diff --git a/implementation/test/DepositFundingTest.js b/implementation/test/DepositFundingTest.js
@@ -75,6 +75,7 @@ describe("DepositFunding", async function() {
     )
 
     await testDeposit.reset()
+    await ecdsaKeepStub.reset()
     await testDeposit.setKeepAddress(ecdsaKeepStub.address)
   })
 

diff --git a/implementation/test/DepositLiquidationTest.js b/implementation/test/DepositLiquidationTest.js
@@ -66,6 +66,7 @@ describe("DepositLiquidation", async function() {
       web3.utils.toBN(testDeposit.address),
     )
     await testDeposit.reset()
+    await ecdsaKeepStub.reset()
     await testDeposit.setKeepAddress(ecdsaKeepStub.address)
   })
 

diff --git a/implementation/test/DepositRedemptionTest.js b/implementation/test/DepositRedemptionTest.js
@@ -69,6 +69,7 @@ describe("DepositRedemption", async function() {
 
   beforeEach(async () => {
     await testDeposit.reset()
+    await ecdsaKeepStub.reset()
     await testDeposit.setKeepAddress(ecdsaKeepStub.address)
   })
 
@@ -509,7 +510,6 @@ describe("DepositRedemption", async function() {
       await tbtcToken.resetAllowance(testDeposit.address, requiredBalance, {
         from: owner,
       })
-      await ecdsaKeepStub.setSuccess(true)
     })
 
     afterEach(async () => {
@@ -796,7 +796,6 @@ describe("DepositRedemption", async function() {
         withdrawalRequestTime,
         prevSighash,
       )
-      await ecdsaKeepStub.setSuccess(true)
     })
 
     it("approves a new digest for signing, updates the state, and logs RedemptionRequested", async () => {

diff --git a/implementation/test/DepositUtilsTest.js b/implementation/test/DepositUtilsTest.js
@@ -84,7 +84,10 @@ describe("DepositUtils", async function() {
       fullBtc,
       {value: funderBondAmount},
     )
+  })
 
+  beforeEach(async () => {
+    await ecdsaKeepStub.reset()
     await testDeposit.setKeepAddress(ecdsaKeepStub.address)
   })
 

diff --git a/implementation/test/VendingMachineTest.js b/implementation/test/VendingMachineTest.js
@@ -35,7 +35,6 @@ describe("VendingMachine", async function() {
   let tbtcDepositToken
   let feeRebateToken
   let testDeposit
-  let ecdsaKeepStub
 
   let assertBalance
   let tdtId
@@ -54,7 +53,6 @@ describe("VendingMachine", async function() {
       tbtcDepositToken,
       feeRebateToken,
       testDeposit,
-      ecdsaKeepStub,
       deployed,
       redemptionScript,
       fundingScript,
@@ -337,7 +335,6 @@ describe("VendingMachine", async function() {
       await tbtcToken.resetAllowance(vendingMachine.address, requiredBalance, {
         from: owner,
       })
-      await ecdsaKeepStub.setSuccess(true)
       await testDeposit.setState(states.ACTIVE)
       await testDeposit.setUTXOInfo(valueBytes, block.timestamp, outpoint)
     })