Skip to content

Commit

Permalink
Merge branch 'develop' into renovate/ckb-lumos-base-0.x
Browse files Browse the repository at this point in the history
Signed-off-by: Chen Yu <[email protected]>
  • Loading branch information
Keith-CY authored Oct 12, 2023
2 parents a3cb31e + fdec2ce commit 8ac2f1b
Show file tree
Hide file tree
Showing 106 changed files with 1,833 additions and 1,759 deletions.
2 changes: 1 addition & 1 deletion .ckb-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.110.1
v0.110.2
51 changes: 51 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,54 @@
# 0.110.3 (2023-10-11)

### CKB Node & Light Client

- [[email protected]](https://github.com/nervosnetwork/ckb/releases/tag/v0.110.2) was released on Sep. 12nd, 2023. This version of CKB node is now bundled and preconfigured in Neuron.
- [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

#### Caveat

**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.
**default node** has been renamed to **Internal Node** for clarity.

### Assumed valid target

Block before `0x6b6db6bb23e6e98f63b88e6cd38fa49f46980e5b816f620c71c6c9c74633ee54`(at height `10,985,048`) will be skipped in validation.(257c06eb95062e8ef3bf53179668965fc743b10f)

---

We are so excited to announce this new release of Neuron that has been completely revamped with modernizaed user interface and also enhanced your overall user experience.

Say goodbye to clunky interface and hello to a smoother, more intuitive user experience. Neuron's new version is designed to make managing your assets on CKB effortless.

Curious to see the magic of the new Neuron in action? Checkout our demo video on YouTube: https://youtu.be/MRuXmTLcXFo

[![Brand-new Neuron](https://github.com/nervosnetwork/neuron/assets/7271329/77618118-4524-46c8-bf56-789b3e9d3206)](https://youtu.be/MRuXmTLcXFo)

---

## New features

- Adopt brand new User Interface.(@yanguoyu, @devchenyan, @WhiteMinds, @jeffreyma597, @zhangyouxin, @homura)
- #2672: Optimize storage of transactions to boost searching and reduce disk usage.(@yanguoyu)
- #2783: Check new versions actively.(@yanguoyu)
- #2786: Support synchronization from a specified block number in light client mode.(@yanguoyu)
- #2808: Optimize compatibility checking of CKB NODE.(@yanguoyu)
- #2813: Rename `default node` to `Internal node` for clarity.(@yanguoyu)
- #2839: Update Ckb client versions(@github-actions)

## Bug fixes

- #2711: Fix exit of synchronization with exception and multisig balance.(@yanguoyu)
- #2722: Automatically pad decimal places when the deposit dialog automatically provides a maximum value with decimals by(@WhiteMinds)
- #2772: Fix generating transaction when deposit all without balance.(@yanguoyu)

## New Contributors

- @zhangyouxin made their first contribution in https://github.com/nervosnetwork/neuron/pull/2775

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


# 0.110.2 (2023-07-07)

### CKB Node & Light Client
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"packages": ["packages/*"],
"version": "0.110.2",
"version": "0.110.3",
"npmClient": "yarn",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "neuron",
"productName": "Neuron",
"description": "CKB Neuron Wallet",
"version": "0.110.2",
"version": "0.110.3",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down Expand Up @@ -40,7 +40,7 @@
"update:client-versions": "node ./scripts/update-ckb-client-versions.js"
},
"devDependencies": {
"@babel/core": "7.22.15",
"@babel/core": "7.23.2",
"@types/jest": "27.5.2",
"@types/node": "18.16.18",
"@types/npmlog": "4.1.4",
Expand Down
5 changes: 1 addition & 4 deletions packages/neuron-ui/.storybook/.babelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
{
"presets": [
"@babel/preset-env",
"@babel/preset-typescript"
]
"presets": ["@babel/preset-env", "@babel/preset-typescript"]
}
6 changes: 3 additions & 3 deletions packages/neuron-ui/.storybook/electron.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const sendSyncValues = {
'get-locale': 'zh',
'get-version': '0.103.1'
'get-version': '0.103.1',
}

module.exports = {
Expand All @@ -12,10 +12,10 @@ module.exports = {
return Promise.resolve({})
},
on() {},
removeAllListeners() {}
removeAllListeners() {},
},
clipboard() {},
nativeImage() {},
shell() {},
desktopCapturer() {}
desktopCapturer() {},
}
25 changes: 16 additions & 9 deletions packages/neuron-ui/.storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,38 @@ import { action } from '@storybook/addon-actions'
import { NeuronWalletContext, initStates } from '../src/states'

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
}
},
}

