Revert "Additional fixes and support for direct staking of rewards (#14…

…)"

This reverts commit 69d9ba4.

README.md

@@ -7,10 +7,6 @@ Install Foundry (https://book.getfoundry.sh/getting-started/installation) and th
 forge install OpenZeppelin/openzeppelin-contracts-upgradeable --no-commit
 forge install OpenZeppelin/openzeppelin-contracts --no-commit
 ```
-The Zilliqa 2.0 deposit contract must be compiled for the tests in this repository to work. Specify the folder containing the `deposit.sol` file in `remappings.txt`:
-```
-@zilliqa/zq2/=/home/user/zq2/zilliqa/src/contracts/
-```
 
 ## Contract Deployment
 The delegation contract is used by delegators to stake and unstake ZIL with the respective validator. It acts as the validator node's control address and interacts with the `Deposit` system contract.
@@ -86,7 +82,7 @@ forge script script/commission_Delegation.s.sol --rpc-url http://localhost:4201
 using `same` for the second argument to leave the commission percentage unchanged and `true` for the third argument. Replacing the second argument with `same` and the third argument with `false` only displays the current commission rate.
 
 ## Validator Activation
-If your node's account has enough ZIL for the minimum stake required, you can activate your node as a validator with a deposit of e.g. 10 million ZIL. Run
+If you node's account has enough ZIL for the minimum stake required, you can activate your node as a validator with a deposit of e.g. 10 million ZIL. Run
 ```bash
 cast send --legacy --value 10000000ether --rpc-url http://localhost:4201 --private-key $PRIVATE_KEY \
 0x7a0b7e6d24ede78260c9ddbd98e828b0e11a8ea2 "deposit(bytes,bytes,bytes)" \
@@ -189,13 +185,8 @@ To query how much ZIL you can already claim, run
 cast to-unit $(cast call 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 "getClaimable()(uint256)" --from 0xd819fFcE7A58b1E835c25617Db7b46a00888B013 --block latest --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g') ether
 ```
 
-## Staking and Withdrawing Rewards
-In the liquid staking variant, only you as the node operator can stake the rewards accrued by the node. To do so, run
-```bash
-forge script script/stakeRewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable)" 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 --private-key 0x...
-```
-
-In the non-liquid variant of staking, delegators can stake or withdraw their share of the rewards earned by the validator. To query the amount of rewards available, run
+## Withdrawing Rewards
+In the non-liquid variant of staking delegators can withdraw their share of the rewards earned by the validator. To query the amount of rewards available, run
 ```bash
 cast to-unit $(cast call 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 "rewards()(uint256)" --from 0xd819fFcE7A58b1E835c25617Db7b46a00888B013 --block latest --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g') ether
 ```
@@ -206,14 +197,8 @@ cast to-unit $(cast call 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 "rewards(uin
 ```
 Note that `n` actually denotes the number of additional (un)stakings so that at least one is always reflected in the result, even if you specified `n = 0`.
 
-To withdraw 1 ZIL of rewards using `n = 100`, run
-```bash
-forge script script/withdrawRewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable, string, string)" 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 1000000000000000000 100 --private-key 0x...
-```
-with the private key of a staked account. To withdrawn as much as possible with the given value of `n` set the amount to `all`. To withdraw the chosen amount without setting `n` replace `n` with `all`. To withdraw all rewards replace both the amount and `n` with `all`.
-
-Last but not least, in order to stake rewards instead of withdrawing them, run
+Last but not least, to withdraw 1 ZIL of rewards using `n = 100`, run
 ```bash
-forge script script/stakeRewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable)" 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 --private-key 0x...
+forge script script/rewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable, string, string)" 0x7A0b7e6D24eDe78260c9ddBD98e828B0e11A8EA2 1000000000000000000 100 --private-key 0x...
 ```
-with the private key of a staked account.
+with the private key of an staked account. To withdrawn as much as possible with the given value of `n` set the amount to `all`. To withdraw the chosen amount without setting `n` replace `n` with `all`. To withdraw all rewards replace both the amount and `n` with `all`.

claim.sh

@@ -24,7 +24,7 @@ if [[ "$variant" == "ILiquidDelegation" ]]; then
     echo taxedRewardsAfterClaiming = $(cast call $1 "getTaxedRewards()(uint256)" --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 fi
 
-stakerWeiAfter=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+staker_wei_after=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
 
 tmp=$(cast logs --from-block $block_num --to-block $block_num --address $1 "Claimed(address,uint256,bytes)" --rpc-url http://localhost:4201 | grep "data")
 if [[ "$tmp" != "" ]]; then
@@ -48,9 +48,9 @@ if [[ "$variant" == "ILiquidDelegation" ]]; then
     echo taxedRewardsBeforeClaiming = $(cast call $1 "getTaxedRewards()(uint256)" --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 fi
 
-stakerWeiBefore=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+staker_wei_before=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
 
-echo claimed amount - gas fee = $(bc -l <<< "scale=18; $stakerWeiAfter-$stakerWeiBefore") wei
+echo claimed amount - gas fee = $(bc -l <<< "scale=18; $staker_wei_after-$staker_wei_before") wei
 
 if [[ "$tmp" != "" ]]; then echo event Claimed\($staker, $d1, $d2\) emitted; fi
 

remappings.txt

@@ -1,3 +1,2 @@
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
-@zilliqa/zq2/=/home/zoltan/Github/zq2/zilliqa/src/contracts/
+@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/

withdrawRewards.sh → rewards.sh

@@ -30,7 +30,7 @@ if [[ "$variant" != "INonLiquidDelegation" ]]; then
     exit 1
 fi
 
-forge script script/withdrawRewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable, string, string)" $1 $amount $steps --private-key $2
+forge script script/rewards_Delegation.s.sol --rpc-url http://localhost:4201 --broadcast --legacy --sig "run(address payable, string, string)" $1 $amount $steps --private-key $2
 
 block=$(cast rpc eth_blockNumber --rpc-url http://localhost:4201)
 block_num=$(echo $block | tr -d '"' | cast to-dec --base-in 16)
@@ -40,8 +40,8 @@ owner=$(cast call $1 "owner()(address)" --block $block_num --rpc-url http://loca
 rewardsAfterWithdrawal=$(cast call $1 "getRewards()(uint256)" --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 echo rewardsAfterWithdrawal = $rewardsAfterWithdrawal
 
-stakerWeiAfter=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
-ownerWeiAfter=$(cast rpc eth_getBalance $owner $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+staker_wei_after=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+owner_wei_after=$(cast rpc eth_getBalance $owner $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
 
 tmp1=$(cast logs --from-block $block_num --to-block $block_num --address $1 "RewardPaid(address,uint256)" --rpc-url http://localhost:4201 | grep "data")
 if [[ "$tmp1" != "" ]]; then
@@ -76,16 +76,16 @@ stake=$(cast call $1 "getStake()(uint256)" --block $block_num --rpc-url http://l
 commissionNumerator=$(cast call $1 "getCommissionNumerator()(uint256)" --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 denominator=$(cast call $1 "DENOMINATOR()(uint256)" --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 
-stakerWeiBefore=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
-ownerWeiBefore=$(cast rpc eth_getBalance $owner $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+staker_wei_before=$(cast rpc eth_getBalance $staker $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
+owner_wei_before=$(cast rpc eth_getBalance $owner $block --rpc-url http://localhost:4201 | tr -d '"' | cast to-dec --base-in 16)
 
 x=$(cast call $1 "rewards()(uint256)" --from $staker --block $block_num --rpc-url http://localhost:4201 | sed 's/\[[^]]*\]//g')
 staker_rewards_before_withdrawal=$(cast to-unit $x ether)
 
 echo staker rewards before withdrawal: $staker_rewards_before_withdrawal ZIL
 echo staker rewards after withdrawal: $staker_rewards_after_withdrawal ZIL
-echo withdrawn rewards - gas fee = $(bc -l <<< "scale=18; $stakerWeiAfter-$stakerWeiBefore") wei
-echo validator commission = $(bc -l <<< "scale=18; $ownerWeiAfter-$ownerWeiBefore") wei
+echo withdrawn rewards - gas fee = $(bc -l <<< "scale=18; $staker_wei_after-$staker_wei_before") wei
+echo validator commission = $(bc -l <<< "scale=18; $owner_wei_after-$owner_wei_before") wei
 echo total reward reduction = $(bc -l <<< "scale=18; $rewardsBeforeWithdrawal-$rewardsAfterWithdrawal") wei
 
 if [[ "$tmp1" != "" ]]; then echo event RewardPaid\($staker, $d1\) emitted; fi

script/withdrawRewards_Delegation.s.sol → script/rewards_Delegation.s.sol

@@ -6,7 +6,7 @@ import {NonLiquidDelegation} from "src/NonLiquidDelegation.sol";
 import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import "forge-std/console.sol";
 
-contract WithdrawRewards is Script {
+contract Rewards is Script {
     using Strings for string;
 
     function run(address payable proxy, string calldata amount, string calldata additionalSteps) external {

script/unstake_Delegation.s.sol

@@ -49,7 +49,6 @@ contract Unstake is Script {
             );
 
             if (amount == 0) {
-                vm.prank(msg.sender);
                 amount = INonLiquidDelegation(address(delegation)).getDelegatedStake();
             }
         } else

src/BaseDelegation.sol

@@ -177,8 +177,6 @@ abstract contract BaseDelegation is Delegation, PausableUpgradeable, Ownable2Ste
 
     function collectCommission() public virtual;
 
-    function stakeRewards() public virtual;
-
     function getClaimable() public virtual view returns(uint256 total) {
         BaseDelegationStorage storage $ = _getBaseDelegationStorage();
         WithdrawalQueue.Fifo storage fifo = $.withdrawals[_msgSender()];

src/Delegation.sol

@@ -7,11 +7,8 @@ interface Delegation {
     event Staked(address indexed delegator, uint256 amount, bytes data);
     event Unstaked(address indexed delegator, uint256 amount, bytes data);
     event Claimed(address indexed delegator, uint256 amount, bytes data);
-    event CommissionPaid(address indexed owner, uint256 commission);
 
     function stake() external payable;
     function unstake(uint256) external;
     function claim() external;
-    function collectCommission() external;
-    function stakeRewards() external;
 }