refund workaround

Makefile

@@ -0,0 +1,35 @@
+a:
+	make build
+	./a.sh
+
+l:
+	./a.sh
+
+build:
+	./build.sh
+
+server_build:
+	./build_server.sh
+
+server_run:
+	./run_server.sh
+
+build_linux:
+	./build_linux.sh
+
+test:
+	./run_tests.sh
+
+format:
+	gofmt -w -s $$(find . -type f -name '*.go' -not -path "./pkg/proto/*" -not -name "*.gen.go" -not -path "*/mock/*")
+	goimports -w $$(find . -type f -name '*.go' -not -path "./pkg/proto/*" -not -name "*.gen.go" -not -path "*/mock/*")
+
+#comment:
+#	$GOPATH/bin/commentwrap -fix -docflow_limit=90 /Users/norwnd/crypto-integrations/applications/outgoing-transactions/domain/outgoing_transaction.go
+#    $GOPATH/bin/commentwrap -fix -docflow_limit=90 TODO
+
+server_deps_up:
+	docker-compose -f server/docker/deps-compose.yml up -d --build
+
+server_deps_down:
+	docker-compose -f server/docker/deps-compose.yml down

a.sh

@@ -0,0 +1,16 @@
+set -e
+
+#!/usr/bin/env bash
+
+## mainnet
+# pprof is available at:
+# http://127.0.0.1:3333/debug/pprof/goroutine?debug=1
+(./client/cmd/bisonw/bisonw --webaddr=127.0.0.1:3333 --log=trace --httpprof)
+
+## mainnet with dedicated DB:
+#(./client/cmd/bisonw/bisonw --db=/Users/norwnd/d-e-x-c-db/db_mainnet --webaddr=127.0.0.1:3333 --log=trace --httpprof)
+## testnet
+#(./client/cmd/bisonw/bisonw --db=/Users/norwnd/d-e-x-c-db/db_mainnet --webaddr=127.0.0.1:3333 --log=trace --testnet --httpprof)
+
+## mainnet with disaster backups:
+#(./client/cmd/bisonw/bisonw --webaddr=127.0.0.1:3333 --log=trace --skynetapikey=I8JMMBPUNMEHGCV056IG1V8OEEIB0CJUTG97S0J3IQNJJ4CSGH0G --skynetapiurl='https://web3portal.com' --testnet --httpprof)

build.sh

@@ -0,0 +1,21 @@
+set -e
+
+#!/usr/bin/env bash
+
+pushd client/webserver/site
+rm -rf dist
+npm clean-install
+npm run build
+popd
+
+(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on go build -tags lgpl)
+#
+# Mac-specific issue with older Golang versions (resolved with `codesign`), see discussions
+# here for details: https://github.com/golang/go/issues/63997
+#(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on go build -tags lgpl && codesign -s - -f ./bisonw)
+#
+# to specify OS and Architecture
+#(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on GOOS=darwin GOARCH=arm64 go build -tags lgpl)
+#
+# -race build
+#(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on go build -race -tags lgpl)

build_linux.sh

@@ -0,0 +1,19 @@
+set -e
+
+#!/usr/bin/env bash
+
+pushd client/webserver/site
+npm clean-install
+npm run build
+popd
+
+#(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on GOOS=linux GOARCH=amd64 go build -tags lgpl)
+(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on go build -tags lgpl)
+#
+# Note, this is -race build, to be used for testing only!
+#(cd client/cmd/bisonw/ && CGO_ENABLED=1 GO111MODULE=on go build -race -tags lgpl)
+# TODO, previously was CGO_ENABLED=0 ?
+
+# Run Bison binary with:
+# - (./client/cmd/bisonw/bisonw --db=/home/t/dcrdex-old-decrediton/db --webaddr=127.0.0.1:5758 --log=trace)
+# - (./client/cmd/bisonw/bisonw --db=/home/t/dcrdex-anon/db --webaddr=127.0.0.1:5758 --log=trace)

build_server.sh

@@ -0,0 +1,6 @@
+set -e
+
+#!/usr/bin/env bash
+
+#(cd server/cmd/dcrdex/ && CGO_ENABLED=0 GO111MODULE=on go build -tags lgpl -race)
+(cd server/cmd/dcrdex/ && CGO_ENABLED=0 GO111MODULE=on go build -tags lgpl)

client/asset/btc/btc.go

