.gitignore

@@ -33,7 +33,6 @@ coverage.txt
 c.out
 *.leveldb/
 .envrc
-log
 blockscannertest/
 *.log
 *.ldb

.golangci.yml

@@ -25,7 +25,7 @@ linters-settings:
   exhaustivestruct:
     check-generated: false
   staticcheck:
-    checks: ["all", "-SA1029", "-SA1019"]
+    checks: ["all"]
   revive:
     rules:
       - name: exported

.trunk/.gitignore

-out
-logs
-notifications
-actions
+*out
+*logs
+*actions
+*notifications
+plugins
+user_trunk.yaml
+user.yaml

.trunk/trunk.yaml

 version: 0.1
 cli:
-  version: 0.17.0-beta
+  version: 1.0.1
 lint:
   enabled:
-    - black-py@22.3.0
-    - flake8@4.0.1
-    - gitleaks@8.2.5
+    - git-diff-check
+    - black@22.10.0
+    - black-py@22.10.0
+    - flake8@5.0.4
+    - gitleaks@8.15.0
     - gofmt@1.16.7
-    - golangci-lint@1.46.2
-    - hadolint@2.8.0
+    - golangci-lint@1.50.1
+    - hadolint@2.10.0
     - isort@5.10.1
-    - markdownlint@0.30.0
-    - prettier@2.5.1
+    - markdownlint@0.32.2
+    - prettier@2.7.1
     - shellcheck@0.8.0
-    - shfmt@3.4.0
+    - shfmt@3.5.0
   ignore:
     - linters: [ALL]
       paths:
@@ -24,3 +26,16 @@ lint:
         - prettier
       paths:
         - "test/fixtures/endpoints/auth/accounts/malformed.json"
+actions:
+  enabled:
+    - trunk-upgrade-available
+plugins:
+  sources:
+    - id: trunk
+      ref: v0.0.5
+      uri: https://github.com/trunk-io/plugins
+runtimes:
+  enabled:
+    - go@1.18.3
+    - node@16.14.2
+    - python@3.10.3

Makefile

@@ -115,6 +115,7 @@ lint-ci:
 	@./scripts/lint.sh
 	@go run tools/analyze/main.go ./common/... ./constants/... ./x/...
 	@./scripts/trunk check --all --no-progress --monitor=false
+	@./scripts/lint-versions.bash
 
 # ------------------------------ Testing ------------------------------
 

app/thornode_logger.go

 package app
 
 import (
-	"strings"
-
-	"github.com/rs/zerolog"
 	tmlog "github.com/tendermint/tendermint/libs/log"
+	"gitlab.com/thorchain/thornode/log"
 )
 
