From 63d774b85bcf9a53a5ed1bd47167eda7fbca9b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Mon, 14 Jun 2021 17:04:29 +0200
Subject: [PATCH 01/13] first sketch for new dough staking page

---
 src/pages/DoughStaking.svelte | 364 ++++++++++++++++++++++++++++++++++
 1 file changed, 364 insertions(+)
 create mode 100644 src/pages/DoughStaking.svelte

diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte
new file mode 100644
index 00000000..127caabf
--- /dev/null
+++ b/src/pages/DoughStaking.svelte
@@ -0,0 +1,364 @@
+<script>
+  import { approve, connectWeb3, subject, eth } from '../stores/eth.js';
+  import { ethers } from 'ethers';
+  import BigNumber from 'bignumber.js';
+  import { _ } from 'svelte-i18n';
+  import sharesTimeLockABI from '../abis/sharesTimeLock.json';
+  import smartcontracts from '../config/smartcontracts.json';
+  import { get } from 'svelte/store';
+  import images from '../config/images.json';
+  import displayNotification from '../notifications';
+  import { formatEther, parseEther } from '@ethersproject/units';
+
+  const toNum = (num) =>
+    BigNumber(num.toString())
+      .dividedBy(10 ** 18)
+      .toFixed(2);
+
+  $: needAllowance = true;
+  $: isLoading = true;
+  $: stakeError = false;
+
+  let data = {
+    totalStaked: BigNumber(0),
+    rewardTokenSupply: BigNumber(0),
+    accountRewardTokenBalance: BigNumber(0),
+    accountWithdrawableRewards: BigNumber(0),
+    accountWithdrawnRewards: BigNumber(0),
+    accountDepositTokenBalance: BigNumber(0),
+    accountLocks: [],
+  };
+
+  let stake = {
+    amount: 0.0,
+    duration: 1,
+    receiver: ""
+  };
+
+  let unstake = {
+    amount: 0.0
+  }
+
+  let sharesTimeLock = false;
+
+  const fetchStakingData = async () => {
+    let response = await sharesTimeLock.getStakingData($eth.address);
+
+    Object.keys(response).forEach((key) => {
+      if (key != 'accountLocks') {
+        data[key] = new BigNumber(response[key].toString());
+      } else {
+        let locks = [];
+
+        response[key].forEach((lock, index) => {
+          if(lock.amount.toString() != '0') {
+            locks.push({
+              amount: new BigNumber(lock.amount.toString()),
+              lockDuration: lock.lockDuration,
+              lockedAt: lock.lockedAt,
+              lockId: index
+            });
+          }
+        });
+
+        data[key] = locks;
+      }
+    });
+    
+    console.log(data);
+    data = data;
+    return data;
+  };
+
+  $: if($eth.address && isLoading) {
+    initialize();
+  }
+
+  async function initialize() {
+    try {
+      sharesTimeLock = new ethers.Contract(
+        smartcontracts.doughStaking,
+        sharesTimeLockABI,
+        $eth.signer || $eth.provider,
+      );
+
+      await fetchStakingData();
+
+      isLoading = false;
+      stake.receiver = $eth.address;
+      checkApproval(data.accountDepositTokenAllowance);
+    } catch(e) {
+      console.log('Something went wrong...', e);
+    }
+    
+  }
+
+  function checkApproval(allowance) {
+    if(stake.amount && allowance) {
+      stakeError = false;
+      let stakeAmount = BigNumber(stake.amount.toString()).multipliedBy(10 ** 18);
+
+      if(allowance.isGreaterThanOrEqualTo(stakeAmount)) {
+        needAllowance = false;
+      } else {
+        needAllowance = true;
+      }
+    } else {
+      stakeError = true;
+    }
+  }
+
+  async function approveToken() {
+    if (!$eth.address || !$eth.signer) {
+      displayNotification({ message: $_('piedao.please.connect.wallet'), type: 'hint' });
+      connectWeb3();
+      return;
+    }
+
+    try {
+      // resetting the approve to zero, before initiating a new approval...
+      if(!data.accountDepositTokenAllowance.isEqualTo(0)) {
+        await approve(smartcontracts.dough, smartcontracts.doughStaking, 0);
+      }
+
+      let stakeAmount = BigNumber(stake.amount.toString()).multipliedBy(10 ** 18);     
+      await approve(smartcontracts.dough, smartcontracts.doughStaking, stakeAmount.toString(), {gasLimit: 100000});
+      needAllowance = false; 
+      
+    } catch(error) {
+      stakeError = true;
+      needAllowance = true;
+    }
+  }
+
+  async function stakeDOUGH() {
+    if(!sharesTimeLock) return;
+
+    try {
+      let response = await sharesTimeLock.depositByMonths(
+        parseEther(stake.amount.toString()), 
+        stake.duration, 
+        stake.receiver);
+
+      const { emitter } = displayNotification({
+        hash: response.hash,
+      });
+
+      emitter.on("txConfirmed", async() => {
+
+        displayNotification({
+          message: `You staked ${stake.amount.toString()} DOUGH. Your new stake will appear in the list in a really short while...`,
+          type: "success",
+        });       
+
+        const subscription = subject("blockNumber").subscribe({
+          next: async () => {
+            await fetchStakingData();
+            console.log("fetchStakingData", data);               
+
+            subscription.unsubscribe();
+          },
+        });          
+      });
+
+    } catch(error) {
+      console.error(error);
+    }
+  }
+
+  async function unstakeDOUGH(id, lockAmount) {
+    if(!sharesTimeLock) return;
+
+    try {
+      let response = await sharesTimeLock.withdraw(id);
+
+      const { emitter } = displayNotification({
+        hash: response.hash
+      });
+
+      emitter.on("txConfirmed", async() => {
+        displayNotification({
+          message: `You unstaked ${lockAmount.toString()} DOUGH`,
+          type: "success",
+        });
+
+        const subscription = subject("blockNumber").subscribe({
+          next: async () => {
+            console.log("unstakeDOUGH -> blockNumber");
+
+            await fetchStakingData();
+            console.log("fetchStakingData", data);   
+
+            subscription.unsubscribe();
+          },
+        });      
+      });
+
+    } catch(error) {
+      if(error.message.includes('lock not expired')) {
+        displayNotification({
+          message: 'can\'t unstake, lock not expired.',
+          type: "error",
+        });
+      } else {
+        displayNotification({
+          message: 'sorry, some error occurred while unstaking. Please try again later...',
+          type: "error",
+        });        
+      }
+    }
+  }
+
+</script>
+
+<div class="content flex flex-col pt-10pc justify-center spl">
+  <div class="font-huge text-center">DOUGH Staking</div>
+  <div class="font-thin text-lg text-center mt-10px mb-10px md:w-80pc">
+    The new Stake, under development.
+  </div>
+
+  <div
+    class="swap-container flex flex-col items-center w-94pc p-60px bg-lightgrey md:w-50pc h-50pc"
+  >
+    <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px">
+      <div class="flex items-center justify-between">
+        <div class="flex nowrap intems-center p-1 font-thin">Amount to Stake</div>
+        <div
+          class="sc-kkGfuU hyvXgi css-1qqnh8x font-thin"
+          style="display: inline; cursor: pointer;"
+        >
+          <div
+            on:click={() => {
+              stake.amount = toNum(data.accountDepositTokenBalance);
+            }}
+          >
+            Max balance: {toNum(data.accountDepositTokenBalance)}
+          </div>
+        </div>
+      </div>
+      <div class="flex nowrap items-center p-1">
+        <input
+          on:keyup={() => { checkApproval(data.accountDepositTokenAllowance)}}
+          bind:value={stake.amount}
+          class="swap-input-from"
+          inputmode="decimal"
+          title="Token Amount"
+          autocomplete="off"
+          autocorrect="off"
+          type="number"
+          pattern="^[0-9]*[,]?[0-9]*$"
+          placeholder="0.0"
+          minlength="1"
+          maxlength="79"
+          spellcheck="false"
+        />
+        <span class="sc-iybRtq gjVeBU">
+          <img class="h-auto w-24px mr-5px" src={images.doughtoken} alt="dough token" />
+          <span class="sc-kXeGPI jeVIZw token-symbol-container">DOUGH</span>
+        </span>
+      </div>
+    </div>
+
+    <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px mt-4">
+      <div class="flex items-center justify-between">
+        <div class="flex nowrap intems-center p-1 font-thin">Stake Duration (Months)</div>
+        <div
+          class="sc-kkGfuU hyvXgi css-1qqnh8x font-thin"
+          style="display: inline; cursor: pointer;"
+        >
+          <div
+            on:click={() => {
+              stake.duration = 36;
+            }}
+          >
+            Max 36 Months
+          </div>
+        </div>
+      </div>
+      <div class="flex nowrap items-center p-1">
+        <input
+          bind:value={stake.duration}
+          class="swap-input-from"
+          inputmode="number"
+          title="Token Amount"
+          autocomplete="off"
+          autocorrect="off"
+          type="number"
+          pattern="^[0-9]*[.]?[0-9]*$"
+          placeholder="36"
+          minlength="1"
+          maxlength="79"
+          spellcheck="false"
+        />
+        <span class="sc-iybRtq gjVeBU">
+          <img class="h-auto w-24px mr-5px" src={images.simulator_hands} alt="dough token" />
+          <span class="sc-kXeGPI jeVIZw token-symbol-container">3 Years</span>
+        </span>
+      </div>
+    </div>
+
+    <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px mt-4">
+      <div class="flex items-center justify-between">
+        <div class="flex nowrap intems-center p-1 font-thin">Receiver</div>
+      </div>
+      <div class="flex nowrap items-center p-1">
+        <input
+          bind:value={stake.receiver}
+          class="swap-input-from"
+          inputmode="text"
+          placeholder="loading default address..."
+          title="Token Amount"
+          autocomplete="off"
+          autocorrect="off"
+          type="text"
+          spellcheck="false"
+        />
+      </div>
+    </div>    
+
+    {#if needAllowance}
+      <button
+        on:click={approveToken}
+        class:error={isLoading || stakeError ? true : false}
+        disabled={isLoading || stakeError ? true : false}
+        class="btn clear stake-button mt-10px rounded-20px p-15px w-100pc">Approve</button
+      >
+    {:else}
+      <button
+      on:click={stakeDOUGH}
+        class:error={isLoading || stakeError ? true : false}
+        disabled={isLoading || stakeError ? true : false}
+        class="error stake-button mt-10px rounded-20px p-15px w-100pc"
+      >
+        Stake Your Coins
+      </button>
+    {/if}
+  </div>
+
+  <div
+  class="swap-container flex flex-col items-center w-94pc p-60px bg-lightgrey md:w-50pc h-50pc mt-4"
+>
+  <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px">
+    <div class="flex nowrap items-center p-1">
+      <span class="sc-iybRtq gjVeBU">
+        Total Staked: {toNum(data.totalStaked)}
+        <img class="h-auto w-24px mr-5px ml-4" src={images.doughtoken} alt="dough token" />
+        <span class="sc-kXeGPI jeVIZw token-symbol-container">DOUGH</span>
+      </span>
+    </div>
+    <div>Select the item you wish to unstake from the list.</div>
+  </div>   
+
+  <ul>
+    {#each data.accountLocks as lock, id}
+	  <li class="swap-container mt-8 stake-button">
+      <button on:click={() => {unstakeDOUGH(lock.lockId, toNum(lock.amount))}}>
+        <div>{toNum(lock.amount)} DOUGH</div>
+        <div>staked for: {lock.lockDuration / 60} Months</div>
+        <div>started: {new Date(lock.lockedAt * 1000).toLocaleString()}</div>
+      </button>
+	  </li>
+    {/each}
+  </ul>
+</div>
+</div>

From 87a9bc46c757346913ba4b9409632847e0d10ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Mon, 14 Jun 2021 17:22:57 +0200
Subject: [PATCH 02/13] added contract address, routes, and abis

---
 src/abis/sharesTimeLock.json   | 1 +
 src/config/smartcontracts.json | 3 ++-
 src/pages/DoughStaking.svelte  | 4 ++--
 src/stores/routes.js           | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 src/abis/sharesTimeLock.json

diff --git a/src/abis/sharesTimeLock.json b/src/abis/sharesTimeLock.json
new file mode 100644
index 00000000..da9939dd
--- /dev/null
+++ b/src/abis/sharesTimeLock.json
@@ -0,0 +1 @@
+[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"BoostedToMax","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":false,"internalType":"uint32","name":"lockDuration","type":"uint32"},{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"Deposited","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"Ejected","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"newLockAmount","type":"uint256"}],"name":"MinLockAmountChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"user","type":"address"},{"indexed":true,"internalType":"bool","name":"whitelisted","type":"bool"}],"name":"WhitelistedChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":true,"internalType":"address","name":"owner","type":"address"}],"name":"Withdrawn","type":"event"},{"inputs":[{"internalType":"uint256","name":"lockId","type":"uint256"}],"name":"boostToMax","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"uint256","name":"lockId","type":"uint256"}],"name":"canEject","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint256","name":"months","type":"uint256"},{"internalType":"address","name":"receiver","type":"address"}],"name":"depositByMonths","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"depositToken","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address[]","name":"lockAccounts","type":"address[]"},{"internalType":"uint256[]","name":"lockIds","type":"uint256[]"}],"name":"eject","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"getLocksOfLength","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32","name":"duration","type":"uint32"}],"name":"getRewardsMultiplier","outputs":[{"internalType":"uint256","name":"multiplier","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"getStakingData","outputs":[{"components":[{"internalType":"uint256","name":"totalStaked","type":"uint256"},{"internalType":"uint256","name":"rewardTokenTotalSupply","type":"uint256"},{"internalType":"uint256","name":"accountRewardTokenBalance","type":"uint256"},{"internalType":"uint256","name":"accountWithdrawableRewards","type":"uint256"},{"internalType":"uint256","name":"accountWithdrawnRewards","type":"uint256"},{"internalType":"uint256","name":"accountDepositTokenBalance","type":"uint256"},{"internalType":"uint256","name":"accountDepositTokenAllowance","type":"uint256"},{"components":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint32","name":"lockedAt","type":"uint32"},{"internalType":"uint32","name":"lockDuration","type":"uint32"}],"internalType":"struct SharesTimeLock.Lock[]","name":"accountLocks","type":"tuple[]"}],"internalType":"struct SharesTimeLock.StakingData","name":"data","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"depositToken_","type":"address"},{"internalType":"contract ERC20NonTransferableRewardsOwned","name":"rewardsToken_","type":"address"},{"internalType":"uint32","name":"minLockDuration_","type":"uint32"},{"internalType":"uint32","name":"maxLockDuration_","type":"uint32"},{"internalType":"uint256","name":"minLockAmount_","type":"uint256"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"uint256","name":"","type":"uint256"}],"name":"locksOf","outputs":[{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"uint32","name":"lockedAt","type":"uint32"},{"internalType":"uint32","name":"lockDuration","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxLockDuration","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"minLockAmount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"minLockDuration","outputs":[{"internalType":"uint32","name":"","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"rewardsToken","outputs":[{"internalType":"contract ERC20NonTransferableRewardsOwned","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"secPerMonth","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"minLockAmount_","type":"uint256"}],"name":"setMinLockAmount","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"secondsPerMonth_","type":"uint256"}],"name":"setSecondsPerMonth","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"user","type":"address"},{"internalType":"bool","name":"isWhitelisted","type":"bool"}],"name":"setWhitelisted","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"whitelisted","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"lockId","type":"uint256"}],"name":"withdraw","outputs":[],"stateMutability":"nonpayable","type":"function"}]
\ No newline at end of file
diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index 26760d92..d4efa689 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -3,5 +3,6 @@
     "recipe_old": "0xE1F9E100cbF4aD6D546b196Af33E1129Dd0866b3",
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
-    "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d"
+    "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
+    "doughStaking": "0x44776A2C6368F85044123C79E49f03E914bb9a44"
 }
