Merge pull request #3269 from nervosnetwork/rc/v0.119.0

.ckb-light-version

@@ -1 +1 @@
-v0.3.7
+v0.4.1

.ckb-version

@@ -1 +1 @@
-v0.117.0
+v0.119.0

CHANGELOG.md

@@ -1,3 +1,25 @@
+# 0.119.0 (2024-12-02)
+
+### CKB Node & Light Client
+
+- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.119.0) was released on Oct. 25th, 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 `0x7488acf2280ebf5b83c805a517f766eab77f45cd51f61476811d1ce96a60ea71`(at height `14,687,217`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3268)
+
+---
+
+## Bug fixes
+
+- #3239: Fix abnormal display of remaining time of Nervos DAO.(@devchenyan)
+- #3246: Use the median fee rate instead of the average as a more appropriate reference for fee rate.(@yanguoyu)
+
+
+**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.117.0...v0.119.0
+
+
 # 0.117.0 (2024-08-12)
 
 ### CKB Node & Light Client

README.md

@@ -67,6 +67,18 @@ $ yarn start:ui
 $ yarn start:wallet
 ```
 
+If you want to develop with devnet, replace the testnet script with the dev script in the `packages/neuron-wallet/.env` file.
+
+Here is a script env example, it is constructed by network、script name and filed name.
+
+```
+TESTNET_SUDT_DEP_TXHASH=0xe12877ebd2c3c364dc46c5c992bcfaf4fee33fa13eebdf82c591fc9825aab769
+TESTNET_SUDT_DEP_INDEX=0
+TESTNET_SUDT_DEP_TYPE=code
+TESTNET_SUDT_SCRIPT_CODEHASH=0xc5e5dcf215925f7ef4dfaf5f4b4f105bc321c02776d6e7d52a1db3fcd9d011a4
+TESTNET_SUDT_SCRIPT_HASHTYPE=type
+```
+
 ### Test
 
 ```shell

compatible.json

@@ -1,5 +1,7 @@
 {
   "fullVersions": [
+    "0.119",
+    "0.118",
     "0.117",
     "0.116",
     "0.115",
@@ -17,12 +19,15 @@
     "0.103"
   ],
   "lightVersions": [
+    "0.4",
     "0.3",
     "0.2"
   ],
   "compatible": {
     "0.111": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -34,12 +39,15 @@
         "0.109"
       ],
       "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]
     },
     "0.110": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -51,6 +59,7 @@
         "0.109"
       ],
       "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]
