Skip to content

Commit 0f9b12c

Browse files
authored
Merge branch 'nervosnetwork:develop' into develop
2 parents 13e7073 + 5c11fff commit 0f9b12c

74 files changed

Lines changed: 797 additions & 241 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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.3.8

.ckb-version

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

.github/workflows/package.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ jobs:
103103
env:
104104
CI: false
105105

106+
# Inject LOG_ENCRYPTION_PUBLIC_KEY to encrypt sensitive log
107+
- name: Inject environment variables
108+
run: |
109+
echo "LOG_ENCRYPTION_PUBLIC_KEY=${{ secrets.LOG_ENCRYPTION_PUBLIC_KEY }}" >> packages/neuron-wallet/.env
110+
106111
- name: Package for MacOS
107112
if: matrix.os == 'macos-latest'
108113
run: |

CHANGELOG.md

Lines changed: 51 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
# 0.117.0 (2024-08-12)
2+
3+
### CKB Node & Light Client
4+
5+
- [CKB@v0.117.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.117.0) was released on Jul. 29th, 2024. This version of CKB node is now bundled and preconfigured in Neuron.
6+
- [CKB Light Client@v0.3.7](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
7+
8+
### Assumed valid target
9+
10+
Block before `0xca44ae8f7bc12ba8eab3224cbe3156c913e2284693e36dc1d01e4d30f362f3c2`(at height `13,705,152`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3227)
11+
12+
---
13+
14+
[![Neuron@v0.117.0](https://github.com/user-attachments/assets/7d2eba67-e33e-4fca-a714-7ba1709d8bd3)](https://youtu.be/zf78Y094m60)
15+
16+
YouTube: https://youtu.be/zf78Y094m60
17+
18+
---
19+
20+
## New features
21+
22+
- #3206: Support XUDT asset management.(@yanguoyu)
23+
- #3207: Support connecting to an external light client.(@devchenyan)
24+
- #3167: Support cells consolidation.(@devchenyan)
25+
- #3199: Validate pending transactions periodically.(@devchenyan)
26+
- #3200: Optimize the process of generating a wallet.(@devchenyan)
27+
- #3176: Support setting start block numbers of multisig addresses.(@yanguoyu)
28+
- #3160: Optimize synchronization in light client mode for multiple wallets.(@yanguoyu)
29+
- #3169: Be compatible with multisig transaction JSON file exported from CKB CLI.(@devchenyan)
30+
- #3197: Support resetting pin code for window lock.(@yanguoyu)
31+
- #3194: Add a tip for multisig addresses.(@yanguoyu)
32+
33+
## Bug fixes
34+
35+
- #3195: Fix the synchronization status check.(@yanguoyu)
36+
37+
## New Contributors
38+
39+
- @tcpdumppy made their first contribution in https://github.com/nervosnetwork/neuron/pull/3182
40+
41+
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.116.2...v0.117.0
42+
143
# 0.116.2 (2024-05-29)
244

345
### CKB Node & Light Client
@@ -57,18 +99,18 @@ YouTube: https://youtu.be/QXv8by2C8zU
5799

58100
## New features
59101

60-
- 3134: Support 'replace-by-fee' nervos dao transactions and sudt transactions.(@devchenyan)
61-
- 3144: Reduce size of light client log in debug information and reveal start-block-number in log.(@yanguoyu)
62-
- 3064: Support locking window by pin code.(@yanguoyu)
63-
- 3131: Add detailed result for nervos dao transaction.(@devchenyan)
102+
- #3134: Support 'replace-by-fee' nervos dao transactions and sudt transactions.(@devchenyan)
103+
- #3144: Reduce size of light client log in debug information and reveal start-block-number in log.(@yanguoyu)
104+
- #3064: Support locking window by pin code.(@yanguoyu)
105+
- #3131: Add detailed result for nervos dao transaction.(@devchenyan)
64106

65107
## Bug fixes
66108

67-
- 3121: Locate the first transaction on Explorer directly when users want to set the start-block-number for light client.(@yanguoyu)
68-
- 3101: Show migration instruction properly.(@devchenyan)
69-
- 3062: Migrate legacy ACP to active ACP account(@yanguoyu)
70-
- 3141: Fix some issues about light client synchronizaiton.(@yanguoyu)
71-
- 3120: Remove all sync data when start-block-number is set less than before.(@yanguoyu)
109+
- #3121: Locate the first transaction on Explorer directly when users want to set the start-block-number for light client.(@yanguoyu)
110+
- #3101: Show migration instruction properly.(@devchenyan)
111+
- #3062: Migrate legacy ACP to active ACP account(@yanguoyu)
112+
- #3141: Fix some issues about light client synchronizaiton.(@yanguoyu)
113+
- #3120: Remove all sync data when start-block-number is set less than before.(@yanguoyu)
72114

73115
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.114.3...v0.116.0
74116

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

_typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ thur = "thur"
33
numer = "numer"
44
HD = "HD"
55
hd = "hd"
6+
passin = 'passin'
67

78
# defined in database schema
89
lastest = "lastest"

compatible.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"fullVersions": [
3+
"0.117",
34
"0.116",
45
"0.115",
56
"0.114",
@@ -22,6 +23,7 @@
2223
"compatible": {
2324
"0.111": {
2425
"full": [
26+
"0.117",
2527
"0.116",
2628
"0.115",
2729
"0.114",
@@ -38,6 +40,7 @@
3840
},
3941
"0.110": {
4042
"full": [
43+
"0.117",
4144
"0.116",
4245
"0.115",
4346
"0.114",
@@ -70,6 +73,7 @@
7073
},
7174
"0.112": {
7275
"full": [
76+
"0.117",
7377
"0.116",
7478
"0.115",
7579
"0.114",
@@ -86,6 +90,7 @@
8690
},
8791
"0.114": {
8892
"full": [
93+
"0.117",
8994
"0.116",
9095
"0.115",
9196
"0.114",
@@ -102,6 +107,24 @@
102107
},
103108
"0.116": {
104109
"full": [
110+
"0.117",
111+
"0.116",
112+
"0.115",
113+
"0.114",
114+
"0.113",
115+
"0.112",
116+
"0.111",
117+
"0.110",
118+
"0.109"
119+
],
120+
"light": [
121+
"0.3",
122+
"0.2"
123+
]
124+
},
125+
"0.117": {
126+
"full": [
127+
"0.117",
105128
"0.116",
106129
"0.115",
107130
"0.114",

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": ["packages/*"],
3-
"version": "0.116.2",
3+
"version": "0.117.0",
44
"npmClient": "yarn",
55
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
66
}

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.116.2",
5+
"version": "0.117.0",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",

packages/neuron-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neuron-ui",
3-
"version": "0.116.2",
3+
"version": "0.117.0",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",

0 commit comments

Comments
 (0)