Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Refactor SignerSource to expose DerivationPath to other kinds of signers (backport #16933) #16941

Merged
merged 2 commits into from
Apr 29, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2021

This is an automatic backport of pull request #16933 done by Mergify.
Cherry-pick of d6f30b7 has failed:

On branch mergify/bp/v1.6/pr-16933
Your branch is up to date with 'origin/v1.6'.

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

Changes to be committed:
	modified:   Cargo.lock
	modified:   clap-utils/Cargo.toml
	modified:   clap-utils/src/fee_payer.rs
	modified:   clap-utils/src/input_parsers.rs
	modified:   clap-utils/src/input_validators.rs
	modified:   clap-utils/src/keypair.rs
	modified:   clap-utils/src/memo.rs
	modified:   clap-utils/src/nonce.rs
	modified:   clap-utils/src/offline.rs
	modified:   programs/bpf/Cargo.lock
	modified:   remote-wallet/src/locator.rs
	modified:   remote-wallet/src/remote_keypair.rs
	modified:   remote-wallet/src/remote_wallet.rs
	modified:   sdk/src/derivation_path.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdk/Cargo.toml

To fix up this pull request, you can check it out 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 documentation.

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 on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <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 config editor.

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

…ers (#16933)

* One use statement

* Add stdin uri scheme

* Convert parse_signer_source to return Result

* A-Z deps

* Convert Usb data to Locator

* Pull DerivationPath out of Locator

* Wrap SignerSource to share derivation_path

* Review comments

* Check Filepath existence, readability in parse_signer_source

(cherry picked from commit d6f30b7)

# Conflicts:
#	sdk/Cargo.toml
@mergify mergify bot added the conflicts label Apr 29, 2021
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Apr 29, 2021
@mergify mergify bot merged commit a401b2b into v1.6 Apr 29, 2021
@mergify mergify bot deleted the mergify/bp/v1.6/pr-16933 branch April 29, 2021 09:12
@brooksprumo brooksprumo mentioned this pull request Aug 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant