feat: use discounted liquid transaction size

BoltzExchange · Jan 3, 2025 · 8dfcc13 · 8dfcc13
1 parent 29781cb
commit 8dfcc13
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 49 deletions.
diff --git a/boltz/liquid.go b/boltz/liquid.go
@@ -5,8 +5,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"math"
-
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/vulpemventures/go-elements/address"
@@ -79,8 +77,7 @@ func (transaction *LiquidTransaction) VoutValue(vout uint32) (uint64, error) {
 }
 
 func (transaction *LiquidTransaction) VSize() uint64 {
-	witnessSize := transaction.SerializeSize(true, true) - transaction.SerializeSize(false, true)
-	return uint64(transaction.SerializeSize(false, true)) + uint64(math.Ceil(float64(witnessSize)/4))
+	return uint64(transaction.DiscountVirtualSize())
 }
 
 func liquidTaprootHash(transaction *liquidtx.Transaction, network *Network, outputs []OutputDetails, index int, cooperative bool) []byte {

diff --git a/nursery/nursery.go b/nursery/nursery.go
@@ -292,7 +292,7 @@ func (nursery *Nursery) createTransaction(currency boltz.Currency, outputs []*Ou
 		return id, err
 	}
 
-	feeSatPerVbyte, err := nursery.onchain.EstimateFee(currency, true)
+	feeSatPerVbyte, err := nursery.onchain.EstimateFee(currency)
 	if err != nil {
 		return handleErr(fmt.Errorf("could not get fee estimation: %w", err))
 	}
@@ -372,11 +372,11 @@ func (nursery *Nursery) populateOutputs(outputs []*Output) (valid []*Output, det
 
 func (nursery *Nursery) CheckAmounts(swapType boltz.SwapType, pair boltz.Pair, sendAmount uint64, receiveAmount uint64, serviceFee boltz.Percentage) (err error) {
 	fees := make(boltz.FeeEstimations)
-	fees[boltz.CurrencyLiquid], err = nursery.onchain.EstimateFee(boltz.CurrencyLiquid, true)
+	fees[boltz.CurrencyLiquid], err = nursery.onchain.EstimateFee(boltz.CurrencyLiquid)
 	if err != nil {
 		return err
 	}
-	fees[boltz.CurrencyBtc], err = nursery.onchain.EstimateFee(boltz.CurrencyBtc, true)
+	fees[boltz.CurrencyBtc], err = nursery.onchain.EstimateFee(boltz.CurrencyBtc)
 	if err != nil {
 		return err
 	}

diff --git a/onchain/onchain.go b/onchain/onchain.go
@@ -195,12 +195,7 @@ func (onchain *Onchain) GetWallets(checker WalletChecker) []Wallet {
 	return wallets
 }
 
-func (onchain *Onchain) EstimateFee(currency boltz.Currency, allowLowball bool) (float64, error) {
-	if currency == boltz.CurrencyLiquid && onchain.Network == boltz.MainNet && allowLowball {
-		if boltzProvider, ok := onchain.Liquid.Tx.(*BoltzTxProvider); ok {
-			return boltzProvider.GetFeeEstimation(boltz.CurrencyLiquid)
-		}
-	}
+func (onchain *Onchain) EstimateFee(currency boltz.Currency) (float64, error) {
 	chain, err := onchain.GetCurrency(currency)
 	if err != nil {
 		return 0, err

diff --git a/onchain/onchain_test.go b/onchain/onchain_test.go
diff --git a/onchain/wallet/wallet.go b/onchain/wallet/wallet.go
@@ -32,7 +32,7 @@ import (
 	"github.com/BoltzExchange/boltz-client/v2/boltz"
 )
 
-const MinFeeRate = 0.01
+const MinFeeRate = 0.1
 const MaxInputs = uint64(255) // TODO: change back to 256 when gdk is fixed
 const DefaultAutoConsolidateThreshold = uint64(200)
 const GapLimit = 100

diff --git a/rpcserver/router.go b/rpcserver/router.go
@@ -1657,7 +1657,7 @@ func (server *routedBoltzServer) GetWalletSendFee(ctx context.Context, request *
 	}
 	feeRate := request.GetSatPerVbyte()
 	if feeRate == 0 {
-		feeRate, err = server.onchain.EstimateFee(ownWallet.Currency, request.GetIsSwapAddress())
+		feeRate, err = server.onchain.EstimateFee(ownWallet.Currency)
 		if err != nil {
 			return nil, err
 		}
@@ -2237,7 +2237,7 @@ func (server *routedBoltzServer) estimateFee(requested float64, currency boltz.C
 			logger.Infof("Amount %d exceeds maximal zero conf amount %d, allowing lowball", amount, maxZeroConfAmount)
 			allowLowball = true
 		}
-		feeSatPerVbyte, err := server.onchain.EstimateFee(currency, allowLowball)
+		feeSatPerVbyte, err := server.onchain.EstimateFee(currency)
 		if err != nil {
 			return 0, err
 		}