-var _ tmlog.Logger = (*ThornodeLogWrapper)(nil)
-
-// ThornodeLogWrapper provides a wrapper around a zerolog.Logger instance. It implements
-// Tendermint's Logger interface.
-type ThornodeLogWrapper struct {
-	zerolog.Logger
-	ExcludeModules []string
-}
-
-// Info implements Tendermint's Logger interface and logs with level INFO. A set
-// of key/value tuples may be provided to add context to the log. The number of
-// tuples must be even and the key of the tuple must be a string.
-func (z ThornodeLogWrapper) Info(msg string, keyVals ...interface{}) {
-	z.Logger.Info().Fields(getLogFields(keyVals...)).Msg(msg)
-}
-
-// Error implements Tendermint's Logger interface and logs with level ERR. A set
-// of key/value tuples may be provided to add context to the log. The number of
-// tuples must be even and the key of the tuple must be a string.
-func (z ThornodeLogWrapper) Error(msg string, keyVals ...interface{}) {
-	z.Logger.Error().Fields(getLogFields(keyVals...)).Msg(msg)
-}
-
-// Debug implements Tendermint's Logger interface and logs with level DEBUG. A set
-// of key/value tuples may be provided to add context to the log. The number of
-// tuples must be even and the key of the tuple must be a string.
-func (z ThornodeLogWrapper) Debug(msg string, keyVals ...interface{}) {
-	z.Logger.Debug().Fields(getLogFields(keyVals...)).Msg(msg)
-}
-
-// With returns a new wrapped logger with additional context provided by a set
-// of key/value tuples. The number of tuples must be even and the key of the
-// tuple must be a string.
-func (z ThornodeLogWrapper) With(keyVals ...interface{}) tmlog.Logger {
-	if len(keyVals)%2 != 0 {
-		return ThornodeLogWrapper{
-			Logger:         z.Logger.With().Fields(getLogFields(keyVals...)).Logger(),
-			ExcludeModules: z.ExcludeModules,
-		}
-	}
-	for i := 0; i < len(keyVals); i += 2 {
-		name, ok := keyVals[i].(string)
-		if !ok {
-			z.Logger.Error().Interface("key", keyVals[i]).Msg("non-string logging key provided")
-		}
-		if name != "module" {
-			continue
-		}
-		value, ok := keyVals[i+1].(string)
-		if !ok {
-			continue
-		}
-		for _, item := range z.ExcludeModules {
-			if strings.EqualFold(item, value) {
-				return ThornodeLogWrapper{
-					Logger:         z.Logger.Level(zerolog.WarnLevel).With().Fields(getLogFields(keyVals...)).Logger(),
-					ExcludeModules: z.ExcludeModules,
-				}
-			}
-		}
-	}
-	return ThornodeLogWrapper{
-		Logger:         z.Logger.With().Fields(getLogFields(keyVals...)).Logger(),
-		ExcludeModules: z.ExcludeModules,
-	}
-}
-
-func getLogFields(keyVals ...interface{}) map[string]interface{} {
-	if len(keyVals)%2 != 0 {
-		return nil
-	}
-
-	fields := make(map[string]interface{})
-	for i := 0; i < len(keyVals); i += 2 {
-		val, ok := keyVals[i].(string)
-		if ok {
-			fields[val] = keyVals[i+1]
-		}
-	}
-
-	return fields
-}
+var _ tmlog.Logger = (*log.TendermintLogWrapper)(nil)

bifrost/observer/observe.go

@@ -20,6 +20,7 @@ import (
 	"gitlab.com/thorchain/thornode/bifrost/thorclient"
 	"gitlab.com/thorchain/thornode/bifrost/thorclient/types"
 	"gitlab.com/thorchain/thornode/common"
+	"gitlab.com/thorchain/thornode/common/cosmos"
 	"gitlab.com/thorchain/thornode/constants"
 	mem "gitlab.com/thorchain/thornode/x/thorchain/memo"
 	stypes "gitlab.com/thorchain/thornode/x/thorchain/types"
@@ -485,6 +486,42 @@ func (o *Observer) signAndSendToThorchain(txIn types.TxIn) error {
 	}, bf)
 }
 
