From 947f1e6d8a391f5aa619747a4dc85658f72fca82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E5=9B=BD=E5=AE=87?= <841185308@qq.com> Date: Fri, 15 Mar 2024 18:54:12 +0800 Subject: [PATCH 1/3] fix: The first sync only stuck full ckb node start. (#3081) --- packages/neuron-wallet/src/services/node.ts | 3 ++- packages/neuron-wallet/tests/services/node.test.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/neuron-wallet/src/services/node.ts b/packages/neuron-wallet/src/services/node.ts index d9731d2328..220bb5fa35 100644 --- a/packages/neuron-wallet/src/services/node.ts +++ b/packages/neuron-wallet/src/services/node.ts @@ -136,7 +136,8 @@ class NodeService { await stopMonitor('ckb') const isDefaultCKBNeedStart = await this.isDefaultCKBNeedRestart() if (isDefaultCKBNeedStart) { - if (SettingsService.getInstance().isFirstSync) { + const currentNetwork = NetworksService.getInstance().getCurrent() + if (SettingsService.getInstance().isFirstSync && currentNetwork.type === NetworkType.Default) { logger.info("CKB:\tThis is the first sync, please wait for the user's confirmation") return } diff --git a/packages/neuron-wallet/tests/services/node.test.ts b/packages/neuron-wallet/tests/services/node.test.ts index 29fafa3f4d..bff33582fb 100644 --- a/packages/neuron-wallet/tests/services/node.test.ts +++ b/packages/neuron-wallet/tests/services/node.test.ts @@ -571,7 +571,7 @@ describe('NodeService', () => { describe('test start default node', () => { beforeEach(() => { const NodeService = require('../../src/services/node').default - stubbedNetworsServiceGet.mockReturnValue({ remote: BUNDLED_CKB_URL, readonly: true }) + stubbedNetworsServiceGet.mockReturnValue({ remote: BUNDLED_CKB_URL, readonly: true, type: 0 }) getLocalNodeInfoMock.mockRejectedValue('not start') nodeService = new NodeService() }) From 5a6bb80c85d93315d9fdf456066f477741922312 Mon Sep 17 00:00:00 2001 From: Keith Date: Fri, 15 Mar 2024 23:32:50 +0900 Subject: [PATCH 2/3] ci: update permissions to get and generate checksums --- .github/workflows/check_checksums.yml | 3 +++ .github/workflows/checksums-of-release-draft.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/check_checksums.yml b/.github/workflows/check_checksums.yml index 4c047f4754..9be93dc58e 100644 --- a/.github/workflows/check_checksums.yml +++ b/.github/workflows/check_checksums.yml @@ -8,6 +8,9 @@ jobs: compare: name: Compare checksums runs-on: macos-latest + permissions: + contents: read + actions: read steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/checksums-of-release-draft.yml b/.github/workflows/checksums-of-release-draft.yml index de95e0a90d..7f46c4933a 100644 --- a/.github/workflows/checksums-of-release-draft.yml +++ b/.github/workflows/checksums-of-release-draft.yml @@ -12,6 +12,7 @@ jobs: runs-on: ubuntu-latest permissions: contents: read + actions: read if: github.event.workflow_run.conclusion == 'success' steps: - name: Checkout From fec8de07cc5678e551423901663624dc18e54790 Mon Sep 17 00:00:00 2001 From: Keith Date: Fri, 15 Mar 2024 23:37:36 +0900 Subject: [PATCH 3/3] chore: update versions and changelogs --- CHANGELOG.md | 45 ++++++++++++++++++++++------- lerna.json | 2 +- package.json | 2 +- packages/neuron-ui/package.json | 2 +- packages/neuron-wallet/package.json | 4 +-- 5 files changed, 40 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e79308d215..cad5a74414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,38 @@ +# 0.114.1 (2024-03-15) + +### CKB Node & Light Client + +- [CKB@v0.114.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.114.0) was released on Feb. 29st, 2024. This version of CKB node is now bundled and preconfigured in Neuron. +- [CKB Light Client@v0.3.6](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.6) was released on Feb. 8th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron + +### Assumed valid target + +Block before `0x397d7d41167051cab2bf1610e334ad3aa5cf612e2cd442f71b91422e0361141e`(at height `12,450,084`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3077) + +--- + +Good day, good Neuron, packed with exciting new features and enhancements to elevate your transaction experience! + +With support for Cell Management, Chained Transactions, and detailed viewing options, managing your transactions has never been easier. + +We're also thrilled to announce multilingual support, with French and Spanish interfaces now available, thanks to the contributions of our dedicated community members. + +Plus, enjoy enhanced guidance features like remaining time estimation and the ability to amend pending transactions for added flexibility. + +With optimizations to settings and transaction overviews, Neuron continues to prioritize efficiency and user satisfaction. + +Upgrade now and experience seamless transaction management with Neuron. + +[![Neuron@v0.114.1](https://github.com/nervosnetwork/neuron/assets/7271329/883aba6e-ceb0-402d-9de0-d46609c528b7)](https://youtu.be/df29-EUZG0Y) + +--- + +## Bug fixes + +- #3081: fix start-sync confirmation in light client mode.(@yanguoyu) + +**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.114.0...v0.114.1 + # 0.114.0 (2024-03-15) ### CKB Node & Light Client @@ -53,7 +88,6 @@ Upgrade now and experience seamless transaction management with Neuron. **Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.112.0...v0.114.0 - # 0.112.0 (2023-12-07) ### CKB Node & Light Client @@ -81,10 +115,8 @@ Block before `0x1d46fe5bb62d19a004eadd7ba40564c45620905ab260d8a546a9e4b9d7cc0f85 - #2944: Fix requests jam when a synced transaction includes cellbase cells.(@yanguoyu) - #2965: Fix transaction type recognition on light client mode.(@yanguoyu) - **Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.111.1...v0.112.0 - # 0.111.1 (2023-11-08) ### CKB Node & Light Client @@ -113,10 +145,8 @@ Block before `0x79cecdd6f41361e2474290224751284312a018528d1d92f4e18dd6d542feddfe - #2913: Use KeyLocker to sign Neuron for Windows, conforming to the new industry standards effective since June 1, 2023.(@keith-cy) - #2921: Add network option of "Light Client(Mainnet)", and reserve "Internal Node" for built-in CKB Node only.(@yanguoyu) - **Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.111.0...v0.111.1 - # 0.111.0 (2023-10-19) ### CKB Node & Light Client @@ -140,10 +170,8 @@ Block before `0xd5e25ad24400f237aa5f72f3738a9ae77fe082a89937e75143fcc8ef5b009383 - #2870: Fix width of navbar.(@yanguoyu) - #2873: Fix fallback font on Linux.(@yanguoyu) - **Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.3...v0.111.0 - # 0.110.3 (2023-10-11) ### CKB Node & Light Client @@ -194,7 +222,6 @@ Curious to see the magic of the new Neuron in action? Checkout our demo video on **Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.2...v0.110.3 - # 0.110.2 (2023-07-07) ### CKB Node & Light Client @@ -217,10 +244,8 @@ Block before `0xc0c532e10c708852d9586be46a5ed8317b2aa0835c721aa691abffb9bf4a26cd - #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 diff --git a/lerna.json b/lerna.json index e54ad8d2e1..9370dd8292 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "packages": ["packages/*"], - "version": "0.114.0", + "version": "0.114.1", "npmClient": "yarn", "$schema": "node_modules/lerna/schemas/lerna-schema.json" } diff --git a/package.json b/package.json index d3a1d54f1a..e51ce72d4d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "neuron", "productName": "Neuron", "description": "CKB Neuron Wallet", - "version": "0.114.0", + "version": "0.114.1", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-ui/package.json b/packages/neuron-ui/package.json index ea55615543..6bae739cef 100644 --- a/packages/neuron-ui/package.json +++ b/packages/neuron-ui/package.json @@ -1,6 +1,6 @@ { "name": "neuron-ui", - "version": "0.114.0", + "version": "0.114.1", "private": true, "author": { "name": "Nervos Core Dev", diff --git a/packages/neuron-wallet/package.json b/packages/neuron-wallet/package.json index 6fb2eb31d0..f4326f24e9 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.114.0", + "version": "0.114.1", "private": true, "author": { "name": "Nervos Core Dev", @@ -98,7 +98,7 @@ "electron-builder": "24.9.1", "electron-devtools-installer": "3.2.0", "jest-when": "3.6.0", - "neuron-ui": "0.114.0", + "neuron-ui": "0.114.1", "typescript": "5.3.3" } }