\ No newline at end of file
diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte
index 127caabf..92f3f45e 100644
--- a/src/pages/DoughStaking.svelte
+++ b/src/pages/DoughStaking.svelte
@@ -5,10 +5,9 @@
   import { _ } from 'svelte-i18n';
   import sharesTimeLockABI from '../abis/sharesTimeLock.json';
   import smartcontracts from '../config/smartcontracts.json';
-  import { get } from 'svelte/store';
   import images from '../config/images.json';
   import displayNotification from '../notifications';
-  import { formatEther, parseEther } from '@ethersproject/units';
+  import { parseEther } from '@ethersproject/units';
 
   const toNum = (num) =>
     BigNumber(num.toString())
@@ -195,6 +194,7 @@
       });
 
     } catch(error) {
+      console.log(error.message);
       if(error.message.includes('lock not expired')) {
         displayNotification({
           message: 'can\'t unstake, lock not expired.',
diff --git a/src/stores/routes.js b/src/stores/routes.js
index 6a0a3e8a..1a13ca0c 100644
--- a/src/stores/routes.js
+++ b/src/stores/routes.js
@@ -22,6 +22,7 @@ import PiePageSwitch from '../pages/PiePageSwitch.svelte';
 import Learn from '../pages/Learn.svelte';
 import Integrations from '../pages/Integrations.svelte';
 import Piefolio from '../pages/Piefolio.svelte';
+import DoughStaking from '../pages/DoughStaking.svelte';
 import Farm from '../pages/Farm.svelte';
 
 export const defaultRouteObj = {
@@ -107,6 +108,8 @@ const formatRoute = (route) => {
       return { page: LPStakingV2 };
     case 'farm':
       return { page: Farm };
+    case 'new_staking':
+      return { page: DoughStaking };
     case 'stake':
       referral = route[1] || null;
 

From abe2172a0c9065178ad90b591bafe6e4cafcf20a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Tue, 15 Jun 2021 11:29:03 +0200
Subject: [PATCH 03/13] added return/resolve into approve async function

---
 src/stores/eth.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/stores/eth.js b/src/stores/eth.js
index b81a4fd3..4746f5c6 100644
--- a/src/stores/eth.js
+++ b/src/stores/eth.js
@@ -134,6 +134,8 @@ export const approve = async (address, spender, amount) => {
   if (currentBlockNumber > lastBlock) {
     eth.set({ ...get(eth), currentBlockNumber });
   }
+
+  return true;
 };
 
 export const approveMax = async (address, spender) => {

From 13ec6072d281f22098a3b90d4713830673e18f14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Tue, 15 Jun 2021 14:48:54 +0200
Subject: [PATCH 04/13] updated doughStaking address

---
 src/config/smartcontracts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index d4efa689..81e59648 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -4,5 +4,5 @@
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
-    "doughStaking": "0x44776A2C6368F85044123C79E49f03E914bb9a44"
+    "doughStaking": "0xf4a2BD807C817C41ae8689aAA655ECc1B6Ca6D06"
 }
\ No newline at end of file

From dc95db59dffede17b839c82774ed0da6711b645a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Thu, 17 Jun 2021 10:31:07 +0200
Subject: [PATCH 05/13] added missing dough address

---
 src/config/smartcontracts.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index 81e59648..690bfde4 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -4,5 +4,6 @@
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
-    "doughStaking": "0xf4a2BD807C817C41ae8689aAA655ECc1B6Ca6D06"
+    "doughStaking": "0xf4a2BD807C817C41ae8689aAA655ECc1B6Ca6D06",
+    "dough": "0x6503e51056C881Ebf463207f8E969fA45A1E0747"
 }
\ No newline at end of file

From 7ac378b6f465085fe9800ff35e7107ada74f7536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Thu, 17 Jun 2021 11:24:58 +0200
Subject: [PATCH 06/13] added overrides on approve function

---
 src/config/env.json | 2 +-
 src/stores/eth.js   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/env.json b/src/config/env.json
index 52d38c55..86c224d1 100644
--- a/src/config/env.json
+++ b/src/config/env.json
@@ -1,6 +1,6 @@
 {
   "blocknative": {
     "dappId": "523b279d-0fe0-42e8-8977-e688c3686e57",
-    "networkId": 1
+    "networkId": 4
   }
 }
diff --git a/src/stores/eth.js b/src/stores/eth.js
index 4746f5c6..f3694880 100644
--- a/src/stores/eth.js
+++ b/src/stores/eth.js
@@ -108,9 +108,9 @@ export const trackGasPrice = async () => subject('gasPrice');
 
 // Shortcuts
 
-export const approve = async (address, spender, amount) => {
+export const approve = async (address, spender, amount, overrides = {}) => {
   const erc20Contract = await contract({ address, abi: erc20 });
-  const { hash } = await erc20Contract['approve(address,uint256)'](spender, amount);
+  const { hash } = await erc20Contract['approve(address,uint256)'](spender, amount, overrides);
 
   const { emitter } = displayNotification({ hash });
   const symbol = await erc20Contract.symbol();

From ce2d32d8f0fa1a9a6feb3613cfbf09c1dc4b4b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Thu, 17 Jun 2021 12:00:34 +0200
Subject: [PATCH 07/13] fixed staking contract address, owner bug fixed on
 smart contract

---
 src/config/env.json            | 2 +-
 src/config/smartcontracts.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/env.json b/src/config/env.json
index 86c224d1..52d38c55 100644
--- a/src/config/env.json
+++ b/src/config/env.json
@@ -1,6 +1,6 @@
 {
   "blocknative": {
     "dappId": "523b279d-0fe0-42e8-8977-e688c3686e57",
-    "networkId": 4
+    "networkId": 1
   }
 }
diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index 690bfde4..6e012962 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -4,6 +4,6 @@
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
-    "doughStaking": "0xf4a2BD807C817C41ae8689aAA655ECc1B6Ca6D06",
+    "doughStaking": "0xcc798c02C8D207AA309137C387db5195AAB7dDCd",
     "dough": "0x6503e51056C881Ebf463207f8E969fA45A1E0747"
 }
\ No newline at end of file

From 40ad10ec89bbfb8162c2ea5e886bf478a4cbd4a9 Mon Sep 17 00:00:00 2001
From: Alessio Delmonti <alessio.d@gmail.com>
Date: Wed, 23 Jun 2021 15:54:45 +0100
Subject: [PATCH 08/13] Adding sanity checks and reactivity to input responce

---
 src/config/env.json           |   2 +-
 src/pages/DoughStaking.svelte | 216 ++++++++++++++++++++++------------
 src/stores/eth.js             |   5 +-
 3 files changed, 142 insertions(+), 81 deletions(-)

diff --git a/src/config/env.json b/src/config/env.json
index 52d38c55..86c224d1 100644
--- a/src/config/env.json
+++ b/src/config/env.json
@@ -1,6 +1,6 @@
 {
   "blocknative": {
     "dappId": "523b279d-0fe0-42e8-8977-e688c3686e57",
-    "networkId": 1
+    "networkId": 4
   }
 }
diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte
index 92f3f45e..ce816f0d 100644
--- a/src/pages/DoughStaking.svelte
+++ b/src/pages/DoughStaking.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { approve, connectWeb3, subject, eth } from '../stores/eth.js';
+  import { approve, approveMax, connectWeb3, subject, eth } from '../stores/eth.js';
   import { ethers } from 'ethers';
   import BigNumber from 'bignumber.js';
   import { _ } from 'svelte-i18n';
@@ -8,12 +8,17 @@
   import images from '../config/images.json';
   import displayNotification from '../notifications';
   import { parseEther } from '@ethersproject/units';
+  import { isAddress } from '@pie-dao/utils';
 
   const toNum = (num) =>
     BigNumber(num.toString())
       .dividedBy(10 ** 18)
       .toFixed(2);
 
+  const toBN = (num) =>
+    BigNumber(num.toString())
+      .multipliedBy(10 ** 18);
+
   $: needAllowance = true;
   $: isLoading = true;
   $: stakeError = false;
@@ -28,11 +33,9 @@
     accountLocks: [],
   };
 
-  let stake = {
-    amount: 0.0,
-    duration: 1,
-    receiver: ""
-  };
+  let stakeAmount = 0;
+  let stakeDuration = 36;
+  let receiver = "";
 
   let unstake = {
     amount: 0.0
@@ -64,7 +67,7 @@
       }
     });
     
-    console.log(data);
+    console.log('data', data);
     data = data;
     return data;
   };
@@ -84,29 +87,14 @@
       await fetchStakingData();
 
       isLoading = false;
-      stake.receiver = $eth.address;
-      checkApproval(data.accountDepositTokenAllowance);
+      receiver = $eth.address;
+      console.log('$eth.', $eth)
     } catch(e) {
       console.log('Something went wrong...', e);
     }
     
   }
 
