Dao improvements #1746
Merged
Dao improvements #1746
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
As PB handles enums globally there must not be same entries in 2 diff. enums. Therefore I postfixed with _OUTPUT 3 entries in TxOutputType.
- Remove unneeded isLastOutput - Rename bsqOutputs to tempTxOutputs - Rename commitTxOutputs to commitTxOutputsForValidTx
- Remove voteRevealInputState and replace with isVoteRevealInputInValid in TxInputParser - Rename optionalVerifiedOpReturnType to optionalOpReturnType - Replace if checks with checkNotNull if case must not happen - Remove unused isLastOutput param - Inline handleOpReturnOutput code to processOpReturnOutput - Remove class fields remainingInputValue and use a local var instead - Rename getOptionalVerifiedOpReturnType to getOptionalOpReturnType
- Continue to refactor to make methods more testable
- Add isUnLockInputValid to TxInputParser - Continue to refactor to make methods more testable - Clean up
- Move unlockBlockHeight field from Tx to TxOutput
- Remove tempTx from TxOutputParser - Renamings - Add isOpReturnOutput method to TempTxOuput
- Add check for opReturn in processTxOutput - Handle burntBondValue - Check for TxOutputType.INVALID_OUTPUT in isTxInvalid
- Use commitUTXOCandidates for processGenesisTxOutput - Cleanup
- Extract genesis parsing to GenesisTxParser - Cleanups
sqrrm
approved these changes
Oct 4, 2018
| @@ -52,7 +52,8 @@ | |||
|
|
|||
| private final BsqStateService bsqStateService; | |||
| @Getter | |||
| private TxInputParser.VoteRevealInputState voteRevealInputState = TxInputParser.VoteRevealInputState.UNKNOWN; | |||
| boolean isVoteRevealInputInValid = false; | |||
There was a problem hiding this comment.
This should be isVoteRevealInputValid
| tempTxOutput.setTxOutputType(txOutputType); | ||
|
|
||
| optionalOpReturnType = getMappedOpReturnType(txOutputType); | ||
| // TODO: Do we really want to store the lockTime in another output as where we get it delivered? |
There was a problem hiding this comment.
Since the lockTime is referring to the lockTime of the first output I think it's correct. It just happens that the information has to be carried in the opreturn, and this is when it's parsed and assigned to the concerned txOutput.
| * @param optionalOpReturnType If present, the OP_RETURN type of the transaction. | ||
| * @param tempTx The temporary transaction. | ||
| * @param optionalOpReturnType The optional OP_RETURN type of the transaction. | ||
| * @param hasBurntBSQ If the have been remaining value from the inputs which got not spent in outputs. |
There was a problem hiding this comment.
This comment is quite hard to understand.
| @@ -293,7 +291,7 @@ private void processVoteReveal(int blockHeight, TempTx tempTx) { | |||
| } | |||
|
|
|||
| // We must not use an `if else` here! | |||
| if (!isPhaseValid || txInputParser.isVoteRevealInputInValid()) { | |||
| if (!isPhaseValid || txInputParser.isVoteRevealInputValid()) { | |||
There was a problem hiding this comment.
I think this is now incorrect, it should be !txInputParser.isVoteRevealInputValid()
|
Thanks for the review! |
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.
No description provided.