+// getSaversMemo returns an add or withdraw memo for a Savers Vault
+// If the tx is not a valid savers tx, an empty string will be returned
+// Savers tx criteria:
+// - Inbound amount must be gas asset
+// - Inbound amount must be greater than the Dust Threshold of the tx chain (see chain.DustThreshold())
+func (o *Observer) getSaversMemo(chain common.Chain, tx types.TxInItem) string {
+	// Savers txs should have one Coin input
+	if len(tx.Coins) > 1 || len(tx.Coins) == 0 {
+		return ""
+	}
+
+	txAmt := tx.Coins[0].Amount
+	dustThreshold := chain.DustThreshold()
+
+	// Below dust threshold, ignore
+	if txAmt.LT(dustThreshold) {
+		return ""
+	}
+
+	asset := tx.Coins[0].Asset
+	synthAsset := asset.GetSyntheticAsset()
+	bps := txAmt.Sub(dustThreshold)
+
+	switch {
+	case bps.IsZero():
+		// Amount is too low, ignore
+		return ""
+	case bps.LTE(cosmos.NewUint(10_000)):
+		// Amount is within or includes dustThreshold + 10_000, generate withdraw memo
+		return fmt.Sprintf("-:%s:%s", synthAsset.String(), bps.String())
+	default:
+		// Amount is above dustThreshold + 10_000, generate add memo
+		return fmt.Sprintf("+:%s", synthAsset.String())
+	}
+}
+
 // getThorchainTxIns convert to the type thorchain expected
 // maybe in later THORNode can just refactor this to use the type in thorchain
 func (o *Observer) getThorchainTxIns(txIn types.TxIn) (stypes.ObservedTxs, error) {
@@ -499,6 +536,16 @@ func (o *Observer) getThorchainTxIns(txIn types.TxIn) (stypes.ObservedTxs, error
 			o.logger.Info().Msgf("tx (%s) memo (%s) too long", item.Tx, item.Memo)
 			continue
 		}
+
+		// If memo is empty, see if it is a memo-less savers add or withdraw
+		if strings.EqualFold(item.Memo, "") {
+			memo := o.getSaversMemo(txIn.Chain, item)
+			if !strings.EqualFold(memo, "") {
+				o.logger.Info().Str("memo", memo).Str("txId", item.Tx).Msg("created savers memo")
+				item.Memo = memo
+			}
+		}
+
 		if len(item.To) == 0 {
 			o.logger.Info().Msgf("tx (%s) to address is empty,ignore it", item.Tx)
 			continue

bifrost/observer/observe_test.go

@@ -462,3 +462,80 @@ func (s *ObserverSuite) TestFilterMemoFlag(c *C) {
 	})
 	c.Assert(result, HasLen, 1)
 }
+
+func (s *ObserverSuite) TestGetSaversMemo(c *C) {
+	pubkeyMgr, err := pubkeymanager.NewPubKeyManager(s.bridge, s.m)
+	c.Assert(err, IsNil)
+	obs, err := NewObserver(pubkeyMgr, map[common.Chain]chainclients.ChainClient{
+		common.BNBChain: s.b,
+	}, s.bridge, s.m, "", metrics.NewTssKeysignMetricMgr())
+	c.Assert(obs, NotNil)
+	c.Assert(err, IsNil)
+
+	busd, err := common.NewAsset("BNB.BUSD-BD1")
+	c.Assert(err, IsNil)
+
+	bnbSaversTx := types.TxInItem{
+		BlockHeight: 1024,
+		Tx:          "tx1",
+		Memo:        "",
+		Sender:      thorchain.GetRandomBNBAddress().String(),
+		To:          thorchain.GetRandomBNBAddress().String(),
+		Coins: common.Coins{
+			common.NewCoin(busd, cosmos.NewUint(1024)),
+		},
+		Gas:                 nil,
+		ObservedVaultPubKey: thorchain.GetRandomPubKey(),
+	}
+
+	// memo should be withdraw 1024 basis points
+	memo := obs.getSaversMemo(common.BNBChain, bnbSaversTx)
+	c.Assert(memo, Equals, "-:BNB/BUSD-BD1:1024")
+
+	// memo should be withdraw 1000 basis points
+	bnbSaversTx.Coins = common.NewCoins(common.NewCoin(common.BNBAsset, cosmos.NewUint(1000)))
+	memo = obs.getSaversMemo(common.BNBChain, bnbSaversTx)
+	c.Assert(memo, Equals, "-:BNB/BNB:1000")
+
+	// memo should be add
+	bnbSaversTx.Coins = common.NewCoins(common.NewCoin(common.BNBAsset, cosmos.NewUint(20_000)))
+	memo = obs.getSaversMemo(common.BNBChain, bnbSaversTx)
+	c.Assert(memo, Equals, "+:BNB/BNB")
+
+	btcSaversTx := types.TxInItem{
+		BlockHeight: 1024,
+		Tx:          "tx1",
+		Memo:        "",
+		Sender:      thorchain.GetRandomBNBAddress().String(),
+		To:          thorchain.GetRandomBNBAddress().String(),
+		Coins: common.Coins{
+			common.NewCoin(common.BTCAsset, cosmos.NewUint(1000)),
+		},
+		Gas:                 nil,
+		ObservedVaultPubKey: thorchain.GetRandomPubKey(),
+	}
+
+	// memo should be empty, amount not above dust threshold
+	memo = obs.getSaversMemo(common.BTCChain, btcSaversTx)
+	c.Assert(memo, Equals, "")
+
+	// memo should still be empty, amount is at the dust thresold, but you can't withdraw 0 basis points
+	btcSaversTx.Coins = common.NewCoins(common.NewCoin(common.BTCAsset, cosmos.NewUint(10_000)))
+	memo = obs.getSaversMemo(common.BTCChain, btcSaversTx)
+	c.Assert(memo, Equals, "")
+
+	// memo should be withdraw 500 basis points
+	btcSaversTx.Coins = common.NewCoins(common.NewCoin(common.BTCAsset, cosmos.NewUint(10_500)))
+	memo = obs.getSaversMemo(common.BTCChain, btcSaversTx)
+	c.Assert(memo, Equals, "-:BTC/BTC:500")
+
+	// memo should be withdraw 10_000 basis points
+	btcSaversTx.Coins = common.NewCoins(common.NewCoin(common.BTCAsset, cosmos.NewUint(20_000)))
+	memo = obs.getSaversMemo(common.BTCChain, btcSaversTx)
+	c.Assert(memo, Equals, "-:BTC/BTC:10000")
+
+	// memo should be add
+	btcSaversTx.Coins = common.NewCoins(common.NewCoin(common.BTCAsset, cosmos.NewUint(40_000)))
+	memo = obs.getSaversMemo(common.BTCChain, btcSaversTx)
+	c.Assert(memo, Equals, "+:BTC/BTC")
+}