-  function checkApproval(allowance) {
-    if(stake.amount && allowance) {
-      stakeError = false;
-      let stakeAmount = BigNumber(stake.amount.toString()).multipliedBy(10 ** 18);
-
-      if(allowance.isGreaterThanOrEqualTo(stakeAmount)) {
-        needAllowance = false;
-      } else {
-        needAllowance = true;
-      }
-    } else {
-      stakeError = true;
-    }
-  }
-
   async function approveToken() {
     if (!$eth.address || !$eth.signer) {
       displayNotification({ message: $_('piedao.please.connect.wallet'), type: 'hint' });
@@ -116,52 +104,114 @@
 
     try {
       // resetting the approve to zero, before initiating a new approval...
-      if(!data.accountDepositTokenAllowance.isEqualTo(0)) {
+      if(
+        !data.accountDepositTokenAllowance.isEqualTo(0) && 
+        !data.accountDepositTokenAllowance.isEqualTo(ethers.constants.MaxUint256)
+      ) {
+
         await approve(smartcontracts.dough, smartcontracts.doughStaking, 0);
       }
 
-      let stakeAmount = BigNumber(stake.amount.toString()).multipliedBy(10 ** 18);     
-      await approve(smartcontracts.dough, smartcontracts.doughStaking, stakeAmount.toString(), {gasLimit: 100000});
+      
+      await approveMax(smartcontracts.dough, smartcontracts.doughStaking, {gasLimit: 100000});
+      await fetchStakingData();
+      console.log("fetchStakingData", data);   
       needAllowance = false; 
       
     } catch(error) {
+      console.log('error', error);
       stakeError = true;
       needAllowance = true;
     }
   }
 
-  async function stakeDOUGH() {
-    if(!sharesTimeLock) return;
+  const safeFlow = async () => {
+      const Errors = {
+        NOT_CONNECTED: {
+          code: 1,
+          message: "The wallet is not connected or signer not available"
+        },
+        NOT_APPROVED: {
+          code: 2,
+          message: "Allowance too low"
+        },
+        NOT_INITIALIZED: {
+          code: 2,
+          message: "Timelock not initialized"
+        },
+        WRONG_DURATION: {
+          code: 2,
+          message: "Duration Value incorrect"
+        },
+        NOT_VALID_ADDRESS: {
+          code: 2,
+          message: "Receiver is not a valid address"
+        }
+      }
 
-    try {
-      let response = await sharesTimeLock.depositByMonths(
-        parseEther(stake.amount.toString()), 
-        stake.duration, 
-        stake.receiver);
+      // Check connection to wallet
+      if (!$eth.address || !$eth.signer) {
+        displayNotification({ message: $_("piedao.please.connect.wallet"), type: "hint" });
+        connectWeb3();
+        return Errors.NOT_CONNECTED;
+      }
 
-      const { emitter } = displayNotification({
-        hash: response.hash,
-      });
+      if(!sharesTimeLock) {
+        displayNotification({ message: Errors.NOT_INITIALIZED.message, type: "hint" });
+        return Errors.NOT_INITIALIZED;
+      };
 
-      emitter.on("txConfirmed", async() => {
+      if(!stakeDuration) {
+        displayNotification({ message: Errors.WRONG_DURATION.message, type: "hint" });
+        return Errors.WRONG_DURATION;
+      };
 
-        displayNotification({
-          message: `You staked ${stake.amount.toString()} DOUGH. Your new stake will appear in the list in a really short while...`,
-          type: "success",
-        });       
+      if(!isAddress(receiver)) {
+        displayNotification({ message: Errors.NOT_VALID_ADDRESS.message, type: "hint" });
+        return Errors.NOT_VALID_ADDRESS;
 
-        const subscription = subject("blockNumber").subscribe({
-          next: async () => {
-            await fetchStakingData();
-            console.log("fetchStakingData", data);               
+      }
+      return false;
+  }
 
-            subscription.unsubscribe();
-          },
-        });          
+  async function stake() {
+    const error = await safeFlow();
+    if(error) {
+      console.log('error', error)
+      return;
+    }
+
+    try {
+      const { emitter } = displayNotification( await sharesTimeLock.depositByMonths(
+        parseEther(stakeAmount.toString()), 
+        stakeDuration, 
+        receiver
+      ));
+
+      emitter.on("txConfirmed", async() => {
+        const subscription = subject("blockNumber").subscribe({
+            next: async () => {
+              displayNotification({
+                autoDismiss: 15000,
+                message: `You staked successfully`,
+                type: "success",
+              });
+              stakeAmount = 0;
+              await fetchStakingData();
+              console.log("fetchStakingData", data);
+              subscription.unsubscribe();
+            },
+          });
+        
+        
       });
 
     } catch(error) {
-      console.error(error);
+      displayNotification({
+        autoDismiss: 15000,
+        message: e.message,
+        type: "error",
+      });
     }
   }
 
@@ -217,19 +267,17 @@
     The new Stake, under development.
   </div>
 
+  {#if !isLoading}
   <div
     class="swap-container flex flex-col items-center w-94pc p-60px bg-lightgrey md:w-50pc h-50pc"
   >
     <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px">
       <div class="flex items-center justify-between">
         <div class="flex nowrap intems-center p-1 font-thin">Amount to Stake</div>
-        <div
-          class="sc-kkGfuU hyvXgi css-1qqnh8x font-thin"
-          style="display: inline; cursor: pointer;"
-        >
+        <div class="font-thin" style="display: inline; cursor: pointer;">
           <div
             on:click={() => {
-              stake.amount = toNum(data.accountDepositTokenBalance);
+              stakeAmount = toNum(data.accountDepositTokenBalance);
             }}
           >
             Max balance: {toNum(data.accountDepositTokenBalance)}
@@ -238,8 +286,7 @@
       </div>
       <div class="flex nowrap items-center p-1">
         <input
-          on:keyup={() => { checkApproval(data.accountDepositTokenAllowance)}}
-          bind:value={stake.amount}
+          bind:value={stakeAmount}
           class="swap-input-from"
           inputmode="decimal"
           title="Token Amount"
@@ -268,7 +315,7 @@
         >
           <div
             on:click={() => {
-              stake.duration = 36;
+              stakeDuration = 36;
             }}
           >
             Max 36 Months
@@ -277,7 +324,7 @@
       </div>
       <div class="flex nowrap items-center p-1">
         <input
-          bind:value={stake.duration}
+          bind:value={stakeDuration}
           class="swap-input-from"
           inputmode="number"
           title="Token Amount"
@@ -300,10 +347,19 @@
     <div class="flex flex-col nowrap w-100pc swap-from border rounded-20px border-grey p-16px mt-4">
       <div class="flex items-center justify-between">
         <div class="flex nowrap intems-center p-1 font-thin">Receiver</div>
+        <div class="font-thin" style="display: inline; cursor: pointer;">
+          <div
+            on:click={() => {
+              receiver = $eth.address;
+            }}
+          >
+            {$eth.shortAddress}
+          </div>
+        </div>
       </div>
       <div class="flex nowrap items-center p-1">
         <input
-          bind:value={stake.receiver}
+          bind:value={receiver}
           class="swap-input-from"
           inputmode="text"
           placeholder="loading default address..."
@@ -314,25 +370,28 @@
           spellcheck="false"
         />
       </div>
-    </div>    
-
-    {#if needAllowance}
-      <button
-        on:click={approveToken}
-        class:error={isLoading || stakeError ? true : false}
-        disabled={isLoading || stakeError ? true : false}
-        class="btn clear stake-button mt-10px rounded-20px p-15px w-100pc">Approve</button
-      >
+    </div>
+
+    {#if data.accountDepositTokenBalance.eq(0)}
+      <button disabled class="btn clear stake-button mt-10px rounded-20px p-15px w-100pc">You don't own tokens </button>  
     {:else}
-      <button
-      on:click={stakeDOUGH}
-        class:error={isLoading || stakeError ? true : false}
-        disabled={isLoading || stakeError ? true : false}
-        class="error stake-button mt-10px rounded-20px p-15px w-100pc"
-      >
-        Stake Your Coins
-      </button>
+      {#if stakeAmount }
+        {#if toBN(stakeAmount).isGreaterThan(data.accountDepositTokenBalance)}
+          <button disabled class="btn clear stake-button mt-10px rounded-20px p-15px w-100pcborder-white">Balance too low</button>
+        {:else if toBN(stakeAmount).isGreaterThan(data.accountDepositTokenAllowance)}
+          <button on:click={approveToken} class="btn clear stake-button mt-10px rounded-20px p-15px w-100pcborder-white">Approve</button>
+        {:else}
+          {#if stakeDuration && stakeDuration > 5 && stakeDuration < 37}
+            <button on:click={stake} class="btn clear stake-button mt-10px rounded-20px p-15px w-100pcborder-white">Stake</button>
+          {:else}
+            <button disabled class="btn clear stake-button mt-10px rounded-20px p-15px w-100pcborder-white">Duration not correct</button>
+          {/if}
+        {/if}
+      {:else}
+        <button disabled class="btn clear stake-button mt-10px rounded-20px p-15px w-100pc">Enter an amount</button>  
+      {/if}
     {/if}
+
   </div>
 
   <div
@@ -361,4 +420,7 @@
     {/each}
   </ul>
 </div>
+{:else}
+  Loading...
+{/if}
 </div>
diff --git a/src/stores/eth.js b/src/stores/eth.js
index f3694880..42ee5601 100644
--- a/src/stores/eth.js
+++ b/src/stores/eth.js
@@ -138,6 +138,5 @@ export const approve = async (address, spender, amount, overrides = {}) => {
   return true;
 };
 
-export const approveMax = async (address, spender) => {
-  await approve(address, spender, ethers.constants.MaxUint256);
-};
+// eslint-disable-next-line max-len
+export const approveMax = async (address, spender, overrides = {}) => approve(address, spender, ethers.constants.MaxUint256, overrides);

From 0b3d09dc1ce1543c25947f231cda0ae4cb456582 Mon Sep 17 00:00:00 2001
From: Alessio Delmonti <alessio.d@gmail.com>
Date: Mon, 28 Jun 2021 12:34:30 +0200
Subject: [PATCH 09/13] Merkle root verification

---
 src/classes/MerkleTreeUtils.js | 146 +++++++++++++++++++++++++++++++++
 src/config/rewards/test.json   |  14 ++++
 src/pages/DoughStaking.svelte  |  53 +++++++++---
 3 files changed, 203 insertions(+), 10 deletions(-)
 create mode 100644 src/classes/MerkleTreeUtils.js
 create mode 100644 src/config/rewards/test.json

diff --git a/src/classes/MerkleTreeUtils.js b/src/classes/MerkleTreeUtils.js
new file mode 100644
index 00000000..509baf6f
--- /dev/null
+++ b/src/classes/MerkleTreeUtils.js
@@ -0,0 +1,146 @@
+import { ethers } from 'ethers';
+
+class MerkleTree {
+  constructor(elements) {
+    // Filter empty strings and hash elements
+    // NOTE do not double has leafs
+    // this.elements = elements.filter(el => el).map(el => keccakFromString(el));
+    this.elements = elements;
+    // Sort elements
+    this.elements.sort();
+    // Deduplicate elements
+    // this.elements = this.bufDedup(this.elements);
+
+    // Create layers
+    this.layers = this.getLayers(this.elements);
+  }
+
+  getLayers(elements) {
+    if (elements.length === 0) {
+      return [['']];
+    }
+
+    const layers = [];
+    layers.push(elements);
+
+    // Get next layer until we reach the root
+    while (layers[layers.length - 1].length > 1) {
+      layers.push(this.getNextLayer(layers[layers.length - 1]));
+    }
+
+    return layers;
+  }
+
+  getNextLayer(elements) {
+    return elements.reduce((layer, el, idx, arr) => {
+      if (idx % 2 === 0) {
+        // Hash the current element with its pair element
+        layer.push(this.combinedHash(el, arr[idx + 1]));
+      }
+
+      return layer;
+    }, []);
+  }
+
+  combinedHash(first, second) {
+    if (!first) { return second; }
+    if (!second) { return first; }
+
+    return ethers.utils.solidityKeccak256(['bytes32', 'bytes32'], [first, second].sort());
+  }
+
+  getRoot() {
+    return this.layers[this.layers.length - 1][0];
+  }
+
+  getHexRoot() {
+    return bufferToHex(this.getRoot());
+  }
+
+  getProof(el) {
+    let idx = this.bufIndexOf(el, this.elements);
+
+    if (idx === -1) {
+      throw new Error('Element does not exist in Merkle tree');
+    }
+
+    return this.layers.reduce((proof, layer) => {
+      const pairElement = this.getPairElement(idx, layer);
+
+      if (pairElement) {
+        proof.push(pairElement);
+      }
+
+      idx = Math.floor(idx / 2);
+
+      return proof;
+    }, []);
+  }
+
+  getHexProof(el) {
+    const proof = this.getProof(el);
+
+    return this.bufArrToHexArr(proof);
+  }
+
+  getPairElement(idx, layer) {
+    const pairIdx = idx % 2 === 0 ? idx + 1 : idx - 1;
+
+    if (pairIdx < layer.length) {
+      return layer[pairIdx];
+    }
+    return null;
+  }
+
+  bufIndexOf(el, arr) {
+    let hash;
+
+    hash = el;
+
+    for (let i = 0; i < arr.length; i++) {
+      if (hash == arr[i]) {
+        return i;
+      }
+    }
+
+    return -1;
+  }
+
+  bufDedup(elements) {
+    return elements.filter((el, idx) => idx === 0 || !elements[idx - 1].equals(el));
+  }
+
+  bufArrToHexArr(arr) {
+    if (arr.some((el) => !Buffer.isBuffer(el))) {
+      throw new Error('Array is not an array of buffers');
+    }
+
+    return arr.map((el) => `0x${el.toString('hex')}`);
+  }
+}
+
+const hashEntry = (entry) => ethers.utils.solidityKeccak256(
+  ['address', 'uint256'],
+  [
+    entry.address,
+    entry.participation,
+  ],
+);
+
+// eslint-disable-next-line import/prefer-default-export
+export const createParticipationTree = (entries = []) => {
+  const entriesWithLeafs = entries.map((item) => {
+    const entryWithLeaf = {
+      ...item,
+      leaf: hashEntry(item),
+    };
+
+    return entryWithLeaf;
+  });
+
+  console.log('entriesWithLeafs', entriesWithLeafs)
+  return {
+    merkleTree: new MerkleTree(entriesWithLeafs.map((item) => item.leaf)),
+    leafs: entriesWithLeafs,
+  };
+};
diff --git a/src/config/rewards/test.json b/src/config/rewards/test.json
new file mode 100644
index 00000000..fe99c2ae
--- /dev/null
+++ b/src/config/rewards/test.json
@@ -0,0 +1,14 @@
+[
+    {
+        "address": "0xd18a54f89603Fe4301b29EF6a8ab11b9Ba24f139",
+        "participation": 1
+    },
+    {
+        "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96046",
+        "participation": 1
+    },
+    {
+        "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96047",
+        "participation": 0
+    }
+]
\ No newline at end of file
diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte
index ce816f0d..8c8cddae 100644
--- a/src/pages/DoughStaking.svelte
+++ b/src/pages/DoughStaking.svelte
@@ -9,6 +9,7 @@
   import displayNotification from '../notifications';
   import { parseEther } from '@ethersproject/units';
   import { isAddress } from '@pie-dao/utils';
+  import { createParticipationTree } from '../classes/MerkleTreeUtils';
 
   const toNum = (num) =>
     BigNumber(num.toString())
@@ -19,9 +20,11 @@
     BigNumber(num.toString())
       .multipliedBy(10 ** 18);
 
-  $: needAllowance = true;
-  $: isLoading = true;
-  $: stakeError = false;
+
+  
+  // All the epochs where rewards are available.
+  $: epochs = [];
+  $: isLoading = true;  
 
   let data = {
     totalStaked: BigNumber(0),
@@ -85,10 +88,9 @@
       );
 
       await fetchStakingData();
-
-      isLoading = false;
       receiver = $eth.address;
-      console.log('$eth.', $eth)
+      console.log(prepareProofs());
+      isLoading = false;
     } catch(e) {
       console.log('Something went wrong...', e);
     }
@@ -116,12 +118,39 @@
       await approveMax(smartcontracts.dough, smartcontracts.doughStaking, {gasLimit: 100000});
       await fetchStakingData();
       console.log("fetchStakingData", data);   
-      needAllowance = false; 
-      
     } catch(error) {
       console.log('error', error);
-      stakeError = true;
-      needAllowance = true;
+      displayNotification({
+        autoDismiss: 15000,
+        message: e.message,
+        type: "error",
+      });
+    }
+  }
+
+  function prepareProofs() {
+    if(!$eth.address) return;
+    const merkleTree = createParticipationTree([
+        {
+            "address": "0xd18a54f89603Fe4301b29EF6a8ab11b9Ba24f139",
+            "participation": 1
+        },
+        {
+            "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96046",
+            "participation": 1
+        },
+        {
+            "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96047",
+            "participation": 0
+        }
+    ]);
+      
+    console.log('merkleTree', merkleTree)
+    const leaf = merkleTree.leafs.find((item) => item.address.toLowerCase() === $eth.address.toLowerCase());
+
+    return {
+      valid: leaf ? true : false,
+      proof: leaf ? merkleTree.merkleTree.getProof(leaf.leaf) : null
     }
   }
 
@@ -405,6 +434,10 @@
         <span class="sc-kXeGPI jeVIZw token-symbol-container">DOUGH</span>
       </span>
     </div>
+
+    <div>Account Reward Token Balance: {toNum(data.accountRewardTokenBalance)}</div>
+    <div>Account Withdrawable Rewards: {toNum(data.accountWithdrawableRewards)}</div>
+    <div>Account Withdrawn Rewards: {toNum(data.accountWithdrawnRewards)}</div>
     <div>Select the item you wish to unstake from the list.</div>
   </div>   
 

From 0112402b7020d286303625935fdd84ac9e61db1b Mon Sep 17 00:00:00 2001
From: Alessio Delmonti <alessio.d@gmail.com>
Date: Mon, 28 Jun 2021 13:16:19 +0200
Subject: [PATCH 10/13] Claim reward token

---
 src/abis/veDoughABI.json       |  1 +
 src/config/rewards/test.json   | 45 +++++++++++++++++++++-
 src/config/smartcontracts.json |  1 +
 src/pages/DoughStaking.svelte  | 70 +++++++++++++++++++++++++---------
 4 files changed, 96 insertions(+), 21 deletions(-)
 create mode 100644 src/abis/veDoughABI.json

diff --git a/src/abis/veDoughABI.json b/src/abis/veDoughABI.json
new file mode 100644
index 00000000..cfd00b4a
--- /dev/null
+++ b/src/abis/veDoughABI.json
@@ -0,0 +1 @@
+[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_owner","type":"address"},{"indexed":true,"internalType":"address","name":"_spender","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":true,"internalType":"address","name":"collector","type":"address"},{"indexed":true,"internalType":"address","name":"to","type":"address"},{"indexed":false,"internalType":"bytes32[]","name":"proof","type":"bytes32[]"}],"name":"ClaimedFor","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"previousOwner","type":"address"},{"indexed":true,"internalType":"address","name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"by","type":"address"},{"indexed":false,"internalType":"uint256","name":"rewardsDistributed","type":"uint256"}],"name":"RewardsDistributed","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"by","type":"address"},{"indexed":false,"internalType":"uint256","name":"fundsWithdrawn","type":"uint256"}],"name":"RewardsWithdrawn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"previousAdminRole","type":"bytes32"},{"indexed":true,"internalType":"bytes32","name":"newAdminRole","type":"bytes32"}],"name":"RoleAdminChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleGranted","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"bytes32","name":"role","type":"bytes32"},{"indexed":true,"internalType":"address","name":"account","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"}],"name":"RoleRevoked","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_from","type":"address"},{"indexed":true,"internalType":"address","name":"_to","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"Transfer","type":"event"},{"inputs":[],"name":"DEFAULT_ADMIN_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"MAINTAINER_ROLE","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"},{"internalType":"address","name":"","type":"address"}],"name":"allowance","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"approve","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"balanceOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"from","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"burn","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32[]","name":"proof","type":"bytes32[]"}],"name":"claim","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"},{"internalType":"bytes32[]","name":"proof","type":"bytes32[]"}],"name":"claimFor","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"cumulativeRewardsOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"decimals","outputs":[{"internalType":"uint8","name":"","type":"uint8"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"subtractedValue","type":"uint256"}],"name":"decreaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"distributeRewards","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"getPointsCorrection","outputs":[{"internalType":"int256","name":"","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleAdmin","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"uint256","name":"index","type":"uint256"}],"name":"getRoleMember","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"}],"name":"getRoleMemberCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"grantRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"hasRole","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"spender","type":"address"},{"internalType":"uint256","name":"addedValue","type":"uint256"}],"name":"increaseAllowance","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"name_","type":"string"},{"internalType":"string","name":"symbol_","type":"string"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"string","name":"name_","type":"string"},{"internalType":"string","name":"symbol_","type":"string"},{"internalType":"address","name":"token_","type":"address"},{"internalType":"address","name":"maintainer_","type":"address"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"mint","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"name","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"owner","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"participationMerkleRoot","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"pointsPerShare","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address[]","name":"accounts","type":"address[]"},{"internalType":"bytes32[][]","name":"proofs","type":"bytes32[][]"}],"name":"redistribute","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"redistributeDust","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"renounceOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"renounceRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"role","type":"bytes32"},{"internalType":"address","name":"account","type":"address"}],"name":"revokeRole","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"newParticipationMerkleRoot","type":"bytes32"}],"name":"setParticipationMerkleRoot","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"symbol","outputs":[{"internalType":"string","name":"","type":"string"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"token","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"totalSupply","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"to","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transfer","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"sender","type":"address"},{"internalType":"address","name":"recipient","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"transferFrom","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"withdrawableRewardsOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"account","type":"address"}],"name":"withdrawnRewardsOf","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]
\ No newline at end of file
diff --git a/src/config/rewards/test.json b/src/config/rewards/test.json
index fe99c2ae..81d550c9 100644
--- a/src/config/rewards/test.json
+++ b/src/config/rewards/test.json
@@ -4,11 +4,52 @@
         "participation": 1
     },
     {
-        "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96046",
+        "address": "0xe89dEe662C94FfEE76d0942f4a4bAD27cC076dd2",
+        "participation": 0
+    },
+
+    {
+        "address": "0xCB388d0f190496109316e0d5526DA46D72E52F61",
+        "participation": 1
+    },
+    {
+        "address": "0xc96265c36F6D77747f9c259946a1eF55FcE946b7",
+        "participation": 0
+    },
+
+    {
+        "address": "0x16B89DF3B761D83D772376d3D18AeE63f7D74Dfd",
+        "participation": 1
+    },
+    {
+        "address": "0x51BB5E83a7e686e39ec0d6FCFe62A0402f7Ef8f6",
+        "participation": 0
+    },
+
+    {
+        "address": "0x3d867dBbb7e5a448A6864DA063D9AB723Aec90c2",
+        "participation": 1
+    },
+    {
+        "address": "0x70E2402986807128Ff949579A8d444ec9465AEFf",
+        "participation": 0
+    },
+
+    {
+        "address": "0x1e17A75616cd74f5846B1b71622Aa8e10ea26Cc0",
+        "participation": 1
+    },
+    {
+        "address": "0x9B83fb36D0c865E0C8a539759f1F97146D748DAb",
+        "participation": 0
+    },
+
+    {
+        "address": "0x42556f667Dfc74704914F98d1e0c0aC4Ea2f492e",
         "participation": 1
     },
     {
-        "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96047",
+        "address": "0x7884C447d5CD98e794c1A5c08e3107fbF29B2877",
         "participation": 0
     }
 ]
