Merge branch 'develop' into feat-425

.github/workflows/spam-comment-detection.yaml

@@ -4,6 +4,9 @@ on:
   issue_comment:
     types: [created, edited]
 
+permissions:
+  issues: write
+
 jobs:
   detect-spam:
     runs-on: ubuntu-latest
@@ -21,7 +24,7 @@ jobs:
             const issue_number = process.env.ISSUE_NUMBER
             const owner = process.env.REPO_OWNER
             const repo = process.env.REPO_NAME
-            const EXTERNAL_LINK_REGEXT = /https:\/\/(?!((\w+\.)?github\.com|github\.com|(\w+\.)?magickbase\.com|(\w+\.)?nervos\.org))/gi
+            const EXTERNAL_LINK_REGEXT = /https?:\/\/(?!((\w+\.)?github\.com|github\.com|(\w+\.)?magickbase\.com|(\w+\.)?nervos\.org))/gi
             if (spam_words.some(w => comment.includes(w))) {
               console.info(`Spam comment: ${comment}`)
               github.rest.issues.deleteComment({ owner, repo, comment_id })
@@ -43,4 +46,4 @@ jobs:
           ISSUE_NUMBER: ${{ github.event.issue.number }}
           REPO_OWNER: ${{github.repository_owner }}
           REPO_NAME: ${{ github.event.repository.name }}
-          SPAM_WORDS: ${{ github.secrets.SPAM_WORDS }}
+          SPAM_WORDS: ${{ secrets.SPAM_WORDS }}

CHANGELOG.md

@@ -1,3 +1,27 @@
+# 0.120.0 (2024-12-13)
+
+### CKB Node & Light Client
+
+- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.120.0) was released on Dec. 12th, 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.4.1) was released on Nov. 13th, 2024. This version of CKB Light Client is now bundled and preconfigured in Neuron
+
+### Assumed valid target
+
+Block before `0xe1085c7ce8f4e8461ea75afe63ef21d2c1ce6a5d0bf0f0170042bebdd2fbde04`(at height `14,817,366`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3282)
+
+---
+
+## New features
+
+- #3271: Support Arabic, FrCanadian/Belgian in User Interface.(@Natixe)
+
+## New Contributors
+
+- @Natixe made their first contribution in https://github.com/nervosnetwork/neuron/pull/3271
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.119.0...v0.120.0
+
+
 # 0.119.0 (2024-12-02)
 
 ### CKB Node & Light Client

compatible.json

@@ -169,7 +169,6 @@
     },
     "0.119": {
       "full": [
-        "0.120",
         "0.119",
         "0.118",
         "0.117",
@@ -188,7 +187,7 @@
         "0.2"
       ]
     },
