Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@
},
"devDependencies": {
"@cryptape/sdk-ts-config": "0.0.1",
"@types/jest": "^24.0.11",
"@typescript-eslint/eslint-plugin": "1.6.0",
"@typescript-eslint/parser": "1.6.0",
"concurrently": "^4.1.0",
"cross-env": "^5.2.0",
"cz-conventional-changelog": "^2.1.0",
"@types/jest": "24.0.11",
"@typescript-eslint/eslint-plugin": "1.7.0",
"@typescript-eslint/parser": "1.7.0",
"concurrently": "4.1.0",
"cross-env": "5.2.0",
"cz-conventional-changelog": "2.1.0",
"eslint": "5.16.0",
"eslint-config-airbnb": "^17.1.0",
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jsx-a11y": "^6.1.2",
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.4",
"lerna": "^3.13.2",
"nodemon": "^1.18.11",
"prettier": "^1.17.0",
"ts-jest": "^24.0.2",
"typescript": "^3.4.1",
"wait-on": "^3.2.0"
"eslint-config-airbnb": "17.1.0",
"eslint-config-prettier": "4.0.0",
"eslint-plugin-import": "2.14.0",
"eslint-plugin-jsx-a11y": "6.1.2",
"eslint-plugin-prettier": "3.0.1",
"eslint-plugin-react": "7.12.4",
"lerna": "3.13.2",
"nodemon": "1.18.11",
"prettier": "1.17.0",
"ts-jest": "24.0.2",
"typescript": "3.4.1",
"wait-on": "3.2.0"
},
"dependencies": {},
"config": {
Expand Down
56 changes: 28 additions & 28 deletions packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,40 @@
},
"browserslist": ["last 2 chrome versions"],
"dependencies": {
"@nervosnetwork/ckb-sdk-core": "^0.8.0",
"@nervosnetwork/ckb-sdk-core": "0.11.0-alpha.0",
"@types/node": "11.13.5",
"@types/react": "16.8.13",
"@types/react-dom": "16.8.4",
"@types/styled-components": "^4.1.6",
"bootstrap": "^4.3.1",
"dayjs": "^1.8.12",
"grommet-icons": "^4.2.0",
"history": "^4.9.0",
"i18next": "^15.0.5",
"node-sass": "^4.11.0",
"@types/styled-components": "4.1.6",
"bootstrap": "4.3.1",
"dayjs": "1.8.12",
"grommet-icons": "4.2.0",
"history": "4.9.0",
"i18next": "15.0.5",
"node-sass": "4.11.0",
"qrcode.react": "0.9.3",
"react": "^16.8.1",
"react-bootstrap": "^1.0.0-beta.5",
"react-dom": "^16.8.1",
"react-i18next": "^10.2.0",
"react-router-dom": "^5.0.0",
"react-scripts": "3.0.0",
"styled-components": "^4.1.3"
"react": "16.8.1",
"react-bootstrap": "1.0.0-beta.5",
"react-dom": "16.8.1",
"react-i18next": "10.2.0",
"react-router-dom": "5.0.0",
"react-scripts": "3.0.1",
"styled-components": "4.2.0"
},
"devDependencies": {
"@nervosnetwork/ckb-types": "^0.8.0",
"@types/enzyme": "^3.1.16",
"@types/enzyme-adapter-react-16": "^1.0.3",
"@nervosnetwork/ckb-types": "0.11.0-alpha.0",
"@types/enzyme": "3.1.16",
"@types/enzyme-adapter-react-16": "1.0.3",
"@types/qrcode.react": "0.8.2",
"@types/react-router-dom": "^4.3.1",
"babel-jest": "^24.7.1",
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.9.1",
"husky": "^1.3.1",
"jest-styled-components": "^6.3.1",
"jsqr": "^1.2.0",
"lint-staged": "^8.1.5",
"react-app-rewired": "^2.1.1",
"rimraf": "^2.6.3"
"@types/react-router-dom": "4.3.1",
"babel-jest": "24.8.0",
"enzyme": "3.8.0",
"enzyme-adapter-react-16": "1.9.1",
"husky": "1.3.1",
"jest-styled-components": "6.3.1",
"jsqr": "1.2.0",
"lint-staged": "8.1.5",
"react-app-rewired": "2.1.1",
"rimraf": "2.6.3"
}
}
28 changes: 15 additions & 13 deletions packages/neuron-ui/src/components/Receive/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { useState } from 'react'
import styled from 'styled-components'
import { Container, Card, OverlayTrigger, Tooltip, Modal, Form } from 'react-bootstrap'
import { Container, Card, OverlayTrigger, Tooltip, Modal, Form, InputGroup } from 'react-bootstrap'
import QRCode from 'qrcode.react'
import { RouteComponentProps } from 'react-router-dom'
import { Copy } from 'grommet-icons'
import { Copy as CopyIcon } from 'grommet-icons'
import { useTranslation } from 'react-i18next'
import { useNeuronWallet } from 'utils/hooks'