\ No newline at end of file
diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index 6e012962..e46deec2 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -5,5 +5,6 @@
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
     "doughStaking": "0xcc798c02C8D207AA309137C387db5195AAB7dDCd",
+    "veDOUGH": "0x250B5CC49658Dd9f9369a71d654e5DB3fc87e69C",
     "dough": "0x6503e51056C881Ebf463207f8E969fA45A1E0747"
 }
\ No newline at end of file
diff --git a/src/pages/DoughStaking.svelte b/src/pages/DoughStaking.svelte
index 8c8cddae..98512ea4 100644
--- a/src/pages/DoughStaking.svelte
+++ b/src/pages/DoughStaking.svelte
@@ -4,8 +4,10 @@
   import BigNumber from 'bignumber.js';
   import { _ } from 'svelte-i18n';
   import sharesTimeLockABI from '../abis/sharesTimeLock.json';
+  import veDoughABI from '../abis/veDoughABI.json';
   import smartcontracts from '../config/smartcontracts.json';
   import images from '../config/images.json';
+  import PartecipationJson from '../config/rewards/test.json'
   import displayNotification from '../notifications';
   import { parseEther } from '@ethersproject/units';
   import { isAddress } from '@pie-dao/utils';
@@ -29,8 +31,8 @@
   let data = {
     totalStaked: BigNumber(0),
     rewardTokenSupply: BigNumber(0),
-    accountRewardTokenBalance: BigNumber(0),
-    accountWithdrawableRewards: BigNumber(0),
+    accountRewardTokenBalance: BigNumber(0), //amount of veDOUGH you have
+    accountWithdrawableRewards: BigNumber(0), //amount is in reward Pie
     accountWithdrawnRewards: BigNumber(0),
     accountDepositTokenBalance: BigNumber(0),
     accountLocks: [],
@@ -45,6 +47,7 @@
   }
 
   let sharesTimeLock = false;
