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.

Sign up for GitHub

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

Add logic to support setting networking keys, transferring, and re-ticketing on L2 #640

Merged
merged 8 commits into from
Sep 30, 2021
Merged

Add logic to support setting networking keys, transferring, and re-ticketing on L2 #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
feb78cb
urbit-id: add logic for L2 transferPoint
yosoyubik Sep 29, 2021
be7698d
wip set networking keys
yosoyubik Sep 29, 2021
1df2257
network-keys: use attemptSeedDerivation
yosoyubik Sep 29, 2021
1e209c4
reticket: add support for L2
yosoyubik Sep 29, 2021
19d412d
api: retrieve latest nonce from Roller api
yosoyubik Sep 29, 2021
b423bae
transfer: use setTransferProxy in Transfer.js
yosoyubik Sep 30, 2021
b37adf2
proxies: choose proxy based on action
yosoyubik Sep 30, 2021
f7069b7
proxies: add getProxy functions
yosoyubik Sep 30, 2021
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
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@types/styled-components": "^5.1.10",
"@types/styled-system": "^5.1.11",
"@types/styled-system__css": "^5.0.15",
"@urbit/roller-api": "^0.1.8",
"@urbit/roller-api": "^0.1.9",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this was addressed in #641, does this branch need to be rebased on roller?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look locally if there's any conflicts, although the merge message here says that all is fine

"@walletconnect/client": "^1.6.2",
"@walletconnect/qrcode-modal": "^1.6.2",
"@welldone-software/why-did-you-render": "^3.2.3",
Expand Down
Loading