Merge pull request #183 from lightninglabs/fix-ancient-sweep

cmd+lnd: fix tweak handling

Author: guggero

cmd/chantools/root.go

@@ -31,7 +31,7 @@ const (
 	// version is the current version of the tool. It is set during build.
 	// NOTE: When changing this, please also update the version in the
 	// download link shown in the README.
-	version = "0.13.6"
+	version = "0.13.7"
 	na      = "n/a"
 
 	// lndVersion is the current version of lnd that we support. This is

cmd/chantools/summary.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil"
+	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/chantools/btc"
 	"github.com/lightninglabs/chantools/dataformat"
 	"github.com/lightninglabs/chantools/lnd"
@@ -211,16 +212,40 @@ func summarizeAncientChannelOutputs(apiURL, ancientFile string) error {
 
 	var (
 		api         = newExplorerAPI(apiURL)
+		numSpents   uint32
 		numUnspents uint32
 		unspentSats uint64
+		spentSats   uint64
 	)
-	for _, channel := range ancients {
+	for idx, channel := range ancients {
+		// The first entry is for unit tests.
+		if idx == 0 {
+			continue
+		}
+
+		closeOutPoint, err := wire.NewOutPointFromString(channel.OP)
+		if err != nil {
+			return fmt.Errorf("error parsing outpoint %s: %w",
+				channel.OP, err)
+		}
+
 		unspents, err := api.Unspent(channel.Addr)
 		if err != nil {
 			return fmt.Errorf("error fetching unspents for %s: %w",
 				channel.Addr, err)
 		}
 
+		if len(unspents) == 0 {
+			tx, err := api.Transaction(closeOutPoint.Hash.String())
+			if err != nil {
+				return fmt.Errorf("error fetching transaction "+
+					"%s: %w", closeOutPoint.Hash, err)
+			}
+
+			numSpents++
+			spentSats += tx.Vout[closeOutPoint.Index].Value
+		}
+
 		if len(unspents) > 1 {
 			log.Infof("Address %s has multiple unspents",
 				channel.Addr)
@@ -237,6 +262,8 @@ func summarizeAncientChannelOutputs(apiURL, ancientFile string) error {
 
 	log.Infof("Found %d unspent outputs with %d sats", numUnspents,
 		unspentSats)
+	log.Infof("%d outputs with %d sats have been spent", numSpents,
+		spentSats)
 
 	return nil
 }

cmd/chantools/sweepremoteclosed.go

@@ -371,7 +371,8 @@ func sweepRemoteClosed(extendedKey *hdkeychain.ExtendedKey, apiURL,
 			// output...
 			desc.WitnessScript = desc.Output.PkScript
 			witness, err := input.CommitSpendNoDelay(
-				signer, desc, sweepTx, true,
+				signer, desc, sweepTx,
+				len(desc.SingleTweak) == 0,
 			)
 			if err != nil {
 				return err