+  let veDOUGH = false;
 
   const fetchStakingData = async () => {
     let response = await sharesTimeLock.getStakingData($eth.address);
@@ -87,6 +90,12 @@
         $eth.signer || $eth.provider,
       );
 
+      veDOUGH = new ethers.Contract(
+        smartcontracts.veDOUGH,
+        veDoughABI,
+        $eth.signer || $eth.provider,
+      );
+
       await fetchStakingData();
       receiver = $eth.address;
       console.log(prepareProofs());
@@ -122,28 +131,49 @@
       console.log('error', error);
       displayNotification({
         autoDismiss: 15000,
-        message: e.message,
+        message: error.message,
         type: "error",
       });
     }
   }
 
+  async function claim() {
+    const proof = prepareProofs();
+    console.log('proof', proof);
+
+    try {
+      const { emitter } = displayNotification( await veDOUGH.claim(proof.proof));
+
+      emitter.on("txConfirmed", async() => {
+        const subscription = subject("blockNumber").subscribe({
+            next: async () => {
+              displayNotification({
+                autoDismiss: 15000,
+                message: `Pay day baby!`,
+                type: "success",
+              });
+              stakeAmount = 0;
+              await fetchStakingData();
+              subscription.unsubscribe();
+            },
+          });
+        
+        
+      });
+
+    } catch(error) {
+      displayNotification({
+        autoDismiss: 15000,
+        message: error.message,
+        type: "error",
+      });
+    }
+
+  }
+
   function prepareProofs() {
     if(!$eth.address) return;
-    const merkleTree = createParticipationTree([
-        {
-            "address": "0xd18a54f89603Fe4301b29EF6a8ab11b9Ba24f139",
-            "participation": 1
-        },
-        {
-            "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96046",
-            "participation": 1
-        },
-        {
-            "address": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96047",
-            "participation": 0
-        }
-    ]);
+    const merkleTree = createParticipationTree(PartecipationJson);
       
     console.log('merkleTree', merkleTree)
     const leaf = merkleTree.leafs.find((item) => item.address.toLowerCase() === $eth.address.toLowerCase());
@@ -238,7 +268,7 @@
     } catch(error) {
       displayNotification({
         autoDismiss: 15000,
-        message: e.message,
+        message: error.message,
         type: "error",
       });
     }
