Skip to content

Commit 1da19fb

Browse files
jholdstockjrick
authored andcommitted
[release-v2.1] wallet: Don't validate already validated blocks.
Since the merkle root of blocks fetched from SPV peers are now validated immediately, and blocks from a local node are already considered to be trusted, there is no need for the merkle root to be checked again. Backport of f617518.
1 parent 745996b commit 1da19fb

1 file changed

Lines changed: 1 addition & 11 deletions

File tree

wallet/discovery.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2015-2020 The Decred developers
1+
// Copyright (c) 2015-2026 The Decred developers
22
// Use of this source code is governed by an ISC
33
// license that can be found in the LICENSE file.
44

@@ -11,7 +11,6 @@ import (
1111
"sync"
1212

1313
"decred.org/dcrwallet/v5/errors"
14-
"decred.org/dcrwallet/v5/validate"
1514
"decred.org/dcrwallet/v5/wallet/udb"
1615
"decred.org/dcrwallet/v5/wallet/walletdb"
1716
"github.com/decred/dcrd/blockchain/stake/v5"
@@ -346,15 +345,6 @@ func (a *addrFinder) filter(ctx context.Context, fs []*udb.BlockCFilter, data bl
346345
}
347346
for i, b := range blocks {
348347
g.Go(func() error {
349-
// validate blocks
350-
err := validate.MerkleRoots(b)
351-
if err != nil {
352-
err = validate.DCP0005MerkleRoot(b)
353-
}
354-
if err != nil {
355-
return err
356-
}
357-
358348
c := blockCommitments(b)
359349
a.mu.Lock()
360350
a.commitments[*fetch[i]] = c

0 commit comments

Comments
 (0)