Upgrade dcrwallet to master branch (future version v4) #48
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -6,8 +6,7 @@ import ( | |
| "sort" | ||
| "strings" | ||
|
|
||
| "decred.org/dcrwallet/v4/errors" | ||
|
|
||
| "github.com/crypto-power/cryptopower/libwallet/utils" | ||
| "github.com/decred/dcrd/chaincfg/chainhash" | ||
|
|
@@ -111,24 +110,21 @@ func (asset *Asset) SetVoteChoice(agendaID, choiceID, hash, passphrase string) e | |
| return err | ||
| } | ||
|
|
||
| currentChoice, ok := choices[agendaID] | ||
| if ok && currentChoice == strings.ToLower(choiceID) { | ||
| // Do not set the same choice again | ||
| return nil | ||
| } | ||
|
Comment on lines
+114
to
117
Collaborator
There was a problem hiding this comment. Might it be necessary to continue even if it's the same value? Below, the specified ticket or all unvoted tickets are updated with the vsp to use this choice. I'm wondering if it's possible that a ticket in that list doesn't already have the correct vote choice set with the vsp.
Collaborator
Author
There was a problem hiding this comment. The purpose of this is to prevent unnecessary API calls. It does this by preventing the existing choice being set again. |
||
|
|
||
| if !ok { | ||
| // Default to abstain if no previous choice existed | ||
| currentChoice = "abstain" | ||
| } | ||
|
|
||
| currentChoiceMap := map[string]string{agendaID: currentChoice} | ||
| newChoiceMap := map[string]string{agendaID: strings.ToLower(choiceID)} | ||
|
|
||
| _, err = asset.Internal().DCR.SetAgendaChoices(ctx, ticketHash, newChoiceMap) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
@@ -138,7 +134,7 @@ func (asset *Asset) SetVoteChoice(agendaID, choiceID, hash, passphrase string) e | |
| if !vspPreferenceUpdateSuccess { | ||
| // Updating the agenda voting preference with the vsp failed, | ||
| // revert the locally saved voting preference for the agenda. | ||
| _, revertError := asset.Internal().DCR.SetAgendaChoices(ctx, ticketHash, currentChoiceMap) | ||
| if revertError != nil { | ||
| log.Errorf("unable to revert locally saved voting preference: %v", revertError) | ||
| } | ||
|
|
@@ -181,7 +177,7 @@ func (asset *Asset) SetVoteChoice(agendaID, choiceID, hash, passphrase string) e | |
| firstErr = err | ||
|
Collaborator
There was a problem hiding this comment. One of the new dcrwallet commits since
Collaborator
Author
There was a problem hiding this comment. This could be done app wide so a separate issue can best address this. |
||
| continue // try next tHash | ||
| } | ||
| err = vspClient.SetVoteChoice(ctx, tHash, newChoiceMap, nil, nil) | ||
| if err != nil && firstErr == nil { | ||
| firstErr = err | ||
| continue // try next tHash | ||
|
|
@@ -245,9 +241,9 @@ func (asset *Asset) AllVoteAgendas(hash string, newestFirst bool) ([]*Agenda, er | |
| d := &deployments[i] | ||
|
|
||
| votingPreference := "abstain" // assume abstain, if we have the saved pref, it'll be updated below | ||
| for agendaID, choiceID := range choices { | ||
| if agendaID == d.Vote.Id { | ||
| votingPreference = choiceID | ||
| break | ||
| } | ||
| } | ||
|
Comment on lines
+244
to
249
Collaborator
There was a problem hiding this comment. This look correct?
Collaborator
Author
There was a problem hiding this comment. This is double query; during the map for loop, |
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.