Merge branch 'master' into multiple_tx

README.md

@@ -55,6 +55,7 @@ cryptopower [options]
 ```
 
 - Run `./cryptopower --network=testnet` to run cryptopower on the testnet network.
+- Run `./cryptopower --network=dextest` to run cryptopower with the decred dex simnet harness.
 - Run `cryptopower -h` or `cryptopower help` to get general information of commands and options that can be issued on the cli.
 - Use `cryptopower <command> -h` or `cryptopower help <command>` to get detailed information about a command.
 

config.go

@@ -25,7 +25,7 @@ const (
 )
 
 type config struct {
-	Network          string `long:"network" description:"Network to use (mainnet, testnet or simnet). Cannot be changed from the app once set."`
+	Network          string `long:"network" description:"Network to use (mainnet, simnet, testnet, dextest). Default is mainnet. Cannot be changed from the app once set."`
 	HomeDir          string `long:"appdata" description:"Directory where the app configuration file and wallet data is stored"`
 	ConfigFile       string `long:"configfile" description:"Filename of the config file in the app directory"`
 	ShowVersion      bool   `short:"V" long:"version" description:"Display version information and exit"`
@@ -35,6 +35,9 @@ type config struct {
 	Quiet            bool   `short:"q" long:"quiet" description:"Easy way to set debuglevel to error"`
 	SpendUnconfirmed bool   `long:"spendunconfirmed" description:"Allow the assetsManager to use transactions that have not been confirmed"`
 	Profile          int    `long:"profile" description:"Runs local web server for profiling"`
+	DEXTestAddr      string `long:"dextestaddr" description:"If using the dextest network, set an address for the dex harness to be used as a persistant peer for all new wallets."`
+
+	net libutils.NetworkType
 }
 
 func defaultConfig(defaultHomeDir string) config {

dexc/core.go

@@ -256,7 +256,7 @@ func parseDEXNet(net libutils.NetworkType) (dex.Network, error) {
 		return dex.Mainnet, nil
 	case libutils.Testnet:
 		return dex.Testnet, nil
-	case libutils.Regression, libutils.Simulation:
+	case libutils.Regression, libutils.Simulation, libutils.DEXTest:
 		return dex.Simnet, nil
 	default:
 		return 0, fmt.Errorf("unknown network %s", net)

go.mod

@@ -94,7 +94,8 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dchest/blake2b v1.0.0 // indirect
 	github.com/dchest/siphash v1.2.3 // indirect
-	github.com/dcrlabs/neutrino-bch v0.0.0-20221031001408-f296bfa9bd1c // indirect
+	github.com/dcrlabs/bchwallet v0.0.0-20240114124852-0e95005810be // indirect
+	github.com/dcrlabs/neutrino-bch v0.0.0-20240114121828-d656bce11095 // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/base58 v1.0.5 // indirect
 	github.com/decred/dcrd/blockchain/stake/v3 v3.0.0 // indirect
@@ -130,9 +131,6 @@ require (
 	github.com/gcash/bchd v0.19.0 // indirect
 	github.com/gcash/bchlog v0.0.0-20180913005452-b4f036f92fa6 // indirect
 	github.com/gcash/bchutil v0.0.0-20210113190856-6ea28dff4000 // indirect
-	github.com/gcash/bchwallet v0.10.0 // indirect
-	github.com/gcash/bchwallet/walletdb v0.0.0-20210524114850-4837f9798568 // indirect
-	github.com/gcash/neutrino v0.0.0-20210524114821-3b1878290cf9 // indirect
 	github.com/getsentry/sentry-go v0.18.0 // indirect
 	github.com/go-chi/chi/v5 v5.0.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
@@ -144,6 +142,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.3.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/trillian v1.4.1 // indirect
@@ -229,9 +228,4 @@ replace github.com/lib/pq => github.com/lib/pq v1.10.4
 // github.com/btcsuite/btcwallet.
 replace github.com/btcsuite/btcwallet v0.16.10-0.20230706223227-037580c66b74 => github.com/btcsuite/btcwallet v0.16.9
 
-// github.com/ukane-philemon/dcrdex v0.0.0-20240126135833-b75c189e80a9 is the
-// latest dcrdex master plus commits that adds methods required by
-// cryptopower. This should be updated when these PRs get merged.
-// 1. core: add ActiveOrders method to Core: https://github.com/decred/dcrdex/pull/2680
-// 1. core: Add ExpiredBonds method to Core: https://github.com/decred/dcrdex/pull/2679
-replace decred.org/dcrdex v0.6.3 => github.com/ukane-philemon/dcrdex v0.0.0-20240126135833-b75c189e80a9
+replace decred.org/dcrdex v0.6.3 => github.com/decred/dcrdex v0.0.0-20240207234259-462dcb6e0736