Skip to content

Commit 39fea37

Browse files
authored
Merge pull request nervosnetwork#3269 from nervosnetwork/rc/v0.119.0
2 parents bc88e27 + e2affda commit 39fea37

28 files changed

+589
-447
lines changed

.ckb-light-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.3.7
1+
v0.4.1

.ckb-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.117.0
1+
v0.119.0

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
# 0.119.0 (2024-12-02)
2+
3+
### CKB Node & Light Client
4+
5+
- [[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.
6+
- [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
7+
8+
### Assumed valid target
9+
10+
Block before `0x7488acf2280ebf5b83c805a517f766eab77f45cd51f61476811d1ce96a60ea71`(at height `14,687,217`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3268)
11+
12+
---
13+
14+
## Bug fixes
15+
16+
- #3239: Fix abnormal display of remaining time of Nervos DAO.(@devchenyan)
17+
- #3246: Use the median fee rate instead of the average as a more appropriate reference for fee rate.(@yanguoyu)
18+
19+
20+
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.117.0...v0.119.0
21+
22+
123
# 0.117.0 (2024-08-12)
224

325
### CKB Node & Light Client

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@ $ yarn start:ui
6767
$ yarn start:wallet
6868
```
6969

70+
If you want to develop with devnet, replace the testnet script with the dev script in the `packages/neuron-wallet/.env` file.
71+
72+
Here is a script env example, it is constructed by network、script name and filed name.
73+
74+
```
75+
TESTNET_SUDT_DEP_TXHASH=0xe12877ebd2c3c364dc46c5c992bcfaf4fee33fa13eebdf82c591fc9825aab769
76+
TESTNET_SUDT_DEP_INDEX=0
77+
TESTNET_SUDT_DEP_TYPE=code
78+
TESTNET_SUDT_SCRIPT_CODEHASH=0xc5e5dcf215925f7ef4dfaf5f4b4f105bc321c02776d6e7d52a1db3fcd9d011a4
79+
TESTNET_SUDT_SCRIPT_HASHTYPE=type
80+
```
81+
7082
### Test
7183

7284
```shell

compatible.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"fullVersions": [
3+
"0.119",
4+
"0.118",
35
"0.117",
46
"0.116",
57
"0.115",
@@ -17,12 +19,15 @@
1719
"0.103"
1820
],
1921
"lightVersions": [
22+
"0.4",
2023
"0.3",
2124
"0.2"
2225
],
2326
"compatible": {
2427
"0.111": {
2528
"full": [
29+
"0.119",
30+
"0.118",
2631
"0.117",
2732
"0.116",
2833
"0.115",
@@ -34,12 +39,15 @@
3439
"0.109"
3540
],
3641
"light": [
42+
"0.4",
3743
"0.3",
3844
"0.2"
3945
]
4046
},
4147
"0.110": {
4248
"full": [
49+
"0.119",
50+
"0.118",
4351
"0.117",
4452
"0.116",
4553
"0.115",
@@ -51,6 +59,7 @@
5159
"0.109"
5260
],
5361
"light": [
62+
"0.4",
5463
"0.3",
5564
"0.2"
5665
]
@@ -73,6 +82,8 @@
7382
},
7483
"0.112": {
7584
"full": [
85+
"0.119",
86+
"0.118",
7687
"0.117",
7788
"0.116",
7889
"0.115",
@@ -84,12 +95,15 @@
8495
"0.109"
8596
],
8697
"light": [
98+
"0.4",
8799
"0.3",
88100
"0.2"
89101
]
90102
},
91103
"0.114": {
92104
"full": [
105+
"0.119",
106+
"0.118",
93107
"0.117",
94108
"0.116",
95109
"0.115",
@@ -101,12 +115,15 @@
101115
"0.109"
102116
],
103117
"light": [
118+
"0.4",
104119
"0.3",
105120
"0.2"
106121
]
107122
},
108123
"0.116": {
109124
"full": [
125+
"0.119",
126+
"0.118",
110127
"0.117",
111128
"0.116",
112129
"0.115",
@@ -118,12 +135,15 @@
118135
"0.109"
119136
],
120137
"light": [
138+
"0.4",
121139
"0.3",
122140
"0.2"
123141
]
124142
},
125143
"0.117": {
126144
"full": [
145+
"0.119",
146+
"0.118",
127147
"0.117",
128148
"0.116",
129149
"0.115",
@@ -135,6 +155,27 @@
135155
"0.109"
136156
],
137157
"light": [
158+
"0.4",
159+
"0.3",
160+
"0.2"
161+
]
162+
},
163+
"0.119": {
164+
"full": [
165+
"0.119",
166+
"0.118",
167+
"0.117",
168+
"0.116",
169+
"0.115",
170+
"0.114",
171+
"0.113",
172+
"0.112",
173+
"0.111",
174+
"0.110",
175+
"0.109"
176+
],
177+
"light": [
178+
"0.4",
138179
"0.3",
139180
"0.2"
140181
]

lerna.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2-
"packages": ["packages/*"],
3-
"version": "0.117.0",
2+
"packages": [
3+
"packages/*"
4+
],
5+
"version": "0.119.0",
46
"npmClient": "yarn",
57
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
68
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "neuron",
33
"productName": "Neuron",
44
"description": "CKB Neuron Wallet",
5-
"version": "0.117.0",
5+
"version": "0.119.0",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",

packages/neuron-ui/config-overrides.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,19 @@ module.exports = function override(config) {
99
crypto: false,
1010
buffer: false,
1111
}
12+
/* disable autoprefixer */
13+
webpackConfig.module.rules
14+
.find(r => r.oneOf)
15+
.oneOf.forEach(rule => {
16+
if (rule.use) {
17+
rule.use.forEach(loader => {
18+
if (loader.options && loader.options.postcssOptions) {
19+
loader.options.postcssOptions.plugins = loader.options.postcssOptions.plugins.filter(
20+
plugin => !plugin.toString().includes('autoprefixer')
21+
)
22+
}
23+
})
24+
}
25+
})
1226
return webpackConfig
1327
}

packages/neuron-ui/package.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neuron-ui",
3-
"version": "0.117.0",
3+
"version": "0.119.0",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",
@@ -46,19 +46,16 @@
4646
"jest": {
4747
"displayName": "UI Tests"
4848
},
49-
"browserslist": [
50-
"last 2 chrome versions"
51-
],
5249
"dependencies": {
53-
"@ckb-lumos/lumos": "0.23.0",
54-
"@ckb-lumos/bi": "0.23.0",
55-
"@ckb-lumos/rpc": "0.23.0",
5650
"@ckb-lumos/base": "0.23.0",
51+
"@ckb-lumos/bi": "0.23.0",
5752
"@ckb-lumos/codec": "0.23.0",
53+
"@ckb-lumos/common-scripts": "0.23.0",
54+
"@ckb-lumos/config-manager": "0.23.0",
5855
"@ckb-lumos/hd": "0.23.0",
5956
"@ckb-lumos/helpers": "0.23.0",
60-
"@ckb-lumos/config-manager": "0.23.0",
61-
"@ckb-lumos/common-scripts": "0.23.0",
57+
"@ckb-lumos/lumos": "0.23.0",
58+
"@ckb-lumos/rpc": "0.23.0",
6259
"canvg": "2.0.0",
6360
"i18next": "23.7.11",
6461
"immer": "9.0.21",
@@ -108,7 +105,7 @@
108105
"react-test-renderer": "18.2.0",
109106
"storybook": "7.6.6",
110107
"storybook-addon-react-router-v6": "2.0.10",
111-
"webpack": "5.89.0"
108+
"webpack": "5.94.0"
112109
},
113110
"resolutions": {
114111
"react-i18next": "14.0.0"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ export const DAORecord = ({
137137
break
138138
}
139139
case CellStatus.Deposited: {
140-
if (leftHours) {
140+
if (!compensationEndEpochValue) {
141+
message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle')
142+
} else if (leftHours) {
141143
message = t('nervos-dao.compensation-period.stage-messages.next-compensation-cycle-hours', {
142144
hours: leftHours || '--',
143145
})
@@ -149,7 +151,9 @@ export const DAORecord = ({
149151
break
150152
}
151153
case CellStatus.Locked: {
152-
if (leftHours) {
154+
if (!compensationEndEpochValue) {
155+
message = t('nervos-dao.compensation-period.stage-messages.calculating-the-compensation-cycle')
156+
} else if (leftHours) {
153157
message = t('nervos-dao.compensation-period.stage-messages.compensation-cycle-will-end-hours', {
154158
hours: leftHours || '--',
155159
})

0 commit comments

Comments
 (0)