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

Ledger hardware wallet integration (bp #8068) #8169

Merged
merged 1 commit into from
Feb 7, 2020

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 7, 2020

This is an automated backport of pull request #8068 done by Mergify.io

Cherry-pick of ed0c1d3 has failed:

On branch mergify/bp/v0.23/pr-8068
Your branch is up to date with 'origin/v0.23'.

You are currently cherry-picking commit ed0c1d3b5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   Cargo.toml
	modified:   clap-utils/src/input_parsers.rs
	modified:   clap-utils/src/input_validators.rs
	modified:   clap-utils/src/keypair.rs
	modified:   cli/src/cli.rs
	modified:   cli/src/main.rs
	modified:   keygen/src/keygen.rs
	new file:   remote-wallet/Cargo.toml
	new file:   remote-wallet/src/bin/ledger-udev.rs
	new file:   remote-wallet/src/ledger.rs
	new file:   remote-wallet/src/lib.rs
	new file:   remote-wallet/src/remote_wallet.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   Cargo.lock
	both modified:   clap-utils/Cargo.toml
	both modified:   cli/Cargo.toml
	both modified:   keygen/Cargo.toml

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

Mergify commands and options
More conditions and actions can be found in the [documention](https://doc.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:
  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR
  • @Mergifyio backports <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the simulator.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 7, 2020
* Initial remote wallet module

* Add clap derivation tooling

* Add remote-wallet path apis

* Implement remote-wallet in solana-keygen

* Implement remote-wallet in cli for read-only pubkey usage

* Linux: Use udev backend; add udev rules tool

* Ignore Ledger live test

* Cli api adjustments

(cherry picked from commit ed0c1d3)
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v0.23/pr-8068 branch from 4270b95 to b596add Compare February 7, 2020 18:54
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Feb 7, 2020
@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Feb 7, 2020
@solana-grimes solana-grimes merged commit 030498c into v0.23 Feb 7, 2020
@codecov
Copy link

codecov bot commented Feb 7, 2020

Codecov Report

Merging #8169 into v0.23 will decrease coverage by 0.6%.
The diff coverage is 66.6%.

@@           Coverage Diff           @@
##           v0.23   #8169     +/-   ##
=======================================
- Coverage   82.1%   81.4%   -0.7%     
=======================================
  Files        246     251      +5     
  Lines      53197   54178    +981     
=======================================
+ Hits       43702   44136    +434     
- Misses      9495   10042    +547

@mergify mergify bot deleted the mergify/bp/v0.23/pr-8068 branch February 7, 2020 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants