fix for claiming matured rex, faq additions, fix for claiming existing balance

nsjames · nsjames · commit 40a0215f4537 · 2024-07-02T11:57:25.000+01:00
diff --git a/src/lib/components/ClaimRewards.svelte b/src/lib/components/ClaimRewards.svelte
@@ -1,12 +1,12 @@
 <script>
-    import WharfService, {apr, eosBalance, rexBalance, unstakingBalances} from "$lib/wharf";
+    import WharfService, {eosBalance, rexBalance, unstakingBalances} from "$lib/wharf";
     import InfoRows from "$lib/components/InfoRows.svelte";
     import GlassBox from "$lib/components/GlassBox.svelte";
     import {commaNumber, readableNumber} from "$lib";
     import LoadingSpinner from "$lib/components/LoadingSpinner.svelte";
 
 
-    $: claimable = WharfService.convertRexToEos(WharfService.claimableBalance());
+    $: withdrawable = WharfService.withdrawableBalance();
 
     let loading = false;
     const claim = async () => {
@@ -16,27 +16,26 @@
         loading = false;
     }
 
-    const now = +new Date();
     $: unstaking = WharfService.pendingClaimableBalances().filter(x => !x.savings).map(x => {
         return [
             `${parseFloat(parseFloat(WharfService.convertRexToEos(parseFloat(x.rex.toString())).toString()).toFixed(4))} EOS`,
             x.date.toDateString()];
     }).sort((a, b) => +new Date(a[1]) - +new Date(b[1]));
 
-    $: totalUnstaking = $unstakingBalances.filter(x => !x.savings).reduce((acc, x) => parseFloat(parseFloat((acc + parseFloat(x.rex.toString())).toString()).toFixed(4)), 0);
+    $: totalUnstaking = WharfService.pendingClaimableBalances().filter(x => !x.savings).reduce((acc, x) => parseFloat(parseFloat((acc + parseFloat(x.rex.toString())).toString()).toFixed(4)), 0);
     $: totalUnstakingInEos = parseFloat(parseFloat(WharfService.convertRexToEos(totalUnstaking).toString()).toFixed(4));
 </script>
 
 <GlassBox class="mt-2 overflow-hidden">
 
