Skip to content

Commit

Permalink
Merge released refs/tags/v0.121.1 into develop (#3313)
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 <7271329+Keith-CY@users.noreply.github.com>

* chore: Update ckb node assume valid target (#3300)

chore: Update ckb node assume valid target for rc/v0.121.0.

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

* chore: update versions and changelogs

* chore: Update ckb node assume valid target for rc/v0.121.1.

* chore: update versions and changelogs

* fix: lang (#3312)

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith <keithwhisper@gmail.com>
Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>
Co-authored-by: devchenyan <sgt39007@163.com>
  • Loading branch information
4 people authored Feb 14, 2025
1 parent c68f454 commit c4dcf99
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 14 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
# 0.121.1 (2025-02-13)

### CKB Node & Light Client

- [CKB@v0.121.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.121.0) was released on Jan. 23rd, 2025. This version of CKB node is now bundled and preconfigured in Neuron.
- [CKB Light Client@v0.4.1](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 `0x53dd03a0420b68e082d660cb2e86f167aa8f1bd95c637228285bf36f5caa9e1d`(at height `15,361,857`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/3310)

---

## New features

- #3291: Support complex transaction with multisig account.(@devchenyan)
- #3298: Support Nervos DAO with multisig account.(@devchenyan)


**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.121.0...v0.121.1


# 0.121.0 (2025-01-16)

### CKB Node & Light Client
Expand Down
2 changes: 1 addition & 1 deletion compatible.json
Original file line number Diff line number Diff line change
Expand Up @@ -241,4 +241,4 @@
]
}
}
}
}
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.121.0",
"version": "0.121.1",
"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.121.0",
"version": "0.121.1",
"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.121.0",
"version": "0.121.1",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down
4 changes: 3 additions & 1 deletion packages/neuron-ui/src/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,9 @@
"info": "معلومات",
"send": "إرسال",
"approve": "الموافقة",
"delete": "حذف"
"delete": "حذف",
"daoDeposit": "إيداع في DAO",
"daoWithdraw": "سحب من DAO"
}
},
"import-dialog": {
Expand Down
4 changes: 3 additions & 1 deletion packages/neuron-ui/src/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,9 @@
"info": "Información",
"send": "Enviar",
"approve": "Aprobar",
"delete": "Eliminar"
"delete": "Eliminar",
"daoDeposit": "Depositar en DAO",
"daoWithdraw": "Retirar de DAO"
}
},
"import-dialog": {
Expand Down
4 changes: 3 additions & 1 deletion packages/neuron-ui/src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,9 @@
"info": "Info",
"send": "Envoyer",
"approve": "Approuver",
"delete": "Supprimer"
"delete": "Supprimer",
"daoDeposit": "Déposer dans DAO",
"daoWithdraw": "Retirer de DAO"
}
},
"import-dialog": {
Expand Down
4 changes: 3 additions & 1 deletion packages/neuron-ui/src/locales/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,9 @@
"info": "詳情",
"send": "轉賬",
"approve": "確認",
"delete": "删除"
"delete": "删除",
"daoDeposit": "存入 DAO",
"daoWithdraw": "從 DAO 取出"
}
},
"import-dialog": {
Expand Down
4 changes: 3 additions & 1 deletion packages/neuron-ui/src/locales/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,9 @@
"info": "详情",
"send": "转账",
"approve": "确认",
"delete": "删除"
"delete": "删除",
"daoDeposit": "存入 DAO",
"daoWithdraw": "从 DAO 取出"
}
},
"import-dialog": {
Expand Down
6 changes: 3 additions & 3 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='0x1381f9e4f70ce521256c4095fa536d11165488171a8a2cbac687f8cf53907afa'
CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=15119157
CKB_NODE_DATA_SIZE=118
CKB_NODE_ASSUME_VALID_TARGET='0x53dd03a0420b68e082d660cb2e86f167aa8f1bd95c637228285bf36f5caa9e1d'
CKB_NODE_ASSUME_VALID_TARGET_BLOCK_NUMBER=15361857
CKB_NODE_DATA_SIZE=120
4 changes: 2 additions & 2 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.121.0",
"version": "0.121.1",
"private": true,
"author": {
"name": "Nervos Core Dev",
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.121.0",
"neuron-ui": "0.121.1",
"typescript": "5.3.3"
}
}

2 comments on commit c4dcf99

@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 13322129460

@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 13322128115

Please sign in to comment.