diff --git a/CHANGELOG.md b/CHANGELOG.md index 760656b3ab..beb859d982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,49 @@ +# [0.25.0](https://github.com/nervosnetwork/neuron/compare/v0.24.5...v0.25.0) (2019-11-16) + + +### Bug Fixes + +* capacity null when calculate bytes ([97ee2a1](https://github.com/nervosnetwork/neuron/commit/97ee2a1)) +* update tx and its outputs in different sqls ([b8fe366](https://github.com/nervosnetwork/neuron/commit/b8fe366)) +* **neuron:** use deposit timestamp to calculate phase2 dao cell apc ([abdab3f](https://github.com/nervosnetwork/neuron/commit/abdab3f)) +* **neuron-ui:** cache the genesis block timestamp in the nervos dao component instead of in global ([5274edd](https://github.com/nervosnetwork/neuron/commit/5274edd)) +* **neuron-ui:** fix the missing field in error message. ([a7dc73b](https://github.com/nervosnetwork/neuron/commit/a7dc73b)) +* **neuron-ui:** fix the missing of password request dialog ([19d07bd](https://github.com/nervosnetwork/neuron/commit/19d07bd)) +* **neuron-ui:** fix the missing word in i18n ([952ae72](https://github.com/nervosnetwork/neuron/commit/952ae72)) +* **neuron-ui:** hide the countdown if the current epoch number is greater than the target epoch number. ([2cded1c](https://github.com/nervosnetwork/neuron/commit/2cded1c)) +* add typeHash when generate dao tx ([ce5e264](https://github.com/nervosnetwork/neuron/commit/ce5e264)) +* **neuron-ui:** remove sort of dao cells ([e501072](https://github.com/nervosnetwork/neuron/commit/e501072)) +* next address order ([fffd2f0](https://github.com/nervosnetwork/neuron/commit/fffd2f0)) + + +### Features + +* Always load genesis hash and chain info when ([761a4a8](https://github.com/nervosnetwork/neuron/commit/761a4a8)) +* ChainInfo delegates Networks Service to get current chain ([0673343](https://github.com/nervosnetwork/neuron/commit/0673343)) +* If genesis hash doesn't match do not proceed to sync ([bd8e4e4](https://github.com/nervosnetwork/neuron/commit/bd8e4e4)) +* Remove ChainInfo moving its feature into NetworksService ([81f1eff](https://github.com/nervosnetwork/neuron/commit/81f1eff)) +* **neuron-ui:** add a guide bubble in connection status ([59f2dd5](https://github.com/nervosnetwork/neuron/commit/59f2dd5)) +* **neuron-ui:** add a guide link to run a ckb mainnet node. ([89aa04c](https://github.com/nervosnetwork/neuron/commit/89aa04c)) +* **neuron-ui:** add difficulty formatter ([#1105](https://github.com/nervosnetwork/neuron/issues/1105)) ([98ba68d](https://github.com/nervosnetwork/neuron/commit/98ba68d)) +* **neuron-ui:** add hint for synchronization not started. ([7d0cc67](https://github.com/nervosnetwork/neuron/commit/7d0cc67)) +* **neuron-ui:** hide the general settings and redirect to wallets setting ([b3e3d0e](https://github.com/nervosnetwork/neuron/commit/b3e3d0e)) +* **neuron-ui:** limit the times of guide bubble to 3 ([9b85589](https://github.com/nervosnetwork/neuron/commit/9b85589)) +* **neuron-ui:** update chain types on launch ([2cb5047](https://github.com/nervosnetwork/neuron/commit/2cb5047)) +* **neuron-ui:** update the hint of withdraw dialog ([0bec01e](https://github.com/nervosnetwork/neuron/commit/0bec01e)) +* **neuron-ui:** update the warning in withdraw dialog. ([e819439](https://github.com/nervosnetwork/neuron/commit/e819439)) +* add depositTimestamp ([108d5b1](https://github.com/nervosnetwork/neuron/commit/108d5b1)) +* Do not allow importing keystore from cli ([1b66ea3](https://github.com/nervosnetwork/neuron/commit/1b66ea3)) +* If chain info couldn't be fetched set as ckb_dev ([17c1715](https://github.com/nervosnetwork/neuron/commit/17c1715)) +* Let addresses regeneration happen before sync task starts ([a52a531](https://github.com/nervosnetwork/neuron/commit/a52a531)) +* Prefer network's chain and genesis hash when syncing ([9b5b52c](https://github.com/nervosnetwork/neuron/commit/9b5b52c)) +* Preset mainnet network configuration ([1979e8a](https://github.com/nervosnetwork/neuron/commit/1979e8a)) +* Set current wallet to null if it's undefined ([6c7117f](https://github.com/nervosnetwork/neuron/commit/6c7117f)) +* Update all networks' chain and genesis hash when NetworkService ([a3ccf2d](https://github.com/nervosnetwork/neuron/commit/a3ccf2d)) +* **neuron-ui:** use calculateGlobalAPC to update Nervos DAO APC ([e96ca61](https://github.com/nervosnetwork/neuron/commit/e96ca61)) +* verify address according to chain type ([2026921](https://github.com/nervosnetwork/neuron/commit/2026921)) + + + ## [0.24.5](https://github.com/nervosnetwork/neuron/compare/v0.24.4...v0.24.5) (2019-11-14) diff --git a/lerna.json b/lerna.json index a4bf763061..7f8e065009 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.24.5", + "version": "0.25.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 9768d96911..5be6db89bd 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "neuron", "productName": "Neuron", "description": "CKB Neuron Wallet", - "version": "0.24.5", + "version": "0.25.0", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index b10015055d..dd1352d594 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -1,6 +1,6 @@ { "name": "neuron-ui", - "version": "0.24.5", + "version": "0.25.0", "private": true, "author": { "name": "Nervos Core Dev", @@ -17,7 +17,7 @@ "scripts": { "start": "react-app-rewired start", "lint": "eslint --fix --ext .tsx,.ts,.js src", - "test": "react-app-rewired test --env=jsdom --color --watchAll=false", + "test": "react-app-rewired test --env=jsdom --watchAll=false", "build": "react-app-rewired build", "clean": "rimraf build/*", "precommit": "lint-staged", diff --git a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx index a847a68b62..0594d8ab65 100644 --- a/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx +++ b/packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx @@ -1,9 +1,9 @@ import React, { useEffect, useState, useMemo } from 'react' import { DefaultButton } from 'office-ui-fabric-react' import { useTranslation } from 'react-i18next' -import { ckbCore, getBlockByNumber } from 'services/chain' +import { ckbCore, getHeaderByNumber } from 'services/chain' import { showMessage } from 'services/remote' -import calculateAPC from 'utils/calculateAPC' +import calculateGlobalAPC from 'utils/calculateGlobalAPC' import { shannonToCKBFormatter, uniformTimeFormatter, localNumberFormatter } from 'utils/formatters' import calculateClaimEpochNumber from 'utils/calculateClaimEpochNumber' import { epochParser } from 'utils/parsers' @@ -19,6 +19,8 @@ const DAORecord = ({ actionLabel, onClick, timestamp, + genesisBlockTimestamp, + depositTimestamp, depositOutPoint, epoch, withdraw, @@ -29,17 +31,25 @@ const DAORecord = ({ tipBlockNumber: string epoch: string withdraw: string | null + genesisBlockTimestamp: number | undefined connectionStatus: 'online' | 'offline' }) => { const [t] = useTranslation() const [withdrawingEpoch, setWithdrawingEpoch] = useState('') const [depositEpoch, setDepositEpoch] = useState('') + const [apc, setApc] = useState(0) + + useEffect(() => { + calculateGlobalAPC(+(depositTimestamp || timestamp), genesisBlockTimestamp).then(res => { + setApc(res) + }) + }, [depositTimestamp, timestamp, genesisBlockTimestamp]) useEffect(() => { if (!depositOutPoint) { - getBlockByNumber(BigInt(blockNumber)) - .then(b => { - setDepositEpoch(b.header.epoch) + getHeaderByNumber(BigInt(blockNumber)) + .then(header => { + setDepositEpoch(header.epoch) }) .catch((err: Error) => { console.error(err) @@ -47,17 +57,17 @@ const DAORecord = ({ return } const depositBlockNumber = ckbCore.utils.bytesToHex(ckbCore.utils.hexToBytes(daoData).reverse()) - getBlockByNumber(BigInt(depositBlockNumber)) - .then(b => { - setDepositEpoch(b.header.epoch) + getHeaderByNumber(BigInt(depositBlockNumber)) + .then(header => { + setDepositEpoch(header.epoch) }) .catch((err: Error) => { console.error(err) }) - getBlockByNumber(BigInt(blockNumber)) - .then(b => { - setWithdrawingEpoch(b.header.epoch) + getHeaderByNumber(BigInt(blockNumber)) + .then(header => { + setWithdrawingEpoch(header.epoch) }) .catch((err: Error) => { console.error(err) @@ -142,7 +152,7 @@ const DAORecord = ({