feat: 董事会

src/App.tsx

@@ -8,6 +8,8 @@ import { usePollCoreFarmData, useFetchProfile, usePollBlockNumber } from 'state/
 import { DatePickerPortal } from 'components/DatePicker'
 import { initAxios } from 'utils/request'
 import useToast from 'hooks/useToast'
+import { fetchUserInfo } from 'state/actions'
+import { useAccount } from 'state/userInfo/hooks'
 import GlobalStyle from './style/Global'
 import Menu from './components/Menu'
 import SuspenseWithChunkError from './components/SuspenseWithChunkError'
@@ -64,10 +66,14 @@ const App: React.FC = () => {
   usePollCoreFarmData()
   const dispatch = useDispatch()
   const toast = useToast()
+  const account = useAccount()
 
   useEffect(() => {
     initAxios(dispatch, toast)
-  })
+  }, [])
+  useEffect(() => {
+    account && dispatch(fetchUserInfo())
+  }, [account])
 
   return (
     <Router history={history}>

src/components/Menu/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useState, useMemo } from 'react'
 import { Menu as UikitMenu, ConnectorNames } from '@pancakeswap/uikit'
 import { useWeb3React } from '@web3-react/core'
 import { languageList } from 'config/localization/languages'
@@ -7,7 +7,7 @@ import useTheme from 'hooks/useTheme'
 import useAuth from 'hooks/useAuth'
 import { useDispatch } from 'react-redux'
 import { usePriceCakeBusd, useProfile } from 'state/hooks'
-import { useUnactiveAccount, useSignLogin, useAccount } from 'state/userInfo/hooks'
+import { useUnactiveAccount, useSignLogin, useAccount, useUserInfo } from 'state/userInfo/hooks'
 import useWeb3Provider from 'hooks/useActiveWeb3React'
 import { clearUserInfo } from 'state/actions'
 import config from './config'