bifrost/pkg/chainclients/bitcoin/client.go

@@ -51,7 +51,6 @@ const (
 	// EstimateAverageTxSize for THORChain the estimate tx size is hard code to 1000 here , as most of time it will spend 1 input, have 3 output
 	// which is average at 250 vbytes , however asgard will consolidate UTXOs , which will take up to 1000 vbytes
 	EstimateAverageTxSize = 1000
-	DefaultCoinbaseValue  = 6.25
 	MaxMempoolScanPerTry  = 500
 )
 
@@ -880,7 +879,7 @@ func (c *Client) extractTxs(block *btcjson.GetBlockVerboseTxResult) (types.TxIn,
 		if txInItem.Coins.IsEmpty() {
 			continue
 		}
-		if txInItem.Coins[0].Amount.LT(cosmos.NewUint(minSpendableUTXOAmountSats)) {
+		if txInItem.Coins[0].Amount.LT(c.chain.DustThreshold()) {
 			continue
 		}
 		exist, err := c.temporalStorage.TrackObservedTx(txInItem.Tx)
@@ -1166,7 +1165,7 @@ func (c *Client) getBlockRequiredConfirmation(txIn types.TxIn, height int64) (in
 		c.logger.Err(err).Msg("fail to get coinbase value")
 	}
 	if totalFeeAndSubsidy == 0 {
-		cbValue, err := btcutil.NewAmount(DefaultCoinbaseValue)
+		cbValue, err := btcutil.NewAmount(c.chain.DefaultCoinbase())
 		if err != nil {
 			return 0, fmt.Errorf("fail to get default coinbase value: %w", err)
 		}

bifrost/pkg/chainclients/bitcoin/signer.go

@@ -33,10 +33,9 @@ const (
 	// SatsPervBytes it should be enough , this one will only be used if signer can't find any previous UTXO , and fee info from local storage.
 	SatsPervBytes = 25
 	// MinUTXOConfirmation UTXO that has less confirmation then this will not be spent , unless it is yggdrasil
-	MinUTXOConfirmation        = 1
-	defaultMaxBTCFeeRate       = btcutil.SatoshiPerBitcoin / 10
-	maxUTXOsToSpend            = 10
-	minSpendableUTXOAmountSats = 10000 // If UTXO is less than this , it will not observed , and will not spend it either
+	MinUTXOConfirmation  = 1
+	defaultMaxBTCFeeRate = btcutil.SatoshiPerBitcoin / 10
+	maxUTXOsToSpend      = 10
 )
 
 func getBTCPrivateKey(key cryptotypes.PrivKey) (*btcec.PrivateKey, error) {
@@ -122,7 +121,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 		return utxos[i].TxID < utxos[j].TxID
 	})
 	var toSpend float64
-	minUTXOAmt := btcutil.Amount(minSpendableUTXOAmountSats).ToBTC()
+	minUTXOAmt := btcutil.Amount(c.chain.DustThreshold().Uint64()).ToBTC()
 	for _, item := range utxos {
 		if !c.isValidUTXO(item.ScriptPubKey) {
 			c.logger.Info().Msgf("invalid UTXO , can't spent it")
@@ -135,7 +134,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 				continue
 			}
 		}
-		// when the utxo is signed yggdrasil / asgard , even amount is less than minSpendableUTXOAmountSats
+		// when the utxo is signed yggdrasil / asgard , even amount is less than DustThreshold
 		// it is ok to spend it
 		if item.Amount < minUTXOAmt && !isSelfTx && !isYggdrasil {
 			continue

bifrost/pkg/chainclients/bitcoincash/client.go

@@ -50,7 +50,6 @@ const (
 	MaxAsgardAddresses  = 100
 	// EstimateAverageTxSize for THORChain the estimate tx size is hard code to 250 here , as most of time it will spend 1 input, have 3 output
 	EstimateAverageTxSize = 1500
-	DefaultCoinbaseValue  = 6.25
 	MaxMempoolScanPerTry  = 500
 )
 
@@ -864,7 +863,7 @@ func (c *Client) extractTxs(block *btcjson.GetBlockVerboseTxResult) (types.TxIn,
 		if txInItem.Coins.IsEmpty() {
 			continue
 		}
-		if txInItem.Coins[0].Amount.LT(cosmos.NewUint(minSpendableUTXOAmountSats)) {
+		if txInItem.Coins[0].Amount.LT(c.chain.DustThreshold()) {
 			continue
 		}
 		exist, err := c.temporalStorage.TrackObservedTx(txInItem.Tx)
@@ -1091,7 +1090,7 @@ func (c *Client) getBlockRequiredConfirmation(txIn types.TxIn, height int64) (in
 		c.logger.Err(err).Msg("fail to get coinbase value")
 	}
 	if totalFeeAndSubsidy == 0 {
-		cbValue, err := bchutil.NewAmount(DefaultCoinbaseValue)
+		cbValue, err := bchutil.NewAmount(c.chain.DefaultCoinbase())
 		if err != nil {
 			return 0, fmt.Errorf("fail to get default coinbase value: %w", err)
 		}

bifrost/pkg/chainclients/bitcoincash/signer.go

@@ -32,10 +32,9 @@ const (
 	// SatsPervBytes it should be enough , this one will only be used if signer can't find any previous UTXO , and fee info from local storage.
 	SatsPervBytes = 25
 	// MinUTXOConfirmation UTXO that has less confirmation then this will not be spent , unless it is yggdrasil
-	MinUTXOConfirmation        = 1
-	defaultMaxBCHFeeRate       = bchutil.SatoshiPerBitcoin / 10
-	maxUTXOsToSpend            = 10
-	minSpendableUTXOAmountSats = 10000 // If UTXO is less than this , it will not observed , and will not spend it either
+	MinUTXOConfirmation  = 1
+	defaultMaxBCHFeeRate = bchutil.SatoshiPerBitcoin / 10
+	maxUTXOsToSpend      = 10
 )
 
 func getBCHPrivateKey(key cryptotypes.PrivKey) (*bchec.PrivateKey, error) {
@@ -123,7 +122,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 		return utxos[i].TxID < utxos[j].TxID
 	})
 	var toSpend float64
-	minUTXOAmt := bchutil.Amount(minSpendableUTXOAmountSats).ToBCH()
+	minUTXOAmt := bchutil.Amount(c.chain.DustThreshold().Uint64()).ToBCH()
 	for _, item := range utxos {
 		if !c.isValidUTXO(item.ScriptPubKey) {
 			c.logger.Info().Msgf("invalid UTXO , can't spent it")
@@ -136,7 +135,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 				continue
 			}
 		}
-		// when the utxo is signed yggdrasil / asgard , even amount is less than minSpendableUTXOAmountSats
+		// when the utxo is signed yggdrasil / asgard , even amount is less than DustThreshold
 		// it is ok to spend it
 		if item.Amount < minUTXOAmt && !isSelfTx && !isYggdrasil {
 			continue

bifrost/pkg/chainclients/dogecoin/client.go

@@ -52,7 +52,6 @@ const (
 	EstimateAverageTxSize = 1000
 	// DefaultFeePerKB is guidance set by dogecoin core team and adopted by miners: https://github.com/dogecoin/dogecoin/blob/master/doc/fee-recommendation.md
 	DefaultFeePerKB      = 0.01
-	DefaultCoinbaseValue = 10000
 	MaxMempoolScanPerTry = 500
 )
 
@@ -698,7 +697,7 @@ func (c *Client) sendNetworkFee(blockResult *btcjson.GetBlockVerboseTxResult) er
 	if totalVSize == 0 {
 		return nil
 	}
-	amt, err := dogutil.NewAmount(total - DefaultCoinbaseValue)
+	amt, err := dogutil.NewAmount(total - c.chain.DefaultCoinbase())
 	if err != nil {
 		return fmt.Errorf("fail to parse total block fee amount,err: %w", err)
 	}
@@ -925,7 +924,7 @@ func (c *Client) extractTxs(block *btcjson.GetBlockVerboseTxResult) (types.TxIn,
 		if txInItem.Coins.IsEmpty() {
 			continue
 		}
-		if txInItem.Coins[0].Amount.LT(cosmos.NewUint(minSpendableUTXOAmountSats)) {
+		if txInItem.Coins[0].Amount.LT(c.chain.DustThreshold()) {
 			continue
 		}
 		exist, err := c.temporalStorage.TrackObservedTx(txInItem.Tx)
@@ -1148,7 +1147,7 @@ func (c *Client) getBlockRequiredConfirmation(txIn types.TxIn, height int64) (in
 		c.logger.Err(err).Msgf("fail to get coinbase value")
 	}
 	if totalFeeAndSubsidy == 0 {
-		cbValue, err := dogutil.NewAmount(DefaultCoinbaseValue)
+		cbValue, err := dogutil.NewAmount(c.chain.DefaultCoinbase())
 		if err != nil {
 			return 0, fmt.Errorf("fail to get default coinbase value: %w", err)
 		}

bifrost/pkg/chainclients/dogecoin/signer.go

@@ -34,10 +34,9 @@ const (
 	// SatsPervBytes it should be enough , this one will only be used if signer can't find any previous UTXO , and fee info from local storage.
 	SatsPervBytes = 25
 	// MinUTXOConfirmation UTXO that has less confirmation then this will not be spent , unless it is yggdrasil
-	MinUTXOConfirmation        = 1
-	defaultMaxDOGEFeeRate      = dogutil.SatoshiPerBitcoin * 10
-	maxUTXOsToSpend            = 10
-	minSpendableUTXOAmountSats = 100000000 // If UTXO is less than this , it will not observed , and will not spend it either
+	MinUTXOConfirmation   = 1
+	defaultMaxDOGEFeeRate = dogutil.SatoshiPerBitcoin * 10
+	maxUTXOsToSpend       = 10
 )
 
 func getDOGEPrivateKey(key cryptotypes.PrivKey) (*btcec.PrivateKey, error) {
@@ -125,7 +124,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 		return utxos[i].TxID < utxos[j].TxID
 	})
 	var toSpend float64
-	minUTXOAmt := dogutil.Amount(minSpendableUTXOAmountSats).ToBTC()
+	minUTXOAmt := dogutil.Amount(c.chain.DustThreshold().Uint64()).ToBTC()
 	for _, item := range utxos {
 		if !c.isValidUTXO(item.ScriptPubKey) {
 			c.logger.Info().Msgf("invalid UTXO , can't spent it")
@@ -138,7 +137,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 				continue
 			}
 		}
-		// when the utxo is signed by yggdrasil / asgard , even amount is less than minSpendableUTXOAmountSats
+		// when the utxo is signed by yggdrasil / asgard , even amount is less than DustThreshold
 		// it is ok to spend it
 		if item.Amount < minUTXOAmt && !isSelfTx && !isYggdrasil {
 			continue

bifrost/pkg/chainclients/ethereum/smartcontract_log_parser_test.go

@@ -32,10 +32,8 @@ func mockIsValidContractAddr(addr *ecommon.Address, _ bool) bool {
 }
 
 const (
-	// trunk-ignore-begin(gitleaks/generic-api-key)
 	errAssetToken = "0x983e2cC84Bb8eA7b75685F285A28Bde2b4D5aCDA" // nolint
 	tknTestToken  = "0X3B7FA4DD21C6F9BA3CA375217EAD7CAB9D6BF483" // nolint
-	// trunk-ignore-end(gitleaks/generic-api-key)
 )
 
 func mockAssetResolver(token string) (common.Asset, error) {

bifrost/pkg/chainclients/litecoin/client.go

@@ -49,7 +49,6 @@ const (
 	MaxAsgardAddresses  = 100
 	// EstimateAverageTxSize for THORChain the estimate tx size is hard code to 250 here , as most of time it will spend 1 input, have 3 output
 	EstimateAverageTxSize = 250
-	DefaultCoinbaseValue  = 12.5
 	gasCacheBlocks        = 10
 	MaxMempoolScanPerTry  = 500
 )
@@ -847,7 +846,7 @@ func (c *Client) extractTxs(block *btcjson.GetBlockVerboseTxResult) (types.TxIn,
 		if txInItem.Coins.IsEmpty() {
 			continue
 		}
-		if txInItem.Coins[0].Amount.LT(cosmos.NewUint(minSpendableUTXOAmountSats)) {
+		if txInItem.Coins[0].Amount.LT(c.chain.DustThreshold()) {
 			continue
 		}
 		exist, err := c.temporalStorage.TrackObservedTx(txInItem.Tx)
@@ -1075,7 +1074,7 @@ func (c *Client) getBlockRequiredConfirmation(txIn types.TxIn, height int64) (in
 		c.logger.Err(err).Msg("fail to get coinbase value")
 	}
 	if totalFeeAndSubsidy == 0 {
-		cbValue, err := ltcutil.NewAmount(DefaultCoinbaseValue)
+		cbValue, err := ltcutil.NewAmount(c.chain.DefaultCoinbase())
 		if err != nil {
 			return 0, fmt.Errorf("fail to parse default coinbase value:%w", err)
 		}

bifrost/pkg/chainclients/litecoin/signer.go

@@ -33,10 +33,9 @@ const (
 	// SatsPervBytes it should be enough , this one will only be used if signer can't find any previous UTXO , and fee info from local storage.
 	SatsPervBytes = 25
 	// MinUTXOConfirmation UTXO that has less confirmation then this will not be spent , unless it is yggdrasil
-	MinUTXOConfirmation        = 1
-	defaultMaxLTCFeeRate       = ltcutil.SatoshiPerBitcoin / 10
-	maxUTXOsToSpend            = 10
-	minSpendableUTXOAmountSats = 10000 // If UTXO is less than this , it will not observed , and will not spend it either
+	MinUTXOConfirmation  = 1
+	defaultMaxLTCFeeRate = ltcutil.SatoshiPerBitcoin / 10
+	maxUTXOsToSpend      = 10
 )
 
 func getLTCPrivateKey(key cryptotypes.PrivKey) (*btcec.PrivateKey, error) {
@@ -124,7 +123,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 		return utxos[i].TxID < utxos[j].TxID
 	})
 	var toSpend float64
-	minUTXOAmt := ltcutil.Amount(minSpendableUTXOAmountSats).ToBTC()
+	minUTXOAmt := ltcutil.Amount(c.chain.DustThreshold().Uint64()).ToBTC()
 	for _, item := range utxos {
 		if !c.isValidUTXO(item.ScriptPubKey) {
 			c.logger.Info().Msgf("invalid UTXO , can't spent it")
@@ -137,7 +136,7 @@ func (c *Client) getUtxoToSpend(pubKey common.PubKey, total float64) ([]btcjson.
 				continue
 			}
 		}
-		// when the utxo is signed yggdrasil / asgard , even amount is less than minSpendableUTXOAmountSats
+		// when the utxo is signed yggdrasil / asgard , even amount is less than DustThreshold
 		// it is ok to spend it
 		if item.Amount < minUTXOAmt && !isSelfTx && !isYggdrasil {
 			continue

bifrost/pkg/chainclients/shared/evm/smartcontract_log_parser_test.go

@@ -32,10 +32,8 @@ func mockIsValidContractAddr(addr *ecommon.Address, _ bool) bool {
 }
 
 const (
-	// trunk-ignore-begin(gitleaks/generic-api-key)
-	errAssetToken = "0x983e2cC84Bb8eA7b75685F285A28Bde2b4D5aCDA" // nolint
-	tknTestToken  = "0X3B7FA4DD21C6F9BA3CA375217EAD7CAB9D6BF483" // nolint
-	// trunk-ignore-end(gitleaks/generic-api-key)
+	errAssetToken = "0x983e2cC84Bb8eA7b75685F285A28Bde2b4D5aCDA" // nolint gosec:G101 not a hardcoded credential
+	tknTestToken  = "0X3B7FA4DD21C6F9BA3CA375217EAD7CAB9D6BF483" // nolint gosec:G101 not a hardcoded credential
 )
 
 func mockAssetResolver(token string) (common.Asset, error) {

bifrost/thorclient/types/set_tx.go

-package types
-
-import (
-	legacytypes "github.com/cosmos/cosmos-sdk/x/auth/legacy/legacytx"
-	cosmos "gitlab.com/thorchain/thornode/common/cosmos"
-)
-
-type SetTx struct {
-	Mode string `json:"mode"`
-	Tx   struct {
-		Msg        []cosmos.Msg               `json:"msg"`
-		Fee        legacytypes.StdFee         `json:"fee"`
-		Signatures []legacytypes.StdSignature `json:"signatures"`
-		Memo       string                     `json:"memo"`
-	} `json:"tx"`
-}

bifrost/thorclient/types/tx_out_test.go

@@ -35,9 +35,8 @@ func (TxOutTestSuite) TestTxOutItemHash(c *C) {
 	c.Check(item.Hash(), Equals, "5037BD52845B23EEA538248622F0F9625536192A066FDCED91494171BD1EF43D")
 
 	item = TxOutItem{
-		Chain:     "BNB",
-		ToAddress: "tbnb1yxfyeda8pnlxlmx0z3cwx74w9xevspwdpzdxpj",
-		// trunk-ignore(gitleaks/generic-api-key)
+		Chain:       "BNB",
+		ToAddress:   "tbnb1yxfyeda8pnlxlmx0z3cwx74w9xevspwdpzdxpj",
 		VaultPubKey: "thorpub1addwnpepqv7kdf473gc4jyls7hlx4rg",
 		Memo:        "REFUND:9999A5A08D8FCF942E1AAAA01AB1E521B699BA3A009FA0591C011DC1FFDC5E68",
 		InHash:      "9999A5A08D8FCF942E1AAAA01AB1E521B699BA3A009FA0591C011DC1FFDC5E68",