client: bitcoin spv

client/asset/bch/bch.go

@@ -33,9 +33,16 @@ const (
 	// structure.
 	defaultFee        = 100
 	minNetworkVersion = 221100
+	walletTypeRPC     = "bitcoindRPC"
+	walletTypeLegacy  = ""
 )
 
 var (
+	netPorts = dexbtc.NetPorts{
+		Mainnet: "8332",
+		Testnet: "18332",
+		Simnet:  "18443",
+	}
 	fallbackFeeKey = "fallbackfee"
 	configOpts     = []*asset.ConfigOption{
 		{
@@ -85,9 +92,14 @@ var (
 		Name:    "Bitcoin Cash",
 		Version: version,
 		// Same as bitcoin. That's dumb.
-		DefaultConfigPath: dexbtc.SystemConfigPath("bitcoin"),
-		ConfigOpts:        configOpts,
-		UnitInfo:          dexbch.UnitInfo,
+		UnitInfo: dexbch.UnitInfo,
+		AvailableWallets: []*asset.WalletDefinition{{
+			Type:              walletTypeRPC,
+			Tab:               "External",
+			Description:       "Connect to bitcoind",
+			DefaultConfigPath: dexbtc.SystemConfigPath("bitcoin"), // Same as bitcoin. That's dumb.
+			ConfigOpts:        configOpts,
+		}},
 	}
 )
 
@@ -98,15 +110,14 @@ func init() {
 // Driver implements asset.Driver.
 type Driver struct{}
 
-// Open opens the BCH exchange wallet. Start the wallet with its Run method.
+// Check that Driver implements asset.Driver.
+var _ asset.Driver = (*Driver)(nil)
+
+// Open creates the BCH exchange wallet. Start the wallet with its Run method.
 func (d *Driver) Open(cfg *asset.WalletConfig, logger dex.Logger, network dex.Network) (asset.Wallet, error) {
 	return NewWallet(cfg, logger, network)
 }
 
-func (d *Driver) Create(params *asset.CreateWalletParams) error {
-	return fmt.Errorf("no creatable wallet types")
-}
-
 // DecodeCoinID creates a human-readable representation of a coin ID for
 // Bitcoin Cash.
 func (d *Driver) DecodeCoinID(coinID []byte) (string, error) {
@@ -120,9 +131,7 @@ func (d *Driver) Info() *asset.WalletInfo {
 }
 
 // NewWallet is the exported constructor by which the DEX will import the
-// exchange wallet. The wallet will shut down when the provided context is
-// canceled. The configPath can be an empty string, in which case the standard
-// system location of the daemon config file is assumed.
+// exchange wallet.
 func NewWallet(cfg *asset.WalletConfig, logger dex.Logger, network dex.Network) (asset.Wallet, error) {
 	var params *chaincfg.Params
 	switch network {
@@ -139,11 +148,6 @@ func NewWallet(cfg *asset.WalletConfig, logger dex.Logger, network dex.Network)
 	// Designate the clone ports. These will be overwritten by any explicit
 	// settings in the configuration file. Bitcoin Cash uses the same default
 	// ports as Bitcoin.
-	ports := dexbtc.NetPorts{
-		Mainnet: "8332",
-		Testnet: "18332",
-		Simnet:  "18443",
-	}
 	cloneCFG := &btc.BTCCloneCFG{
 		WalletCFG:          cfg,
 		MinNetworkVersion:  minNetworkVersion,
@@ -152,7 +156,7 @@ func NewWallet(cfg *asset.WalletConfig, logger dex.Logger, network dex.Network)
 		Logger:             logger,
 		Network:            network,
 		ChainParams:        params,
-		Ports:              ports,
+		Ports:              netPorts,
 		DefaultFallbackFee: defaultFee,
 		Segwit:             false,
 		LegacyBalance:      true,

client/asset/bch/regnet_test.go

@@ -23,8 +23,6 @@ import (
 	dexbtc "decred.org/dcrdex/dex/networks/btc"
 )
 
-const alphaAddress = "bchreg:qqnm4z2tftyyeu3kvzzepmlp9mj3g6fvxgft570vll"
-
 var (
 	tLotSize  uint64 = 1e6
 	tRateStep uint64 = 10
@@ -40,5 +38,9 @@ var (
 )
 
 func TestWallet(t *testing.T) {
-	livetest.Run(t, NewWallet, alphaAddress, tLotSize, tBCH, false)
+	livetest.Run(t, &livetest.Config{
+		NewWallet: NewWallet,
+		LotSize:   tLotSize,
+		Asset:     tBCH,
+	})
 }