@@ -22,7 +22,11 @@ const Menu = (props) => {
   const unActiveAccount = useUnactiveAccount()
   const dispatch = useDispatch()
   const { profile } = useProfile()
+  const userInfo = useUserInfo()
   const { currentLanguage, setLanguage, t } = useTranslation()
+  const inviteUrl = useMemo(() => {
+    return userInfo?.inviteCode ? `${window.location.origin}?inviteCode=${userInfo.inviteCode}` : window.location.origin
+  }, [userInfo])
   const sign = useSignLogin()
   const handleLogin = async (connectorID: ConnectorNames) => {
     await login(connectorID)
@@ -43,6 +47,7 @@ const Menu = (props) => {
     <UikitMenu
       account={account}
       login={handleLogin}
+      inviteUrl={inviteUrl}
       logout={handleLogout}
       isDark={isDark}
       toggleTheme={toggleTheme}

src/config/abi/board.json

@@ -1,21 +1,9 @@
 [
   {
     "inputs": [
-			{
+      { "internalType": "contract IERC20", "name": "_HCC", "type": "address" },
-				"internalType": "contract IERC20",
+      { "internalType": "address", "name": "_HCCBODReawardPool", "type": "address" },
-				"name": "_HCC",
+      { "internalType": "uint256", "name": "_minStakeAmount", "type": "uint256" }
-				"type": "address"
-			},
-			{
-				"internalType": "address",
-				"name": "_HCCBODReawardPool",
-				"type": "address"
-			},
-			{
-				"internalType": "uint256",
-				"name": "_minStakeAmount",
-				"type": "uint256"
-			}
     ],
     "stateMutability": "nonpayable",
     "type": "constructor"
@@ -23,18 +11,8 @@
   {
     "anonymous": false,
     "inputs": [
-			{
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
-				"indexed": true,
+      { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }
-				"internalType": "address",
-				"name": "user",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "value",
-				"type": "uint256"
-			}
     ],
     "name": "Deposit",
     "type": "event"
@@ -42,18 +20,8 @@
   {
     "anonymous": false,
     "inputs": [
-			{
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
-				"indexed": true,
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
-				"internalType": "address",
-				"name": "user",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "amount",
-				"type": "uint256"
-			}
     ],
     "name": "EmergencyWithdraw",
     "type": "event"
@@ -61,76 +29,44 @@
   {
     "anonymous": false,
     "inputs": [
-			{
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
-				"indexed": true,
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
-				"internalType": "address",
+    ],
-				"name": "previousOwner",
+    "name": "Harvest",
-				"type": "address"
+    "type": "event"
   },
   {
-				"indexed": true,
+    "anonymous": false,
-				"internalType": "address",
+    "inputs": [
-				"name": "newOwner",
+      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
-				"type": "address"
+      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
-			}
     ],
     "name": "OwnershipTransferred",
     "type": "event"
   },
   {
     "anonymous": false,
-		"inputs": [
+    "inputs": [{ "indexed": false, "internalType": "address", "name": "newHCCBODReawardPool", "type": "address" }],
-			{
-				"indexed": false,
-				"internalType": "address",
-				"name": "newHCCBODReawardPool",
-				"type": "address"
-			}
-		],
     "name": "SetHCCBODReawardPoolEvent",
     "type": "event"
   },
   {
     "anonymous": false,
-		"inputs": [
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "newLockTime", "type": "uint256" }],
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "newLockTime",
-				"type": "uint256"
-			}
-		],
     "name": "SetLockTimeEvent",
     "type": "event"
   },
   {
     "anonymous": false,
-		"inputs": [
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "newMinStakeAmount", "type": "uint256" }],
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "newMinStakeAmount",
-				"type": "uint256"
-			}
-		],
     "name": "SetMinStakeAmontEvent",
     "type": "event"
   },
   {
     "anonymous": false,
     "inputs": [
-			{
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
-				"indexed": true,
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
-				"internalType": "address",
-				"name": "user",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"internalType": "uint256",
-				"name": "amount",
-				"type": "uint256"
-			}
     ],
     "name": "Withdraw",
     "type": "event"
@@ -138,26 +74,14 @@
   {
     "inputs": [],
     "name": "HCC",
-		"outputs": [
+    "outputs": [{ "internalType": "contract IERC20", "name": "", "type": "address" }],
-			{
-				"internalType": "contract IERC20",
-				"name": "",
-				"type": "address"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "HCCBODReawardPool",
-		"outputs": [
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-			{
-				"internalType": "address",
-				"name": "",
-				"type": "address"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
@@ -165,223 +89,97 @@
     "inputs": [],
     "name": "_poolInfo",
     "outputs": [
-			{
+      { "internalType": "uint256", "name": "accHCCPerShare", "type": "uint256" },
-				"internalType": "uint256",
+      { "internalType": "uint256", "name": "totalAmount", "type": "uint256" }
-				"name": "accHCCPerShare",
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256",
-				"name": "totalAmount",
-				"type": "uint256"
-			}
     ],
     "stateMutability": "view",
     "type": "function"
   },
   {
-		"inputs": [
+    "inputs": [{ "internalType": "uint256", "name": "_amount", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "_amount",
-				"type": "uint256"
-			},
-			{
-				"internalType": "address",
-				"name": "_userAddress",
-				"type": "address"
-			}
-		],
     "name": "deposit",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
-	{
+  { "inputs": [], "name": "emergencyWithdrawHCC", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
-		"inputs": [],
+  { "inputs": [], "name": "harvest", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
-		"name": "emergencyWithdrawHCC",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
   {
     "inputs": [],
     "name": "lockTime",
-		"outputs": [
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "",
-				"type": "uint256"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "minStakeAmount",
-		"outputs": [
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "",
-				"type": "uint256"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "owner",
-		"outputs": [
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-			{
-				"internalType": "address",
-				"name": "",
-				"type": "address"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [],
     "name": "paused",
-		"outputs": [
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-			{
-				"internalType": "bool",
-				"name": "",
-				"type": "bool"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
   {
-		"inputs": [
+    "inputs": [{ "internalType": "address", "name": "_user", "type": "address" }],
-			{
-				"internalType": "address",
-				"name": "_user",
-				"type": "address"
-			}
-		],
     "name": "pendingHCC",
-		"outputs": [
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "",
-				"type": "uint256"
-			}
-		],
     "stateMutability": "view",
     "type": "function"
   },
+  { "inputs": [], "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
   {
-		"inputs": [],
+    "inputs": [{ "internalType": "address", "name": "_HCCBODReawardPool", "type": "address" }],
-		"name": "renounceOwnership",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "_HCCBODReawardPool",
-				"type": "address"
-			}
-		],
     "name": "setHCCBODReawardPool",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
-		"inputs": [
+    "inputs": [{ "internalType": "uint256", "name": "_lockTime", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "_lockTime",
-				"type": "uint256"
-			}
-		],
     "name": "setLockTime",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
-		"inputs": [
+    "inputs": [{ "internalType": "uint256", "name": "_minStakeAmount", "type": "uint256" }],
-			{
-				"internalType": "uint256",
-				"name": "_minStakeAmount",
-				"type": "uint256"
-			}
-		],
     "name": "setMinStakeAmount",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  { "inputs": [], "name": "setPause", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
   {
-		"inputs": [],
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
-		"name": "setPause",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "newOwner",
-				"type": "address"
-			}
-		],
     "name": "transferOwnership",
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  { "inputs": [], "name": "updatePool", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
   {
-		"inputs": [],
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-		"name": "updatePool",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"internalType": "address",
-				"name": "",
-				"type": "address"
-			}
-		],
     "name": "userInfo",
     "outputs": [
-			{
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
-				"internalType": "uint256",
+      { "internalType": "uint256", "name": "rewardDebt", "type": "uint256" },
-				"name": "amount",
+      { "internalType": "uint256", "name": "unLockTime", "type": "uint256" }
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256",
-				"name": "rewardDebt",
-				"type": "uint256"
-			},
-			{
-				"internalType": "uint256",
-				"name": "unLockTime",
-				"type": "uint256"
-			}
     ],
     "stateMutability": "view",
     "type": "function"
   },
-	{
+  { "inputs": [], "name": "withdrawHCC", "outputs": [], "stateMutability": "nonpayable", "type": "function" }
-		"inputs": [],
-		"name": "withdrawHCC",
-		"outputs": [],
-		"stateMutability": "nonpayable",
-		"type": "function"
-	}
 ]

src/config/abi/holder.json

@@ -0,0 +1,170 @@
+[
+  {
+    "inputs": [
+      { "internalType": "contract IERC20", "name": "_HCC", "type": "address" },
+      { "internalType": "address", "name": "_HCCStakeReawardPool", "type": "address" },
+      { "internalType": "uint256", "name": "_minStakeAmount", "type": "uint256" }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" }
+    ],
+    "name": "Deposit",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "EmergencyWithdraw",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "Harvest",
+    "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": false, "internalType": "address", "name": "newHCCStakeReawardPool", "type": "address" }],
+    "name": "SetHCCStakeReawardPoolEvent",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "newLockTime", "type": "uint256" }],
+    "name": "SetLockTimeEvent",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "newMinStakeAmount", "type": "uint256" }],
+    "name": "SetMinStakeAmontEvent",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "internalType": "address", "name": "user", "type": "address" },
+      { "indexed": false, "internalType": "uint256", "name": "amount", "type": "uint256" }
+    ],
+    "name": "Withdraw",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "HCC",
+    "outputs": [{ "internalType": "contract IERC20", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "HCCStakeReawardPool",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "_poolInfo",
+    "outputs": [
+      { "internalType": "uint256", "name": "accHCCPerShare", "type": "uint256" },
+      { "internalType": "uint256", "name": "totalAmount", "type": "uint256" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_amount", "type": "uint256" }],
+    "name": "deposit",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  { "inputs": [], "name": "emergencyWithdrawHCC", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  { "inputs": [], "name": "harvest", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [],
+    "name": "minStakeAmount",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "paused",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "address", "name": "_user", "type": "address" }],
+    "name": "pendingHCC",
+    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  { "inputs": [], "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [{ "internalType": "address", "name": "_HCCStakeReawardPool", "type": "address" }],
+    "name": "setHCCStakeReawardPool",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [{ "internalType": "uint256", "name": "_minStakeAmount", "type": "uint256" }],
+    "name": "setMinStakeAmount",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  { "inputs": [], "name": "setPause", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
+    "name": "transferOwnership",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  { "inputs": [], "name": "updatePool", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
+  {
+    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
+    "name": "userInfo",
+    "outputs": [
+      { "internalType": "uint256", "name": "amount", "type": "uint256" },
+      { "internalType": "uint256", "name": "rewardDebt", "type": "uint256" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  { "inputs": [], "name": "withdrawHCC", "outputs": [], "stateMutability": "nonpayable", "type": "function" }
+]

src/config/constants/boards.ts

@@ -1,5 +1,6 @@
 import addresses from 'config/constants/contracts'
-import boardChef from 'config/abi/board.json'
+import boardAbi from 'config/abi/board.json'
+import holderAbi from 'config/abi/holder.json'
 import tokens from './tokens'
 import { BoardConfig } from './types'
 
@@ -12,7 +13,17 @@ const bordsList: BoardConfig[] = [
     tokenAddresses: tokens.hcc.address,
     tokenDecimals: 18,
     contractAddress: addresses.boardChef,
-    abi: boardChef,
+    abi: boardAbi,
+  },
+  {
+    pid: 2,
+    name: 'Holder',
+    img: 'nodes',
+    tokenSymbol: tokens.hcc.symbol,
+    tokenAddresses: tokens.hcc.address,
+    tokenDecimals: 18,
+    contractAddress: addresses.holderChef,
+    abi: holderAbi,
   },
 ]
 

src/config/constants/contracts.ts

@@ -8,9 +8,13 @@ export default {
     56: '0x6ab8463a4185b80905e05a9ff80a2d6b714b9e95',
   },
   boardChef: {
-    97: '0x0dF74009bF2b85b2B19FC7aF67DD5AAF2cde4Ce0',
+    97: '0x88fd1e29160f6d498038254f1bd0f7729f812fa1',
     56: '0xD34871F12ace1BB8034E18009104b9dA60B84250', // NEED CHANGE 节点董事会合约
   },
+  holderChef: {
+    97: '0x0373aa1d09d58bb789db694d6b944b052ff26d91',
+    56: '0xD34871F12ace1BB8034E18009104b9dA60B84250', // NEED CHANGE 持币人
+  },
   referralChef: {
     97: '0xE79D28722220fcC13833476E327DEA3a663f64DB',
     56: '0x88F46EF2Ee08494D84942DCA3bd24cDEf7C88Ae2', // NEED CHANGE 邀请或则军团长

src/state/actions.ts

@@ -10,7 +10,7 @@ export {
   updateUserPendingReward,
   updateUserStakedBalance,
 } from './pools'
-export { setUserInfo, clearUserInfo } from './userInfo'
+export { setUserInfo, clearUserInfo, fetchUserInfo } from './userInfo'
 export { fetchReferralInfoAsync } from './referral'
 export { fetchBoardsPublicDataAsync, fetchBoardUserDataAsync } from './boards'
 export { profileFetchStart, profileFetchSucceeded, profileFetchFailed } from './profile'

src/state/boards/fetchBoards.ts

@@ -1,6 +1,5 @@
 import BigNumber from 'bignumber.js'
 import erc20 from 'config/abi/erc20.json'
-import boardchefABI from 'config/abi/board.json'
 import multicall from 'utils/multicall'
 import { getAddress, getBoardAddress } from 'utils/addressHelpers'
 import boardsConfig from 'config/constants/boards'
@@ -26,8 +25,11 @@ const fetchBoards = async () => {
       // eslint-disable-next-line prefer-const
       let [tokenBalance, tokenDecimals] = await multicall(erc20, calls)
       tokenBalance = new BigNumber(tokenBalance).div(new BigNumber(10).pow(tokenDecimals))
-      // eslint-disable-next-line prefer-const
+      let minStakeAmount = 0
-      let [minStakeAmount, lockTime] = await multicall(boardConfig.abi, [
+      let lockTime = 0
+      if (boardConfig.pid === 1) {
+        // prettier-ignore
+        [minStakeAmount, lockTime] = await multicall(boardConfig.abi, [
           // 最低质押额度
           {
             address: BoardChefAddress,
@@ -39,9 +41,20 @@ const fetchBoards = async () => {
             name: 'lockTime',
           },
         ])
-      lockTime = new BigNumber(lockTime).toJSON()
+      } else {
-      console.log(lockTime)
+        // prettier-ignore
-      minStakeAmount = new BigNumber(minStakeAmount).div(new BigNumber(10).pow(tokenDecimals)).toJSON()
+        [minStakeAmount] = await multicall(boardConfig.abi, [
+          // 最低质押额度
+          {
+            address: BoardChefAddress,
+            name: 'minStakeAmount',
+          },
+        ])
+        lockTime = 0
+      }
+
+      lockTime = new BigNumber(lockTime).toNumber()
+      minStakeAmount = new BigNumber(minStakeAmount).div(new BigNumber(10).pow(tokenDecimals)).toNumber()
       return {
         ...boardConfig,
         tokenBalance: tokenBalance.toJSON(),

src/state/boards/fetchBoardsUser.ts

@@ -52,10 +52,11 @@ export const fetchBoardUserInfo = async (account: string) => {
           params: [account],
         },
       ]
-      const [userInfo, estimatedProfit] = await multicall(boardABI, calls)
+      const [userInfo, estimatedProfit] = await multicall(board.abi, calls)
+      console.log(estimatedProfit)
       return {
         stakedBalance: new BigNumber(userInfo.amount._hex).toJSON(),
-        unLockTime: new BigNumber(userInfo.unLockTime._hex).toNumber(),
+        unLockTime: userInfo.unLockTime ? new BigNumber(userInfo.unLockTime._hex).toNumber() : 0,
         estimatedProfit: new BigNumber(estimatedProfit).toJSON(),
       }
     }),

src/state/types.ts

@@ -477,19 +477,9 @@ export type UserTicketsResponse = [ethers.BigNumber[], number[], boolean[]]
 
 export interface UserInfo {
   id?: number
-  avatar?: string
+  inviteCode?: string
   name?: string
   address?: string
-  description?: string
-  invite_num?: string
-  invite_link?: string
-  email?: string
-  twitter?: string
-  facebook?: string
-  invite_code?: string
-  scoring_account?: number
-  invite_reward?: number
-  inviter_address?: string
 }
 export interface UserInfoState {
   userInfo: UserInfo
@@ -509,12 +499,12 @@ export interface ReferralState {
   data: Referral
 }
 export interface Boards extends BoardConfig {
-  tokenAmount?: BigNumber
+  tokenAmount?: number
   minStakeAmount?: number
   userData?: {
-    allowance: BigNumber
+    allowance: number
-    tokenBalance: BigNumber
+    tokenBalance: number
-    stakedBalance: BigNumber
+    stakedBalance: number
     unlockTime: number
     estimatedProfit: number
   }

src/state/userInfo/hooks.ts

@@ -30,10 +30,6 @@ export const useUserInfo = () => {
   return useSelector((state: State) => state.userInfo.userInfo)
 }
 
-export const useUserPortrait = () => {
-  const userInfo = useSelector((state: State) => state.userInfo.userInfo)
-  return userInfo?.avatar || '/images/common/portrait.png'
-}
 // 签名登录
 export const useSignLogin = () => {
   const unActiveAccount = useUnactiveAccount()

src/utils/calls/boards.ts

@@ -7,15 +7,13 @@ const options = {
 
 export const stakeBoard = async (masterChefContract, pid, amount) => {
   const value = new BigNumber(amount).times(DEFAULT_TOKEN_DECIMAL).toString()
-
+  const tx = await masterChefContract.deposit(value, options)
-  const tx = await masterChefContract.deposit(pid, value, options)
   const receipt = await tx.wait()
   return receipt.status
 }
 
-export const unstakeBoard = async (masterChefContract, pid, amount) => {
+export const unstakeBoard = async (masterChefContract) => {
-  const value = new BigNumber(amount).times(DEFAULT_TOKEN_DECIMAL).toString()
+  const tx = await masterChefContract.withdrawHCC(options)
-  const tx = await masterChefContract.withdrawHCC(pid, value, options)
   const receipt = await tx.wait()
   return receipt.status
 }

src/utils/formatBalance.ts

@@ -10,14 +10,14 @@ export const getDecimalAmount = (amount: BigNumber, decimals = 18) => {
   return new BigNumber(amount).times(BIG_TEN.pow(decimals))
 }
 
-export const getBalanceAmount = (amount: BigNumber, decimals = 18) => {
+export const getBalanceAmount = (amount: BigNumber | number, decimals = 18) => {
   return new BigNumber(amount).dividedBy(BIG_TEN.pow(decimals))
 }
 
 /**
  * This function is not really necessary but is used throughout the site.
  */
-export const getBalanceNumber = (balance: BigNumber, decimals = 18, decimalPlaces?: number) => {
+export const getBalanceNumber = (balance: BigNumber | number, decimals = 18, decimalPlaces?: number) => {
   const displayBalance = getBalanceAmount(balance, decimals)
   return decimalPlaces ? displayBalance.decimalPlaces(decimalPlaces).toNumber() : displayBalance.toNumber()
 }

src/utils/request.ts

@@ -14,7 +14,7 @@ export const initAxios = (dispatch: Dispatch<any>, toast) => {
   hasInit = true
   request.interceptors.request.use(
     (memo: any) => {
-      memo.headers.token = localStorage.getItem(CACHE_TOKEN)
+      memo.headers.Authorization = `Bearer ${localStorage.getItem(CACHE_TOKEN)} `
       return memo
     },
     (error) => {

src/views/Board/components/BoardCard/CardActionsContainer.tsx

@@ -47,6 +47,14 @@ const CardActions: React.FC<NodeCardActionsProps> = ({ board, account }) => {
   const renderApprovalOrStakeButton = () => {
     return isApproved ? (
       <>
+        <Flex>
+          <Text bold textTransform="uppercase" color="secondary" fontSize="12px" pr="3px">
+            {board.tokenSymbol}
+          </Text>
+          <Text bold textTransform="uppercase" color="textSubtle" fontSize="12px">
+            {t('Staked')}
+          </Text>
+        </Flex>
         <StakeAction stakedBalance={stakedBalance} tokenBalance={tokenBalance} pid={pid} />
         <Flex flexDirection="column" alignItems="flex-start" mt="10">
           <Flex>
@@ -66,19 +74,7 @@ const CardActions: React.FC<NodeCardActionsProps> = ({ board, account }) => {
     )
   }
 
-  return (
+  return <Action>{!account ? <UnlockButton mt="8px" width="100%" /> : renderApprovalOrStakeButton()}</Action>
-    <Action>
-      <Flex>
-        <Text bold textTransform="uppercase" color="secondary" fontSize="12px" pr="3px">
-          {board.tokenSymbol}
-        </Text>
-        <Text bold textTransform="uppercase" color="textSubtle" fontSize="12px">
-          {t('Staked')}
-        </Text>
-      </Flex>
-      {!account ? <UnlockButton mt="8px" width="100%" /> : renderApprovalOrStakeButton()}
-    </Action>
-  )
 }
 
 export default CardActions

src/views/Board/components/BoardCard/StakeAction.tsx

@@ -53,21 +53,24 @@ const StakeAction: React.FC<NodeCardActionsProps> = ({ stakedBalance, tokenBalan
     const unlockTime = userData.unlockTime * 1000
     if (unlockTime > new Date().getTime()) {
       toastWarning(t('Unlock time %unlockTime%', { unlockTime: dayjs(unlockTime).format('YYYY-MM-DD HH:mm') }))
-      // return
+      return
     }
-    // onUnstake()
+    onUnstake()
   }
   const renderStakingButtons = () => {
     return rawStakedBalance === 0 ? (
       <Button onClick={onPresentDeposit}>{t(`Stake Token`)}</Button>
     ) : (
       <IconButtonWrapper>
-        <IconButton variant="tertiary" onClick={handleUnstake} mr="6px">
+        {userData.stakedBalance > 0 ? (
+          <IconButton variant="tertiary" onClick={handleUnstake}>
             <MinusIcon color="primary" />
           </IconButton>
-        <IconButton variant="tertiary" onClick={onPresentDeposit}>
+        ) : (
+          <IconButton variant="tertiary" onClick={onPresentDeposit} ml="6px">
             <AddIcon color="primary" />
           </IconButton>
+        )}
       </IconButtonWrapper>
     )
   }

src/views/Board/hooks/useUnstakeBoard.ts

@@ -5,12 +5,9 @@ import { useBoardchef } from 'hooks/useContract'
 const useUnstakeBoard = (pid: number) => {
   const boardChefContract = useBoardchef(pid)
 
-  const handleUnstake = useCallback(
+  const handleUnstake = useCallback(async () => {
-    async (amount: string) => {
+    await unstakeBoard(boardChefContract)
-      await unstakeBoard(boardChefContract, pid, amount)
+  }, [boardChefContract, pid])
-    },
-    [boardChefContract, pid],
-  )
 
   return { onUnstake: handleUnstake }
 }

src/views/Board/index.tsx

@@ -27,7 +27,7 @@ const Header = styled.div`
 const SecondText = styled(Text)`
   white-space: break-spaces;
 `
-const Farms: React.FC = () => {
+const Boards: React.FC = () => {
   const { t } = useTranslation()
   const boardsList = useBoards()
   const [query, setQuery] = useState('')
@@ -42,16 +42,11 @@ const Farms: React.FC = () => {
     }
   }, [account, dispatch, fastRefresh])
 
-  const farmsList = useMemo(() => {
-    return boardsList.map((board) => {
-      return board
-    })
-  }, [boardsList])
   const renderContent = (): JSX.Element => {
     return (
       <div>
         <FlexLayout>
-          {farmsList.map((board) => (
+          {boardsList.map((board) => (
             <BoardCard key={board.pid} board={board} account={account} removed />
           ))}
         </FlexLayout>
@@ -76,4 +71,4 @@ const Farms: React.FC = () => {
   )
 }
 
-export default Farms
+export default Boards

src/views/Home/HomeIndex.tsx

@@ -1,11 +1,19 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { useTranslation } from 'contexts/Localization'
+import { CACHE_INVITE_CODE } from 'config/constants/cacheKey'
+import useParsedQueryString from 'hooks/useParsedQueryString'
 import FristCom from './components/FristCom'
 import IntroduceCom from './components/IntroduceCom'
 import CourseCom from './components/CourseCom'
 
 const Home: React.FC = () => {
   const { t } = useTranslation()
+  const { inviteCode } = useParsedQueryString()
+  useEffect(() => {
+    if (inviteCode) {
+      sessionStorage.setItem(CACHE_INVITE_CODE, inviteCode as string)
+    }
+  }, [])
 
   return (
     <>