fixed dust limits, biggest utxo of all outputs and not of taproot outputs was used

Author: setavenger

blindbit.example.toml

@@ -44,7 +44,7 @@ tweaks_full_with_dust_filter = 0
 
 # This index applies cut-through and dust filtering.
 # Beware that it will be stored in addition to any full index (with or without dust) if activated.
-# It has more storage requirments than the simple indices.
+# It has more storage requirements than the simple indices.
 # Currently still requires tweaks_only=1.
 # default: 0
 tweaks_cut_through_with_dust_filter = 0

src/common/types/tweakindex_dust.go

@@ -35,8 +35,8 @@ func (t TweakData) Tweak() [33]byte {
 }
 
 func PairFactoryTweakIndexDust() Pair {
-	var filter Pair = &TweakIndexDust{}
-	return filter
+	var pair Pair = &TweakIndexDust{}
+	return pair
 }
 
 const lengthDataTweakIndexDust = TweakDataLength + 8

src/core/cleanup.go

@@ -37,7 +37,7 @@ func markSpentUTXOsAndTweaks(utxos []types.UTXO) error {
 	if len(utxos) == 0 {
 		if common.Chain == common.Mainnet {
 			// no warnings on other chains as it is very likely to not have any taproot outputs for several blocks on end
-			common.WarningLogger.Println("no utxos to mark as spent")
+			common.DebugLogger.Println("no utxos to mark as spent")
 		}
 		return nil
 	}
@@ -87,13 +87,26 @@ func markSpentUTXOsAndTweaks(utxos []types.UTXO) error {
 			common.ErrorLogger.Println(err)
 			return err
 		} else if err != nil && errors.Is(err, dblevel.NoEntryErr{}) {
-			//	if no UTXOs are left for a certain blockHash-txid combination we can remove the tweak
+			// this case should not even occur at this stage as utxos are not deleted before this query and are only marked as spent
+			common.DebugLogger.Printf("txid: %x\n", utxo.Txid)
+			common.DebugLogger.Println("no UTXOs were found for transaction")
+			continue
+		}
+		var canBeRemoved = true
+		for _, utxo := range remainingUTXOs {
+			if !utxo.Spent {
+				canBeRemoved = false
+				break
+			}
+		}
+		if canBeRemoved {
 			tweaksToDelete = append(tweaksToDelete, types.Tweak{
 				// we only need those Fields to serialise the key
 				BlockHash: utxo.BlockHash,
 				Txid:      utxo.Txid,
 			})
 			continue
+
 		}
 		var newBiggest *uint64
 		newBiggest, err = types.FindBiggestRemainingUTXO(utxo, remainingUTXOs)

src/core/tweak.go

@@ -8,10 +8,11 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"github.com/btcsuite/btcd/btcec/v2"
 	"math/big"
 	"sort"
 	"sync"
+
+	"github.com/btcsuite/btcd/btcec/v2"
 )
 
 func ComputeTweaksForBlock(block *types.Block) ([]types.Tweak, error) {
@@ -311,14 +312,19 @@ func FindBiggestOutputFromTx(tx types.Transaction) (uint64, error) {
 	var biggest uint64
 
 	for _, output := range tx.Vout {
+		if output.ScriptPubKey.Type != "witness_v1_taproot" {
+			continue
+		}
 		valueOutput := common.ConvertFloatBTCtoSats(output.Value)
 		if valueOutput > biggest {
 			biggest = valueOutput
 		}
 	}
 
 	if biggest == 0 {
-		common.WarningLogger.Printf("Highest value was 0 txid: %s", tx.Txid)
+		common.DebugLogger.Printf("%+v\n", tx)
+		common.ErrorLogger.Printf("Highest value was 0 txid: %s", tx.Txid)
+		// panic("highest value was 0") // This should not happen, but we don't kill the program
 	}
 
 	return biggest, nil

src/main.go

@@ -133,13 +133,17 @@ func main() {
 			common.ErrorLogger.Fatalln(err)
 			return
 		}
+
+		// so we can start fetching data while not fully synced. Requires headers to be synced to avoid grave errors.
+		go server.RunServer(&server.ApiHandler{})
+
 		// todo buggy for sync catchup from 0, needs to be 1 or higher
 		err = core.SyncChain()
 		if err != nil {
 			common.ErrorLogger.Fatalln(err)
 			return
 		}
-		common.InfoLogger.Printf("Sync took: %s", time.Now().Sub(startSync).String())
+		common.InfoLogger.Printf("Sync took: %s", time.Since(startSync).String())
 		go core.CheckForNewBlockRoutine()
 
 		// only call this if you need to reindex. It doesn't delete anything but takes a couple of minutes to finish
@@ -149,15 +153,12 @@ func main() {
 		//	return
 		//}
 
-		go server.RunServer(&server.ApiHandler{})
 	}()
 
 	for {
-		select {
-		case <-interrupt:
-			common.InfoLogger.Println("Program interrupted")
-			return
-		}
+		<-interrupt
+		common.InfoLogger.Println("Program interrupted")
+		return
 	}
 }