Merge pull request #283 from skalenetwork/update-community-pool-logic

Update community pool logic, remove legacy components

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skalenetwork/metaport",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "SKALE Metaport Widget",
   "keywords": [
     "skale",
@@ -101,4 +101,4 @@
       "prettier -w"
     ]
   }
-}
+}

src/components/CommunityPool.tsx

@@ -44,6 +44,7 @@ import { fromWei } from '../core/convertation'
 import { withdraw, recharge } from '../core/community_pool'
 import {
   BALANCE_UPDATE_INTERVAL_MS,
+  COMMUNITY_POOL_DECIMALS,
   DEFAULT_ERC20_DECIMALS,
   MINIMUM_RECHARGE_AMOUNT
 } from '../core/constants'
@@ -126,9 +127,9 @@ export default function CommunityPool() {
     if (loading === 'recharge') return 'Recharging...'
     if (loading === 'activate') return 'Activating account...'
     if (Number(amount) > Number(accountBalanceEther)) return 'Insufficient ETH balance'
+    if (amount === '' || amount === '0' || !amount) return 'Enter an amount'
     if (Number(amount) < MINIMUM_RECHARGE_AMOUNT)
       return `Recharge amount should be bigger than ${MINIMUM_RECHARGE_AMOUNT}`
-    if (amount === '' || amount === '0' || !amount) return 'Enter an amount'
     return 'Recharge exit gas wallet'
   }
 
@@ -210,7 +211,7 @@ export default function CommunityPool() {
                 <TokenBalance
                   balance={cpData.accountBalance}
                   symbol="ETH"
-                  truncate={4}
+                  truncate={COMMUNITY_POOL_DECIMALS}
                   size="sm"
                   primary
                 />
@@ -224,7 +225,7 @@ export default function CommunityPool() {
                 <TokenBalance
                   balance={cpData.balance}
                   symbol="ETH"
-                  truncate={4}
+                  truncate={COMMUNITY_POOL_DECIMALS}
                   size="sm"
                   primary
                 />

src/core/community_pool.ts

@@ -38,10 +38,11 @@ import {
   RECHARGE_MULTIPLIER,
   MINIMUM_RECHARGE_AMOUNT,
   COMMUNITY_POOL_WITHDRAW_GAS_LIMIT,
+  COMMUNITY_POOL_ESTIMATE_GAS_LIMIT,
   DEFAULT_ERROR_MSG,
   BALANCE_UPDATE_INTERVAL_MS
 } from './constants'
-import { delay } from './helper'
+import { delay, roundUp } from './helper'
 import MetaportCore from './metaport'
 
 import * as dataclasses from '../core/dataclasses'
@@ -83,14 +84,21 @@ export async function getCommunityPoolData(
   const chainHash = ethers.id(chainName1)
   const activeM = await mainnet.communityPool.contract.activeUsers(address, chainHash)
 
+  const feeData = await mainnet.communityPool.contract.runner.provider.getFeeData()
   const rraWei = await mainnet.communityPool.contract.getRecommendedRechargeAmount(
     chainHash,
-    address
+    address,
+    {
+      gasPrice: feeData.gasPrice,
+      gasLimit: COMMUNITY_POOL_ESTIMATE_GAS_LIMIT
+    }
   )
   const rraEther = fromWei(rraWei as string, DEFAULT_ERC20_DECIMALS)
 
-  let recommendedAmount = parseFloat(rraEther as string) * RECHARGE_MULTIPLIER
-  if (recommendedAmount < MINIMUM_RECHARGE_AMOUNT) recommendedAmount = MINIMUM_RECHARGE_AMOUNT
+  let recommendedAmount = roundUp(parseFloat(rraEther as string) * RECHARGE_MULTIPLIER)
+  if (recommendedAmount < MINIMUM_RECHARGE_AMOUNT && recommendedAmount !== 0) {
+    recommendedAmount = MINIMUM_RECHARGE_AMOUNT
+  }
 
   const communityPoolData = {
     exitGasOk: activeM && activeS && rraWei === 0n,

src/core/constants.ts

@@ -104,11 +104,13 @@ export const FAUCET_DATA = faucetJson
 
 // community pool
 
-export const RECHARGE_MULTIPLIER = 1.2
-export const MINIMUM_RECHARGE_AMOUNT = 0.005
+export const RECHARGE_MULTIPLIER = 1.1
+export const MINIMUM_RECHARGE_AMOUNT = 0.000005
+export const COMMUNITY_POOL_ESTIMATE_GAS_LIMIT = 1000000n
 export const COMMUNITY_POOL_WITHDRAW_GAS_LIMIT = 150000n
 export const _BALANCE_UPDATE_INTERVAL_SECONDS = 10
 export const BALANCE_UPDATE_INTERVAL_MS = _BALANCE_UPDATE_INTERVAL_SECONDS * 1000
+export const COMMUNITY_POOL_DECIMALS = 6
 
 export const SFUEL_RESERVE_AMOUNT = 0.01
 

src/core/helper.ts

@@ -23,7 +23,7 @@
 
 import { getAddress } from 'ethers'
 
-import { MAINNET_CHAIN_NAME } from './constants'
+import { COMMUNITY_POOL_DECIMALS, MAINNET_CHAIN_NAME } from './constants'
 import { TransferRequestStatus } from './dataclasses'
 
 export function eqArrays(arr1, arr2) {
@@ -67,3 +67,13 @@ export function sortObjectByKeys(obj: { [key: string]: any }): { [key: string]:
 
   return sortedObject
 }
+
+export function roundDown(num: number, decimals: number = COMMUNITY_POOL_DECIMALS): number {
+  decimals = decimals || 0
+  return Math.floor(num * Math.pow(10, decimals)) / Math.pow(10, decimals)
+}
+
+export function roundUp(num: number, decimals: number = COMMUNITY_POOL_DECIMALS): number {
+  const factor = Math.pow(10, decimals)
+  return Math.round(num * factor) / factor
+}

src/index.ts

@@ -23,8 +23,6 @@ import TokenBalance from './components/TokenBalance'
 import AmountInput from './components/AmountInput'
 import SwitchDirection from './components/SwitchDirection'
 import SkStepper from './components/Stepper'
-import TransferETF from './components/TransferETF'
-import TransferETA from './components/TransferETA'
 import AmountErrorMessage from './components/AmountErrorMessage'
 import DestTokenBalance from './components/DestTokenBalance'
 import ErrorMessage from './components/ErrorMessage'
@@ -45,7 +43,6 @@ import { ERC_ABIS } from './core/contracts'
 import { sendTransaction } from './core/transactions'
 import { Station, StationData } from './core/sfuel'
 
-
 import { getWidgetTheme as getMetaportTheme } from './core/themes'
 
 import {
@@ -78,8 +75,6 @@ export {
   AmountInput,
   SwitchDirection,
   SkStepper,
-  TransferETF,
-  TransferETA,
   AmountErrorMessage,
   TokenBalance,
   DestTokenBalance,