This repository has been archived by the owner on Nov 2, 2018. It is now read-only.
Add support for offline transaction signing #2907
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ package wallet | |
| import ( | ||
| "bytes" | ||
| "errors" | ||
| "math" | ||
| "sort" | ||
|
|
||
| "github.com/NebulousLabs/Sia/crypto" | ||
|
|
@@ -642,6 +643,7 @@ func (w *Wallet) SpendableOutputs() []modules.SpendableOutput { | |
| // ensure durability of reported outputs | ||
| w.syncDB() | ||
|
|
||
| // build initial list of confirmed outputs | ||
| var outputs []modules.SpendableOutput | ||
| dbForEachSiacoinOutput(w.dbTx, func(scoid types.SiacoinOutputID, sco types.SiacoinOutput) { | ||
| outputs = append(outputs, modules.SpendableOutput{ | ||
|
|
@@ -660,6 +662,23 @@ func (w *Wallet) SpendableOutputs() []modules.SpendableOutput { | |
| }) | ||
| }) | ||
|
|
||
| // don't include outputs marked as spent in pending transactions | ||
|
There was a problem hiding this comment. @DavidVorick this seemed like a reasonable thing to do, but would like to hear your thoughts |
||
| pending := make(map[types.OutputID]struct{}) | ||
| for _, pt := range w.unconfirmedProcessedTransactions { | ||
| for _, input := range pt.Inputs { | ||
| if input.WalletAddress { | ||
| pending[input.ParentID] = struct{}{} | ||
| } | ||
| } | ||
| } | ||
| filtered := outputs[:0] | ||
| for _, o := range outputs { | ||
| if _, ok := pending[o.ID]; !ok { | ||
| filtered = append(filtered, o) | ||
| } | ||
| } | ||
| outputs = filtered | ||
|
|
||
| // set the confirmation height for each output | ||
| outer: | ||
| for i, o := range outputs { | ||
|
|
@@ -678,6 +697,21 @@ outer: | |
| } | ||
| } | ||
|
|
||
| // add unconfirmed outputs | ||
|
|
||
| for _, pt := range w.unconfirmedProcessedTransactions { | ||
| for _, o := range pt.Outputs { | ||
| if o.WalletAddress { | ||
| outputs = append(outputs, modules.SpendableOutput{ | ||
| FundType: types.SpecifierSiacoinOutput, | ||
| ID: o.ID, | ||
| UnlockHash: o.RelatedAddress, | ||
| Value: o.Value, | ||
| ConfirmationHeight: types.BlockHeight(math.MaxUint64), // unconfirmed | ||
|
There was a problem hiding this comment. not sure what the best approach is here. I guess this is an argument for making the field |
||
| }) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return outputs | ||
| } | ||
|
|
||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to sync here? Once you got the outputs and created a transaction, the transaction pool will decide if the transaction is valid. Therefore I think it is not really an issue if the output disappears from the wallet due to a crash.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's more about the principle. If the wallet reports that it has an output, and then it crashes, it should still have that output next time you ask it. The general rule is: "don't give the user any data that won't survive a crash."
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see 👍