Skip to content

Commit

Permalink
Merge released refs/tags/v0.120.0 into develop (#3286)
Browse files Browse the repository at this point in the history
* chore: Update ckb node assume valid target (#3282)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* chore: update versions and changelogs

* Update Neuron compatibility table (#3284)

Co-authored-by: Keith-CY <[email protected]>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith <[email protected]>
Co-authored-by: Keith-CY <[email protected]>
  • Loading branch information
3 people authored Jan 14, 2025
1 parent 9a77b74 commit 764e34a
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 10 deletions.
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions compatible.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
},
"0.119": {
"full": [
"0.120",
"0.119",
"0.118",
"0.117",
Expand All @@ -188,7 +187,7 @@
"0.2"
]
},
"0.119": {
"0.120": {
"full": [
"0.119",
"0.118",
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.119.0",
"version": "0.120.0",
"npmClient": "yarn",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "neuron-ui",
"version": "0.119.0",
"version": "0.120.0",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down
4 changes: 2 additions & 2 deletions packages/neuron-wallet/.env
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ DAO_CODE_HASH=0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e
MULTISIG_CODE_HASH=0x5c5069eb0857efc65e1bca0c07df34c31663b3622fd3876c876320fc9634e2a8

# CKB NODE OPTIONS
CKB_NODE_ASSUME_VALID_TARGET='0x7488acf2280ebf5b83c805a517f766eab77f45cd51f61476811d1ce96a60ea71'
CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=14687217
CKB_NODE_ASSUME_VALID_TARGET='0xe1085c7ce8f4e8461ea75afe63ef21d2c1ce6a5d0bf0f0170042bebdd2fbde04'
CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=14817366
CKB_NODE_DATA_SIZE=116
6 changes: 3 additions & 3 deletions packages/neuron-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Neuron",
"description": "CKB Neuron Wallet",
"homepage": "https://www.nervos.org/",
"version": "0.119.0",
"version": "0.120.0",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down Expand Up @@ -47,9 +47,9 @@
"@ckb-lumos/helpers": "0.23.0",
"@ckb-lumos/lumos": "0.23.0",
"@ckb-lumos/rpc": "0.23.0",
"@magickbase/hw-app-ckb": "0.2.0-alpha.0",
"@iarna/toml": "2.2.5",
"@ledgerhq/hw-transport-node-hid": "6.27.22",
"@magickbase/hw-app-ckb": "0.2.0-alpha.0",
"@spore-sdk/core": "0.1.0",
"archiver": "6.0.2",
"async": "3.2.5",
Expand Down Expand Up @@ -92,7 +92,7 @@
"electron-builder": "24.9.1",
"electron-devtools-installer": "3.2.0",
"jest-when": "3.6.0",
"neuron-ui": "0.119.0",
"neuron-ui": "0.120.0",
"typescript": "5.3.3"
}
}

1 comment on commit 764e34a

@github-actions
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Packaging for test is done in 12760552975

Please sign in to comment.