Skip to content

Commit df66a6c

Browse files
Keith-CYKeith-CY
authored
Merge pull request #2924 from nervosnetwork/rc/v0.111.1
2 parents 572f4bb + 9e5dac6 commit df66a6c

File tree

108 files changed

+2517
-644
lines changed

Some content is hidden

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

108 files changed

+2517
-644
lines changed

‎.ckb-light-version‎

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

‎.github/workflows/check_checksums.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
body="${body//'%'/'%25'}"
3232
body="${body//$'\n'/'%0A'}"
3333
body="${body//$'\r'/'%0D'}"
34-
echo ::set-output name=body::$body
34+
echo "body=$body" >> $GITHUB_OUTPUT
3535
3636
- uses: peter-evans/commit-comment@v2
3737
with:

‎.github/workflows/package.yml‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,39 @@ jobs:
5151
env:
5252
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
5353

54+
- name: Setup Certificate
55+
if: matrix.os == 'windows-2019'
56+
run: |
57+
echo "${{ secrets.SM_CLIENT_CERT_FILE_BASE64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
58+
shell: bash
59+
60+
- name: Set variables
61+
if: matrix.os == 'windows-2019'
62+
run: |
63+
echo "SM_KEYPAIR_NAME=${{ secrets.SM_KEYPAIR_ALIAS }}" >> "$GITHUB_ENV"
64+
echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
65+
echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
66+
echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
67+
echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
68+
echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
69+
echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
70+
echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
71+
shell: bash
72+
73+
- name: Setting up the client tools
74+
if: ${{ matrix.os == 'windows-2019' && env.SM_API_KEY != '' }}
75+
run: |
76+
curl -X GET https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
77+
msiexec /i smtools-windows-x64.msi /quiet /qn
78+
C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
79+
shell: cmd
80+
81+
- name: Certificates Sync
82+
if: ${{ matrix.os == 'windows-2019' && env.SM_API_KEY != '' }}
83+
run: |
84+
smctl windows certsync
85+
shell: cmd
86+
5487
- name: Install libudev
5588
if: matrix.os == 'ubuntu-20.04'
5689
run: |
@@ -88,8 +121,6 @@ jobs:
88121
bash ./scripts/release.sh win
89122
env:
90123
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
91-
CSC_LINK: ${{ secrets.WIN_CERTIFICATE_BASE64 }}
92-
CSC_KEY_PASSWORD: ${{ secrets.WIN_CERTIFICATE_PASSWORD }}
93124

94125
- name: Package for Linux
95126
if: matrix.os == 'ubuntu-20.04'

‎.github/workflows/package_for_test.yml‎

Lines changed: 34 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,39 @@ jobs:
6262
env:
6363
ACTIONS_ALLOW_UNSECURE_COMMANDS: "true"
6464

65+
- name: Setup Certificate
66+
if: matrix.os == 'windows-2019'
67+
run: |
68+
echo "${{ secrets.SM_CLIENT_CERT_FILE_BASE64 }}" | base64 --decode > /d/Certificate_pkcs12.p12
69+
shell: bash
70+
71+
- name: Set variables
72+
if: matrix.os == 'windows-2019'
73+
run: |
74+
echo "SM_KEYPAIR_NAME=${{ secrets.SM_KEYPAIR_ALIAS }}" >> "$GITHUB_ENV"
75+
echo "SM_HOST=${{ secrets.SM_HOST }}" >> "$GITHUB_ENV"
76+
echo "SM_API_KEY=${{ secrets.SM_API_KEY }}" >> "$GITHUB_ENV"
77+
echo "SM_CLIENT_CERT_FILE=D:\\Certificate_pkcs12.p12" >> "$GITHUB_ENV"
78+
echo "SM_CLIENT_CERT_PASSWORD=${{ secrets.SM_CLIENT_CERT_PASSWORD }}" >> "$GITHUB_ENV"
79+
echo "C:\Program Files (x86)\Windows Kits\10\App Certification Kit" >> $GITHUB_PATH
80+
echo "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools" >> $GITHUB_PATH
81+
echo "C:\Program Files\DigiCert\DigiCert One Signing Manager Tools" >> $GITHUB_PATH
82+
shell: bash
83+
84+
- name: Setting up the client tools
85+
if: ${{ matrix.os == 'windows-2019' && env.SM_API_KEY != '' }}
86+
run: |
87+
curl -X GET https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi
88+
msiexec /i smtools-windows-x64.msi /quiet /qn
89+
C:\Windows\System32\certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
90+
shell: cmd
91+
92+
- name: Certificates Sync
93+
if: ${{ matrix.os == 'windows-2019' && env.SM_API_KEY != '' }}
94+
run: |
95+
smctl windows certsync
96+
shell: cmd
97+
6598
- name: Install libudev
6699
if: matrix.os == 'ubuntu-20.04'
67100
run: |
@@ -101,19 +134,7 @@ jobs:
101134
SKIP_NOTARIZE: true
102135

