This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Version and notification for private contract wrapper added #9761
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
grbIzl
added
A0-pleasereview 🤓
|
please review @dvdplm @andresilva |
andresilva
reviewed
Oct 29, 2018
ethcore/private-tx/src/lib.rs
Outdated
| @@ -350,6 +354,21 @@ impl Provider where { | |||
| bail!(err); | |||
| } | |||
| } | |||
| //Notify about state changes | |||
| let contract = Self::contract_address_from_transaction(&desc.original_transaction); | |||
ethcore/private-tx/src/lib.rs
Outdated
| bail!("Incorrect type of action for the transaction"); | ||
| } | ||
| let contract = contract.expect("Error was checked before"); | ||
| // TODO Usage of BlockId::Latest |
There was a problem hiding this comment.
What's the issue with using BlockId::Latest?
There was a problem hiding this comment.
See for example @tomusdrw comment here: https://github.com/paritytech/parity-ethereum/blob/master/ethcore/private-tx/src/lib.rs#L209 We still use Latest in several modules, but I agree with him, that it's error-prone.
BTW I created a separate issue for addressing BlockId::Latest todo in private tx code (#9825)
ethcore/private-tx/src/lib.rs
Outdated
|
|
||
| fn get_contract_version(&self, block: BlockId, address: &Address) -> Result<usize, Error> { | ||
| let (data, decoder) = private_contract::functions::get_version::call(); | ||
| let value = self.client.call_contract(block, *address, data)?; |
There was a problem hiding this comment.
Should we also fallback to INITIAL_PRIVATE_CONTRACT_VER if this call fails? (this way this function would return usize instead of Result).
There was a problem hiding this comment.
My suggestion is that we may want to fail early when possible. If someone deploys a contract that has illegal interface, then stop early. It wouldn't crash the client anyway!
ethcore/private-tx/src/lib.rs
Outdated
| trace!(target: "privatetx", "Sending signature for private transaction: {:?}", signed_private_transaction); | ||
| self.broadcast_signed_private_transaction(signed_private_transaction.hash(), signed_private_transaction.rlp_bytes()); | ||
| } else { | ||
| let contract = Self::contract_address_from_transaction(&transaction.transaction); |
ethcore/private-tx/src/lib.rs
Outdated
| status_code: 0, | ||
| }) | ||
| } | ||
| let contract = Self::contract_address_from_transaction(&signed_transaction); |
There was a problem hiding this comment.
Prefer .map_err and ? here, instead of using expect below.
3 tasks
sorpaas
reviewed
Nov 25, 2018
There was a problem hiding this comment.
LGTM (after @andresilva's grumbles are addressed!). Also a small grumble.
ethcore/private-tx/src/lib.rs
Outdated
| @@ -350,6 +347,15 @@ impl Provider where { | |||
| bail!(err); | |||
| } | |||
| } | |||
| //Notify about state changes | |||
There was a problem hiding this comment.
nit: missing space after //
sorpaas
added
A5-grumble 🔥
grbIzl
added
A0-pleasereview 🤓
sorpaas
approved these changes
Nov 28, 2018
ethcore/private-tx/src/lib.rs
Outdated
| let data = signed_transaction.rlp_bytes(); | ||
| let encrypted_transaction = self.encrypt(&contract, &Self::iv_from_transaction(&signed_transaction), &data)?; | ||
| let private = PrivateTransaction::new(encrypted_transaction, contract); | ||
| // TODO [ToDr] Using BlockId::Latest is bad here, |
There was a problem hiding this comment.
Suggested change
| // TODO [ToDr] Using BlockId::Latest is bad here, | |
| // TODO #9825 [ToDr] Using BlockId::Latest is bad here, |
Please add issue number to help navigate!
ethcore/private-tx/src/lib.rs
Outdated
| bail!("Incorrect type of action for the transaction"); | ||
| let contract = Self::contract_address_from_transaction(&transaction.transaction) | ||
| .map_err(|_| "Incorrect type of action for the transaction")?; | ||
| // TODO [ToDr] Usage of BlockId::Latest |
There was a problem hiding this comment.
Suggested change
| // TODO [ToDr] Usage of BlockId::Latest | |
| // TODO #9825 [ToDr] Usage of BlockId::Latest |
sorpaas
added
A5-grumble 🔥
grbIzl
added
A0-pleasereview 🤓
sorpaas
approved these changes
Dec 3, 2018
sorpaas
added
A8-looksgood 🦄
andresilva
approved these changes
Dec 3, 2018
niklasad1
pushed a commit
that referenced
this pull request
Dec 16, 2018
* Version and notification for private contract wrapper added * Error handling improved * Style for comments in file fixed * TODO issue added into comments
insipx
pushed a commit
to insipx/parity-ethereum
that referenced
this pull request
Dec 17, 2018
…reum#9761) * Version and notification for private contract wrapper added * Error handling improved * Style for comments in file fixed * TODO issue added into comments
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Special (Solidity) event is emitted, when changes in private contract state are approved and corresponding transaction sent to local miner.
The code of the contract wrapper is also updated, review can be found openethereum/private-tx#7
Closes #9719