Skip to content

Merge master into develop after v0.204.1 release#3470

Closed
rivjc1025 wants to merge 11 commits intodevelopfrom
codex/merge-master-into-develop-v0.204.1
Closed

Merge master into develop after v0.204.1 release#3470
rivjc1025 wants to merge 11 commits intodevelopfrom
codex/merge-master-into-develop-v0.204.1

Conversation

@rivjc1025
Copy link
Copy Markdown
Collaborator

@rivjc1025 rivjc1025 commented Apr 10, 2026

Summary

  • merge the released master back into develop
  • carry forward the v0.204.1 version bump and changelog entry
  • preserve the newer dependency set already present on develop

Notes

  • resolved merge conflicts manually
  • regenerated yarn.lock with yarn install --ignore-scripts

walker27 and others added 11 commits January 7, 2026 10:55
@walker27 @devchenyan
@dependabot @github-actions @Keith-CY @yajianggroup @u2
Rc/v0.204.0 (#3431)
a95688e 
* fix: Issues of release v0.201.0 regression testing (#3365)

fix: Issues of release v0.201.0 regression

* chore(deps): bump tar-fs from 2.1.2 to 2.1.3 (#3368)

Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.2 to 2.1.3.
- [Commits](https://github.com/mafintosh/tar-fs/commits)

---
updated-dependencies:
- dependency-name: tar-fs
  dependency-version: 2.1.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update ckb client versions (#3371)

feat: update ckb client versions

Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>

* feat: Identify and prompt for multisig transaction (#3370)

* feat: Identify and prompt for multisig transaction

* fix: error message

* fix: Full node in mainnet can not change data path (#3382)

* chore(deps): bump pbkdf2 from 3.1.2 to 3.1.3 (#3379)

Bumps [pbkdf2](https://github.com/crypto-browserify/pbkdf2) from 3.1.2 to 3.1.3.
- [Changelog](https://github.com/browserify/pbkdf2/blob/master/CHANGELOG.md)
- [Commits](browserify/pbkdf2@v3.1.2...v3.1.3)

---
updated-dependencies:
- dependency-name: pbkdf2
  dependency-version: 3.1.3
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* feat: Optimize receive address handling for hardware wallets (#3394)

* fix: compatible with  "Ledger Nano S+" (#3402)

Co-authored-by: zhengzhou <zhengzhou@rivtower.com>

* Update ckb client versions (#3403)

feat: update ckb client versions

Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>

* chore(deps-dev): bump electron from 36.6.0 to 36.8.1 in /packages/neuron-ui (#3404)

chore(deps-dev): bump electron in /packages/neuron-ui

Bumps [electron](https://github.com/electron/electron) from 36.6.0 to 36.8.1.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](electron/electron@v36.6.0...v36.8.1)

---
updated-dependencies:
- dependency-name: electron
  dependency-version: 36.8.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump electron from 36.6.0 to 36.8.1 in /packages/neuron-wallet (#3405)

chore(deps-dev): bump electron in /packages/neuron-wallet

Bumps [electron](https://github.com/electron/electron) from 36.6.0 to 36.8.1.
- [Release notes](https://github.com/electron/electron/releases)
- [Changelog](https://github.com/electron/electron/blob/main/docs/breaking-changes.md)
- [Commits](electron/electron@v36.6.0...v36.8.1)

---
updated-dependencies:
- dependency-name: electron
  dependency-version: 36.8.1
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps): bump sha.js from 2.4.11 to 2.4.12 (#3406)

Bumps [sha.js](https://github.com/crypto-browserify/sha.js) from 2.4.11 to 2.4.12.
- [Changelog](https://github.com/browserify/sha.js/blob/master/CHANGELOG.md)
- [Commits](browserify/sha.js@v2.4.11...v2.4.12)

---
updated-dependencies:
- dependency-name: sha.js
  dependency-version: 2.4.12
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update ckb client versions (#3408)

feat: update ckb client versions

Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>

* chore(deps-dev): bump vite from 6.2.7 to 6.3.6 (#3409)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 6.2.7 to 6.3.6.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v6.3.6/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v6.3.6/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-version: 6.3.6
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Update bug_report.yml

change default assignees

* Update ckb client versions (#3416)

feat: update ckb client versions

Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>

* chore: remove font ProximaNova

* fix: spell fix

* chore: fix github actions node version

* Update ckb client versions (#3422)

feat: update ckb client versions

Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>

* chore: fix broken url (#3413)

Signed-off-by: yajianggroup <yajianggroup@outlook.com>
Co-authored-by: zhangyaning <zhangyaning1985@gmail.com>
Co-authored-by: 郑州 <wzszhengzhou@hotmail.com>

* chore: update AppId (#3426)

* chore(deps): bump qs from 6.14.0 to 6.14.1 (#3425)

Bumps [qs](https://github.com/ljharb/qs) from 6.14.0 to 6.14.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.14.0...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 郑州 <wzszhengzhou@hotmail.com>

* chore(deps): bump tar-fs from 2.1.3 to 2.1.4 (#3412)

Bumps [tar-fs](https://github.com/mafintosh/tar-fs) from 2.1.3 to 2.1.4.
- [Commits](mafintosh/tar-fs@v2.1.3...v2.1.4)

---
updated-dependencies:
- dependency-name: tar-fs
  dependency-version: 2.1.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: update neuron version

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

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

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

* Update ckb client versions (#3429) (#3430)

feat: update ckb client versions

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

* chore: update CHANGELOG

* chore: update CHANGELOG

* chore: update CHANGELOG

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: yajianggroup <yajianggroup@outlook.com>
Co-authored-by: devchenyan <sgt39007@163.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Keith-CY <7271329+Keith-CY@users.noreply.github.com>
Co-authored-by: zhengzhou <zhengzhou@rivtower.com>
Co-authored-by: yajianggroup <yajianggroup@outlook.com>
Co-authored-by: zhangyaning <zhangyaning1985@gmail.com>
@rivjc1025
fix: harden release notes window handling
f204c31
@rivjc1025
fix: correct navbar compatibility typo
e73c9f6
@u2
Merge pull request #3465 from appfi5/bugfix/release-notes-window
2be92f7 
fix: harden release notes rendering and privileged window navigation
@rivjc1025
chore: release v0.204.1
0f9e711
@github-actions
chore: Update ckb node assume valid target (#3466)
e7da7ad 
chore: Update ckb node assume valid target for rc/v0.204.1.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@rivjc1025
Merge remote-tracking branch 'origin/rc/v0.204.1' into rc/v0.204.1
d29ef3c
@rivjc1025 @Keith-CY
feat: Update Neuron compatibility table
aa1c5b5
@rivjc1025
Merge pull request #3468 from nervosnetwork/update-neuron-compatible
d08395a 
Update Neuron compatibility table
@rivjc1025
Merge pull request #3467 from nervosnetwork/rc/v0.204.1
d3a7467 
Rc/v0.204.1
@rivjc1025
Merge branch 'master' into develop
b61e147
@rivjc1025 rivjc1025 closed this Apr 10, 2026
@rivjc1025 rivjc1025 deleted the codex/merge-master-into-develop-v0.204.1 branch April 10, 2026 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rivjc1025 @walker27 @u2