WIP/NOMERGE External signing enhancements #209
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
adcockalexander
commented
Aug 27, 2020
adcockalexander
commented
- Moves Corda version to 4.6
- Adds 'haltForExternalSigning' parameter to flows for moving tokens, which can be set to true to make these flows halt while awaiting a transaction signature (intended for calls to external services)
- External calls will timeout after 30 minutes
kasiastreich
suggested changes
Sep 14, 2020
| @@ -49,7 +50,7 @@ abstract class AbstractTokenContract<AT : AbstractToken> : Contract { | |||
| // Issuances should only contain one issue command. | |||
| is IssueTokenCommand -> verifyIssue(commands.single(), inputs, outputs, attachments, references) | |||
| // Moves may contain more than one move command. | |||
| is MoveTokenCommand -> verifyMove(commands, inputs, outputs, attachments, references) | |||
| is MoveTokenCommand -> verifyMove(commands, inputs, outputs, attachments, references, summary) | |||
There was a problem hiding this comment.
Redeem doesn't need summary? It should be signed by token holder too
| inputs: List<TransactionState<ContractState>>, | ||
| outputs: List<TransactionState<ContractState>>, | ||
| commands: List<CommandData>, | ||
| attachments: List<SecureHash>): List<String> { |
There was a problem hiding this comment.
are references not needed?
| outputs: List<TransactionState<ContractState>>, | ||
| commands: List<CommandData>, | ||
| attachments: List<SecureHash>): List<String> { | ||
| return when(commands.first()) { |
There was a problem hiding this comment.
what if this throws on empty list? add edge cases
| outputs: List<TransactionState<ContractState>>, | ||
| commands: List<CommandData>, | ||
| attachments: List<SecureHash>): List<String> { | ||
| return when(commands.first()) { |
There was a problem hiding this comment.
why do we check only first? what if we have more command data?
| // Moves may contain more than one move command. | ||
| is MoveTokenCommand -> constructMoveDescription(inputs, outputs) | ||
| // Redeems must only contain one redeem command. | ||
| is RedeemTokenCommand -> listOf("I AM A REDEPMPTION SONG)") |
| return when(commands.first()) { | ||
| //verify the type jar presence and correctness | ||
| // Issuances should only contain one issue command. | ||
| is IssueTokenCommand -> listOf("") |
There was a problem hiding this comment.
Should it be implemented too?
There was a problem hiding this comment.
or at least some todo
| @@ -38,6 +41,6 @@ constructor( | |||
| participantSessions.forEach { it.send(TransactionRole.PARTICIPANT) } | |||
| observerSessions.forEach { it.send(TransactionRole.OBSERVER) } | |||
| val confidentialOutput = subFlow(ConfidentialTokensFlow(listOf(output), participantSessions)).single() | |||
| return subFlow(MoveTokensFlow(input, confidentialOutput, participantSessions, observerSessions)) | |||
| return subFlow(MoveTokensFlow(listOf(input), listOf(confidentialOutput), participantSessions, observerSessions, haltForExternalSigning)) | |||
There was a problem hiding this comment.
you don't need to change it to listOf(input) etc
| ?: throw IllegalArgumentException("Didn't provide transactionBuilder nor signedTransaction to the flow.") | ||
|
|
||
| val stx = if (haltForExternalSigning) { | ||
| await(SignTransactionOperation(transactionBuilder!!, ourSigningKeys, serviceHub)) |
There was a problem hiding this comment.
Remove !! because it throws null pointer exception without explaining what happened. Have meaningful error handling if the transaction builder is null
| val moveFrom = inputs.first().asFungibleToken().holder.owningKey | ||
| val moveTo = (outputs.map { it.asFungibleToken().holder }).firstOrNull { p -> p.owningKey != moveFrom }?.owningKey ?: throw IllegalArgumentException("") | ||
| val amountToMove = outputs.filter { p -> p.asFungibleToken().holder.owningKey != moveFrom }.first().asFungibleToken().amount | ||
| amountToMove.displayTokenSize |
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.