@@ -436,7 +466,9 @@
     </div>
 
     <div>Account Reward Token Balance: {toNum(data.accountRewardTokenBalance)}</div>
-    <div>Account Withdrawable Rewards: {toNum(data.accountWithdrawableRewards)}</div>
+    <div>Account Withdrawable Rewards: {toNum(data.accountWithdrawableRewards)}
+      <button on:click={claim}> Claim now</button>
+    </div>
     <div>Account Withdrawn Rewards: {toNum(data.accountWithdrawnRewards)}</div>
     <div>Select the item you wish to unstake from the list.</div>
   </div>   

From bb9ca78b2d08d348daf5a5ba140ea843bf5fdeae Mon Sep 17 00:00:00 2001
From: Alessio Delmonti <alessio.d@gmail.com>
Date: Wed, 30 Jun 2021 15:28:54 +0200
Subject: [PATCH 11/13] New address

---
 src/config/smartcontracts.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index e46deec2..47dfe684 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -4,7 +4,7 @@
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
-    "doughStaking": "0xcc798c02C8D207AA309137C387db5195AAB7dDCd",
+    "doughStaking": "0xff6D2c7DD1B265C7d69319236eFbdEDdd8964Bc9",
     "veDOUGH": "0x250B5CC49658Dd9f9369a71d654e5DB3fc87e69C",
     "dough": "0x6503e51056C881Ebf463207f8E969fA45A1E0747"
 }
