Merge branch 'develop' into feat-keep-awake

.github/workflows/check_checksums.yml

@@ -8,13 +8,16 @@ jobs:
   compare:
     name: Compare checksums
     runs-on: macos-latest
+    environment: Release
+    permissions:
+      contents: write # to append checksum for each commit
+      actions: read # to read artifacts
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Generate checksums from artifacts
-        run:
-          ruby ./scripts/release-checksums.rb ${{ github.event.release.tag_name }} | tee generated_checksums.txt
+        run: ruby ./scripts/release-checksums.rb ${{ github.event.release.tag_name }} | tee generated_checksums.txt
 
       - name: Fetch checksums from release note
         run: |
@@ -36,4 +39,3 @@ jobs:
       - uses: peter-evans/commit-comment@v3
         with:
           body: ${{ steps.comment_body.outputs.body }}
-

.github/workflows/checksums-of-release-draft.yml

@@ -10,6 +10,9 @@ on:
 jobs:
   checksums:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      actions: read
     if: github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Checkout

.github/workflows/merge_released_into_develop.yml

@@ -9,6 +9,9 @@ jobs:
   merge-to-dev:
     name: Merge into develop
     runs-on: ubuntu-latest
+    environment: Release
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/checkout@master
       - name: Request

.github/workflows/package.yml

@@ -21,6 +21,8 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     environment: Release
+    permissions:
+      contents: write
 
     name: ${{ matrix.os }}(Node.js ${{ matrix.node }})
 
@@ -136,28 +138,28 @@ jobs:
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Mac
+          name: Neuron-Mac-x64
           path: release/Neuron-*-mac-x64.zip
 
       - name: Upload Neuron App Zip(arm64)
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Mac
+          name: Neuron-Mac-arm64
           path: release/Neuron-*-mac-arm64.zip
 
       - name: Upload Neuron Dmg
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Dmg
+          name: Neuron-Dmg-x64
           path: release/Neuron-*-x64.dmg
 
       - name: Upload Neuron Dmg(arm64)
         if: matrix.os == 'macos-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: Neuron-Dmg
+          name: Neuron-Dmg-arm64
           path: release/Neuron-*-arm64.dmg
 
       - name: Upload Neuron Win

.github/workflows/update_wallet_env.yml

@@ -7,6 +7,10 @@ jobs:
   ready-for-release:
     name: Update ckb node assume valid target
     runs-on: ubuntu-latest
+    environment: neuron-bot
+    permissions:
+      pull-requests: write # open PR
+      contents: write # update version files
     if: ${{ startsWith(github.ref_name, 'rc/') }}
     steps:
       - name: Create Branch

CHANGELOG.md

@@ -1,3 +1,93 @@
+# 0.114.2 (2024-03-15)
+
+### CKB Node & Light Client
+
+- [[email protected]](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 [email protected]](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.
+
+[![[email protected]](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.2
+
+# 0.114.0 (2024-03-15)
+
+### CKB Node & Light Client
+
+- [[email protected]](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 [email protected]](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.
+
+[![[email protected]](https://github.com/nervosnetwork/neuron/assets/7271329/883aba6e-ceb0-402d-9de0-d46609c528b7)](https://youtu.be/df29-EUZG0Y)
+
+---
+
+## New features
+
+- #2859: Support Cell Management.(@yanguoyu)
+- #2963: Support chained transactions.(@yanguoyu)
+- #2986: Support viewing chained transaction detail.(@yanguoyu)
+- #3012: Support French in User Interface.(Special thanks to @Natixe)
+- #3024: Support Spanish in User Interface.(Special thanks to @Natixe)
+- #3014: Support remaining time estimation.(@yanguoyu)
+- #3045: Support "amend a pending transaction".(@devchenyan)
+- #3005: Show tip for first sync and show warning when disk is not enough for full-node mode.(@yanguoyu)
+- #2994: Optimize setting of light client.(@yanguoyu)
+- #3040: Optimize transaction overview.(@yanguoyu)
+
+## Bug fixes
+
+- #2951: Fix error on creating multisig address.(@devchenyan)
+- #2992: Fix transaction lost in light client mode.(@yanguoyu)
+- #3010: Fix storage of multisig configuration.(@yanguoyu)
+- #3020: Disable nervos dao unlock button when balance is not enough as transaction fee.(@yanguoyu)
+
+## New Contributors
+
+- @Natixe made their first contribution in https://github.com/nervosnetwork/neuron/pull/3012
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.112.0...v0.114.0
+
 # 0.112.0 (2023-12-07)
 
 ### CKB Node & Light Client
@@ -25,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
@@ -57,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
@@ -84,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
@@ -138,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
@@ -161,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

compatible.json

@@ -75,6 +75,20 @@
         "0.3",
         "0.2"
       ]
+    },
+    "0.114": {
+      "full": [
+        "0.114",
+        "0.113",
+        "0.112",
+        "0.111",
+        "0.110",
+        "0.109"
+      ],
+      "light": [
+        "0.3",
+        "0.2"
+      ]
     }
   }
 }

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.112.0",
+  "version": "0.114.2",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

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

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.112.0",
+  "version": "0.114.2",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

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

@@ -61,8 +61,14 @@ const RowExtend = ({ column, columns, isMainnet, id, bestBlockNumber }: RowExten
   )
 
   const { blockNumber, hash, description, status } = column
-  const confirmations = blockNumber ? 1 + bestBlockNumber - +blockNumber : 0
-  const confirmationsLabel = confirmations > 1000 ? '1,000+' : localNumberFormatter(confirmations)
+  const confirmations = bestBlockNumber && blockNumber ? 1 + bestBlockNumber - +blockNumber : null
+  const confirmationsLabel =
+    // eslint-disable-next-line no-nested-ternary
+    confirmations === null || confirmations < 0
+      ? '--'
+      : confirmations > 1000
+      ? '1,000+'
+      : localNumberFormatter(confirmations)
   const onCopy = useCallback(() => {
     window.navigator.clipboard.writeText(hash)
     showPageNotice('common.copied')(dispatch)

packages/neuron-wallet/.env

@@ -117,5 +117,5 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
 MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8
 
 # CKB NODE OPTIONS
-CKB_NODE_ASSUME_VALID_TARGET='0xe88730476c6ef0508f4767b233c82a0f20c6365fb1572bf020cb1dce2a0e704b'
-CKB_NODE_DATA_SIZE=49
+CKB_NODE_ASSUME_VALID_TARGET='0x397d7d41167051cab2bf1610e334ad3aa5cf612e2cd442f71b91422e0361141e'
+CKB_NODE_DATA_SIZE=51

packages/neuron-wallet/package.json

@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.112.0",
+  "version": "0.114.2",
   "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.112.0",
+    "neuron-ui": "0.114.2",
     "typescript": "5.3.3"
   }
 }

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
       }

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()
     })