Skip to content

Commit

Permalink
Merge pull request #2365 from nervosnetwork/rc/v0.103.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith-CY authored May 9, 2022
2 parents 7c16588 + 10f8a75 commit 39e5c6a
Show file tree
Hide file tree
Showing 346 changed files with 13,869 additions and 4,103 deletions.
2 changes: 1 addition & 1 deletion .ckb-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.101.4
v0.103.0
39 changes: 39 additions & 0 deletions .github/workflows/check_checksums.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Check Checksums

on:
release:
types: [published, prereleased]

jobs:
compare:
name: Compare checksums
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Generate checksums from artifacts
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:]))" |\
tee release_note_checksums.txt
- name: Compare
run: diff generated_checksums.txt release_note_checksums.txt

- id: comment_body
run: |
body=$(cat generated_checksums.txt)
body="${body//'%'/'%25'}"
body="${body//$'\n'/'%0A'}"
body="${body//$'\r'/'%0D'}"
echo ::set-output name=body::$body
- uses: peter-evans/commit-comment@v1
with:
body: ${{ steps.comment_body.outputs.body }}

4 changes: 2 additions & 2 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node:
- 16
- 16.4.0
os:
- macos-latest
- ubuntu-20.04
Expand All @@ -38,7 +38,7 @@ jobs:
path: |
node_modules
*/*/node_modules
key: 2021-8-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}

- name: Add msbuild to PATH
if: matrix.os == 'windows-2019'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/package_for_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
strategy:
matrix:
node:
- 16
- 16.4.0
os:
- macos-latest
- ubuntu-20.04
Expand All @@ -33,7 +33,7 @@ jobs:
path: |
node_modules
*/*/node_modules
key: 2021-8-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}

- name: Add msbuild to PATH
if: matrix.os == 'windows-2019'
Expand Down
4 changes: 2 additions & 2 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
- 16.4.0
os:
- macos-latest
- ubuntu-20.04
Expand All @@ -35,7 +35,7 @@ jobs:
path: |
node_modules
*/*/node_modules
key: 2021-8-11-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}
key: 2022-05-07-${{ runner.os }}-${{ hashFiles('**/yarn.lock')}}

- name: Install libudev
if: matrix.os == 'ubuntu-20.04'
Expand Down
46 changes: 46 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,49 @@
# 0.103.0 (2022-05-10)

### Hardfork