\ No newline at end of file

From 5f79762753ef1fe7fabae765404ce33a3078413d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Toto=CC=80=20Volturno?= <info@kunigu.tech>
Date: Fri, 2 Jul 2021 14:44:25 +0200
Subject: [PATCH 12/13] changed contract addresses for new ones

---
 src/config/smartcontracts.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/smartcontracts.json b/src/config/smartcontracts.json
index 47dfe684..4b25333b 100644
--- a/src/config/smartcontracts.json
+++ b/src/config/smartcontracts.json
@@ -4,7 +4,7 @@
     "recipev1": "0x6cb4b8669e23295563d3b34df4a760c0cee993c7",
     "stakingPools": "0x6de77A304609472A4811a0BFD47d8682Aebc29df",
     "eDOUGH": "0x63cbd1858bd79de1a06c3c26462db360b834912d",
-    "doughStaking": "0xff6D2c7DD1B265C7d69319236eFbdEDdd8964Bc9",
-    "veDOUGH": "0x250B5CC49658Dd9f9369a71d654e5DB3fc87e69C",
+    "doughStaking": "0x03508154Dd64aCe391D1f0bdaAe9e426Be4A9e05",
+    "veDOUGH": "0x6f64B2626939A313B831D435fc68238e35CA5f97",
     "dough": "0x6503e51056C881Ebf463207f8E969fA45A1E0747"
 }
