Update staking and unstaking for bonds to activate and no need for co…

…oldowns. Add unit tests
xy-graveyard · Apr 26, 2019 · 7fb4a13 · 7fb4a13
1 parent 8d68cee
commit 7fb4a13
Show file tree

Hide file tree

Showing 12 changed files with 413 additions and 346 deletions.
diff --git a/contracts/staking/XyBond.sol b/contracts/staking/XyBond.sol
@@ -115,25 +115,6 @@ contract XyBond is GovernorRole, Initializable {
         emit BondWithdraw(bondId, to, withdrawAmount);
     }
 
-    function unstake (bytes32 bondId, bytes32 stakingId) 
-        public  
-    {
-        bytes32 checkBondId = XyStakingConsensus(consensus).bondedStake(stakingId);
-        (uint amount,,,,,,) = XyStakingConsensus(consensus).stakeData(stakingId);
-        require(checkBondId == bondId, "Stake needs to be bonded");
-
-        Bond storage bs = bond[bondId];
-        require (msg.sender == bs.owner || governable(bs), "owner or governable can unstake");
-
-        require(bs.allocated >= amount, "Cannot unstake over bond allocation");
-        bs.allocated = bs.allocated.sub(amount);
-
-        // will fail if already withdrew  
-        XyStakingConsensus(consensus).unstakeBonded(bondId, stakingId, amount);
-
-        emit BondUnstake(bondId, msg.sender, stakingId, amount);
-    }
-
     function stake (bytes32 bondId, address payable beneficiary, address[] memory stakees, uint[] memory amounts)
         public
     {
@@ -169,6 +150,25 @@ contract XyBond is GovernorRole, Initializable {
         stake(bondId, beneficiary, stakees, amounts);
     }
 
+    function unstake (bytes32 bondId, bytes32 stakingId) 
+        public  
+    {
+        bytes32 checkBondId = XyStakingConsensus(consensus).bondedStake(stakingId);
+        (uint amount,,,,,,) = XyStakingConsensus(consensus).stakeData(stakingId);
+        require(checkBondId == bondId, "Stake needs to be bonded");
+
+        Bond storage bs = bond[bondId];
+        require (msg.sender == bs.owner || governable(bs), "owner or governable can unstake");
+
+        require(bs.allocated >= amount, "Cannot unstake over bond allocation");
+        bs.allocated = bs.allocated.sub(amount);
+
+        // will fail if already withdrew  
+        XyStakingConsensus(consensus).unstakeBonded(bondId, stakingId);
+
+        emit BondUnstake(bondId, msg.sender, stakingId, amount);
+    }
+
     function isExpired(bytes32 bondId) 
         public 
         view 

diff --git a/contracts/staking/XyStakingModel.sol b/contracts/staking/XyStakingModel.sol
diff --git a/contracts/tests/XyConsensusMock.sol b/contracts/tests/XyConsensusMock.sol
@@ -1,23 +1,31 @@
 pragma solidity >=0.5.0 <0.6.0;
 import "../staking/XyStakingConsensus.sol";
+import "../XyPayOnDelivery.sol";
 
 contract XyConsensusMock is XyStakingConsensus {
-
+    function fake_data(uint amount, address stakee) internal view returns (Stake memory) {
+      Stake memory data = Stake(
+          amount,         // amount
+          block.number,   // stakeBlock
+          0,              // unstakeBlock
+          stakee,         // stakee 
+          msg.sender,     // staker
+          true,          // isActivated
+          false           // is coolded down
+      );
+      return data;
+    }
     constructor(
-        address[] memory stakees,
-        address _token,
-        address _stakableToken,
-        address _governance)
+        address[] memory stakees)
         public
-    XyStakingConsensus()
+        XyStakingConsensus()
     {
-      initialize(_token, _stakableToken, _governance);
       uint activeAmount = 1000;
       for (uint i = 0; i < stakees.length; i++) {
-        updateCacheOnStake(activeAmount, stakees[i]);
-        updateCacheOnActivate(activeAmount, stakees[i]);
+        Stake memory data = fake_data(activeAmount, stakees[i]);
+        updateCacheOnStake(data);
+        updateCacheOnActivate(data);
       }
-
     }
     function mock_handleResponses(bytes32[] memory _requests, bytes memory responses)
         public 
@@ -40,9 +48,20 @@ contract XyConsensusMock is XyStakingConsensus {
       checkSigsAndStakes(messageHash, signers, sigR, sigS, sigV);
     }
     function fake_updateCacheOnStake(uint amount, address stakee) public {
-      updateCacheOnStake(amount, stakee);
+      updateCacheOnStake(fake_data(amount, stakee));
     }
     function fake_updateCacheOnActivate(uint amount, address stakee) public {
-      updateCacheOnActivate(amount, stakee);
+      updateCacheOnActivate(fake_data(amount, stakee));
+    }
+    function submitResponse(
+        bytes32 requestId, 
+        uint8 requestType, 
+        bytes memory responseData,
+        address pOnDAddress
+    ) 
+        public
+        payable
+    {
+       XyPayOnDelivery(pOnDAddress).submitResponse(requestId,requestType,responseData);
     }
 }
diff --git a/contracts/tests/XyConsensusMock2.sol b/contracts/tests/XyConsensusMock2.sol
diff --git a/contracts/tests/XyConsensusMock3.sol b/contracts/tests/XyConsensusMock3.sol
diff --git a/contracts/tests/XyStakingMock.sol b/contracts/tests/XyStakingMock.sol
@@ -12,12 +12,25 @@ contract XyStakingMock is XyStakingModel {
     {
       init(_token, _stakableToken, _governance);
     }
+
+    function fake_data(uint amount, address stakee) internal view returns (Stake memory) {
+      Stake memory data = Stake(
+          amount,         // amount
+          block.number,   // stakeBlock
+          0,              // unstakeBlock
+          stakee,         // stakee 
+          msg.sender,     // staker
+          true,          // isActivated
+          false           // is coolded down
+      );
+      return data;
+    }
      /** Increase and decrease cached stake amounts */
     function fake_updateCacheOnStake(uint amount, address stakee) public {
-      updateCacheOnStake(amount, stakee);
+      updateCacheOnStake(fake_data(amount, stakee));
     }
     function fake_updateCacheOnActivate(uint amount, address stakee) public {
-      updateCacheOnActivate(amount, stakee);
+      updateCacheOnActivate(fake_data(amount, stakee));
     }
     function stub_updateCacheOnUnstake(uint amount, address stakee) public {
         Stake memory data = Stake(
@@ -33,6 +46,6 @@ contract XyStakingMock is XyStakingModel {
       updateCacheOnUnstake(tempStake);
   }
     function fake_updateCacheOnWithdraw(uint amount, address stakee) public {
-      updateCacheOnWithdraw(amount, stakee);
+      updateCacheOnWithdraw(fake_data(amount, stakee));
    }
 }
diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -59,6 +59,7 @@ module.exports = async function (deployer, network, [contractsOwner, bp2]) {
   await consensus.initialize(erc20.address, blockProducerInstance.address, gov.address)
   await bonder.initialize(erc20.address, consensus.address, bondPeriodSeconds)
 
+  await gov.ownerSet(`XyBondContract`, bonder.address)
   console.log(`INNITIALIZED WITH PARAMS`, parameters)
 
   printAddress([SCSC, Governance, XYOERC20, PayOnD, BlockProducer, Bond])