Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Secretstore RPCs + integration #5439

Merged
merged 99 commits into from
May 5, 2017
Merged

Secretstore RPCs + integration #5439

merged 99 commits into from
May 5, 2017

Conversation

svyatonik
Copy link
Collaborator

On top of #5416

This is PR for RPCs && small changes required for easier secretstore integration.
First change, as suggested by @ngotchac is to use ethcrypto::encrypt/decrypt with known MAC instead of ethcrypto::{encrypt/decrypt}_single_message. This will help with using RPCs like parity_decryptMessage.
@ngotchac I've slightly changed your commit && moved DEFAULT_MAC to ethcrypto from bith RPC && SecretStore modules. Hope you're ok with that :)

@svyatonik svyatonik added A0-pleasereview 🤓 Pull request needs code review. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels May 2, 2017
@svyatonik
Copy link
Collaborator Author

@keorn done

@keorn keorn added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 3, 2017
/// Parity-specific rpc interface.
pub trait SecretStore {
/// Encrypt data with key, received from secret store.
/// Arguments: `account`, `key`, `data`.
Copy link

Choose a reason for hiding this comment

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

RPC has 4 args

fn encrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;

/// Decrypt data with key, received from secret store.
/// Arguments: `account`, `key`, `data`.
Copy link

@keorn keorn May 3, 2017

Choose a reason for hiding this comment

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

arg number

fn decrypt(&self, H160, String, Bytes, Bytes) -> Result<Bytes, Error>;

/// Decrypt data with shadow key, received from secret store.
/// Arguments: `account`, `decrypted_secret`, `common_point`, `decrypt_shadows`, `data`.
Copy link

Choose a reason for hiding this comment

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

arg number

@gavofyork gavofyork added A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. and removed A8-looksgood 🦄 Pull request is reviewed well. labels May 3, 2017
@keorn keorn added A8-looksgood 🦄 Pull request is reviewed well. and removed A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. labels May 3, 2017
@svyatonik
Copy link
Collaborator Author

Tests fail seems unrelated, because only docs were changed in @keorn commit, but it fails, while previous - does not.

@gavofyork
Copy link
Contributor

conflicts?

@gavofyork gavofyork added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A8-looksgood 🦄 Pull request is reviewed well. labels May 4, 2017
@svyatonik svyatonik added A0-pleasereview 🤓 Pull request needs code review. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. labels May 4, 2017
@keorn keorn added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels May 4, 2017
@gavofyork gavofyork merged commit 8b9adb4 into master May 5, 2017
@gavofyork gavofyork deleted the secretstore_rpcs branch May 5, 2017 13:57
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well. M6-rpcapi 📣 RPC API.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants