From 58fab61f4a4b0171d9a303a2c5f13728e41c9ea1 Mon Sep 17 00:00:00 2001 From: classicalliu Date: Tue, 15 Oct 2019 12:53:14 +0800 Subject: [PATCH 1/8] chore: add lock to input toInterface --- packages/neuron-wallet/src/database/chain/entities/input.ts | 1 + packages/neuron-wallet/src/types/cell-types.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/neuron-wallet/src/database/chain/entities/input.ts b/packages/neuron-wallet/src/database/chain/entities/input.ts index bf498f4e6b..b72bb12f30 100644 --- a/packages/neuron-wallet/src/database/chain/entities/input.ts +++ b/packages/neuron-wallet/src/database/chain/entities/input.ts @@ -64,6 +64,7 @@ export default class Input extends BaseEntity { previousOutput: this.previousOutput(), capacity: this.capacity, lockHash: this.lockHash, + lock: this.lock, } } } diff --git a/packages/neuron-wallet/src/types/cell-types.ts b/packages/neuron-wallet/src/types/cell-types.ts index 150dec9946..05f0659d68 100644 --- a/packages/neuron-wallet/src/types/cell-types.ts +++ b/packages/neuron-wallet/src/types/cell-types.ts @@ -62,7 +62,7 @@ export interface Input { since?: string capacity?: string | null lockHash?: string | null - lock?: Script + lock?: Script | null } export interface Cell { From f146e34ed0c1a777bafde25f9d87c4247f966aa8 Mon Sep 17 00:00:00 2001 From: Keith Date: Tue, 15 Oct 2019 15:29:57 +0800 Subject: [PATCH 2/8] fix(neuron-ui): set current wallet to empty when all wallets are deleted --- packages/neuron-ui/src/states/initStates/wallet.ts | 7 +++++++ .../src/states/stateProvider/actionCreators/wallets.ts | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/neuron-ui/src/states/initStates/wallet.ts b/packages/neuron-ui/src/states/initStates/wallet.ts index b19cb1587e..d9bbbff977 100644 --- a/packages/neuron-ui/src/states/initStates/wallet.ts +++ b/packages/neuron-ui/src/states/initStates/wallet.ts @@ -1,5 +1,12 @@ import { addresses, currentWallet } from 'services/localCache' +export const emptyWallet: State.Wallet = { + name: '', + id: '', + balance: '0', + addresses: [], +} + const wallet = currentWallet.load() export const walletState: State.Wallet = { diff --git a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts index c950f48a82..9aaf4757d9 100644 --- a/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts +++ b/packages/neuron-ui/src/states/stateProvider/actionCreators/wallets.ts @@ -14,7 +14,7 @@ import { backupWallet as backupRemoteWallet, showErrorMessage, } from 'services/remote' -import initStates from 'states/initStates' +import { emptyWallet } from 'states/initStates/wallet' import { WalletWizardPath } from 'components/WalletWizard' import i18n from 'utils/i18n' import { wallets as walletsCache, currentWallet as currentWalletCache } from 'services/localCache' @@ -26,7 +26,7 @@ import { addNotification, addPopup } from './app' export const updateCurrentWallet = () => (dispatch: StateDispatch, history: any) => { getCurrentWallet().then(res => { if (res.status === 1) { - const payload = res.result || initStates.wallet + const payload = res.result || emptyWallet if (!payload || !payload.id) { history.push(`${Routes.WalletWizard}${WalletWizardPath.Welcome}`) } From dafcb3e2e5523a740c18cf42682b5ce8ec6dc569 Mon Sep 17 00:00:00 2001 From: Keith Date: Wed, 16 Oct 2019 10:08:09 +0800 Subject: [PATCH 3/8] fix(neuron-ui): fix the label of skip-data toggle 1. capitalize Cells, Data, TypeScript 2. use plural of Cell --- packages/neuron-ui/src/locales/en.json | 2 +- packages/neuron-ui/src/locales/zh.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json index 27d4f4b88c..b68fc7c8df 100644 --- a/packages/neuron-ui/src/locales/en.json +++ b/packages/neuron-ui/src/locales/en.json @@ -175,7 +175,7 @@ }, "general": { "display-address-book-in-the-navbar": "Show the address book", - "skip-data-and-type": "Skip the cells which contain data or type script", + "skip-data-and-type": "Skip the Cells which contain Data or Type Script", "show": "Show", "hide": "Hide" }, diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index 9e018928df..b1c485e1b6 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -175,7 +175,7 @@ }, "general": { "display-address-book-in-the-navbar": "显示地址簿", - "skip-data-and-type": "忽略包含 Data 或 Type Script 的 Cell", + "skip-data-and-type": "忽略包含 Data 或 Type Script 的 Cells", "show": "显示", "hide": "隐藏" }, From 0cb9a1db12e567db57185a056d8737a9bf9efdfe Mon Sep 17 00:00:00 2001 From: Chen Yu Date: Wed, 16 Oct 2019 11:00:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat(neuron-ui):=20display=20address=20fiel?= =?UTF-8?q?d=20of=20input=20on=20the=20transaction=20de=E2=80=A6=20(#987)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(neuron-ui): display address field of input on the transaction detail view * fix(neuron-ui): fix the typo of cellbase --- .../src/components/Transaction/index.tsx | 71 ++++++++++++------- packages/neuron-ui/src/locales/en.json | 3 +- packages/neuron-ui/src/locales/zh.json | 3 +- packages/neuron-ui/src/types/App/index.d.ts | 25 ++++--- packages/neuron-ui/src/utils/formatters.ts | 3 + 5 files changed, 66 insertions(+), 39 deletions(-) diff --git a/packages/neuron-ui/src/components/Transaction/index.tsx b/packages/neuron-ui/src/components/Transaction/index.tsx index f7fa80f1e7..3f038331fd 100644 --- a/packages/neuron-ui/src/components/Transaction/index.tsx +++ b/packages/neuron-ui/src/components/Transaction/index.tsx @@ -13,6 +13,20 @@ import { explorerNavButton } from './style.module.scss' const MIN_CELL_WIDTH = 70 +const CompactAddress = ({ address }: { address: string }) => ( +
+ {address.slice(0, -6)} + {address.slice(-6)} +
+) + const Transaction = () => { const [t] = useTranslation() const [transaction, setTransaction] = useState(transactionState) @@ -27,7 +41,7 @@ const Transaction = () => { name: t('transaction.index'), minWidth: 60, maxWidth: 60, - onRender: (_item?: any, index?: number) => { + onRender: (_input?: State.DetailedInput, index?: number) => { if (undefined !== index) { return index } @@ -35,17 +49,34 @@ const Transaction = () => { }, }, { - key: 'outPointCell', - name: 'OutPoint Cell', - minWidth: 150, - maxWidth: 600, - onRender: (item: any) => { - const text = item.previousOutput ? `${item.previousOutput.txHash}[${item.previousOutput.index}]` : 'none' - return ( - - {text} - - ) + key: 'address', + name: t('transaction.address'), + minWidth: 200, + maxWidth: 500, + onRender: (input?: State.DetailedInput, _index?: number, column?: IColumn) => { + if (!input) { + return null + } + if (!input.lock) { + return t('transaction.cell-from-cellbase') + } + try { + const address = ckbCore.utils.bech32Address(input.lock.args, { + prefix: addressPrefix, + type: ckbCore.utils.AddressType.HashIdx, + codeHashIndex: '0x00', + }) + if (column && (column.calculatedWidth || 0) < 450) { + return + } + return ( + + {address} + + ) + } catch { + return null + } }, }, { @@ -67,7 +98,7 @@ const Transaction = () => { ...col, }) ), - [t] + [addressPrefix, t] ) const outputColumns: IColumn[] = useMemo( @@ -101,19 +132,7 @@ const Transaction = () => { codeHashIndex: '0x00', }) if (column && (column.calculatedWidth || 0) < 450) { - return ( -
- {address.slice(0, -6)} - {address.slice(-6)} -
- ) + return } return ( diff --git a/packages/neuron-ui/src/locales/en.json b/packages/neuron-ui/src/locales/en.json index 27d4f4b88c..271c939a72 100644 --- a/packages/neuron-ui/src/locales/en.json +++ b/packages/neuron-ui/src/locales/en.json @@ -150,7 +150,8 @@ "inputs": "Inputs", "outputs": "Outputs", "view-in-explorer": "Explorer", - "view-in-explorer-button-title": "View on explorer" + "view-in-explorer-button-title": "View on explorer", + "cell-from-cellbase": "From cellbase" }, "addresses": { "addresses": "Addresses", diff --git a/packages/neuron-ui/src/locales/zh.json b/packages/neuron-ui/src/locales/zh.json index 9e018928df..eb4574678e 100644 --- a/packages/neuron-ui/src/locales/zh.json +++ b/packages/neuron-ui/src/locales/zh.json @@ -150,7 +150,8 @@ "inputs": "输入", "outputs": "输出", "view-in-explorer": "浏览器", - "view-in-explorer-button-title": "浏览器中查看详情" + "view-in-explorer-button-title": "浏览器中查看详情", + "cell-from-cellbase": "来自 Cellbase" }, "addresses": { "addresses": "地址", diff --git a/packages/neuron-ui/src/types/App/index.d.ts b/packages/neuron-ui/src/types/App/index.d.ts index 4899aa4a23..ac4fd95909 100644 --- a/packages/neuron-ui/src/types/App/index.d.ts +++ b/packages/neuron-ui/src/types/App/index.d.ts @@ -11,6 +11,19 @@ declare namespace State { status: 'pending' | 'success' | 'failed' } + interface DetailedInput { + capacity: string | null + lockHash: string | null + previousOutput: { + blockHash: string | null + cell: { + txHash: string + index: string + } | null + } + lock: CKBComponents.Script | null + } + interface DetailedOutput { capacity: string lock: { @@ -27,17 +40,7 @@ declare namespace State { blockHash: string blockNumber: string deps: any[] - inputs: { - capacity: string | null - lockHash: string | null - previousOutput: { - blockHash: string | null - cell: { - txHash: string - index: string - } | null - } - }[] + inputs: DetailedInput[] inputsCount: string outputs: DetailedOutput[] outputsCount: string diff --git a/packages/neuron-ui/src/utils/formatters.ts b/packages/neuron-ui/src/utils/formatters.ts index ced652e53e..5b11497609 100644 --- a/packages/neuron-ui/src/utils/formatters.ts +++ b/packages/neuron-ui/src/utils/formatters.ts @@ -102,6 +102,9 @@ export const shannonToCKBFormatter = (shannon: string = '0', showPositiveSign?: console.warn(`Shannon is not a valid number`) return shannon } + if (shannon === null) { + return '0' + } let sign = '' if (shannon.startsWith('-')) { sign = '-' From 7ce28b6348556496c04d7b847fc9d43b37e78cf7 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2019 14:26:57 +0900 Subject: [PATCH 5/8] feat: Load icon for BrowserWindow to show it on linux launcher --- .../assets/{images => icons}/icon.icns | Bin .../neuron-wallet/assets/{images => icons}/icon.ico | Bin .../neuron-wallet/assets/{images => icons}/icon.png | Bin packages/neuron-wallet/electron-builder.yml | 6 +++--- .../neuron-wallet/src/startup/create-main-window.ts | 1 + 5 files changed, 4 insertions(+), 3 deletions(-) rename packages/neuron-wallet/assets/{images => icons}/icon.icns (100%) rename packages/neuron-wallet/assets/{images => icons}/icon.ico (100%) rename packages/neuron-wallet/assets/{images => icons}/icon.png (100%) diff --git a/packages/neuron-wallet/assets/images/icon.icns b/packages/neuron-wallet/assets/icons/icon.icns similarity index 100% rename from packages/neuron-wallet/assets/images/icon.icns rename to packages/neuron-wallet/assets/icons/icon.icns diff --git a/packages/neuron-wallet/assets/images/icon.ico b/packages/neuron-wallet/assets/icons/icon.ico similarity index 100% rename from packages/neuron-wallet/assets/images/icon.ico rename to packages/neuron-wallet/assets/icons/icon.ico diff --git a/packages/neuron-wallet/assets/images/icon.png b/packages/neuron-wallet/assets/icons/icon.png similarity index 100% rename from packages/neuron-wallet/assets/images/icon.png rename to packages/neuron-wallet/assets/icons/icon.png diff --git a/packages/neuron-wallet/electron-builder.yml b/packages/neuron-wallet/electron-builder.yml index 95a3815d6b..197035e94c 100644 --- a/packages/neuron-wallet/electron-builder.yml +++ b/packages/neuron-wallet/electron-builder.yml @@ -44,7 +44,7 @@ dmg: win: verifyUpdateCodeSignature: false artifactName: "${productName}-v${version}-${os}-${arch}-installer.${ext}" - icon: assets/images/icon.ico + icon: assets/icons/icon.ico target: - target: nsis arch: @@ -53,7 +53,7 @@ win: mac: artifactName: "${productName}-v${version}-${os}.${ext}" category: public.app-category.finance - icon: assets/images/icon.icns + icon: assets/icons/icon.icns hardenedRuntime: true gatekeeperAssess: false entitlements: assets/entitlements.plist @@ -66,6 +66,6 @@ mac: linux: artifactName: "${productName}-v${version}-${os}-${arch}.${ext}" category: Finance - icon: assets/images/ + icon: assets/icons/ target: - AppImage diff --git a/packages/neuron-wallet/src/startup/create-main-window.ts b/packages/neuron-wallet/src/startup/create-main-window.ts index 7e9bdd59ff..70502f6371 100644 --- a/packages/neuron-wallet/src/startup/create-main-window.ts +++ b/packages/neuron-wallet/src/startup/create-main-window.ts @@ -20,6 +20,7 @@ function createWindow() { minHeight: 600, show: false, backgroundColor: '#e9ecef', + icon: path.join(__dirname, '../neuron-ui/icon.png'), webPreferences: { devTools: env.isDevMode, nodeIntegration: env.isDevMode || env.isTestMode, From 185c4c9162f5f3c0e156f26f6ddbab0db302cc2f Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2019 14:47:48 +0900 Subject: [PATCH 6/8] chore: Remove travis It's been too slow to run recently. It's safe to remove since we have Azure Pipelines doing the same checks. --- .travis.yml | 29 ----------------------------- README.md | 1 - 2 files changed, 30 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 251418d94e..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -language: node_js - -os: - - linux - - osx - -dist: xenial -osx_image: xcode10.2 - -services: - - xvfb - -node_js: - - '12' - -cache: - - npm - - yarn - -before_install: - - yarn global add lerna - -install: - - travis_retry yarn bootstrap - -script: - - git diff --exit-code yarn.lock - - CI=false yarn build - - yarn test diff --git a/README.md b/README.md index be642ea1c2..913f9fdff6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ Nervos CKB Desktop Wallet [![Azure Pipelines Build Status](https://dev.azure.com/nervosnetwork/neuron/_apis/build/status/nervosnetwork.neuron?branchName=develop)](https://dev.azure.com/nervosnetwork/neuron/_build/latest?definitionId=8&branchName=develop) -[![TravisCI](https://travis-ci.com/nervosnetwork/neuron.svg?branch=develop)](https://travis-ci.com/nervosnetwork/neuron) [![Telegram Group](https://cdn.rawgit.com/Patrolavia/telegram-badge/8fe3382b/chat.svg)](https://t.me/nervos_ckb_dev) --- From dd597d637fd8aa1a08d07b72c0b2f7c01c557c24 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2019 14:59:46 +0900 Subject: [PATCH 7/8] chore: Bump to v0.22.2 --- lerna.json | 2 +- package.json | 2 +- packages/neuron-ui/package.json | 2 +- packages/neuron-wallet/package.json | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lerna.json b/lerna.json index 665371039e..39a2e5de54 100644 --- a/lerna.json +++ b/lerna.json @@ -2,7 +2,7 @@ "packages": [ "packages/*" ], - "version": "0.22.1", + "version": "0.22.2", "npmClient": "yarn", "useWorkspaces": true } diff --git a/package.json b/package.json index 3e22188367..f2b8da78de 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "neuron", "productName": "Neuron", "description": "CKB Neuron Wallet", - "version": "0.22.1", + "version": "0.22.2", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index 29e006594b..2d5eb0c546 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -1,6 +1,6 @@ { "name": "neuron-ui", - "version": "0.22.1", + "version": "0.22.2", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 1d0764cd7f..0ef7808cea 100644 --- a/packages/neuron-wallet/package.json +++ b/packages/neuron-wallet/package.json @@ -3,7 +3,7 @@ "productName": "Neuron", "description": "CKB Neuron Wallet", "homepage": "https://www.nervos.org/", - "version": "0.22.1", + "version": "0.22.2", "private": true, "author": { "name": "Nervos Core Dev", @@ -64,7 +64,7 @@ "electron-devtools-installer": "2.2.4", "electron-notarize": "0.1.1", "lint-staged": "9.2.5", - "neuron-ui": "0.22.1", + "neuron-ui": "0.22.2", "rimraf": "3.0.0", "spectron": "8.0.0", "ts-transformer-imports": "0.4.3", From b9d5695d0116cdbce3e193d30539092b4be809e6 Mon Sep 17 00:00:00 2001 From: James Chen Date: Wed, 16 Oct 2019 15:00:28 +0900 Subject: [PATCH 8/8] docs: Update changelog for v0.22.2 --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d96a6474be..f107ca0d54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +## [0.22.2](https://github.com/nervosnetwork/neuron/compare/v0.22.1...v0.22.2) (2019-10-16) + + +### Bug Fixes + +* **neuron-ui:** fix the label of skip-data toggle ([dafcb3e](https://github.com/nervosnetwork/neuron/commit/dafcb3e)) +* **neuron-ui:** set current wallet to empty when all wallets are deleted ([f146e34](https://github.com/nervosnetwork/neuron/commit/f146e34)) + + +### Features + +* Load icon for BrowserWindow to show it on linux launcher ([7ce28b6](https://github.com/nervosnetwork/neuron/commit/7ce28b6)) +* **neuron-ui:** display address field of input on the transaction de… ([#987](https://github.com/nervosnetwork/neuron/issues/987)) ([0cb9a1d](https://github.com/nervosnetwork/neuron/commit/0cb9a1d)) + + + ## [0.22.1](https://github.com/nervosnetwork/neuron/compare/v0.22.0...v0.22.1) (2019-10-15)