Merge pull request #5 from setavenger/dev

small adjustments

Author: setavenger

src/common/vars.go

@@ -33,9 +33,9 @@ var (
 	// SyncHeadersMaxPerCall how many headers will maximally be requested in one batched RPC call
 	SyncHeadersMaxPerCall uint32 = 10_000
 	// MaxParallelRequests sets how many RPC calls will be made in parallel to the Node
-	MaxParallelRequests uint16 = 24
+	MaxParallelRequests uint16 = 2
 	// MaxParallelTweakComputations number of parallel processes which will be spawned in order to compute the tweaks for a given block
-	MaxParallelTweakComputations = 1
+	MaxParallelTweakComputations = 2
 	// PruneFrequency every x blocks the data will be checked and pruned
 	// possible routines: -remove utxos for 100% spent transaction
 	PruneFrequency = 72

src/core/cleanup.go

@@ -7,84 +7,6 @@ import (
 	"errors"
 )
 
-/*
-todo needs a routine that cleans up the tweak data if no more utxos exist for a tx.
- The routine will then remove the corresponding tweak data from the db for every txid without light utxos.
- In an optimal implementation this should not be needed though.
-*/
-
-func removeSpentUTXOsAndTweaks(utxos []types.UTXO) error {
-	// First delete the old UTXOs
-	err := dblevel.DeleteBatchUTXOs(utxos)
-	if err != nil {
-		common.ErrorLogger.Println(err)
-		return err
-	}
-
-	// Now begin process to find the tweaks that need to be deleted
-
-	// we only need to check for one utxo per txid, so we reduce the number of utxos -> fewer lookups in DB
-	var cleanUTXOs []types.UTXO
-	includedTxids := make(map[string]bool)
-
-	for _, utxo := range utxos {
-		if _, exists := includedTxids[utxo.Txid]; !exists {
-			cleanUTXOs = append(cleanUTXOs, utxo)
-			includedTxids[utxo.Txid] = true
-		}
-	}
-
-	var tweaksToDelete []types.Tweak
-	var tweaksToOverwrite []types.Tweak
-
-	for _, utxo := range cleanUTXOs {
-		var remainingUTXOs []types.UTXO
-		remainingUTXOs, err = dblevel.FetchByBlockHashAndTxidUTXOs(utxo.BlockHash, utxo.Txid)
-		if err != nil && !errors.Is(err, dblevel.NoEntryErr{}) {
-			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
-			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)
-		if err != nil {
-			common.ErrorLogger.Println(err)
-			return err
-		}
-		if newBiggest != nil {
-			// find the biggest UTXO for the tx and overwrite if necessary
-			tweaksToOverwrite = append(tweaksToOverwrite, types.Tweak{
-				BlockHash:    utxo.BlockHash,
-				BlockHeight:  0,
-				Txid:         utxo.Txid,
-				Data:         [33]byte{},
-				HighestValue: *newBiggest,
-			})
-		}
-	}
-
-	err = dblevel.DeleteBatchTweaks(tweaksToDelete)
-	if err != nil {
-		common.ErrorLogger.Println(err)
-		return err
-	}
-
-	err = dblevel.OverWriteTweaks(tweaksToOverwrite)
-	if err != nil {
-		common.ErrorLogger.Println(err)
-		return err
-	}
-
-	return err
-}
-
 func overwriteUTXOsWithLookUp(utxos []types.UTXO) error {
 	var utxosToOverwrite []types.UTXO
 

src/db/dblevel/utxo.go

@@ -3,6 +3,7 @@ package dblevel
 import (
 	"SilentPaymentAppBackend/src/common"
 	"SilentPaymentAppBackend/src/common/types"
+	"errors"
 )
 
 func InsertUTXOs(utxos []types.UTXO) error {
@@ -55,6 +56,10 @@ func FetchByBlockHashAndTxidUTXOs(blockHash, txid string) ([]types.UTXO, error)
 	//common.InfoLogger.Println("Fetching UTXOs")
 	pairs, err := retrieveManyByBlockHashAndTxid(UTXOsDB, blockHash, txid, types.PairFactoryUTXO)
 	if err != nil {
+		if errors.Is(err, NoEntryErr{}) {
+			// don't print if it's a no entry error
+			return nil, err
+		}
 		common.ErrorLogger.Println(err)
 		return nil, err
 	}

src/main.go

@@ -41,11 +41,11 @@ func init() {
 		log.Fatal(err)
 	}
 
-	file, err := os.OpenFile(fmt.Sprintf("%s/logs/logs-%s.txt", common.BaseDirectory, time.Now()), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
+	file, err := os.OpenFile(fmt.Sprintf("%s/logs.log", common.BaseDirectory), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
 	if err != nil {
 		log.Fatal(err)
 	}
-	fileDebug, err := os.OpenFile(fmt.Sprintf("%s/logs/logs-debug-%s.txt", common.BaseDirectory, time.Now()), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
+	fileDebug, err := os.OpenFile(fmt.Sprintf("%s/logs-debug.log", common.BaseDirectory), os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
 	if err != nil {
 		log.Fatal(err)
 	}