Merge pull request #4285 from cfromknecht/pay-addr-index

channeldb: index payments by payment addr, use payment hash as fallback

channeldb/db.go

@@ -13,6 +13,7 @@ import (
 	"github.com/btcsuite/btcwallet/walletdb"
 	"github.com/go-errors/errors"
 	"github.com/lightningnetwork/lnd/channeldb/kvdb"
+	mig "github.com/lightningnetwork/lnd/channeldb/migration"
 	"github.com/lightningnetwork/lnd/channeldb/migration12"
 	"github.com/lightningnetwork/lnd/channeldb/migration13"
 	"github.com/lightningnetwork/lnd/channeldb/migration_01_to_11"
@@ -136,6 +137,13 @@ var (
 			number:    13,
 			migration: migration13.MigrateMPP,
 		},
+		{
+			// Initialize payment address index and begin using it
+			// as the default index, falling back to payment hash
+			// index.
+			number:    14,
+			migration: mig.CreateTLB(payAddrIndexBucket),
+		},
 	}
 
 	// Big endian is the preferred byte order, due to cursor scans over
@@ -242,48 +250,32 @@ func (d *DB) Path() string {
 	return d.dbPath
 }
 
+var topLevelBuckets = [][]byte{
+	openChannelBucket,
+	closedChannelBucket,
+	forwardingLogBucket,
+	fwdPackagesKey,
+	invoiceBucket,
+	payAddrIndexBucket,
+	nodeInfoBucket,
+	nodeBucket,
+	edgeBucket,
+	edgeIndexBucket,
+	graphMetaBucket,
+	metaBucket,
+}
+
 // Wipe completely deletes all saved state within all used buckets within the
 // database. The deletion is done in a single transaction, therefore this
 // operation is fully atomic.
 func (d *DB) Wipe() error {
 	return kvdb.Update(d, func(tx kvdb.RwTx) error {
-		err := tx.DeleteTopLevelBucket(openChannelBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
+		for _, tlb := range topLevelBuckets {
+			err := tx.DeleteTopLevelBucket(tlb)
+			if err != nil && err != kvdb.ErrBucketNotFound {
+				return err
+			}
 		}
-
-		err = tx.DeleteTopLevelBucket(closedChannelBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-
-		err = tx.DeleteTopLevelBucket(invoiceBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-
-		err = tx.DeleteTopLevelBucket(nodeInfoBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-
-		err = tx.DeleteTopLevelBucket(nodeBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-		err = tx.DeleteTopLevelBucket(edgeBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-		err = tx.DeleteTopLevelBucket(edgeIndexBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-		err = tx.DeleteTopLevelBucket(graphMetaBucket)
-		if err != nil && err != kvdb.ErrBucketNotFound {
-			return err
-		}
-
 		return nil
 	})
 }
@@ -301,33 +293,13 @@ func initChannelDB(db kvdb.Backend) error {
 			return nil
 		}
 
-		if _, err := tx.CreateTopLevelBucket(openChannelBucket); err != nil {
-			return err
-		}
-		if _, err := tx.CreateTopLevelBucket(closedChannelBucket); err != nil {
-			return err
+		for _, tlb := range topLevelBuckets {
+			if _, err := tx.CreateTopLevelBucket(tlb); err != nil {
+				return err
+			}
 		}
 
-		if _, err := tx.CreateTopLevelBucket(forwardingLogBucket); err != nil {
-			return err
-		}
-
-		if _, err := tx.CreateTopLevelBucket(fwdPackagesKey); err != nil {
-			return err
-		}
-
-		if _, err := tx.CreateTopLevelBucket(invoiceBucket); err != nil {
-			return err
-		}
-
-		if _, err := tx.CreateTopLevelBucket(nodeInfoBucket); err != nil {
-			return err
-		}
-
-		nodes, err := tx.CreateTopLevelBucket(nodeBucket)
-		if err != nil {
-			return err
-		}
+		nodes := tx.ReadWriteBucket(nodeBucket)
 		_, err = nodes.CreateBucket(aliasIndexBucket)
 		if err != nil {
 			return err
@@ -337,10 +309,7 @@ func initChannelDB(db kvdb.Backend) error {
 			return err
 		}
 
-		edges, err := tx.CreateTopLevelBucket(edgeBucket)
-		if err != nil {
-			return err
-		}
+		edges := tx.ReadWriteBucket(edgeBucket)
 		if _, err := edges.CreateBucket(edgeIndexBucket); err != nil {
 			return err
 		}
@@ -354,19 +323,12 @@ func initChannelDB(db kvdb.Backend) error {
 			return err
 		}
 
-		graphMeta, err := tx.CreateTopLevelBucket(graphMetaBucket)
-		if err != nil {
-			return err
-		}
+		graphMeta := tx.ReadWriteBucket(graphMetaBucket)
 		_, err = graphMeta.CreateBucket(pruneLogBucket)
 		if err != nil {
 			return err
 		}
 
-		if _, err := tx.CreateTopLevelBucket(metaBucket); err != nil {
-			return err
-		}
-
 		meta.DbVersionNumber = getLatestDBVersion(dbVersions)
 		return putMeta(meta, tx)
 	})