Merge pull request #1086 from nervosnetwork/rc/v0.24.4

[ᚬmaster] Rc/v0.24.4

Author: Keith-CY

CHANGELOG.md

@@ -1,3 +1,40 @@
+## [0.24.4](https://github.com/nervosnetwork/neuron/compare/v0.24.3...v0.24.4) (2019-11-12)
+
+
+### Bug Fixes
+
+* **neuron-ui:** fix the apy calculation ([03c88d2](https://github.com/nervosnetwork/neuron/commit/03c88d2))
+* **neuron-ui:** fix the free and locked value of nervos dao ([16b2233](https://github.com/nervosnetwork/neuron/commit/16b2233))
+* **neuron-ui:** fix the minimal withdraw epoch number ([1c19582](https://github.com/nervosnetwork/neuron/commit/1c19582))
+* **neuron-ui:** fix the yield of nervos dao records ([544becd](https://github.com/nervosnetwork/neuron/commit/544becd))
+* **neuron-ui:** including keywords on tx list paging ([935950d](https://github.com/nervosnetwork/neuron/commit/935950d))
+* calculate tx serialized size for dao ([2088d5c](https://github.com/nervosnetwork/neuron/commit/2088d5c))
+* calculateDaoMaximumWithdraw return type ([22ee960](https://github.com/nervosnetwork/neuron/commit/22ee960))
+* deposit dao and withdraw step1 error ([77a505d](https://github.com/nervosnetwork/neuron/commit/77a505d))
+* fix getDaoCells return ([c914dff](https://github.com/nervosnetwork/neuron/commit/c914dff))
+* fix withdraw dao bug ([9b1c0ed](https://github.com/nervosnetwork/neuron/commit/9b1c0ed))
+* getDaoCells and its tests ([2460b0b](https://github.com/nervosnetwork/neuron/commit/2460b0b))
+* getDaoCells load dao cells except dead ([d5ba396](https://github.com/nervosnetwork/neuron/commit/d5ba396))
+* load init txs in windows ([8880d34](https://github.com/nervosnetwork/neuron/commit/8880d34))
+* mark depositOutPoint when create step1 ([85a851b](https://github.com/nervosnetwork/neuron/commit/85a851b))
+
+
+### Features
+
+* add dao methods to controller ([41953bf](https://github.com/nervosnetwork/neuron/commit/41953bf))
+* add inputIndex to inputs ([c760db5](https://github.com/nervosnetwork/neuron/commit/c760db5))
+* add typeHash and daoData to Output ([5efe225](https://github.com/nervosnetwork/neuron/commit/5efe225))
+* add typeHash and daoData when sync ([1b6b062](https://github.com/nervosnetwork/neuron/commit/1b6b062))
+* generate dao transactions ([36ba523](https://github.com/nervosnetwork/neuron/commit/36ba523))
+* remove SkipDataAndType module ([1bc25eb](https://github.com/nervosnetwork/neuron/commit/1bc25eb))
+* remove totalBalance ([5b0df6f](https://github.com/nervosnetwork/neuron/commit/5b0df6f))
+* Shorter binary file names ([337790d](https://github.com/nervosnetwork/neuron/commit/337790d))
+* **neuron-ui:** add nervos dao view ([ca46665](https://github.com/nervosnetwork/neuron/commit/ca46665))
+* **neuron-ui:** allow user to claim since unlock epoch. ([f1ad76b](https://github.com/nervosnetwork/neuron/commit/f1ad76b))
+* **neuron-ui:** update i18n of nervos dao ([3b72042](https://github.com/nervosnetwork/neuron/commit/3b72042))
+
+
+
 ## [0.24.3](https://github.com/nervosnetwork/neuron/compare/v0.24.2...v0.24.3) (2019-11-11)
 
 

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.24.3",
+  "version": "0.24.4",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

package.json

@@ -2,7 +2,7 @@
   "name": "neuron",
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -43,7 +43,7 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
-    "@nervosnetwork/ckb-sdk-core": "0.24.1",
+    "@nervosnetwork/ckb-sdk-core": "0.25.0-alpha.0",
     "@uifabric/experiments": "7.16.1",
     "@uifabric/styling": "7.6.2",
     "canvg": "2.0.0",
@@ -53,7 +53,7 @@
     "qr.js": "0.0.0",
     "react": "16.9.0",
     "react-dom": "16.9.0",
-    "react-i18next": "10.12.2",
+    "react-i18next": "11.0.1",
     "react-router-dom": "5.0.1",
     "react-scripts": "3.2.0",
     "styled-components": "5.0.0-beta.0"

packages/neuron-ui/src/components/CustomRows/DAORecordRow.tsx

@@ -0,0 +1,121 @@
+import React, { useEffect, useState } from 'react'
+import { DefaultButton } from 'office-ui-fabric-react'
+import { useTranslation } from 'react-i18next'
+import { ckbCore, getBlockByNumber } from 'services/chain'
+import calculateAPY from 'utils/calculateAPY'
+import { shannonToCKBFormatter, uniformTimeFormatter, localNumberFormatter } from 'utils/formatters'
+import calculateClaimEpochNumber from 'utils/calculateClaimEpochNumber'
+import { epochParser } from 'utils/parsers'
+
+import * as styles from './daoRecordRow.module.scss'
+
+const DAORecord = ({
+  daoData,
+  blockNumber,
+  outPoint: { txHash, index },
+  tipBlockNumber,
+  capacity,
+  actionLabel,
+  onClick,
+  timestamp,
+  depositOutPoint,
+  epoch,
+  withdraw,
+}: State.NervosDAORecord & {
+  actionLabel: string
+  onClick: any
+  tipBlockNumber: string
+  epoch: string
+  withdraw: string | null
+}) => {
+  const [t] = useTranslation()
+  const [withdrawingEpoch, setWithdrawingEpoch] = useState('')
+  const [depositEpoch, setDepositEpoch] = useState('')
+
+  useEffect(() => {
+    if (!depositOutPoint) {
+      return
+    }
+    const depositBlockNumber = ckbCore.utils.bytesToHex(ckbCore.utils.hexToBytes(daoData).reverse())
+    getBlockByNumber(BigInt(depositBlockNumber))
+      .then(b => {
+        setDepositEpoch(b.header.epoch)
+      })
+      .catch((err: Error) => {
+        console.error(err)
+      })
+
+    getBlockByNumber(BigInt(blockNumber))
+      .then(b => {
+        setWithdrawingEpoch(b.header.epoch)
+      })
+      .catch((err: Error) => {
+        console.error(err)
+      })
+  }, [daoData, depositOutPoint, blockNumber])
+
+  const interest = BigInt(withdraw || capacity) - BigInt(capacity)
+
+  let ready = false
+  let metaInfo = 'Ready'
+  if (!depositOutPoint) {
+    const duration = BigInt(tipBlockNumber) - BigInt(blockNumber)
+    metaInfo = t('nervos-dao.interest-accumulated', {
+      blockNumber: localNumberFormatter(duration >= BigInt(0) ? duration : 0),
+    })
+  } else {
+    const depositEpochInfo = epochParser(depositEpoch)
+    const currentEpochInfo = epochParser(epoch)
+    const withdrawingEpochInfo = epochParser(withdrawingEpoch)
+    const targetEpochNumber = calculateClaimEpochNumber(depositEpochInfo, withdrawingEpochInfo)
+    if (targetEpochNumber <= currentEpochInfo.number) {
+      metaInfo = 'Ready'
+      ready = true
+    } else {
+      const epochs = targetEpochNumber - currentEpochInfo.number - BigInt(1)
+      metaInfo = t('nervos-dao.blocks-left', {
+        epochs: localNumberFormatter(epochs),
+        blocks: localNumberFormatter(currentEpochInfo.length - currentEpochInfo.index),
+        days: localNumberFormatter(epochs / BigInt(6)),
+      })
+    }
+  }
+
+  return (
+    <div className={styles.daoRecord}>
+      <div className={styles.primaryInfo}>
+        <div>{interest >= BigInt(0) ? `${shannonToCKBFormatter(interest.toString()).toString()} CKB` : ''}</div>
+        <div>{`${shannonToCKBFormatter(capacity)} CKB`}</div>
+        <div>
+          <DefaultButton
+            text={actionLabel}
+            data-tx-hash={txHash}
+            data-index={index}
+            onClick={onClick}
+            disabled={depositOutPoint && !ready}
+            styles={{
+              flexContainer: {
+                pointerEvents: 'none',
+              },
+              textContainer: {
+                pointerEvents: 'none',
+              },
+              label: {
+                pointerEvents: 'none',
+              },
+            }}
+          />
+        </div>
+      </div>
+      <div className={styles.secondaryInfo}>
+        <span>{`APY: ~${calculateAPY(interest.toString(), capacity, `${Date.now() - +timestamp}`)}%`}</span>
+        <span>{uniformTimeFormatter(+timestamp)}</span>
+        <span>{metaInfo}</span>
+      </div>
+    </div>
+  )
+}
+
+DAORecord.displayName = 'DAORecord'
+
+export default DAORecord

packages/neuron-ui/src/components/CustomRows/daoRecordRow.module.scss

@@ -0,0 +1,35 @@
+.daoRecord {
+  display: flex;
+  flex-direction: column;
+  border: 1px solid #000;
+  border-radius: 5px;
+  margin: 10px 0;
+  padding: 5px 15px;
+
+  .primaryInfo,
+  .secondaryInfo {
+    display: flex;
+    justify-content: space-between;
+
+    &>div,
+    &>span {
+      flex: 1;
+      text-align: center;
+
+      &:first-child {
+        text-align: left;
+      }
+
+      &:last-child {
+        text-align: right;
+      }
+    }
+
+  }
+
+  .secondaryInfo {
+    font-size: 12px;
+    color: #666;
+  }
+
+}

packages/neuron-ui/src/components/History/index.tsx

@@ -76,7 +76,7 @@ const History = ({
           lastPageIconProps={{ iconName: 'LastPage' }}
           format="buttons"
           onPageChange={(idx: number) => {
-            history.push(`${Routes.History}?pageNo=${idx + 1}`)
+            history.push(`${Routes.History}?pageNo=${idx + 1}&keywords=${keywords}`)
           }}
         />
       </Stack>

packages/neuron-ui/src/components/NervosDAO/DepositDialog.tsx

@@ -0,0 +1,86 @@
+import React from 'react'
+import {
+  Stack,
+  Dialog,
+  TextField,
+  Slider,
+  Text,
+  DefaultButton,
+  PrimaryButton,
+  DialogType,
+  DialogFooter,
+  Spinner,
+  SpinnerSize,
+} from 'office-ui-fabric-react'
+import { useTranslation } from 'react-i18next'
+import { SHANNON_CKB_RATIO } from 'utils/const'
+
+const DepositDialog = ({
+  show,
+  value,
+  fee,
+  balance,
+  onChange,
+  onSlide,
+  onSubmit,
+  onDismiss,
+  isDepositing,
+  errorMessage,
+}: any) => {
+  const [t] = useTranslation()
+  const maxValue = +(BigInt(balance) / BigInt(SHANNON_CKB_RATIO)).toString()
+
+  if (!show) {
+    return null
+  }
+
+  return (
+    <Dialog
+      hidden={false}
+      onDismiss={onDismiss}
+      dialogContentProps={{
+        type: DialogType.close,
+        title: t('nervos-dao.deposit-to-nervos-dao'),
+      }}
+      modalProps={{
+        isBlocking: false,
+        styles: { main: { maxWidth: '500px!important' } },
+      }}
+    >
+      {isDepositing ? (
+        <Spinner size={SpinnerSize.large} />
+      ) : (
+        <>
+          <TextField label={t('nervos-dao.deposit')} value={value} onChange={onChange} suffix="CKB" />
+          <Slider value={value} min={0} max={maxValue} step={1} showValue={false} onChange={onSlide} />
+          <Text as="p" variant="small" block>
+            {`${t('nervos-dao.fee')}: ${fee}`}
+          </Text>
+          <Text as="span" variant="tiny" block styles={{ root: { color: 'red' } }}>
+            {errorMessage}
+          </Text>
+          <Stack>
+            <Text as="h2" variant="large">
+              {t('nervos-dao.notice')}
+            </Text>
+            {t('nervos-dao.deposit-terms')
+              .split('\n')
+              .map(term => (
+                <Text as="p" key={term}>
+                  {term}
+                </Text>
+              ))}
+          </Stack>
+          <DialogFooter>
+            <DefaultButton onClick={onDismiss} text={t('nervos-dao.cancel')} />
+            <PrimaryButton onClick={onSubmit} text={t('nervos-dao.proceed')} disabled={errorMessage} />
+          </DialogFooter>
+        </>
+      )}
+    </Dialog>
+  )
+}
+
+DepositDialog.displayName = 'DepositDialog'
+
+export default DepositDialog