Expand All @@ -19,13 +19,6 @@ const AddressPanel = styled.div`
margin: 10px 0 0 0;
`

const CopyImage = styled(Copy)`
width: 15px;
height: 25px;
padding-top: 10px;
margin-left: 10px;
`

const QRCodePanel = styled.div`
width: 300px;
margin: 50px 0 0 30px;
Expand Down Expand Up @@ -68,10 +61,19 @@ const Receive = (props: React.PropsWithoutRef<RouteComponentProps<{ address: str
<Form.Label>{t('Address')}</Form.Label>
<AddressPanel>
<OverlayTrigger placement="bottom" overlay={<Tooltip id="address-tooltip">{t('Copy address')}</Tooltip>}>
<Form.Control readOnly type="text" placeholder={accountAddress} onClick={() => copyAddress()} />
</OverlayTrigger>
<OverlayTrigger placement="bottom" overlay={<Tooltip id="address-tooltip">{t('Copy address')}</Tooltip>}>
<CopyImage onClick={() => copyAddress()} />
<InputGroup>
<Form.Control readOnly type="text" placeholder={accountAddress} onClick={() => copyAddress()} />
<InputGroup.Append>
<CopyIcon
style={{
width: '15px',
height: '25px',
paddingTop: '10px',
marginLeft: '10px',
}}
/>
</InputGroup.Append>
</InputGroup>
</OverlayTrigger>
</AddressPanel>
</Form.Group>
Expand Down
56 changes: 28 additions & 28 deletions packages/neuron-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"test": "jest --color",
"lint": "eslint 'src/**/*.{js,ts}'",
"package": "./script/package.sh",
"precommit": "lint-staged",
"precommit": "lint-staged && yarn test",
"rebuild:nativemodules": "electron-builder install-app-deps"
},
"husky": {
Expand Down Expand Up @@ -51,38 +51,38 @@
]
},
"dependencies": {
"@nervosnetwork/ckb-sdk-core": "^0.10.2",
"bip32": "^2.0.2",
"bip39": "^2.4.2",
"chalk": "^2.4.2",
"@nervosnetwork/ckb-sdk-core": "0.11.0-alpha.0",
"bip32": "2.0.2",
"bip39": "3.0.2",
"chalk": "2.4.2",
"crypto-browserify": "3.12.0",
"electron-store": "^2.0.0",
"electron-window-state": "^5.0.3",
"i18next": "^15.0.5",
"reflect-metadata": "^0.1.13",
"rxjs": "^6.4.0",
"electron-store": "3.2.0",
"electron-window-state": "5.0.3",
"i18next": "15.0.5",
"reflect-metadata": "0.1.13",
"rxjs": "6.5.1",
"scrypt.js": "0.3.0",
"sha3": "^2.0.1",
"sqlite3": "^4.0.6",
"typeorm": "^0.2.16",
"uuid": "^3.3.2",
"winston": "^3.2.1"
"sha3": "2.0.1",
"sqlite3": "4.0.7",
"typeorm": "0.2.17",
"uuid": "3.3.2",
"winston": "3.2.1"
},
"devDependencies": {
"@nervosnetwork/ckb-types": "^0.10.1",
"@nervosnetwork/neuron-ui": "^0.1.0",
"@types/bip39": "^2.4.2",
"@types/electron-devtools-installer": "^2.2.0",
"@types/electron-store": "^1.3.0",
"@types/sqlite3": "^3.1.5",
"@types/uuid": "^3.4.4",
"devtron": "^1.4.0",
"@nervosnetwork/ckb-types": "0.11.0-alpha.0",
"@nervosnetwork/neuron-ui": "0.1.0",
"@types/bip39": "2.4.2",
"@types/electron-devtools-installer": "2.2.0",
"@types/electron-store": "1.3.0",
"@types/sqlite3": "3.1.5",
"@types/uuid": "3.4.4",
"devtron": "1.4.0",
"electron": "5.0.1",
"electron-builder": "20.40.2",
"electron-devtools-installer": "^2.2.4",
"husky": "^1.3.1",
"lint-staged": "^8.1.5",
"rimraf": "^2.6.3",
"spectron": "^5.0.0"
"electron-devtools-installer": "2.2.4",
"husky": "1.3.1",
"lint-staged": "8.1.5",
"rimraf": "2.6.3",
"spectron": "5.0.0"
}
}
4 changes: 2 additions & 2 deletions packages/neuron-wallet/src/channel/listeners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ export default class Listeners {
public static wallets = () => {
return ipcMain.on(
Channel.Wallets,
(e: Electron.Event, method: keyof typeof WalletsController, ...params: any[]) => {
e.sender.send(Channel.Wallets, method, (WalletsController[method] as Function)(...params))
async (e: Electron.Event, method: keyof typeof WalletsController, ...params: any[]) => {
e.sender.send(Channel.Wallets, method, await (WalletsController[method] as Function)(...params))
},
)
}
Expand Down
12 changes: 6 additions & 6 deletions packages/neuron-wallet/src/controllers/wallets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class WalletsController {
}
}

public static importMnemonic = ({
public static importMnemonic = async ({
name,
password,
mnemonic,
Expand All @@ -75,9 +75,9 @@ class WalletsController {
mnemonic: string
receivingAddressNumber: number
changeAddressNumber: number
}): ChannelResponse<WalletData> => {
}): Promise<ChannelResponse<WalletData>> => {
try {
const key = Key.fromMnemonic(mnemonic, password, receivingAddressNumber, changeAddressNumber)
const key = await Key.fromMnemonic(mnemonic, password, receivingAddressNumber, changeAddressNumber)
const wallet = WalletsController.service.create({
name,
keystore: key.keystore!,
Expand All @@ -96,7 +96,7 @@ class WalletsController {
}
}

public static create({
public static create = async ({
name,
password,
mnemonic,
Expand All @@ -108,8 +108,8 @@ class WalletsController {
mnemonic: string
receivingAddressNumber: number
changeAddressNumber: number
}): ChannelResponse<WalletData> {
const res = WalletsController.importMnemonic({
}): Promise<ChannelResponse<WalletData>> => {
const res = await WalletsController.importMnemonic({
name,
password,
mnemonic,
Expand Down
4 changes: 2 additions & 2 deletions packages/neuron-wallet/src/entities/Input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default class Input extends BaseEntity {
@Column({
type: 'varchar',
})
outPointHash!: string
outPointTxHash!: string

@Column({
type: 'varchar',
Expand Down Expand Up @@ -42,7 +42,7 @@ export default class Input extends BaseEntity {

public previousOutput(): OutPoint {
return {
hash: this.outPointHash,
txHash: this.outPointTxHash,
index: this.outPointIndex,
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/src/entities/Output.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class Output extends BaseEntity {

public outPoint(): OutPoint {
return {
hash: this.outPointHash,
txHash: this.outPointHash,
index: this.outPointIndex,
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/src/entities/Transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import InputEntity from './Input'
import OutputEntity from './Output'

interface OutPoint {
hash: string
txHash: string
index: number
}

Expand Down
10 changes: 5 additions & 5 deletions packages/neuron-wallet/src/keys/key.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as bip32 from 'bip32'
import bip39 from 'bip39'
import * as bip39 from 'bip39'
import crypto from 'crypto-browserify'
import scryptsy from 'scrypt.js'
import SHA3 from 'sha3'
Expand Down Expand Up @@ -92,7 +92,7 @@ export default class Key {
return key
}

public static fromMnemonic(
public static async fromMnemonic(
mnemonic: string,
password: string,
receivingAddressNumber = DefaultAddressNumber.Receiving,
Expand All @@ -102,7 +102,7 @@ export default class Key {
throw new Error('Wrong Mnemonic')
}
const key = new Key()
const keysData = key.generatePrivateKeyFromMnemonic(mnemonic)
const keysData = await key.generatePrivateKeyFromMnemonic(mnemonic)
key.keysData = keysData
key.addresses = Address.generateAddresses(keysData, receivingAddressNumber, changeAddressNumber)
key.keystore = key.toKeystore(JSON.stringify(keysData), password)
Expand Down Expand Up @@ -149,8 +149,8 @@ export default class Key {
return []
}

private generatePrivateKeyFromMnemonic = (mnemonic: string) => {
const seed = bip39.mnemonicToSeed(mnemonic)
private generatePrivateKeyFromMnemonic = async (mnemonic: string) => {
const seed = await bip39.mnemonicToSeed(mnemonic)
const root = bip32.fromSeed(seed)
if (root.privateKey) {
const privateKey = root.privateKey.toString('hex')
Expand Down
Loading