Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ckb showcase fix 2 #2

Draft
wants to merge 49 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
e6c1c43
chore(deps): update dependency lerna to v7.4.2 (#314)
renovate[bot] Nov 27, 2023
52acea6
chore(deps): update dependency jest-when to v3.6.0 (#313)
renovate[bot] Nov 27, 2023
b894c1a
chore(deps): update dependency jest-styled-components to v7.2.0 (#312)
renovate[bot] Nov 28, 2023
89d58c3
fix(deps): update dependency @ckb-lumos/bi to v0.21.0-next.3 (#317)
renovate[bot] Nov 28, 2023
28ec92f
chore(deps): update dependency eslint-plugin-import to v2.29.0 (#309)
renovate[bot] Nov 28, 2023
e2f63d1
fix(deps): update dependency @ckb-lumos/codec to v0.21.0-next.3 (#319)
renovate[bot] Nov 28, 2023
799eb2f
fix(deps): update dependency @ckb-lumos/hd to v0.21.0-next.3 (#322)
renovate[bot] Nov 28, 2023
2cd52f2
fix(deps): update dependency @ckb-lumos/common-scripts to v0.21.0-nex…
renovate[bot] Nov 28, 2023
9d3d1b5
fix(deps): update dependency @ckb-lumos/ckb-indexer to v0.21.0-next.3…
renovate[bot] Nov 28, 2023
1dede13
fix(deps): update dependency @ckb-lumos/config-manager to v0.21.0-nex…
renovate[bot] Nov 28, 2023
633f4ed
Merge branch 'develop' of https://github.com/magickbase/neuron into d…
Keith-CY Dec 8, 2023
3dfc45a
chore(deps): update dependency react-i18next to v13.5.0 (#325)
renovate[bot] Dec 10, 2023
ff90dd3
chore(deps): update dependency @babel/core to v7.23.5 (#327)
renovate[bot] Dec 10, 2023
81a5139
chore(deps): update dependency typescript to v5.3.3
renovate[bot] Dec 10, 2023
32dc1c7
chore(deps): update dependency @types/enzyme to v3.10.18 (#328)
renovate[bot] Dec 10, 2023
2602094
Merge pull request #332 from Magickbase/renovate/typescript-5.x
Keith-CY Dec 10, 2023
421c4c1
chore: update reviewers of renovate (#330)
Keith-CY Dec 11, 2023
a1fddf6
Merge branch 'develop' into develop
Keith-CY Dec 12, 2023
b36e1cb
refactor: refactor sign method to allow unidentified lock scripts (#2…
Keith-CY Dec 12, 2023
066845e
Merge branch 'develop' into alpha/skip-unidentified-inputs
Keith-CY Dec 12, 2023
a156dca
Merge branch 'develop' of https://github.com/nervosnetwork/neuron int…
Keith-CY Dec 14, 2023
56096fe
Merge branch 'develop' into alpha/skip-unidentified-inputs
Keith-CY Dec 15, 2023
7b3e0c1
wip: ignore unidentified locks to debug polycrypt
Keith-CY Dec 15, 2023
f552dc9
Add: Perun-Channels tab
sophia1ch Nov 2, 2023
c1c278f
neuron-{ui,wallet}: Integrate Perun payment channels
ndzik Nov 16, 2023
8eb6b37
perun: Pass Perun reject reasons to backend
ndzik Nov 19, 2023
bb811ab
demo: Helping debug prints
ndzik Nov 29, 2023
9c5cebc
service-runner: Pad R value when necessary
ndzik Nov 29, 2023
bef57a8
service-runner: Use correct r value
ndzik Nov 29, 2023
9ccd2dc
service-runner: Retry live-channel fetching multiple times
ndzik Nov 29, 2023
8fa4f01
service-runner: Be more generous when waiting for node-sync
ndzik Nov 29, 2023
7470cc9
service-runner: Additional logging
ndzik Nov 29, 2023
9a71f2c
service-runner: Additional logging
ndzik Nov 29, 2023
d6dee5f
service-runner: Use RPC service as a last resort
ndzik Nov 29, 2023
caa48f3
service-runner: additional logging
ndzik Nov 29, 2023
1c34041
service-runner: Use correct indexing format
ndzik Nov 29, 2023
e05e0ca
perun-ui: Additional logging
ndzik Nov 30, 2023
8435cab
services/perun/service-runner: Setup node service with new api (quick…
janbormet Dec 12, 2023
f8177e7
transaction-sender: Add logging
janbormet Dec 12, 2023
0a274dc
transaction-sender: Add logging for debugging
janbormet Dec 15, 2023
74873fd
Convert ChannelID to string before sending it to UI
janbormet Dec 17, 2023
b3ed963
WIP fixes
janbormet Dec 19, 2023
2073ead
Index: getChannels
sophia1ch Dec 19, 2023
b2d31b8
Perun/index: Remove plus button, add state display
sophia1ch Dec 21, 2023
e555b14
WIP: fix getChannels
janbormet Dec 21, 2023
2cead18
Remove logging noise
janbormet Dec 21, 2023
567f87b
WIP: Fix Update and Close
janbormet Dec 22, 2023
e05a5e8
Index: add peer amount field
sophia1ch Dec 22, 2023
a20cebf
ui: Fix balances display
janbormet Dec 22, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ $ yarn test

If you don't want to bother building from source, you can download a binary from [releases](https://github.com/nervosnetwork/neuron/releases). We offer pre-built binaries for Windows, Linux and macOS.

## Use Perun Channels

To use the Perun Channels you need to clone the perun-wallet-wrapper and link it to the src file of this project. Additionally uncomments all necessary functions and imports in the neuon-ui/src/components/Perun/index.tsx file.

## License

Neuron is released under the terms of the MIT license. See [COPYING](COPYING) for more information or see [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT).
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"update:client-versions": "node ./scripts/update-ckb-client-versions.js"
},
"devDependencies": {
"@babel/core": "7.23.3",
"@babel/core": "7.23.5",
"@types/jest": "27.5.2",
"@types/node": "18.16.18",
"@types/npmlog": "4.1.6",
Expand All @@ -53,12 +53,12 @@
"eslint-config-prettier": "8.10.0",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
"lerna": "7.1.0",
"lerna": "7.4.2",
"lint-staged": "13.3.0",
"ncp": "2.0.0",
"prettier": "2.8.8",
"ts-jest": "29.1.1",
"typescript": "5.3.2",
"typescript": "5.3.3",
"wait-on": "7.0.1"
},
"dependencies": {},
Expand Down
8 changes: 5 additions & 3 deletions packages/neuron-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@
"office-ui-fabric-react": "7.204.0",
"qr.js": "0.0.0",
"react": "17.0.2",
"react-bootstrap": "^2.9.1",
"react-dom": "17.0.2",
"react-i18next": "12.1.5",
"react-icons": "^4.11.0",
"react-router-dom": "6.14.0",
"react-transition-group": "4.4.5",
"sass": "1.63.6"
Expand All @@ -80,7 +82,7 @@
"@storybook/react": "7.0.24",
"@storybook/react-webpack5": "7.0.24",
"@storybook/testing-library": "0.2.2",
"@types/enzyme": "3.10.16",
"@types/enzyme": "3.10.18",
"@types/enzyme-adapter-react-16": "1.0.9",
"@types/node": "18.16.18",
"@types/react": "17.0.71",
Expand All @@ -93,10 +95,10 @@
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.7",
"eslint-config-airbnb": "19.0.4",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.32.2",
"jest-styled-components": "7.1.1",
"jest-styled-components": "7.2.0",
"react-app-rewired": "2.2.1",
"react-scripts": "5.0.1",
"react-test-renderer": "16.14.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/neuron-ui/src/components/Perun/hooks.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { useState } from '../../states'

export const usePerun = () => {
const { perunState } = useState()
// TODO: Register some callbacks here if needed.
return perunState
}
Loading
Loading