Remove zkapp_input
#23
Merged
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
mimoo
approved these changes
Jan 27, 2024
| .iter() | ||
| .find(|tx| tx.previous_output.txid == self.zkapp_tx.txid()) | ||
| .context("the transaction ID that was passed in the request does not exist")? | ||
| .previous_output; |
There was a problem hiding this comment.
might be slightly cleaner
fn zkapp_outpoint(&self) -> Result<OutPoint> {
self
.tx
.input
.iter()
.find(|tx| tx.previous_output.txid == self.zkapp_tx.txid())
.context("the transaction ID that was passed in the request does not exist")
.and_then(|input| input.previous_output)
}| Ok(txin.previous_output) | ||
| .iter() | ||
| .find(|tx| tx.previous_output.txid == self.zkapp_tx.txid()) | ||
| .context("the transaction ID that was passed in the request does not exist")? |
There was a problem hiding this comment.
maybe a better error here would be "the zkapp transaction ID could not be found in the transaction's inputs"
| ensure!( | ||
| zkapp_inputs.len() == 1, | ||
| "internal error: the transaction does not contain the zkapp being used or it contains duplicate inputs" | ||
| ); |
src/committee/orchestrator.rs
Outdated
| .get_mut(bob_request.zkapp_input) | ||
| .context("couldn't find zkapp input in transaction")? | ||
| .witness = witness; | ||
| let transaction = bob_request.zkapp_tx_with_witness(witness)?; |
There was a problem hiding this comment.
note that we could return the witness to Bob (shorter response) and Bob could fit it in the transaction by himself
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The index of the input that contains the
zkappbeing used is part of theunlock_fundsRPC request. However, this is redundant since we can infer it from the unlock transaction inputs using the following equality check:tx.previous_output.txid == self.zkapp_tx.txid()Fixes #6