client/asset/btc: Identify unknown transactions #2723
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
JoeGruffins
approved these changes
Apr 10, 2024
client/asset/btc/btc.go
Outdated
Comment on lines
1607
to
1609
| btc.tipMtx.Lock() | ||
| tip := btc.currentTip | ||
| btc.tipMtx.Unlock() |
buck54321
requested changes
Apr 13, 2024
client/asset/bch/spv.go
Outdated
| func (w *bchSPVWallet) GetTransactions(startBlock, endBlock int32, _ string, cancel <-chan struct{}) (*btcwallet.GetTransactionsResult, error) { | ||
| startID := wallet.NewBlockIdentifierFromHeight(startBlock) | ||
| endID := wallet.NewBlockIdentifierFromHeight(endBlock) | ||
| ltcGTR, err := w.Wallet.GetTransactions(startID, endID, cancel) |
Comment on lines
+504
to
+506
| // We use GetTransactions instead of ListSinceBlock, because ListSinceBlock | ||
| // does not include transactions that pay to a change address, which | ||
| // Redeem, Refund, and RedeemBond do. |
client/asset/btc/txdb.go
Outdated
| return nil, err | ||
| } | ||
|
|
||
| ctx, die := context.WithCancel(context.Background()) |
There was a problem hiding this comment.
Let's pass in a context.Context to the constructor.
client/asset/btc/txdb.go
Outdated
| seq *badger.Sequence | ||
|
|
||
| running atomic.Bool | ||
| wg *sync.WaitGroup |
There was a problem hiding this comment.
Make this a value and you don't have to initialize it.
client/asset/btc/txdb.go
Outdated
| time.Sleep(10 * time.Millisecond) | ||
| } | ||
|
|
||
| return err |
There was a problem hiding this comment.
This can never be anything but nil.
There was a problem hiding this comment.
It could be badger.ErrConflict if we got conflicts 10 times.
client/asset/btc/wallettypes.go
Outdated
| @@ -149,3 +164,7 @@ type listDescriptorsResult struct { | |||
| Next int64 `json:"next"` // next index to addresses generation; only set for ranged descriptors | |||
| } `json:"descriptors"` | |||
| } | |||
|
|
|||
| type listTransactionsResult struct { | |||
There was a problem hiding this comment.
If you're only using this struct in one place, you can define it there.
client/asset/dcr/dcr.go
Outdated
Comment on lines
951
to
955
| var dbPath string | ||
| if spvWallet, ok := dcr.wallet.(*spvWallet); ok { | ||
| initialAddress, err := spvWallet.InitialAddress(ctx) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| dbPath = dcr.txHistoryDBPath(initialAddress) | ||
| } |
There was a problem hiding this comment.
Type assertion is fine, but using an interface is cooler and more flexible imo.
var dbPath string
if initialAddresser, is := dcr.wallet.(interface {
InitialAddress(ctx context.Context) (string, error)
}); is {
initialAddress, err := initialAddresser.InitialAddress(ctx)
if err != nil {
return err
}
dbPath = dcr.txHistoryDBPath(initialAddress)
}
client/asset/dcr/dcr.go
Outdated
| dcr.subprocessWg.Add(1) | ||
| go func() { | ||
| defer dcr.subprocessWg.Done() | ||
| dcr.checkPendingTxs(ctx, uint64(newTipHeight)) |
There was a problem hiding this comment.
Do we need to sequence calls to checkPendingTxs?
| @@ -2529,6 +2534,12 @@ export default class WalletsPage extends BasePage { | |||
| if (n.assetID === this.selectedAssetID) this.handleTxNote(n.transaction, n.new) | |||
| break | |||
| } | |||
| case 'transactionHistorySynced' | |||
| : { | |||
client/asset/dcr/dcr.go
Outdated
| @@ -901,6 +902,125 @@ func (dcr *ExchangeWallet) Info() *asset.WalletInfo { | |||
| // } | |||
| // } | |||
|
|
|||
| func (dcr *ExchangeWallet) txHistoryDBPath(walletID string) string { | |||
| return filepath.Join(dcr.walletDir, fmt.Sprintf("txhistory-%s.db", walletID)) | |||
There was a problem hiding this comment.
If it's a directory, should drop the file extension.
|
@buck54321 This PR comes on top of #2693. For this one I was only going to do identifying BTC transactions, then I'll add another PR for DCR later. Let's merge #2693 first, then I'll rebase this one. |
martonp
force-pushed
the
unknownTxs
branch
2 times, most recently
from
ebf36db
to
b4c1c96
Compare
This diff updates the btc wallet to identify all past transactions that the wallet has made. This way, if dexc is reinitalized with a seed that was already used, the transaction history of native wallets can be recovered. When an RPC wallet is connected, the transaction history prior to connecting will be displayed. The SPV wallet uses the `GetTransactions` method to retrieve unknown transactions rather than `ListSinceBlock` as was previously used to get incoming transactions. This is because `ListSinceBlock` does not include incoming transactions that pay to a change address, which is done by redemption and refund transactions. The RPC wallet continues to use the listsinceblock RPC call. During initial syncing of the transaction history, the wallet does not send notifications to the front end each time it discovers a new transaction. Instead, a notification that the syncing has complete is sent to the front end. Co-authored-by: buck54321 <buck54321@gmail.com>
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.
Comes on top of #2693 and builds on #2694