-    "0.119": {
+    "0.120": {
       "full": [
         "0.119",
         "0.118",

lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.119.0",
+  "version": "0.120.0",
   "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.119.0",
+  "version": "0.120.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/package.json

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

packages/neuron-ui/src/components/AddressBook/addressBook.module.scss

@@ -168,6 +168,20 @@
   }
 }
 
+.privateKey {
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  &:hover {
+    svg {
+      g,
+      path {
+        stroke: var(--primary-color);
+      }
+    }
+  }
+}
+
 @media screen and (max-width: 1330px) {
   .container {
     .balance {

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

@@ -3,7 +3,8 @@ import { useTranslation } from 'react-i18next'
 import { useState as useGlobalState, useDispatch } from 'states'
 import Dialog from 'widgets/Dialog'
 import CopyZone from 'widgets/CopyZone'
-import { Copy } from 'widgets/Icons/icon'
+import ViewPrivateKey from 'components/ViewPrivateKey'
+import { Copy, PrivateKey } from 'widgets/Icons/icon'
 import Table, { TableProps, SortType } from 'widgets/Table'
 import { shannonToCKBFormatter, useLocalDescription } from 'utils'
 import { HIDE_BALANCE } from 'utils/const'
@@ -44,6 +45,7 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
 
   const dispatch = useDispatch()
   const { onChangeEditStatus, onSubmitDescription } = useLocalDescription('address', walletId, dispatch)
+  const [viewPrivateKeyAddress, setViewPrivateKeyAddress] = useState('')
 
   const columns = useMemo<TableProps<State.Address>['columns']>(
     () => [
@@ -149,6 +151,21 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
           return 0
         },
       },
+      {
+        title: '',
+        dataIndex: 'key',
+        align: 'left',
+        width: '40px',
+        render(_, __, { address }) {
+          return (
+            <Tooltip tip={t('addresses.view-private-key')} placement="left">
+              <button type="button" className={styles.privateKey} onClick={() => setViewPrivateKeyAddress(address)}>
+                <PrivateKey />
+              </button>
+            </Tooltip>
+          )
+        },
+      },
     ],
     [t]
   )
@@ -179,6 +196,10 @@ const AddressBook = ({ onClose }: { onClose?: () => void }) => {
             }
           />
         </div>
+
+        {!!viewPrivateKeyAddress && (
+          <ViewPrivateKey address={viewPrivateKeyAddress} onClose={() => setViewPrivateKeyAddress('')} />
+        )}
       </div>
     </Dialog>
   )

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

@@ -7,7 +7,8 @@ import Button from 'widgets/Button'
 import CopyZone from 'widgets/CopyZone'
 import QRCode from 'widgets/QRCode'
 import Tooltip from 'widgets/Tooltip'
-import { AddressTransform, Download, Copy, Attention, SuccessNoBorder } from 'widgets/Icons/icon'
+import ViewPrivateKey from 'components/ViewPrivateKey'
+import { AddressTransform, Download, Copy, Attention, SuccessNoBorder, PrivateKey } from 'widgets/Icons/icon'
 import VerifyHardwareAddress from './VerifyHardwareAddress'
 import styles from './receive.module.scss'
 import { useCopyAndDownloadQrCode, useSwitchAddress } from './hooks'
@@ -29,6 +30,7 @@ export const AddressQrCodeWithCopyZone = ({
   )
 
   const [isCopySuccess, setIsCopySuccess] = useState(false)
+  const [showViewPrivateKey, setShowViewPrivateKey] = useState(false)
   const timer = useRef<ReturnType<typeof setTimeout>>()
   const { ref, onCopyQrCode, onDownloadQrCode, showCopySuccess } = useCopyAndDownloadQrCode()
 
@@ -70,19 +72,27 @@ export const AddressQrCodeWithCopyZone = ({
         <CopyZone content={showAddress} className={styles.showAddress}>
           {showAddress}
         </CopyZone>
-        <button
-          type="button"
-          className={styles.addressToggle}
-          onClick={onClick}
-          title={transformLabel}
-          onFocus={stopPropagation}
-          onMouseOver={stopPropagation}
-          onMouseUp={stopPropagation}
-        >
-          <AddressTransform />
-          {transformLabel}
-        </button>
+        <div className={styles.actionWrap}>
+          <button
+            type="button"
+            className={styles.addressToggle}
+            onClick={onClick}
+            title={transformLabel}
+            onFocus={stopPropagation}
+            onMouseOver={stopPropagation}
+            onMouseUp={stopPropagation}
+          >
+            <AddressTransform />
+            {transformLabel}
+          </button>
+          <button type="button" className={styles.privateKey} onClick={() => setShowViewPrivateKey(true)}>
+            <PrivateKey />
+            {t('addresses.view-private-key')}
+          </button>
+        </div>
       </div>
+
+      {showViewPrivateKey && <ViewPrivateKey address={showAddress} onClose={() => setShowViewPrivateKey(false)} />}
     </div>
   )
 }

packages/neuron-ui/src/components/Receive/receive.module.scss

@@ -125,26 +125,42 @@
   color: var(--main-text-color);
 }
 
-.addressToggle {
-  width: 100%;
+.actionWrap {
   margin-top: 8px;
-  appearance: none;
-  border: none;
-  background: none;
   display: flex;
   justify-content: center;
-  align-items: center;
-  font-size: 12px;
-  font-family: PingFang SC;
-  font-style: normal;
-  font-weight: 500;
-  color: var(--primary-color);
-  line-height: normal;
-  cursor: pointer;
+  gap: 32px;
 
-  svg {
-    pointer-events: none;
-    margin-right: 5px;
+  button {
+    appearance: none;
+    border: none;
+    background: none;
+    font-size: 12px;
+    font-style: normal;
+    font-weight: 500;
+    color: var(--primary-color);
+    line-height: normal;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+  }
+
+  .addressToggle {
+    svg {
+      pointer-events: none;
+      margin-right: 5px;
+    }
+  }
+
+  .privateKey {
+    svg {
+      width: 16px;
+      margin-right: 3px;
+      g,
+      path {
+        stroke: var(--primary-color);
+      }
+    }
   }
 }
 

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

@@ -1,9 +1,18 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import { TFunction } from 'i18next'
 import { useTranslation } from 'react-i18next'
 import { showErrorMessage, signMessage, verifyMessage } from 'services/remote'
 import { ControllerResponse } from 'services/remote/remoteApiWrapper'
-import { ErrorCode, isSuccessResponse, shannonToCKBFormatter, useExitOnWalletChange, useGoBack } from 'utils'
+import {
+  ErrorCode,
+  isSuccessResponse,
+  shannonToCKBFormatter,
+  useExitOnWalletChange,
+  useGoBack,
+  validateAddress,
+  isMainnet as isMainnetUtil,
+} from 'utils'
+import { isErrorWithI18n } from 'exceptions'
 import { useState as useGlobalState } from 'states'
 import Button from 'widgets/Button'
 import Balance from 'widgets/Balance'
@@ -130,8 +139,13 @@ const SignAndVerify = () => {
   const [message, setMessage] = useState('')
   const [signature, setSignature] = useState('')
   const [address, setAddress] = useState('')
-  const { wallet } = useGlobalState()
+  const {
+    chain: { networkID },
+    settings: { networks },
+    wallet,
+  } = useGlobalState()
   const [isDropdownOpen, setIsDropdownOpen] = useState(false)
+  const isMainnet = isMainnetUtil(networks, networkID)
   useExitOnWalletChange()
 
   const handlePasswordDialogOpen = useCallback(() => {
@@ -226,12 +240,29 @@ const SignAndVerify = () => {
 
   const onBack = useGoBack()
 
+  const addressError = useMemo(() => {
+    if (!address) {
+      return undefined
+    }
+    try {
+      validateAddress(address, isMainnet)
+    } catch (err) {
+      if (isErrorWithI18n(err)) {
+        return t(err.message, err.i18n)
+      }
+    }
+    if (wallet?.addresses && !wallet.addresses.find(item => item.address === address)) {
+      return t('sign-and-verify.address-not-found')
+    }
+    return undefined
+  }, [t, address, isMainnet, wallet.addresses])
+
   return (
     <div>
       <Dialog
         show={showDialog}
         title={t('sign-and-verify.sign-or-verify-message')}
-        disabled={!message || !signature || !address}
+        disabled={!message || !signature || !address || !!addressError}
         onCancel={onBack}
         confirmText={t('sign-and-verify.verify')}
         onConfirm={handleVerifyMessage}
@@ -270,6 +301,7 @@ const SignAndVerify = () => {
                     </div>
                   }
                   width="100%"
+                  error={addressError}
                 />
               </div>
               {isDropdownOpen && wallet?.addresses ? (
@@ -311,7 +343,7 @@ const SignAndVerify = () => {
 
           {wallet?.isWatchOnly || (
             <div className={styles.signWrap}>
-              <Button type="text" disabled={!message || !address} onClick={handlePasswordDialogOpen}>
+              <Button type="text" disabled={!message || !address || !!addressError} onClick={handlePasswordDialogOpen}>
                 <Sign />
                 {t('sign-and-verify.sign')}
               </Button>