Skip to content

Commit

Permalink
Merge pull request #2605 from yanguoyu/merge-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith-CY authored Mar 10, 2023
2 parents c3b62bf + 847ef87 commit 9ac0f98
Show file tree
Hide file tree
Showing 110 changed files with 4,278 additions and 3,863 deletions.
2 changes: 1 addition & 1 deletion .ckb-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.104.1
v0.107.0
10 changes: 5 additions & 5 deletions .github/workflows/check_checksums.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Check Checksums

on:
on:
release:
types: [published, prereleased]

Expand All @@ -10,16 +10,16 @@ jobs:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Generate checksums from artifacts
run:
run:
ruby ./scripts/release-checksums.rb ${{ github.event.release.tag_name }} | tee generated_checksums.txt

- name: Fetch checksums from release note
run: |
curl "https://api.github.com/repos/nervosnetwork/neuron/releases/tags/${{ github.event.release.tag_name }}" |\
python3 -c "import sys, json; print(\"\n\".join(json.load(sys.stdin)['body'].splitlines()[-9:]))" |\
python3 -c "import sys, json; print(\"\n\".join(json.load(sys.stdin)['body'].splitlines()[-11:]))" |\
tee release_note_checksums.txt
- name: Compare
Expand All @@ -30,7 +30,7 @@ jobs:
body=$(cat generated_checksums.txt)
body="${body//'%'/'%25'}"
body="${body//$'\n'/'%0A'}"
body="${body//$'\r'/'%0D'}"
body="${body//$'\r'/'%0D'}"
echo ::set-output name=body::$body
- uses: peter-evans/commit-comment@v1
Expand Down
50 changes: 32 additions & 18 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ on:
push:
branches:
- master
- "rc/**"
- "hotfix/**"
- 'rc/**'
- 'hotfix/**'

jobs:
default:
strategy:
matrix:
node:
- 16.10.0
- 18.12.0
os:
- macos-latest
- macos-11
- ubuntu-20.04
- windows-2019

Expand All @@ -29,27 +29,27 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: "yarn"
cache: 'yarn'

- name: Restore
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
node_modules
*/*/node_modules
key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}

- name: Add msbuild to PATH
if: matrix.os == 'windows-2019'
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1.3
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'

- name: Install libudev
if: matrix.os == 'ubuntu-20.04'
Expand All @@ -67,7 +67,7 @@ jobs:
CI: false

- name: Package for MacOS
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-11'
run: |
./scripts/download-ckb.sh mac
yarn release mac
Expand Down Expand Up @@ -99,29 +99,43 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Neuron App Zip
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
path: release/Neuron-*-mac-x64.zip

- name: Upload Neuron App Zip(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
path: release/Neuron-*-mac.zip
path: release/Neuron-*-mac-arm64.zip

- name: Upload Neuron Dmg
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
path: release/Neuron-*-x64.dmg

- name: Upload Neuron Dmg(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
path: release/Neuron-*.dmg
path: release/Neuron-*-arm64.dmg

- name: Upload Neuron Win
if: matrix.os == 'windows-2019'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Win
path: release/Neuron-*-setup.exe

- name: Upload Neuron Linux
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Linux
path: release/Neuron-*.AppImage
46 changes: 30 additions & 16 deletions .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
strategy:
matrix:
node:
- 16.10.0
- 18.12.0
os:
- macos-latest
- macos-11
- ubuntu-20.04
- windows-2019

Expand All @@ -24,27 +24,27 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: "yarn"
cache: 'yarn'

- name: Restore
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
node_modules
*/*/node_modules
key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
key: 2022-12-21-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}

- name: Add msbuild to PATH
if: matrix.os == 'windows-2019'
uses: microsoft/setup-msbuild@v1.0.2
uses: microsoft/setup-msbuild@v1.1.3
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'

- name: Install libudev
if: matrix.os == 'ubuntu-20.04'
Expand All @@ -62,7 +62,7 @@ jobs:
CI: false

- name: Package for MacOS
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-11'
run: |
./scripts/download-ckb.sh mac
yarn package:test mac
Expand Down Expand Up @@ -94,29 +94,43 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload Neuron App Zip
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
path: release/Neuron-*-mac-x64.zip