@@ -50,9 +50,9 @@ const (
 
 	// The default fee is passed to the user as part of the asset.WalletInfo
 	// structure.
-	defaultFee = 100
+	defaultFee = 5
 	// defaultFeeRateLimit is the default value for the feeratelimit.
-	defaultFeeRateLimit = 1400
+	defaultFeeRateLimit = 5
 	// defaultRedeemConfTarget is the default redeem transaction confirmation
 	// target in blocks used by estimatesmartfee to get the optimal fee for a
 	// redeem transaction.
@@ -1879,10 +1879,16 @@ func (btc *baseWallet) feeRate(confTarget uint64) (feeRate uint64, err error) {
 		btc.log.Meter("feeRate.rate.fail", time.Hour).Errorf("Failed to get fee rate from external API: %v", err)
 		return 0, nil
 	}
-	if feeRate <= 0 || feeRate > btc.feeRateLimit() { // but fetcher shouldn't return <= 0 without error
-		return 0, fmt.Errorf("external fee rate %v exceeds configured limit", feeRate)
+	if feeRate <= 0 { // but fetcher shouldn't return <= 0 without error
+		return 0, fmt.Errorf("external fee rate value %v doesn't make sense", feeRate)
 	}
+
 	btc.log.Tracef("Retrieved fee rate from external API: %v", feeRate)
+	if feeRate > btc.feeRateLimit() {
+		btc.log.Tracef("capping fee rate %v retrieved from external API at user-configured limit of %v", feeRate, btc.feeRateLimit())
+		feeRate = btc.feeRateLimit()
+	}
+
 	return feeRate, nil
 }
 
@@ -1964,7 +1970,7 @@ func (btc *baseWallet) feeRateWithFallback(feeSuggestion uint64) uint64 {
 			feeSuggestion)
 		return feeSuggestion
 	}
-	btc.log.Warnf("Unable to get optimal fee rate, using fallback of %d", btc.fallbackFeeRate)
+	btc.log.Warnf("Unable to get optimal fee rate, using fallback of %d", btc.fallbackFeeRate())
 	return btc.fallbackFeeRate()
 }
 