103136
- name: Package for Windows
104-
if: ${{ matrix.os == 'windows-2019' && env.WIN_CERTIFICATE_BASE64 != '' }}
105-
run: |
106-
bash ./scripts/download-ckb.sh win
107-
yarn build
108-
bash ./scripts/copy-ui-files.sh
109-
bash ./scripts/package-for-test.sh win
110-
env:
111-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
112-
CSC_LINK: ${{ secrets.WIN_CERTIFICATE_BASE64 }}
113-
CSC_KEY_PASSWORD: ${{ secrets.WIN_CERTIFICATE_PASSWORD }}
114-
115-
- name: Package for Windows for skip code sign
116-
if: ${{ matrix.os == 'windows-2019' && env.WIN_CERTIFICATE_BASE64 == '' }}
137+
if: matrix.os == 'windows-2019'
117138
run: |
118139
bash ./scripts/download-ckb.sh win
119140
yarn build

‎CHANGELOG.md‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
# 0.111.1 (2023-11-08)
2+
3+
### CKB Node & Light Client
4+
5+
- [CKB@v0.111.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.111.0) was released on Sep. 14nd, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
6+
- [CKB Light Client@v0.3.0](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.3.0) was released on Nov. 2nd, 2023. This version of CKB Light Client is now bundled and preconfigured in Neuron
7+
8+
#### Important
9+
10+
◆ **CKB Light Client on Mainnet** is active and available in Neuron 👏. See how to enable Light Client on Mainnet on YouTube: https://www.youtube.com/watch?v=Vl2LGRNqnvk
11+
12+
[![Light Client on Mainnet](https://github.com/nervosnetwork/neuron/assets/7271329/97fb7848-350d-4d45-ab2d-1e79dd3c9716)](https://www.youtube.com/watch?v=Vl2LGRNqnvk)
13+
14+
#### Caveat
15+
16+
◆ "Internal Node" network option is reserved for the built-in CKB node for clarity, and won't be connected to an external CKB node anymore.
17+
18+
### Assumed valid target
19+
20+
Block before `0x79cecdd6f41361e2474290224751284312a018528d1d92f4e18dd6d542feddfe`(at height `11,204,206`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/2923)
21+
22+
---
23+
24+
## New features
25+
26+
- #2913: Use KeyLocker to sign Neuron for Windows, conforming to the new industry standards effective since June 1, 2023.(@keith-cy)
27+
- #2921: Add network option of "Light Client(Mainnet)", and reserve "Internal Node" for built-in CKB Node only.(@yanguoyu)
28+
29+
30+
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.111.0...v0.111.1
31+
32+
133
# 0.111.0 (2023-10-19)
234

335
### CKB Node & Light Client
@@ -17,9 +49,9 @@ Block before `0xd5e25ad24400f237aa5f72f3738a9ae77fe082a89937e75143fcc8ef5b009383
1749

1850
## Bug fixes
1951

20-
* #2869: Add a dialog for migration.(@yanguoyu)
21-
* #2870: Fix width of navbar.(@yanguoyu)
22-
* #2873: Fix fallback font on Linux.(@yanguoyu)
52+
- #2869: Add a dialog for migration.(@yanguoyu)
53+
- #2870: Fix width of navbar.(@yanguoyu)
54+
- #2873: Fix fallback font on Linux.(@yanguoyu)
2355

2456

2557
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.3...v0.111.0

‎_typos.toml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
[default.extend-words]
22
thur = "thur"
3+
numer = "numer"
34

45
# defined in database schema
56
lastest = "lastest"
67

78
[files]
89
extend-exclude = ["CHANGELOG.md", "**/migrations/*.ts"]
9-
10-
11-

‎compatible.csv‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
CKB,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
2-
Neuron,,,,,,,,
3-
0.110,yes,yes,no,no,no,no,no,no
4-
0.106,no,no,yes,yes,yes,yes,no,no
5-
0.103,no,no,no,no,no,no,yes,yes
1+
CKB,0.111,0.110,0.109,0.108,0.107,0.106,0.105,0.104,0.103
2+
Neuron,,,,,,,,,
3+
0.111,yes,yes,yes,no,no,no,no,no,no
4+
0.110,yes,yes,yes,no,no,no,no,no,no
5+
0.106,no,no,no,yes,yes,yes,yes,no,no
6+
0.103,no,no,no,no,no,no,no,yes,yes

‎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.111.0",
3+
"version": "0.111.1",
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.111.0",
5+
"version": "0.111.1",
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.111.0",
3+
"version": "0.111.1",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",

0 commit comments

Comments
 (0)