@@ -73,6 +82,8 @@
     },
     "0.112": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -84,12 +95,15 @@
         "0.109"
       ],
       "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]
     },
     "0.114": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -101,12 +115,15 @@
         "0.109"
       ],
       "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]
     },
     "0.116": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -118,12 +135,15 @@
         "0.109"
       ],
       "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]
     },
     "0.117": {
       "full": [
+        "0.119",
+        "0.118",
         "0.117",
         "0.116",
         "0.115",
@@ -135,6 +155,27 @@
         "0.109"
       ],
       "light": [
+        "0.4",
+        "0.3",
+        "0.2"
+      ]
+    },
+    "0.119": {
+      "full": [
+        "0.119",
+        "0.118",
+        "0.117",
+        "0.116",
+        "0.115",
+        "0.114",
+        "0.113",
+        "0.112",
+        "0.111",
+        "0.110",
+        "0.109"
+      ],
+      "light": [
+        "0.4",
         "0.3",
         "0.2"
       ]

lerna.json

@@ -1,6 +1,8 @@
 {
-  "packages": ["packages/*"],
-  "version": "0.117.0",
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.119.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.117.0",
+  "version": "0.119.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",

packages/neuron-ui/config-overrides.js

@@ -9,5 +9,19 @@ module.exports = function override(config) {
     crypto: false,
     buffer: false,
   }
+  /* disable autoprefixer */
+  webpackConfig.module.rules
+    .find(r => r.oneOf)
+    .oneOf.forEach(rule => {
+      if (rule.use) {
+        rule.use.forEach(loader => {
+          if (loader.options && loader.options.postcssOptions) {
+            loader.options.postcssOptions.plugins = loader.options.postcssOptions.plugins.filter(
+              plugin => !plugin.toString().includes('autoprefixer')
+            )
+          }
+        })
+      }
+    })
   return webpackConfig
 }

packages/neuron-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neuron-ui",
-  "version": "0.117.0",
+  "version": "0.119.0",
   "private": true,
   "author": {
     "name": "Nervos Core Dev",
@@ -46,19 +46,16 @@
   "jest": {
     "displayName": "UI Tests"
   },
-  "browserslist": [
-    "last 2 chrome versions"
-  ],
   "dependencies": {
-    "@ckb-lumos/lumos": "0.23.0",
-    "@ckb-lumos/bi": "0.23.0",
-    "@ckb-lumos/rpc": "0.23.0",
     "@ckb-lumos/base": "0.23.0",
+    "@ckb-lumos/bi": "0.23.0",
     "@ckb-lumos/codec": "0.23.0",
+    "@ckb-lumos/common-scripts": "0.23.0",
+    "@ckb-lumos/config-manager": "0.23.0",
     "@ckb-lumos/hd": "0.23.0",
     "@ckb-lumos/helpers": "0.23.0",
-    "@ckb-lumos/config-manager": "0.23.0",
-    "@ckb-lumos/common-scripts": "0.23.0",
+    "@ckb-lumos/lumos": "0.23.0",
+    "@ckb-lumos/rpc": "0.23.0",
     "canvg": "2.0.0",
     "i18next": "23.7.11",
     "immer": "9.0.21",
@@ -108,7 +105,7 @@
     "react-test-renderer": "18.2.0",
     "storybook": "7.6.6",
     "storybook-addon-react-router-v6": "2.0.10",
-    "webpack": "5.89.0"
+    "webpack": "5.94.0"
   },
   "resolutions": {
     "react-i18next": "14.0.0"

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

@@ -137,7 +137,9 @@ export const DAORecord = ({
         break
       }
       case CellStatus.Deposited: {
-        if (leftHours) {
+        if (!compensationEndEpochValue) {
+          message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle')
+        } else if (leftHours) {
           message = t('nervos-dao.compensation-period.stage-messages.next-compensation-cycle-hours', {
             hours: leftHours || '--',
           })
@@ -149,7 +151,9 @@ export const DAORecord = ({
         break
       }
       case CellStatus.Locked: {
-        if (leftHours) {
+        if (!compensationEndEpochValue) {
+          message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle')
+        } else if (leftHours) {
           message = t('nervos-dao.compensation-period.stage-messages.compensation-cycle-will-end-hours', {
             hours: leftHours || '--',
           })

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

@@ -132,22 +132,24 @@ const PageContainer: React.FC<ComponentProps> = props => {
         </div>
         {notice && <PageHeadNotice notice={notice} />}
       </div>
-      {showWaitForFullySynced && (
-        <Alert status="warn" className={styles.syncNotification}>
-          {t(`messages.codes.${ErrorCode.WaitForFullySynced}`)}
-          <Close className={styles.close} onClick={closeSyncNotice} />
-        </Alert>
-      )}
-      <div className={styles.body}>{children}</div>
-      <SetStartBlockNumberDialog
-        show={isSetStartBlockShown}
-        headerTipNumber={bestKnownBlockNumber}
-        initStartBlockNumber={walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined}
-        isMainnet={isMainnet}
-        address={addresses[0]?.address}
-        onUpdateStartBlockNumber={onConfirm}
-        onCancel={closeDialog}
-      />
+      <div className={styles.content}>
+        {showWaitForFullySynced && (
+          <Alert status="warn" className={styles.syncNotification}>
+            {t(`messages.codes.${ErrorCode.WaitForFullySynced}`)}
+            <Close className={styles.close} onClick={closeSyncNotice} />
+          </Alert>
+        )}
+        <div className={styles.body}>{children}</div>
+        <SetStartBlockNumberDialog
+          show={isSetStartBlockShown}
+          headerTipNumber={bestKnownBlockNumber}
+          initStartBlockNumber={walletStartBlockNumber ? Number(walletStartBlockNumber) : undefined}
+          isMainnet={isMainnet}
+          address={addresses[0]?.address}
+          onUpdateStartBlockNumber={onConfirm}
+          onCancel={closeDialog}
+        />
+      </div>
     </div>
   )
 }

packages/neuron-ui/src/components/PageContainer/pageContainer.module.scss

@@ -3,7 +3,6 @@
 .page {
   background: var(--main-background-color);
   color: var(--main-text-color);
-  padding: 0 24px;
   position: relative;
   display: flex;
   flex-direction: column;
@@ -15,6 +14,7 @@
     align-items: center;
     height: 72px;
     margin: 0;
+    padding: 0 24px;
     font-size: 20px;
     font-weight: 500;
     justify-content: space-between;
@@ -78,6 +78,9 @@
       }
     }
   }
+  .content {
+    padding: 0 24px;
+  }
 }
 
 .notice {

packages/neuron-ui/src/locales/en.json

@@ -784,7 +784,8 @@
           "compensation-cycle-will-end": "Compensation cycle ends in approximately {{days}} days",
           "compensation-cycle-will-end-hours": "Compensation cycle ends in approximately {{hours}} hours",
           "compensation-cycle-has-ended": "Cycle has ended, CKB is ready to be unlocked",
-          "unlocking": "Unlocking..."
+          "unlocking": "Unlocking...",
+          "calculating-the-compensation-cycle": "Calculating the compensation cycle"
         }
       }
     },
@@ -873,7 +874,7 @@
         "tag": "J"
       },
       "feb": {
-        "full": "Febrary",
+        "full": "February",
         "short": "Feb.",
         "tag": "F"
       },

packages/neuron-ui/src/locales/es.json

@@ -767,7 +767,8 @@
           "compensation-cycle-will-end": "El ciclo de compensación termina en aproximadamente {{days}} días",
           "compensation-cycle-will-end-hours": "El ciclo de compensación termina en aproximadamente {{hours}} horas",
           "compensation-cycle-has-ended": "El ciclo ha terminado, CKB está listo para ser desbloqueado",
-          "unlocking": "Desbloqueando..."
+          "unlocking": "Desbloqueando...",
+          "calculating-the-compensation-cycle": "Calculando el ciclo de compensación"
         }
       }
     },

packages/neuron-ui/src/locales/fr.json

@@ -774,7 +774,8 @@
           "compensation-cycle-will-end": "La période de compensation se termine dans environ {{days}} jours",
           "compensation-cycle-will-end-hours": "La période de compensation se termine dans environ {{hours}} heures",
           "compensation-cycle-has-ended": "Le cycle est terminé, les CKB sont prêts à être déverrouillés",
-          "unlocking": "Déverrouillage en cours..."
+          "unlocking": "Déverrouillage en cours...",
+          "calculating-the-compensation-cycle": "Calculer le cycle de compensation"
         }
       }
     },