@@ -2421,12 +2427,15 @@ func (btc *baseWallet) FundOrder(ord *asset.Order) (asset.Coins, []dex.Bytes, ui
 	if ord.FeeSuggestion > ord.MaxFeeRate {
 		return nil, nil, 0, fmt.Errorf("fee suggestion %d > max fee rate %d", ord.FeeSuggestion, ord.MaxFeeRate)
 	}
-	// Check wallets fee rate limit against server's max fee rate
-	if btc.feeRateLimit() < ord.MaxFeeRate {
-		return nil, nil, 0, fmt.Errorf(
-			"%v: server's max fee rate %v higher than configued fee rate limit %v",
-			dex.BipIDSymbol(BipID), ord.MaxFeeRate, btc.feeRateLimit())
-	}
+	// This is just a sanity check that doesn't allow Bison wallet to configure lower fees
+	// on client side (server doesn't enforce/check this really), we know better than whatever
+	// server suggests.
+	//// Check wallets fee rate limit against server's max fee rate
+	//if btc.feeRateLimit() < ord.MaxFeeRate {
+	//	return nil, nil, 0, fmt.Errorf(
+	//		"%v: server's max fee rate %v higher than configued fee rate limit %v",
+	//		dex.BipIDSymbol(BipID), ord.MaxFeeRate, btc.feeRateLimit())
+	//}
 
 	customCfg := new(swapOptions)
 	err := config.Unmapify(ord.Options, customCfg)
@@ -5501,12 +5510,15 @@ func (btc *baseWallet) FundMultiOrder(mo *asset.MultiOrder, maxLock uint64) ([]a
 	if mo.FeeSuggestion > mo.MaxFeeRate {
 		return nil, nil, 0, fmt.Errorf("fee suggestion %d > max fee rate %d", mo.FeeSuggestion, mo.MaxFeeRate)
 	}
-	// Check wallets fee rate limit against server's max fee rate
-	if btc.feeRateLimit() < mo.MaxFeeRate {
-		return nil, nil, 0, fmt.Errorf(
-			"%v: server's max fee rate %v higher than configued fee rate limit %v",
-			dex.BipIDSymbol(BipID), mo.MaxFeeRate, btc.feeRateLimit())
-	}
+	// This is just a sanity check that doesn't allow Bison wallet to configure lower fees
+	// on client side (server doesn't enforce/check this really), we know better than whatever
+	// server suggests.
+	//// Check wallets fee rate limit against server's max fee rate
+	//if btc.feeRateLimit() < mo.MaxFeeRate {
+	//	return nil, nil, 0, fmt.Errorf(
+	//		"%v: server's max fee rate %v higher than configued fee rate limit %v",
+	//		dex.BipIDSymbol(BipID), mo.MaxFeeRate, btc.feeRateLimit())
+	//}
 
 	bal, err := btc.Balance()
 	if err != nil {
@@ -5623,7 +5635,7 @@ func (btc *baseWallet) idUnknownTx(tx *ListTransactionsResult) (*asset.WalletTra
 		}
 		return
 	}
-	if v := txPaysToScriptHash(msgTx); tx.Send && v > 0 {
+	if v := txPaysToScriptHash(msgTx); v > 0 {
 		return &asset.WalletTransaction{
 			ID:     tx.TxID,
 			Type:   asset.SwapOrSend,
@@ -5649,7 +5661,7 @@ func (btc *baseWallet) idUnknownTx(tx *ListTransactionsResult) (*asset.WalletTra
 				// not segwit
 				const scriptVer = 0
 				tokenizer := txscript.MakeScriptTokenizer(scriptVer, txIn.SignatureScript)
-				for i := 0; i <= idx; i++ { // contract is 5th item item in redemption and 4th in refund
+				for i := 0; i <= idx; i++ { // contract is 5th item in redemption and 4th in refund
 					if !tokenizer.Next() {
 						continue txinloop
 					}

client/asset/dcr/dcr.go

@@ -1870,12 +1870,15 @@ func (dcr *ExchangeWallet) FundOrder(ord *asset.Order) (asset.Coins, []dex.Bytes
 	if ord.FeeSuggestion > cfg.feeRateLimit {
 		return nil, nil, 0, fmt.Errorf("suggested fee > configured limit. %d > %d", ord.FeeSuggestion, cfg.feeRateLimit)
 	}
-	// Check wallet's fee rate limit against server's max fee rate
-	if cfg.feeRateLimit < ord.MaxFeeRate {
-		return nil, nil, 0, fmt.Errorf(
-			"%v: server's max fee rate %v higher than configured fee rate limit %v",
-			dex.BipIDSymbol(BipID), ord.MaxFeeRate, cfg.feeRateLimit)
-	}
+	// This is just a sanity check that doesn't allow Bison wallet to configure lower fees
+	// on client side (server doesn't enforce/check this really), we know better than whatever
+	// server suggests.
+	//// Check wallet's fee rate limit against server's max fee rate
+	//if cfg.feeRateLimit < ord.MaxFeeRate {
+	//	return nil, nil, 0, fmt.Errorf(
+	//		"%v: server's max fee rate %v higher than configured fee rate limit %v",
+	//		dex.BipIDSymbol(BipID), ord.MaxFeeRate, cfg.feeRateLimit)
+	//}
 
 	customCfg := new(swapOptions)
 	err := config.Unmapify(ord.Options, customCfg)
@@ -2260,7 +2263,10 @@ func (dcr *ExchangeWallet) submitMultiSplitTx(fundingCoins asset.Coins, _ /* spe
 			addr: outputAddresses[i].String(),
 		}
 	}
-	dcr.lockFundingCoins(fcs)
+	err = dcr.lockFundingCoins(fcs)
+	if err != nil {
+		return nil, 0, fmt.Errorf("lockFundingCoins: %w", err)
+	}
 
 	var totalOut uint64
 	for _, txOut := range tx.TxOut {
@@ -2410,7 +2416,10 @@ func (dcr *ExchangeWallet) fundMultiWithSplit(keep, maxLock uint64, values []*as
 		}
 	}
 
-	dcr.lockFundingCoins(spents)
+	err = dcr.lockFundingCoins(spents)
+	if err != nil {
+		return nil, nil, 0, fmt.Errorf("lockFundingCoins: %w", err)
+	}
 
 	return coins, redeemScripts, splitFees, nil
 }
@@ -2430,7 +2439,10 @@ func (dcr *ExchangeWallet) fundMulti(maxLock uint64, values []*asset.MultiOrderV
 		return nil, nil, 0, err
 	}
 	if len(coins) == len(values) || !allowSplit {
-		dcr.lockFundingCoins(fundingCoins)
+		err = dcr.lockFundingCoins(fundingCoins)
+		if err != nil {
+			return nil, nil, 0, fmt.Errorf("lockFundingCoins: %w", err)
+		}
 		return coins, redeemScripts, 0, nil
 	}
 
@@ -2459,12 +2471,15 @@ func (dcr *ExchangeWallet) FundMultiOrder(mo *asset.MultiOrder, maxLock uint64)
 		return nil, nil, 0, fmt.Errorf("fee suggestion %d > max fee rate %d", mo.FeeSuggestion, mo.MaxFeeRate)
 	}
 
-	cfg := dcr.config()
-	if cfg.feeRateLimit < mo.MaxFeeRate {
-		return nil, nil, 0, fmt.Errorf(
-			"%v: server's max fee rate %v higher than configured fee rate limit %v",
-			dex.BipIDSymbol(BipID), mo.MaxFeeRate, cfg.feeRateLimit)
-	}
+	// This is just a sanity check that doesn't allow Bison wallet to configure lower fees
+	// on client side (server doesn't enforce/check this really), we know better than whatever
+	// server suggests.
+	//cfg := dcr.config()
+	//if cfg.feeRateLimit < mo.MaxFeeRate {
+	//	return nil, nil, 0, fmt.Errorf(
+	//		"%v: server's max fee rate %v higher than configured fee rate limit %v",
+	//		dex.BipIDSymbol(BipID), mo.MaxFeeRate, cfg.feeRateLimit)
+	//}
 
 	bal, err := dcr.Balance()
 	if err != nil {