Merge branch 'develop' into fix-order-by-time

.ckb-light-version

@@ -1 +1 @@
-v0.3.6
+v0.3.7

CHANGELOG.md

@@ -1,3 +1,32 @@
+# 0.114.3 (2024-04-16)
+
+### CKB Node & Light Client
+
+- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.115.0) was released on Apr. 1st, 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.7) was released on Apr. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0x9443ad8da9172d484367bc5467988cba7a0c46028398309edfdda7d2d79be897`(at height `12,703,957`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3123)
+
+---
+
+## New features
+
+- #3054: Displaying DAO rewards.(@devchenyan)
+- #3066: Support keeping screen awake.(@yanguoyu)
+
+## Bug fixes
+
+- #3055: Fix sending sudt to a new acp cell with extra 142 CKB by offline sign.(@yanguoyu)
+- #3103: Handle MacOS crash properly on quitting.(@devchenyan)
+
+## New Contributors
+
+- @twhy made their first contribution in https://github.com/nervosnetwork/neuron/pull/3110
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.114.2...v0.114.3
+
 # 0.114.2 (2024-03-15)
 
 ### CKB Node & Light Client

lerna.json

@@ -1,6 +1,6 @@
 {
   "packages": ["packages/*"],
-  "version": "0.114.2",
+  "version": "0.114.3",
   "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.114.2",
+  "version": "0.114.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.114.2",
+  "version": "0.114.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -50,6 +50,7 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
+    "@ckb-lumos/bi": "0.21.1",
     "@ckb-lumos/base": "0.21.1",
     "@ckb-lumos/codec": "0.21.1",
     "@nervosnetwork/ckb-sdk-core": "0.109.0",

packages/neuron-ui/src/tests/formatters/sudtValueToAmount/fixtures.ts

@@ -10,18 +10,28 @@ export default {
     expected: '0',
   },
   '0 decimal': {
-    value: '1',
+    value: '12345',
     decimal: '0',
-    expected: '1',
+    expected: '12,345',
   },
   '1 decimal': {
     value: '1',
     decimal: '1',
     expected: '0.1',
   },
+  '2 decimal': {
+    value: '1234567890',
+    decimal: '2',
+    expected: '12,345,678.9',
+  },
   '32 decimal': {
     value: '100000000000000000000000000000001',
     decimal: '32',
     expected: '1.00000000000000000000000000000001',
   },
+  '32 decimal and commas': {
+    value: '12345678900000000000000000000000000000001',
+    decimal: '32',
+    expected: '123,456,789.00000000000000000000000000000001',
+  },
 }

packages/neuron-ui/src/utils/formatters.ts

@@ -1,3 +1,4 @@
+import { formatUnit } from '@ckb-lumos/bi'
 import { molecule } from '@ckb-lumos/codec'
 import { blockchain } from '@ckb-lumos/base'
 import { TFunction } from 'i18next'
@@ -236,45 +237,19 @@ export const sudtValueToAmount = (
   value: string | null = '0',
   decimal: string = '0',
   showPositiveSign = false,
-  separator = ','
+  showCommaSeparator = true
 ) => {
-  if (value === null) {
-    return showPositiveSign ? '+0' : '0'
+  if (Number.isNaN(Number(value))) {
+    console.warn(`Invalid sudt value: ${value}`)
   }
-  if (Number.isNaN(+value)) {
-    console.warn(`sUDT value is not a valid number`)
-    return showPositiveSign ? '+0' : '0'
-  }
-  let sign = ''
-  if (value.startsWith('-')) {
-    sign = '-'
-  } else if (showPositiveSign) {
-    sign = '+'
-  }
-  const unsignedValue = value.replace(/^-?0*/, '')
-  const dec = +decimal
-  if (dec === 0) {
-    return +unsignedValue ? `${sign}${unsignedValue}` : '0'
-  }
-  let unsignedSUDTValue = ''
-  if (unsignedValue.length <= dec) {
-    unsignedSUDTValue = `0.${unsignedValue.padStart(dec, '0')}`.replace(/\.?0+$/, '')
-  } else {
-    const decimalFraction = `.${unsignedValue.slice(-dec)}`.replace(/\.?0+$/, '')
-    const int = unsignedValue.slice(0, -dec).replace(/\^0+/, '')
-    unsignedSUDTValue = `${(
-      int
-        .split('')
-        .reverse()
-        .join('')
-        .match(/\d{1,3}/g) || ['0']
-    )
-      .join(separator)
-      .split('')
-      .reverse()
-      .join('')}${decimalFraction}`
-  }
-  return `${sign}${+unsignedSUDTValue === 0 ? '0' : unsignedSUDTValue}`
+  const val = value === null || Number.isNaN(+value) ? '0' : value
+  const [int, dec = ''] = formatUnit(val, +decimal).split('.')
+  const fmt = new Intl.NumberFormat('en-US', {
+    useGrouping: showCommaSeparator,
+    signDisplay: showPositiveSign ? 'always' : 'auto',
+  })
+  // use any type to avoid TS errors since string is not listed in the args IntlFormatter.prototype.format definition but it works
+  return `${fmt.format(int as any)}${dec ? `.${dec}` : ''}`
 }
 
 export const sUDTAmountFormatter = (amount: string) => {

packages/neuron-ui/src/utils/getSUDTAmount.ts

@@ -11,7 +11,7 @@ export const getSUDTAmount = ({
   let amountToCopy = amount
   if (tokenInfo) {
     amount = `${sudtValueToAmount(amount, tokenInfo.decimal)} ${tokenInfo.symbol}`
-    amountToCopy = sudtValueToAmount(amountToCopy, tokenInfo.decimal, false, '')
+    amountToCopy = sudtValueToAmount(amountToCopy, tokenInfo.decimal, false, false)
   }
   return {
     amount,

packages/neuron-wallet/.env

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

packages/neuron-wallet/package.json

@@ -3,7 +3,7 @@
   "productName": "Neuron",
   "description": "CKB Neuron Wallet",
   "homepage": "https://www.nervos.org/",
-  "version": "0.114.2",
+  "version": "0.114.3",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -97,7 +97,7 @@
     "electron-builder": "24.9.1",
     "electron-devtools-installer": "3.2.0",
     "jest-when": "3.6.0",
-    "neuron-ui": "0.114.2",
+    "neuron-ui": "0.114.3",
     "typescript": "5.3.3"
   }
 }

packages/neuron-wallet/src/block-sync-renderer/sync/light-synchronizer.ts

@@ -262,6 +262,7 @@ export default class LightSynchronizer extends Synchronizer {
           previousTxHashes.add(previousTxHash)
         }
       })
+    if (!previousTxHashes.size) return
     await this.lightRpc.createBatchRequest([...previousTxHashes].map(v => ['fetchTransaction' as keyof Base, v])).exec()
   }