\ No newline at end of file

From fcb465f2d598a6dc21cde8cb09b8f618e03888bf Mon Sep 17 00:00:00 2001
From: Nicola Di Marco <ndimarco@amp.energy>
Date: Mon, 12 Jul 2021 15:34:21 +0200
Subject: [PATCH 13/13] token icons

---
 src/config/images.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/config/images.json b/src/config/images.json
index 5613ea10..2f114df0 100644
--- a/src/config/images.json
+++ b/src/config/images.json
@@ -125,7 +125,9 @@
   "earntogether": "https://raw.githubusercontent.com/pie-dao/brand/master/misc/earntogether2.png",
   "metavote": "https://raw.githubusercontent.com/pie-dao/brand/master/misc/metavote2.png",
   "InfoIcon": "https://raw.githubusercontent.com/pie-dao/brand/eaee121300a4c64c1293bb0f80723539357696c5/misc/Infoicon.svg",
-  "extLink": "https://raw.githubusercontent.com/pie-dao/brand/2deb3b9bb0c666a34dd715dce0f5a48e71ea3fe1/misc/external-link.svg"
+  "extLink": "https://raw.githubusercontent.com/pie-dao/brand/2deb3b9bb0c666a34dd715dce0f5a48e71ea3fe1/misc/external-link.svg",
+  "veDough": "https://raw.githubusercontent.com/pie-dao/brand/6adcf8b3a75380cc49ea119150b683a031afa016/PIE%20Tokens/veDOUGH.svg",
+  "rewardsPie": "https://raw.githubusercontent.com/pie-dao/brand/6adcf8b3a75380cc49ea119150b683a031afa016/PIE%20Tokens/RewardPie.svg"