Neuron adopts new RFCs introduced by [HARDFORK 2021](https://github.com/nervosnetwork/rfcs/blob/master/rfcs/0037-ckb2021/0037-ckb2021.md), prominents are as follows,

1. adopt the new address format and deprecate the short version of addresses #2346


### CKB
[CKB v0.103.0](https://github.com/nervosnetwork/ckb/releases/tag/v0.103.0) was released on Apr. 11th, 2022. This version of CKB node is now bundled and preconfigured in Neuron.


### New features
* #2280: add a balance-not-reserved checkbox in Nervos DAO deposit dialog(@Keith-CY)
* #2291: add a sudt detail link in creating asset account dialog (@yanguoyu)
* #2296, #2320: add address lock script detail in transaction detail window (@Lester-xie, @Keith-CY)
* #2300, #2352: add options of ckb node to boost synchronization (@Keith-CY)
* #2302, #2333: allow ACP account to transfer to secp256k1 addresses (@Lester-xie)
* #2303, #2310, #2313, #2323, #2324, #2332, #2340, #2357, #2363: add multisig address management (@yanguoyu, @Keith-CY)
* #2307: disable some functions when current wallet is an xpub wallet (@yanguoyu)
* #2309: check checksums after publishment (@Keith-CY)
* #2315: add new sign tips and add old sign notice in sign/verify window (@yanguoyu)
* #2330: allow sudt/secp256k1 assets to be migrated to an asset account (@yanguoyu)
* #2331: upgrade bundled ckb version to v0.103.0 (@Keith-CY)
* #2337: allow asset account to be destroied when balance is 0 (@yanguoyu)
* #2341: support syncing cells those have script of hash type 'data1' (@Keith-CY)
* #2342, #2361: mark create and destroy asset account in transaction history (@qiweiii)
* #2346: use new foramt of addresses by default (@Keith-CY)
* #2359: allow secp256k1 address to be timelocked (@Keith-CY)


### Bug fixes
* #2304: fix error message of creating sudt/acp account (@Keith-CY)
* #2335: fix parsers (@Keith-CY)
* #2351: avoid saving duplicate blake160 for one wallet (@yanguoyu)
* #2362: ignore rejected transaction by (@Keith-CY)


### Refactor
* #2277: remove grommet icons (@yanguoyu)
* #2289: format code (@Lester-xie)
* #2290: replace calculate_dao_maximum_withdraw with calculateDaoMaximumWithdraw method in sdk (@yanguoyu)



# 0.101.3 (2022-03-01)

[CKB v0.101.4](https://github.com/nervosnetwork/ckb/releases/tag/v0.101.4) was released on Jan. 20th, 2022. This version of CKB node is now bundled and preconfigured in Neuron.
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

Nervos CKB Full-Node Desktop Wallet

[![Azure Pipelines Build Status](https://dev.azure.com/nervosnetwork/neuron/_apis/build/status/nervosnetwork.neuron?branchName=develop)](https://dev.azure.com/nervosnetwork/neuron/_build/latest?definitionId=8&branchName=develop)
[![Unit Tests](https://github.com/nervosnetwork/neuron/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/nervosnetwork/neuron/actions/workflows/unit_tests.yml)
[![Telegram Group](https://cdn.rawgit.com/Patrolavia/telegram-badge/8fe3382b/chat.svg)](https://t.me/nervos_ckb_dev)
[![Discord](https://img.shields.io/discord/956765352514183188?label=Discord&logo=discord&style=default&color=grey&labelColor=5865F2&logoColor=white)](https://discord.gg/N9nZ3JE2Gg)

---

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.101.3",
"version": "0.103.0",
"npmClient": "yarn",
"useWorkspaces": true
}
2 changes: 1 addition & 1 deletion packages/ckb-indexer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@ckb-lumos/base": "0.18.0-rc2",
"@ckb-lumos/rpc": "0.18.0-rc2",
"ckb-js-toolkit": "0.100.0-rc1",
"cross-fetch": "3.1.4"
"cross-fetch": "3.1.5"
},
"devDependencies": {
"events": "3.3.0"
Expand Down
9 changes: 4 additions & 5 deletions packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "neuron-ui",
"version": "0.101.3",
"version": "0.103.0",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down Expand Up @@ -44,11 +44,11 @@
],
"dependencies": {
"primereact": "7.1.0",
"@nervosnetwork/ckb-sdk-core": "0.101.0",
"@nervosnetwork/ckb-sdk-core": "0.102.2",
"@nervosnetwork/ckb-sdk-utils": "0.102.2",
"@uifabric/experiments": "7.42.4",
"@uifabric/styling": "7.20.0",
"canvg": "2.0.0",
"grommet-icons": "4.7.0",
"i18next": "21.6.6",
"immer": "9.0.12",
"jsqr": "1.4.0",
Expand All @@ -58,8 +58,7 @@
"react-dom": "16.12.0",
"react-i18next": "11.15.3",
"react-router-dom": "5.1.2",
"sass": "1.47.0",
"styled-components": "5.3.3"
"sass": "1.47.0"
},
"devDependencies": {
"@storybook/addon-actions": "5.3.18",
Expand Down
25 changes: 20 additions & 5 deletions packages/neuron-ui/src/components/Addresses/addresses.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ $change-color: #6666cc;

div {
min-width: 100px;
max-width: 500px;
max-width: 818px;
display: flex;
position: relative;

Expand All @@ -116,8 +116,8 @@ $change-color: #6666cc;
display: none;
}

@media screen and (max-width: 1680px) {
width: 20vw;
@media screen and (max-width: 1800px) {
width: 46vw;

.ellipsis {
display: inline;
Expand All @@ -139,6 +139,10 @@ $change-color: #6666cc;
}
}

@media screen and (max-width: 1600px) {
width: 30vw;
}

@media screen and (max-width: 1000px) {
width: 15vw;
}
Expand All @@ -154,14 +158,18 @@ $change-color: #6666cc;
appearance: none;
border: none;
background-color: transparent;
width: 1rem;
width: 2rem;
height: 1rem;
display: flex;
justify-content: center;
align-items: center;

svg {
pointer-events: none;

g {
fill: #000;
}
}
}
}
Expand All @@ -177,11 +185,18 @@ $change-color: #6666cc;
border: none;
}

@media screen and (max-width: 1500px) {
@media screen and (max-width: 2400px) {
input {
width: 100px;
}
}

@media screen and (max-width: 1300px) {
input {
width: 90px;
}
}

}

.balance {
Expand Down
8 changes: 4 additions & 4 deletions packages/neuron-ui/src/components/Addresses/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useEffect, useCallback } from 'react'
import { clipboard } from 'electron'
import { useHistory } from 'react-router-dom'
import { useTranslation } from 'react-i18next'
import { Edit } from 'grommet-icons'
import { ReactComponent as Edit } from 'widgets/Icons/Edit.svg'
import TextField from 'widgets/TextField'
import Breadcrum from 'widgets/Breadcrum'
import CopyZone from 'widgets/CopyZone'
Expand Down Expand Up @@ -105,9 +105,9 @@ const Addresses = () => {
<td className={styles.address}>
<div data-address={addr.address}>
<CopyZone content={addr.address} name={t('addresses.copy-address')}>
<span className={styles.addressOverflow}>{addr.address.slice(0, -6)}</span>
<span className={styles.addressOverflow}>{addr.address.slice(0, -20)}</span>
<span className={styles.ellipsis}>...</span>
<span>{addr.address.slice(-6)}</span>
<span>{addr.address.slice(-20)}</span>
</CopyZone>
</div>
</td>
Expand Down Expand Up @@ -135,7 +135,7 @@ const Addresses = () => {
onClick={onDescriptionSelected}
className={styles.editBtn}
>
<Edit size="0.875rem" />
<Edit />
</button>
)
}
Expand Down
Loading

2 comments on commit 39e5c6a

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

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

Please sign in to comment.