- name: Upload Neuron App Zip(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
path: release/Neuron-*-mac.zip
path: release/Neuron-*-mac-arm64.zip

- name: Upload Neuron Dmg
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
path: release/Neuron-*-x64.dmg

- name: Upload Neuron Dmg(arm64)
if: matrix.os == 'macos-latest'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
path: release/Neuron-*.dmg
path: release/Neuron-*-arm64.dmg

- name: Upload Neuron Win
if: matrix.os == 'windows-2019'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Win
path: release/Neuron-*-setup.exe

- name: Upload Neuron Linux
if: matrix.os == 'ubuntu-20.04'
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: Neuron-Linux
path: release/Neuron-*.AppImage
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
node:
- 16.10.0
- 18.12.0
os:
- macos-latest
- ubuntu-20.04
Expand All @@ -26,16 +26,16 @@ jobs:
git config --global core.eol lf
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Setup Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: "yarn"

- name: Restore
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
node_modules
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/update-issue-status.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Update issue status
on:
schedule:
- cron: '30 5 * * *'

permissions:
issues: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- name: Update stale issues
uses: actions/stale@v7
with:
any-of-issue-labels: replied
stale-issue-label: stale
days-before-pr-close: -1
stale-issue-message: Mark this issue stale because no activity for 60 days
close-issue-message: Close this issue because it's inactive since marked stale
close-issue-reason: completed
1 change: 1 addition & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
registry "https://registry.yarnpkg.com"
nodeLinker: node-modules
network-timeout 120000
53 changes: 53 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,56 @@
# 0.106.0 (2022-12-28)

### CKB

[CKB v0.106.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.106.0) was released on Dec. 23rd, 2022. This version of CKB node is now bundled and preconfigured in Neuron.

### Assumed valid target

Block before `0x076ffa81f8c6f2e1f22a778a1aa5d48531cc33bfd9b302e0d73fb2ce6fa4de3b` will be skipped in validation.

### New features
* #2442: Make multisig import and export config compatible with ckb-cli.(@yanguoyu)
* #2454: Add 'contact us' in the menu -> help submenu.(@Keith-CY)
* #2461: Remove 4 epochs maturity requirement of header deps.(@yanguoyu)
* #2465: Adapt new UAN.(@yanguoyu)
* #2508: Use undici, an official http client, to replace axios.(@yanguoyu)
* #2515, #2542: Support Apple silicon chip.(@JeffreyMa597, @yanguoyu)
* #2518: Bump node.js from 16 to 18.(@JeffreyMa597)
* #2519: Bump react.js from 16 to 18.(@JeffreyMa597)
* #2555: Upgrade ckb node to v0.106.0.(@Keith-CY)

### Bug fixes
* #2447: Prevent from importing the same multisig configuration repeatedly.(@yanguoyu)
* #2451: Refine the input field component.(@yanguoyu)
* #2464, #2478: Optimize setting data path.(@yanguoyu)
* #2467: Fix ckb process killed unexpectedly.(@yanguoyu)
* #2483: Fix ckb node not working with Apple silicon chip.(@yanguoyu)
* #2488: Create a new instance for every test case to avoid side effect.(@yanguoyu)
* #2531: Handle uncaughtException and output it in the log.(@yanguoyu)
* #2541: Remove CKB Indexer module and set a specified version of usb module.(@yanguoyu)

## New contributors
* @JeffreyMa597 made their first contribution in #2515

**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.103.3...v0.106.0



# 0.103.3 (2022-12-21)

### Certificate

We've updated the certificate of Neuron for windows, which is issued by **DigiCert** and distributed to [Magickbase](https://github.com/Magickbase/), the active developer team of Neuron. With this update, a warning may appear on updating Neuron by `check for update` inside Neuron, please don't worry and download Neuron from [GitHub Release](https://github.com/nervosnetwork/neuron/releases) to adopt the new certificate.

### Bug Fixes

* #2551: Fix sending multisig tx when input cell's length is greater than 1.(@yanguoyu)


**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.103.2...v0.103.3



# 0.103.2 (2022-07-09)

### New features
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019-2022 Nervos Foundation
Copyright (c) 2019-2023 Nervos Foundation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Nervos CKB Full-Node Desktop Wallet

### Prerequisites

You will need `node >= 16` and `yarn >= 1.14` to build and run Neuron.
You will need `node >= 18.12.0` and `yarn >= 1.14` to build and run Neuron.

#### Lerna

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.103.2",
"version": "0.106.0",
"npmClient": "yarn",
"useWorkspaces": true
}
Loading

2 comments on commit 9ac0f98

@github-actions
Copy link
Contributor

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 4386197717

@github-actions
Copy link
Contributor

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 4401851012

Please sign in to comment.