-    {#if claimable > 0}
+    {#if parseFloat(withdrawable) > 0}
         {#if !loading}
             <button class="btn" on:click={claim}>
                 Claim Rewards
             </button>
 
             <InfoRows class="mt-2" rows={[
-                ["You can claim", `${commaNumber(claimable)} EOS`, "font-black !text-yellow-300"]
+                ["You can claim", `${commaNumber(withdrawable)} EOS`, "font-black !text-yellow-300"]
             ]} />
         {:else}
             <button class="btn btn-disabled" disabled>
@@ -49,14 +48,13 @@
         </figure>
     {/if}
 
-
-    <section class="flex justify-between relative mt-10">
-        <section>
-            <figure class="text-sm">Currently unstaking</figure>
-            <h1 class="text-3xl font-bold -mt-1">{totalUnstakingInEos} EOS</h1>
-        </section>
-    </section>
     {#if unstaking.length}
+        <section class="flex justify-between relative mt-10">
+            <section>
+                <figure class="text-sm">Currently unstaking</figure>
+                <h1 class="text-3xl font-bold -mt-1">{totalUnstakingInEos} EOS</h1>
+            </section>
+        </section>
         <figure class="text-white text-xs text-opacity-50 mt-5">
             Below are your unstaking balances.
         </figure>
@@ -66,8 +64,6 @@
                 ...unstaking
             ]} />
         </section>
-    {:else}
-
     {/if}
 
 
diff --git a/src/lib/components/FAQ.svelte b/src/lib/components/FAQ.svelte
@@ -36,6 +36,13 @@
                 Once you trigger unstaking, you will then have to wait for 21 days before you can claim your rewards.
             `,
         },
+        {
+            question: 'Why was my matured position automatically sold?',
+            answer:`
+                After you unstake and wait the 21 days, your position will automatically be sold when you do any action (like staking or unstaking).
+                You will still need to claim those rewards, but your will not continue to produce yield on the matured position.
+            `,
+        },
         {
             question: 'Can I immediately unstake and get my EOS back?',
             answer:`
diff --git a/src/lib/components/Stake.svelte b/src/lib/components/Stake.svelte
@@ -1,11 +1,12 @@
 <script>
-    import WharfService, {apr, eosBalance, rexpool} from "$lib/wharf";
+    import WharfService, {account, eosBalance, rexpool} from "$lib/wharf";
     import TokenInput from "$lib/components/TokenInput.svelte";
     import InfoRows from "$lib/components/InfoRows.svelte";
     import GlassBox from "$lib/components/GlassBox.svelte";
     import {commaNumber, readableNumber} from "$lib";
     import LoadingSpinner from "$lib/components/LoadingSpinner.svelte";
     import InfoBox from "$lib/components/InfoBox.svelte";
+    import {toast} from "svelte-sonner";
 
     let amount = 0;
     $: rexReturn = WharfService.convertEosToRex(amount);
@@ -16,6 +17,9 @@
 
     let loading = false;
     const buy = async () => {
+        if(!$account){
+            return WharfService.login();
+        }
         if (loading) return;
         loading = true;
         if(await WharfService.buyRex(amount)){
@@ -45,18 +49,6 @@
                 class="mt-8"
     />
 
-<!--    <section class="flex border rounded border-white border-opacity-10 p-2 mt-4">-->
-<!--        <input type="checkbox" class="w-8 h-8" />-->
-<!--        <section class="">-->
-<!--            <figure class="text-sm font-bold text-white text-opacity-80 ml-2">-->
-<!--                Start unstaking immediately-->
-<!--            </figure>-->
-<!--            <figure class="text-xs text-white text-opacity-50 ml-2">-->
-<!--                You can only withdraw your staked tokens 21 days after you start the unstaking process.-->
-<!--            </figure>-->
-<!--        </section>-->
-<!--    </section>-->
-
     {#if !loading}
         <button class="btn mt-5" on:click={buy}>
             Stake
@@ -68,13 +60,12 @@
     {/if}
 
     <InfoRows class="mt-2" rows={[
-        // ["You will get", `${rexReturn} REX`, "opacity-70"],
         ["You will stake", `${commaNumber(amount)} EOS`, "opacity-70"],
-        ["Estimated yield", `${commaNumber(amount*$apr)} EOS`, "font-black !text-yellow-300"]
+        ["Estimated yield", `${commaNumber(amount*(apy/100))} EOS`, "font-black !text-yellow-300"]
     ]} />
 
     <InfoBox class="mt-10">
-        The APR is an estimate, and may fluctuate based on how many and much others are staking.
+        The APY is an estimate, and may fluctuate based on how many and much others are staking.
         Your 21 day lockup period starts when you unstake your EOS.
         <br />
         <br />
diff --git a/src/lib/components/Unstake.svelte b/src/lib/components/Unstake.svelte
@@ -1,5 +1,5 @@
 <script>
-    import WharfService, {apr, eosBalance, rexBalance} from "$lib/wharf";
+    import WharfService, {rexBalance} from "$lib/wharf";
     import TokenInput from "$lib/components/TokenInput.svelte";
     import InfoRows from "$lib/components/InfoRows.svelte";
     import GlassBox from "$lib/components/GlassBox.svelte";
diff --git a/src/lib/index.ts b/src/lib/index.ts
@@ -12,5 +12,6 @@ export const readableNumber = (num: number) => {
 }
 
 export const commaNumber = (num: any) => {
+    if(isNaN(num) || num === null || num === undefined) return 0;
     return parseFloat(num).toLocaleString();
 }
diff --git a/src/lib/wharf.ts b/src/lib/wharf.ts
@@ -6,12 +6,13 @@ import { WalletPluginAnchor } from "@wharfkit/wallet-plugin-anchor"
 import { toast } from 'svelte-sonner'
 import {showConfetti} from "$lib/index";
 
+export let loadingFromChain:Writable<boolean> = writable(false);
 export let account:Writable<string|null> = writable(null);
 export let eosBalance:Writable<number> = writable(0);
 export let rexBalance:Writable<number> = writable(0);
+export let rexfund:Writable<any> = writable(null);
 export let rexpool:Writable<any> = writable(null);
 export let rawRexBalance:Writable<any> = writable(null);
-export let apr = writable(0.49);
 
 const chains = [
     Chains.EOS,
@@ -94,6 +95,7 @@ export default class WharfService {
         account.set(null)
         eosBalance.set(0)
         rexBalance.set(0)
+        rexfund.set(null)
         unstakingBalances.set([])
         rawRexBalance.set(null)
     }
@@ -108,6 +110,8 @@ export default class WharfService {
         const _rexpool = await WharfService.getRexPool();
         if(_rexpool) rexpool.set(_rexpool);
 
+        await WharfService.getRexFund();
+
         const _unstakingBalances = await WharfService.getUnstakingBalances();
         if(_unstakingBalances) {
             unstakingBalances.set(_unstakingBalances);
@@ -188,6 +192,30 @@ export default class WharfService {
         });
     }
 
+    static async getRexFund(){
+        if (!WharfService.session) return;
+
+
+        return WharfService.session?.client.v1.chain.get_table_rows({
+            code: "eosio",
+            scope: "eosio",
+            lower_bound: WharfService.session.actor,
+            upper_bound: WharfService.session.actor,
+            table: "rexfund",
+            json: true,
+        }).then((res:any) => {
+            const row = res.rows.find((row:any) => row.owner === WharfService.session?.actor.toString());
+            if(!row) return null;
+
+            rexfund.set(parseFloat(row.balance.split(' ')[0]));
+            return true;
+        }).catch(err => {
+            console.error(err)
+            toast.error('There was a problem getting your REX fund balance. Check the console for more information about what happened.')
+            return null;
+        });
+    }
+
     static async getRexPool(){
         if(!WharfService.session && !WharfService.client) return;
 
@@ -319,41 +347,55 @@ export default class WharfService {
         });
     }
 
+    static withdrawableBalance(_claimable:number|null = null){
+        const claimable = _claimable ? _claimable : WharfService.claimableBalance();
+        const withdrawable = parseFloat(get(rexfund) ?? 0);
+        const matured = parseFloat(WharfService.convertRexToEos(claimable).toString());
+        return parseFloat((withdrawable + matured).toString()).toFixed(4);
+    }
+
     static claimableBalance(){
-        return WharfService.claimableBalances().reduce((acc, x) => acc + parseFloat(x.rex.toString()), 0);
+        const maturedRex = get(rawRexBalance) ? get(rawRexBalance).matured_rex / 10000 : 0;
+        return maturedRex + WharfService.claimableBalances().reduce((acc, x) => acc + parseFloat(x.rex.toString()), 0);
     }
 
     static async claim(){
         const claimable = WharfService.claimableBalance();
+        const totalEos = WharfService.withdrawableBalance(claimable);
 
-        if(claimable === 0){
+        if(parseFloat(totalEos) <= 0){
             toast.error('You have no rewards to claim.')
             return null;
         }
 
-        return WharfService.session?.transact({
-            actions: [
-                {
-                    account: "eosio",
-                    name: "sellrex",
-                    authorization: [WharfService.session?.permissionLevel],
-                    data: {
-                        from: WharfService.session?.actor,
-                        rex: `${claimable.toFixed(4)} REX`
-                    },
-                },
-                {
-                    account: "eosio",
-                    name: "withdraw",
-                    authorization: [WharfService.session?.permissionLevel],
-                    data: {
-                        owner: WharfService.session?.actor,
-                        amount: `${WharfService.convertRexToEos(claimable).toFixed(4)} EOS`
-                    }
+        const actions:any[] = [
+            {
+                account: "eosio",
+                name: "withdraw",
+                authorization: [WharfService.session?.permissionLevel],
+                data: {
+                    owner: WharfService.session?.actor,
+                    amount: `${totalEos} EOS`
                 }
-            ]
+            }
+        ]
+
+        if(claimable > 0){
+            actions.unshift({
+                account: "eosio",
+                name: "sellrex",
+                authorization: [WharfService.session?.permissionLevel],
+                data: {
+                    from: WharfService.session?.actor,
+                    rex: `${claimable.toFixed(4)} REX`
+                },
+            })
+        }
+
+        return WharfService.session?.transact({
+            actions: actions as any
         }).then(x => {
-            success(`Successfully claimed ${claimable} EOS!`);
+            success(`Successfully claimed ${totalEos} EOS!`);
             return x;
         }).catch(err => {
             console.error(err)

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@ export const readableNumber = (num: number) => {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`export const commaNumber = (num: any) => {`
	`15`	`+ if(isNaN(num) \|\| num === null \|\| num === undefined) return 0;`
`15`	`16`	`return parseFloat(num).toLocaleString();`
`16`	`17`	`}`