diff --git a/env.md b/env.md index 436050e..ec2dd1a 100644 --- a/env.md +++ b/env.md @@ -1,4 +1,4 @@ SKIP_PREFLIGHT_CHECK=true GENERATE_SOURCEMAP=false -REACT_APP_CHAINID=97 -REACT_APP_DAY_TIME=60 \ No newline at end of file +REACT_APP_CHAINID=56 +REACT_APP_DAY_TIME=86400 diff --git a/package.json b/package.json index 9b19972..d148b89 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "build": "node scripts/build.js", "test": "node scripts/test.js", "deploy:dev": "npm run build && scp -r ./build/* vps:/home/ubuntu/pzy/sofil", + "deploy:test": "npm run build && scp -r ./build/* dcfilefast_prod:/home/web/code/test-app.sofil.io", "deploy:prod": "npm run build && scp -r ./build/* vpsDcminer:/data/wwwroot/sofil" }, "eslintConfig": { diff --git a/src/assets/menu/menu-bg-1.png b/src/assets/menu/menu-bg-1.png index 10be911..cd51ca1 100644 Binary files a/src/assets/menu/menu-bg-1.png and b/src/assets/menu/menu-bg-1.png differ diff --git a/src/contract/api.ts b/src/contract/api.ts index 4c73af6..ac812e6 100644 --- a/src/contract/api.ts +++ b/src/contract/api.ts @@ -8,9 +8,10 @@ import { } from "~/types/api.d"; import { toFixed2 } from "~/utils"; import { fromWei, toBigInt, toWei } from "~/utils/wei"; +import { Pledge } from "./typechain-types"; const { _contract } = store.state.contract; -const { Pledge__factory } = _contract; +const Pledge__factory =(_contract ? _contract.Pledge__factory : {} ) as Pledge; const eth_pledgeRecords = async (_owner: string) => { const _recordPs = Pledge__factory.getPledgeRecords(_owner); //質押記錄 diff --git a/src/contract/index.tsx b/src/contract/index.ts similarity index 55% rename from src/contract/index.tsx rename to src/contract/index.ts index 84b68a9..9eef003 100644 --- a/src/contract/index.tsx +++ b/src/contract/index.ts @@ -5,16 +5,16 @@ import store from '~/store'; import { ContractType } from '~/types/store'; // 0x7a89c2D92Bf53160ab58d7889966741cA8Eb5855 export const config = { - 56: { - chainId: 56, - rpc: "https://bsc-dataseed1.defibit.io", - address: { - FIL__factory: "0x0d8ce2a99bb6e3b7db580ed848240e4a0f9ae153", - NFT__factory: "0x5fd156B6B47Bb0B363fa3D4e2E31a8394Ee7A630", - Pool__factory: "0xC31cEb39961076d8fAD3936D88489972c02b4D83", - Pledge__factory: "0x2F3d8761c8214627743F84F9890A8eEeD914ddf1", - } - }, + // 56: { + // chainId: 56, + // rpc: "https://bsc-dataseed1.defibit.io", + // address: { + // FIL__factory: "0x0d8ce2a99bb6e3b7db580ed848240e4a0f9ae153", + // NFT__factory: "0x5fd156B6B47Bb0B363fa3D4e2E31a8394Ee7A630", + // Pool__factory: "0xC31cEb39961076d8fAD3936D88489972c02b4D83", + // Pledge__factory: "0x2F3d8761c8214627743F84F9890A8eEeD914ddf1", + // } + // }, 97: { chainId: 97, rpc: "https://bsc-testnet.blockpi.network/v1/rpc/public", @@ -34,7 +34,7 @@ export const config = { Pool__factory: "0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9", Pledge__factory: "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707", } - } + }, } as any // 57.333333333333333332 const contractObj = { @@ -75,42 +75,46 @@ const switchNetWork = () => { export const initContract = async () => { - let chainId = Number(process.env.REACT_APP_CHAINID); - let account = [] as string[]; + try { + let chainId = Number(process.env.REACT_APP_CHAINID); + let account = [] as string[]; - let _contract: { [key: string]: any } = { - _contract: {}, - _provider: null - }; + let _contract: { [key: string]: any } = { + _contract: {}, + _provider: null + }; - if (window.ethereum) { - account = await window.ethereum.request({ - method: 'eth_accounts' - }); - chainId = ethers.toNumber(await window.ethereum.request({ - method: 'eth_chainId' - })) - } + if (window.ethereum) { + account = await window.ethereum.request({ + method: 'eth_accounts' + }); + chainId = ethers.toNumber(await window.ethereum.request({ + method: 'eth_chainId' + })) + } + + if (!config[chainId]) { + chainId = Number(process.env.REACT_APP_CHAINID) + }; + + const contractAddress = config[chainId]; + let _provider = null as any; + + if (account.length <= 0) { + _provider = new ethers.JsonRpcProvider(contractAddress.rpc) + } else { + _provider = await new ethers.BrowserProvider(window.ethereum).getSigner() + } + + _contract._provider = _provider; - if(!config[chainId]){ - chainId = Number(process.env.REACT_APP_CHAINID) - }; + Object.keys(contractAddress.address).forEach((item) => { + _contract._contract[item] = contractObj[item].connect(contractAddress.address[item], _provider); + }) + store.setContract(_contract as ContractType); + } catch (error) { - const contractAddress = config[chainId]; - let _provider = null as any; - - if (account.length <= 0) { - _provider = new ethers.JsonRpcProvider(contractAddress.rpc) - } else { - _provider = await new ethers.BrowserProvider(window.ethereum).getSigner() } - - _contract._provider = _provider; - Object.keys(contractAddress.address).forEach((item) => { - _contract._contract[item] = contractObj[item].connect(contractAddress.address[item], _provider); - }) - store.setContract(_contract as ContractType); - } \ No newline at end of file diff --git a/src/language/hk.json b/src/language/hk.json index 1660702..b78f155 100644 --- a/src/language/hk.json +++ b/src/language/hk.json @@ -81,7 +81,7 @@ "WITHDRAW":"提取", "No. of Staking Contracts":"持有的質押合約", "Contract(NFT)":"合約NFT", - "Withdrawable":"可提取總額", + "Withdrawable":"可提取收益", "Maturity Date":"到期日", "Status":"狀態", "Active":"未到期", @@ -90,8 +90,9 @@ "No records":"暫無記錄", "Accumulative Stake":"總質押", "Accumulative Rewards Withdraw":"總提取收益", - "Withdraw":"質押", - "Stake":"提取", + "Accumulative Rewards":"總收益", + "Withdraw":"提取", + "Stake":"質押", "Create Contract(NFT)":"創建合約(NFT)", "Contract Address":"合約地址", "Copy Success":"複製成功", @@ -125,7 +126,7 @@ "Addresses": "錢包地址", "Contributed": "獎勵貢獻", "Binding Time": "綁定時間", - "Contreact(Rewards) Details": "合約(奖励)明細", + "Contract(Rewards) Details": "合約(奖励)明細", "Days Staking": "天質押", "Rewards Details": "收益及提取明細" } \ No newline at end of file diff --git a/src/language/zh.json b/src/language/zh.json index 73d4e7f..161c893 100644 --- a/src/language/zh.json +++ b/src/language/zh.json @@ -81,7 +81,7 @@ "WITHDRAW": "提取", "No. of Staking Contracts": "持有的质押合约", "Contract(NFT)": "合约NFT", - "Withdrawable": "可提取总额", + "Withdrawable": "可提取收益", "Maturity Date": "到期日", "Status": "状态", "Active": "未到期", @@ -90,8 +90,9 @@ "No records": "暂无记录", "Accumulative Stake": "总质押", "Accumulative Rewards Withdraw": "总提取收益", - "Withdraw": "质押", - "Stake": "提取", + "Accumulative Rewards":"总收益", + "Withdraw": "提取", + "Stake": "质押", "Create Contract(NFT)": "创建合约(NFT)", "Contract Address": "合约地址", "Copy Success": "复制成功", @@ -125,7 +126,7 @@ "Addresses": "钱包地址", "Contributed": "奖励贡献", "Binding Time": "绑定时间", - "Contreact(Rewards) Details": "合约(奖励)明细", + "Contract(Rewards) Details": "合约(奖励)明细", "Days Staking": "天质押", "Rewards Details": "收益及提取明细" } diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx index b20ce1b..421d2a3 100644 --- a/src/pages/home/index.tsx +++ b/src/pages/home/index.tsx @@ -5,6 +5,7 @@ import Button from '~/components/Button' import { eth_pledgeProducts } from '~/contract/api' import { useRouter } from '~/hooks/useRouter' import '~/styles/home.scss' +import { openGitBook } from '~/utils' const Home = () => { @@ -109,7 +110,9 @@ const Home = () => {