Merge branch 'develop' into chore-update-typeorm

.ckb-light-version

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

.ckb-version

@@ -1 +1 @@
-v0.114.0
+v0.115.0

.github/workflows/unit_tests.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         node:
-          - 18.12.0
+          - 20.11.1
         os:
           - macos-latest
           - ubuntu-20.04

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

_typos.toml

@@ -1,6 +1,8 @@
 [default.extend-words]
 thur = "thur"
 numer = "numer"
+HD = "HD"
+hd = "hd"
 
 # defined in database schema
 lastest = "lastest"

compatible.json

@@ -1,5 +1,6 @@
 {
   "fullVersions": [
+    "0.115",
     "0.114",
     "0.113",
     "0.112",
@@ -20,6 +21,7 @@
   "compatible": {
     "0.111": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -34,6 +36,7 @@
     },
     "0.110": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -64,6 +67,7 @@
     },
     "0.112": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",
@@ -78,6 +82,7 @@
     },
     "0.114": {
       "full": [
+        "0.115",
         "0.114",
         "0.113",
         "0.112",

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",
@@ -64,7 +64,8 @@
   "dependencies": {},
   "resolutions": {
     "@types/react": "18.2.45",
-    "react-i18next": ">=11.16.4"
+    "react-i18next": ">=11.16.4",
+    "react-refresh": "0.14.0"
   },
   "volta": {
     "node": "20.10.0"

packages/neuron-ui/config-overrides.js

@@ -4,5 +4,6 @@ const path = require('path')
 module.exports = function override(config) {
   const webpackConfig = { ...config }
   webpackConfig.resolve.alias.electron = path.join(__dirname, 'src/electron-modules')
+  webpackConfig.resolve.fallback = { fs: false }
   return webpackConfig
 }

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,9 +50,12 @@
     "last 2 chrome versions"
   ],
   "dependencies": {
+    "@ckb-lumos/bi": "0.21.1",
+    "@ckb-lumos/rpc": "0.21.1",
     "@ckb-lumos/base": "0.21.1",
     "@ckb-lumos/codec": "0.21.1",
-    "@nervosnetwork/ckb-sdk-core": "0.109.0",
+    "@ckb-lumos/helpers": "0.21.1",
+    "@ckb-lumos/config-manager": "0.21.1",
     "@nervosnetwork/ckb-sdk-utils": "0.109.0",
     "canvg": "2.0.0",
     "i18next": "23.7.11",
@@ -90,7 +93,7 @@
     "@types/styled-components": "5.1.34",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "babel-jest": "25.5.1",
-    "electron": "28.1.0",
+    "electron": "30.0.0",
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.7",
     "eslint-config-airbnb": "19.0.4",

packages/neuron-ui/src/components/AddressBook/index.tsx

@@ -118,7 +118,7 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
             return `${HIDE_BALANCE} CKB`
           }
           return (
-            <CopyZone content={shannonToCKBFormatter(balance, false, '')} className={styles.copyBalance}>
+            <CopyZone content={shannonToCKBFormatter(balance, false, false)} className={styles.copyBalance}>
               <span className="textOverflow">{`${shannonToCKBFormatter(balance)} CKB`}</span>
             </CopyZone>
           )

packages/neuron-ui/src/components/ApproveMultisigTxDialog/index.tsx

@@ -2,11 +2,10 @@ import React, { useMemo } from 'react'
 import { useTranslation, Trans } from 'react-i18next'
 import { MultisigConfig, OfflineSignJSON } from 'services/remote'
 import { useState as useGlobalState } from 'states'
-import { ckbCore } from 'services/chain'
 import Tooltip from 'widgets/Tooltip'
 import { Copy } from 'widgets/Icons/icon'
 import CopyZone from 'widgets/CopyZone'
-import { shannonToCKBFormatter } from 'utils'
+import { scriptToAddress, shannonToCKBFormatter } from 'utils'
 import ScriptTag from 'components/ScriptTag'
 import Dialog from 'widgets/Dialog'
 import getMultisigSignStatus from 'utils/getMultisigSignStatus'
@@ -15,10 +14,7 @@ import styles from './approveMultisigTx.module.scss'
 
 const Cell = React.memo(
   ({ cell, isMainnet }: { cell: State.DetailedInput | State.DetailedOutput; isMainnet: boolean }) => {
-    const address = useMemo(
-      () => (cell.lock ? ckbCore.utils.scriptToAddress(cell.lock, isMainnet) : ''),
-      [cell, isMainnet]
-    )
+    const address = useMemo(() => (cell.lock ? scriptToAddress(cell.lock, { isMainnet }) : ''), [cell, isMainnet])
     return (
       <div className={styles.cellItem}>
         <div>

packages/neuron-ui/src/components/Balance/index.tsx

@@ -17,7 +17,7 @@ const Balance = ({ balance, connectionStatus, syncStatus }: BalanceProps) => {
   return (
     <>
       <span>{`${t('overview.balance')}:`}</span>
-      <CopyZone content={shannonToCKBFormatter(balance, false, '')} name={t('overview.copy-balance')}>
+      <CopyZone content={shannonToCKBFormatter(balance, false, false)} name={t('overview.copy-balance')}>
         <span className={styles.balanceValue}>{shannonToCKBFormatter(balance)}</span>
       </CopyZone>
       <BalanceSyncIcon connectionStatus={connectionStatus} syncStatus={syncStatus} />

packages/neuron-ui/src/components/DepositDialog/depositDialog.module.scss

@@ -1,7 +1,11 @@
 @import '../../styles/mixin.scss';
 
+.container {
+  width: 680px;
+}
+
 .slider {
-  margin-top: 16px;
+  margin-top: 10px;
 
   :global(.ms-Slider-thumb) {
     top: -8px;
@@ -32,65 +36,80 @@
   margin-top: 16px;
 }
 
-.depositValueLabel {
-  line-height: 20px;
-  color: var(--secondary-text-color);
-  font-size: 14px;
+.depositValueLabelWrap {
+  display: flex;
+
+  .depositValueLabel {
+    line-height: 20px;
+    color: var(--secondary-text-color);
+    font-size: 14px;
+  }
+  .tooltip {
+    margin-left: 120px;
+  }
+  .tip {
+    width: 400px;
+    word-break: normal;
+    white-space: normal;
+    line-height: 180%;
+  }
+
+  svg {
+    margin: 2px 4px 0;
+    cursor: pointer;
+    path {
+      fill: var(--primary-color);
+    }
+  }
 }
 
 .fee {
-  display: flex;
-  justify-content: space-between;
   font-size: 14px;
   line-height: 20px;
+  margin-top: 4px;
   color: var(--main-text-color);
+}
 
-  & > div {
-    &:nth-last-child(1) {
-      width: 230px;
-      text-align: right;
+.rewards {
+  padding: 6px 16px;
+  background: var(--tag-green-bg-color);
+  border-radius: 8px;
+  margin-top: 14px;
+  div {
+    display: flex;
+    justify-content: space-between;
+    color: var(--primary-color);
+    p {
+      margin: 0;
+      padding: 4px 0;
+      font-size: 14px;
+      line-height: 20px;
     }
   }
 }
 
-.notice {
-  $lineHeight: 24px;
+.acpContent {
   display: flex;
-  box-sizing: border-box;
-  margin-top: 22px;
-  border: 1px solid rgba(252, 136, 0, 0.2);
-  padding: 7px 54px;
-  border-radius: 4px;
-  background: #fff6eb;
-  color: #f68c2a;
-  font-weight: 500;
-  font-size: 12px;
-  line-height: $lineHeight;
-  text-align: center;
-
-  & > svg {
-    $size: 14px;
-    flex-shrink: 0;
-    margin: calc(($lineHeight - $size) / 2) 4px 0 0;
-    width: $size;
-    height: $size;
-
-    g[fill='#D50000'] {
-      fill: currentColor;
-    }
+  .tip {
+    min-width: 190px;
+    word-break: normal;
+    white-space: normal;
+    line-height: 180%;
   }
-
-  @media (prefers-color-scheme: dark) {
-    border-color: #4b391c;
-    background: #4b391c;
+  svg {
+    margin: 2px 4px 0;
+    cursor: pointer;
+    path {
+      fill: var(--primary-color);
+    }
   }
 }
 
 .rfcLink {
   font-weight: 500;
   font-size: 12px;
   background: inherit;
-  color: #f68c2a;
+  color: var(--primary-color);
   border: none;
   padding: 0;
   margin: 0;
@@ -100,6 +119,7 @@
 .isBalanceReserved {
   display: flex;
   align-items: center;
+  margin-top: 12px;
 
   & > input {
     display: none;
@@ -111,6 +131,7 @@
     gap: 8px;
 
     & > svg {
+      flex-shrink: 0;
       path {
         fill: #e5e5e5;
 
@@ -133,3 +154,22 @@
     }
   }
 }
+
+.notification {
+  color: var(--notice-text-color);
+  display: flex;
+  gap: 6px;
+  justify-content: center;
+  align-items: center;
+  word-break: break-word;
+  margin-top: 12px;
+  background-color: var(--warn-background-color);
+  font-size: 12px;
+  line-height: 24px;
+  padding: 8px 14px;
+  border: 1px solid rgba(252, 136, 0, 0.2);
+  border-radius: 4px;
+  span {
+    font-weight: 500;
+  }
+}