Skip to content

Commit dc9b87e

Browse files
authored
Merge pull request nervosnetwork#2884 from nervosnetwork/rc/v0.111.0
2 parents 588a142 + 8dd1d59 commit dc9b87e

File tree

29 files changed

+290
-250
lines changed

29 files changed

+290
-250
lines changed

.ckb-version

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

.github/workflows/update_valid_target.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,26 @@
11
name: Update ckb node assume valid target
22

33
on:
4-
pull_request:
5-
types: [ready_for_review]
6-
branches:
7-
- master
4+
create:
85

96
jobs:
107
ready-for-release:
118
name: Update ckb node assume valid target
129
runs-on: ubuntu-latest
10+
if: ${{ startsWith(github.ref_name, 'rc/') }}
1311
steps:
1412
- name: Create Branch
1513
uses: peterjgrainger/[email protected]
1614
env:
1715
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1816
with:
19-
branch: 'chore-update-valid-target/${{github.head_ref}}'
20-
sha: '${{ github.event.pull_request.head.sha }}'
17+
branch: 'chore-update-valid-target/${{github.ref_name}}'
18+
sha: '${{ github.event.create.head.sha }}'
2119

2220
- name: Checkout
2321
uses: actions/checkout@v3
2422
with:
25-
ref: 'chore-update-valid-target/${{github.head_ref}}'
23+
ref: 'chore-update-valid-target/${{github.ref_name}}'
2624

2725
- name: Setup Node
2826
uses: actions/setup-node@v3
@@ -37,7 +35,7 @@ jobs:
3735
uses: actions/github-script@v6
3836
env:
3937
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40-
BASE: ${{ github.head_ref }}
38+
BASE: ${{ github.ref_name }}
4139
with:
4240
script: |
4341
const fs = require('node:fs')
@@ -64,8 +62,8 @@ jobs:
6462
uses: actions/github-script@v6
6563
env:
6664
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67-
BASE: ${{github.head_ref}}
68-
HEAD: chore-update-valid-target/${{github.head_ref}}
65+
BASE: ${{github.ref}}
66+
HEAD: chore-update-valid-target/${{github.ref_name}}
6967
REPO: ${{github.repository}}
7068
with:
7169
script: |
@@ -83,5 +81,5 @@ jobs:
8381
head: HEAD,
8482
base: BASE,
8583
title: 'chore: Update ckb node assume valid target',
86-
body: `This PR uses to update ckb node assume valid target for PR https://github.com/${REPO}/pull/${context.issue.number}`,
84+
body: `This PR uses to update ckb node assume valid target for ${BASE} branch`,
8785
})

CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
# 0.111.0 (2023-10-19)
2+
3+
### CKB Node & Light Client
4+
5+
- [[email protected]](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 [email protected]](https://github.com/nervosnetwork/ckb-light-client/releases/tag/v0.2.4) was released on May. 28th, 2023. This version of CKB Light Client is now bundled and preconfigured in Neuron
7+
8+
#### Caveat
9+
10+
**CKB Light Client** is only activated on testnet, thus only `light testnet` is enabled in Neuron. **CKB Light Client on Mainnet** requires an activation on the mainnet, the timetable can be found at https://github.com/nervosnetwork/ckb/releases/tag/v0.110.1.
11+
12+
### Assumed valid target
13+
14+
Block before `0xd5e25ad24400f237aa5f72f3738a9ae77fe082a89937e75143fcc8ef5b009383`(at height `11,204,855`) will be skipped in validation.(https://github.com/nervosnetwork/neuron/pull/2881)
15+
16+
---
17+
18+
## Bug fixes
19+
20+
* #2869: Add a dialog for migration.(@yanguoyu)
21+
* #2870: Fix width of navbar.(@yanguoyu)
22+
* #2873: Fix fallback font on Linux.(@yanguoyu)
23+
24+
25+
**Full Changelog**: https://github.com/nervosnetwork/neuron/compare/v0.110.3...v0.111.0
26+
27+
128
# 0.110.3 (2023-10-11)
229

330
### CKB Node & Light Client

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.110.3",
3+
"version": "0.111.0",
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.110.3",
5+
"version": "0.111.0",
66
"private": true,
77
"author": {
88
"name": "Nervos Core Dev",

packages/neuron-ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "neuron-ui",
3-
"version": "0.110.3",
3+
"version": "0.111.0",
44
"private": true,
55
"author": {
66
"name": "Nervos Core Dev",
@@ -86,7 +86,7 @@
8686
"@types/styled-components": "5.1.26",
8787
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
8888
"babel-jest": "25.5.1",
89-
"electron": "24.7.1",
89+
"electron": "24.8.5",
9090
"enzyme": "3.11.0",
9191
"enzyme-adapter-react-16": "1.15.7",
9292
"eslint-config-airbnb": "19.0.4",

packages/neuron-ui/public/css/fonts.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,13 @@
3737
src: url('../fonts/JetBrainsMonoNL-Regular.otf') format('opentype'),
3838
url('../fonts/JetBrainsMonoNL-Regular.ttf') format('opentype');
3939
}
40+
41+
@font-face {
42+
font-family: 'Inter-Regular';
43+
src: url('../fonts/Inter-Regular.otf') format('opentype'), url('../fonts/Inter-Regular.ttf') format('opentype');
44+
}
45+
46+
@font-face {
47+
font-family: 'Inter-Medium';
48+
src: url('../fonts/Inter-Medium.otf') format('opentype'), url('../fonts/Inter-Medium.ttf') format('opentype');
49+
}
263 KB
Binary file not shown.
536 KB
Binary file not shown.
253 KB
Binary file not shown.

0 commit comments

Comments
 (0)