const dispatch = action('Dispatch')

BigInt.prototype['toJSON'] = function() { return this.toString() }
BigInt.prototype['toJSON'] = function () {
return this.toString()
}

export const decorators = [
(Story, { argTypes, args }) => {
const globalArgTypes = Object.keys(argTypes).filter(v => argTypes[v]?.isGlobal)
const globalStates = globalArgTypes.reduce((pre, cur) => args[cur] ? ({
...pre,
[cur]: args[cur]
}) : pre, initStates)
const globalStates = globalArgTypes.reduce(
(pre, cur) =>
args[cur]
? {
...pre,
[cur]: args[cur],
}
: pre,
initStates
)
return (
<NeuronWalletContext.Provider value={{ state: globalStates, dispatch }}>
<Story />
</NeuronWalletContext.Provider>
)
},
];

]
6 changes: 3 additions & 3 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.110.2",
"version": "0.110.3",
"private": true,
"author": {
"name": "Nervos Core Dev",
Expand Down Expand Up @@ -67,7 +67,7 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "7.21.11",
"@babel/preset-typescript": "7.22.15",
"@babel/preset-typescript": "7.23.2",
"@storybook/addon-actions": "7.0.24",
"@storybook/addon-essentials": "7.0.24",
"@storybook/addon-interactions": "7.0.24",
Expand All @@ -83,7 +83,7 @@
"@types/react": "17.0.65",
"@types/react-dom": "17.0.20",
"@types/react-router-dom": "5.3.3",
"@types/styled-components": "5.1.26",
"@types/styled-components": "5.1.27",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"babel-jest": "25.5.1",
"electron": "24.7.1",
Expand Down
10 changes: 5 additions & 5 deletions packages/neuron-ui/public/css/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
@font-face {
font-family: 'ProximaNova-Regular';
src: url('../fonts/ProximaNova-Regular.otf') format('opentype'),
url('../fonts//Proximanova-Regular.ttf') format('opentype');
url('../fonts//Proximanova-Regular.ttf') format('opentype');
}

@font-face {
font-family: 'ProximaNova-Semibold';
src: url('../fonts/ProximaNova-Semibold.otf') format('opentype'),
url('../fonts/ProximaNova-Semibold.ttf') format('opentype');
url('../fonts/ProximaNova-Semibold.ttf') format('opentype');
}

@font-face {
font-family: 'D-DIN-PRO';
src: url('../fonts/D-DIN-PRO-500-Medium.otf') format('opentype'),
url('../fonts/D-DIN-PRO-500-Medium.ttf') format('opentype');
url('../fonts/D-DIN-PRO-500-Medium.ttf') format('opentype');
}

@font-face {
font-family: 'JetBrains Mono Medium';
src: url('../fonts/JetBrainsMonoNL-Medium.otf') format('opentype'),
url('../fonts/JetBrainsMonoNL-Medium.ttf') format('opentype');
url('../fonts/JetBrainsMonoNL-Medium.ttf') format('opentype');
}

@font-face {
font-family: 'JetBrains Mono';
src: url('../fonts/JetBrainsMonoNL-Regular.otf') format('opentype'),
url('../fonts/JetBrainsMonoNL-Regular.ttf') format('opentype');
url('../fonts/JetBrainsMonoNL-Regular.ttf') format('opentype');
}
32 changes: 15 additions & 17 deletions packages/neuron-ui/public/index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="stylesheet" href="%PUBLIC_URL%/css/fonts.css" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<!--
<head>
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="stylesheet" href="%PUBLIC_URL%/css/fonts.css" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All @@ -16,14 +15,13 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>Neuron</title>
</head>

<body>
<navbar class="navbar"></navbar>
<div id="notification" class="notification"></div>
<main id="root" class="main-content"></main>
<div id="dialog" class="dialog"></div>
</body>
<title>Neuron</title>
</head>

<body>
<navbar class="navbar"></navbar>
<div id="notification" class="notification"></div>
<main id="root" class="main-content"></main>
<div id="dialog" class="dialog"></div>
</body>
</html>
Loading

0 comments on commit 8ac2f1b

Please sign in to comment.