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
2 changes: 1 addition & 1 deletion .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:

- name: Boostrap
run: |
yarn bootstrap
yarn
env:
CI: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:

- name: Boostrap
run: |
yarn bootstrap
yarn
env:
CI: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

- name: Boostrap
run: |
yarn bootstrap
yarn
yarn build
env:
CI: false
Expand Down
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

lerna run --no-bail --stream precommit
npx lerna run --no-bail --stream precommit
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,29 @@
# 0.110.2 (2023-07-07)

### CKB Node & Light Client

- [CKB@v0.110.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.110.0) was released on May. 17th, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
- [CKB Light Client@v0.2.4](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.2.4) was released on May. 28th, 2023. This version of CKB Light Client is now bundled and preconfigured in Neuron

#### Caveat

◆ **CKB Light Client** is only activated on testnet, thus only `light testnet` is enabled in Neuron. **CKB Light Client on Mainnet** requires a hardfork on the mainnet in the future.
◆ **CKB@v0.110** requires data migration, which is irreversible. Be cautious to start the migration without a backup. [How to back up data of ckb node](https://github.com/nervosnetwork/neuron/issues/2557#issue-1512510978)

> On the other hand, we strongly recommend you to back up the old data before migrating, the **ckb node data path** can be found by clicking **preference -> Data -> CKB Node Config & Storage**. Because once the migration starts, the data will be no longer compatible with all older versions of CKB.

### Assumed valid target

Block before `0xc0c532e10c708852d9586be46a5ed8317b2aa0835c721aa691abffb9bf4a26cd`(at height `10,004,892`) will be skipped in validation.(#2689)

## Bug fixes

- #2760: Avoid generating deposit DAO when the dialog is not visible.(@yanguoyu)


**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.1...v0.110.2


# 0.110.1 (2023-05-31)

### CKB Node & Light Client
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $ yarn global add lerna # install lerna globally
After lerna has been installed, run this to install and link dependencies:

```shell
$ yarn bootstrap
$ yarn
$ lerna run rebuild:nativemodules
```

Expand Down
8 changes: 3 additions & 5 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"packages": [
"packages/*"
],
"version": "0.110.1",
"packages": ["packages/*"],
"version": "0.110.2",
"npmClient": "yarn",
"useWorkspaces": true
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "neuron",
"productName": "Neuron",
"description": "CKB Neuron Wallet",
"version": "0.110.0",
"version": "0.110.2",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand All @@ -22,7 +22,6 @@
"packages/*"
],
"scripts": {
"bootstrap": "npx cross-env lerna bootstrap && lerna link",
"start:ui": "cd packages/neuron-ui && yarn run start",
"start:wallet": "cd packages/neuron-wallet && yarn run start:debug",
"start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://127.0.0.1:3000 && yarn run start:wallet\"",
Expand All @@ -32,7 +31,7 @@
"build:main": "lerna run build --scope=neuron-wallet",
"release": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/release.sh",
"package:test": "yarn build && ./scripts/copy-ui-files.sh && ./scripts/package-for-test.sh",
"test": "cross-env NODE_OPTIONS=--openssl-legacy-provider lerna run --parallel test",
"test": "cross-env NODE_OPTIONS=--openssl-legacy-provider lerna run --parallel --load-env-files=false test",
"test:ci": "yarn build:main && yarn test",
"lint": "lerna run --stream lint",
"postinstall": "husky install && lerna run build --scope=@nervina-labs/ckb-indexer",
Expand All @@ -50,7 +49,7 @@
"eslint": "8.38.0",
"eslint-config-prettier": "8.8.0",
"husky": "8.0.3",
"lerna": "5.6.2",
"lerna": "7.0.0",
"lint-staged": "13.2.1",
"ncp": "2.0.0",
"prettier": "2.8.7",
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "neuron-ui",
"version": "0.110.1",
"version": "0.110.2",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down
6 changes: 6 additions & 0 deletions packages/neuron-ui/src/components/NervosDAO/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export const useGenerateDaoDepositTx = ({
t,
depositValue,
suggestFeeRate,
showDepositDialog,
}: {
setErrorMessage: React.Dispatch<React.SetStateAction<string>>
clearGeneratedTx: () => void
Expand All @@ -149,10 +150,14 @@ export const useGenerateDaoDepositTx = ({
t: TFunction
depositValue: string
suggestFeeRate: string | number
showDepositDialog: boolean
}) => {
const timer = useRef<ReturnType<typeof setTimeout>>()
useEffect(() => {
clearTimeout(timer.current)
if (!showDepositDialog) {
return
}
timer.current = setTimeout(() => {
setErrorMessage('')
clearGeneratedTx()
Expand Down Expand Up @@ -221,6 +226,7 @@ export const useGenerateDaoDepositTx = ({
isBalanceReserved,
depositValue,
suggestFeeRate,
showDepositDialog,
])
}

Expand Down
3 changes: 2 additions & 1 deletion packages/neuron-ui/src/components/NervosDAO/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ const NervosDAO = () => {
isBalanceReserved,
t,
depositValue,
suggestFeeRate
suggestFeeRate,
showDepositDialog,
})
const updateDepositValue = hooks.useUpdateDepositValue({ setDepositValue })

Expand Down
4 changes: 2 additions & 2 deletions packages/neuron-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Neuron",
"description": "CKB Neuron Wallet",
"homepage": "https://www.nervos.org/",
"version": "0.110.1",
"version": "0.110.2",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down Expand Up @@ -87,7 +87,7 @@
"electron-builder": "23.6.0",
"electron-devtools-installer": "3.2.0",
"jest-when": "2.8.1",
"neuron-ui": "0.110.1",
"neuron-ui": "0.110.2",
"typescript": "5.0.4"
}
}
Loading