rpc: Add default config options to settings.

client/asset/driver.go

@@ -271,3 +271,32 @@ nextasset:
 		delete(tokens, assetID)
 	}
 }
+
+// WalletDef gets the registered WalletDefinition for the asset and
+// wallet type.
+func WalletDef(assetID uint32, walletType string) (*WalletDefinition, error) {
+	token := TokenInfo(assetID)
+	if token != nil {
+		return token.Definition, nil
+	}
+	winfo, err := Info(assetID)
+	if err != nil {
+		return nil, fmt.Errorf("Info error: %w", err)
+	}
+	if walletType == "" {
+		if len(winfo.AvailableWallets) <= winfo.LegacyWalletIndex {
+			return nil, fmt.Errorf("legacy wallet index out of range")
+		}
+		return winfo.AvailableWallets[winfo.LegacyWalletIndex], nil
+	}
+	var wd *WalletDefinition
+	for _, def := range winfo.AvailableWallets {
+		if def.Type == walletType {
+			wd = def
+		}
+	}
+	if wd == nil {
+		return nil, fmt.Errorf("could not find wallet definition for asset %s, type %q", dex.BipIDSymbol(assetID), walletType)
+	}
+	return wd, nil
+}

client/cmd/dexcctl/simnet-setup.sh

@@ -19,6 +19,12 @@ BCH_ON=$?
 ~/dextest/eth/harness-ctl/alpha attach --exec 'eth.blockNumber' > /dev/null
 ETH_ON=$?
 
+~/dextest/doge/harness-ctl/alpha getblockchaininfo > /dev/null
+DOGE_ON=$?
+
+~/dextest/zec/harness-ctl/alpha getblockchaininfo > /dev/null
+ZEC_ON=$?
+
 set -e
 
 echo initializing
@@ -41,8 +47,19 @@ if [ $BCH_ON -eq 0 ]; then
 fi
 
 if [ $ETH_ON -eq 0 ]; then
-	echo configuring Eth wallet
-	./dexcctl -p abc -p "" --simnet newwallet 60 geth
+	echo configuring Eth and dextt.eth wallets
+	./dexcctl -p abc -p "" --simnet newwallet 60 rpc "" "{\"providers\":\"${HOME}/dextest/eth/alpha/node/geth.ipc\"}"
+	./dexcctl -p abc -p "" --simnet newwallet 60000 rpc
+fi
+
+if [ $DOGE_ON -eq 0 ]; then
+	echo configuring doge wallet
+	./dexcctl -p abc -p "" --simnet newwallet 3 dogecoindRPC ~/dextest/doge/alpha/alpha.conf
+fi
+
+if [ $ZEC_ON -eq 0 ]; then
+	echo configuring zcash wallet
+	./dexcctl -p abc -p "" --simnet newwallet 133 zcashdRPC ~/dextest/zec/alpha/alpha.conf
 fi
 
 echo checking if we have an account already

client/core/core.go

@@ -2376,9 +2376,9 @@ func (c *Core) createWalletOrToken(crypter encrypt.Crypter, walletPW []byte, for
 }
 
 func (c *Core) createWallet(crypter encrypt.Crypter, walletPW []byte, assetID uint32, form *WalletForm) (*db.Wallet, error) {
-	walletDef, err := walletDefinition(assetID, form.Type)
+	walletDef, err := asset.WalletDef(assetID, form.Type)
 	if err != nil {
-		return nil, err
+		return nil, newError(assetSupportErr, "asset.WalletDef error: %w", err)
 	}
 
 	// Sometimes core will insert data into the Settings map to communicate
@@ -2798,9 +2798,9 @@ func (c *Core) RecoverWallet(assetID uint32, appPW []byte, force bool) error {
 	if !isRecoverer {
 		return errors.New("wallet is not a recoverer")
 	}
-	walletDef, err := walletDefinition(assetID, oldWallet.walletType)
+	walletDef, err := asset.WalletDef(assetID, oldWallet.walletType)
 	if err != nil {
-		return err
+		return newError(assetSupportErr, "asset.WalletDef error: %w", err)
 	}
 	// Unseeded wallets shouldn't implement the Recoverer interface. This
 	// is just an additional check for safety.
@@ -3016,9 +3016,9 @@ func (c *Core) ReconfigureWallet(appPW, newWalletPW []byte, form *WalletForm) er
 
 	assetID := form.AssetID
 
-	walletDef, err := walletDefinition(assetID, form.Type)
+	walletDef, err := asset.WalletDef(assetID, form.Type)
 	if err != nil {
-		return err
+		return newError(assetSupportErr, "asset.WalletDef error: %w", err)
 	}
 	if walletDef.Seeded && newWalletPW != nil {
 		return newError(passwordErr, "cannot set a password on a built-in(seeded) wallet")
@@ -3034,9 +3034,9 @@ func (c *Core) ReconfigureWallet(appPW, newWalletPW []byte, form *WalletForm) er
 		return fmt.Errorf(walletDisabledErrStr, strings.ToUpper(unbip(assetID)))
 	}
 
-	oldDef, err := walletDefinition(assetID, oldWallet.walletType)
+	oldDef, err := asset.WalletDef(assetID, oldWallet.walletType)
 	if err != nil {
-		return fmt.Errorf("failed to locate old wallet definition: %v", err)
+		return newError(assetSupportErr, "old wallet asset.WalletDef error: %w", err)
 	}
 	oldDepositAddr := oldWallet.currentDepositAddress()
 
@@ -3338,9 +3338,9 @@ func (c *Core) SetWalletPassword(appPW []byte, assetID uint32, newPW []byte) err
 
 // setWalletPassword updates the (encrypted) password for the wallet.
 func (c *Core) setWalletPassword(wallet *xcWallet, newPW []byte, crypter encrypt.Crypter) error {
-	walletDef, err := walletDefinition(wallet.AssetID, wallet.walletType)
+	walletDef, err := asset.WalletDef(wallet.AssetID, wallet.walletType)
 	if err != nil {
-		return err
+		return newError(assetSupportErr, "asset.WalletDef error: %w", err)
 	}
 	if walletDef.Seeded || asset.TokenInfo(wallet.AssetID) != nil {
 		return newError(passwordErr, "cannot set a password on a seeded or token wallet")
@@ -3436,9 +3436,9 @@ func (c *Core) NewDepositAddress(assetID uint32) (string, error) {
 // asset.WalletInfo.DefaultConfigPath. If settings are not found, an empty map
 // is returned.
 func (c *Core) AutoWalletConfig(assetID uint32, walletType string) (map[string]string, error) {
-	walletDef, err := walletDefinition(assetID, walletType)
+	walletDef, err := asset.WalletDef(assetID, walletType)
 	if err != nil {
-		return nil, err
+		return nil, newError(assetSupportErr, "asset.WalletDef error: %w", err)
 	}
 
 	if walletDef.DefaultConfigPath == "" {
@@ -8682,35 +8682,6 @@ func parseCert(host string, certI interface{}, net dex.Network) ([]byte, error)
 	return nil, fmt.Errorf("not a valid certificate type %T", certI)
 }
 
-// walletDefinition gets the registered WalletDefinition for the asset and
-// wallet type.
-func walletDefinition(assetID uint32, walletType string) (*asset.WalletDefinition, error) {
-	token := asset.TokenInfo(assetID)
-	if token != nil {
-		return token.Definition, nil
-	}
-	winfo, err := asset.Info(assetID)
-	if err != nil {
-		return nil, newError(assetSupportErr, "asset.Info error: %w", err)
-	}
-	if walletType == "" {
-		if len(winfo.AvailableWallets) <= winfo.LegacyWalletIndex {
-			return nil, fmt.Errorf("legacy wallet index out of range")
-		}
-		return winfo.AvailableWallets[winfo.LegacyWalletIndex], nil
-	}
-	var walletDef *asset.WalletDefinition
-	for _, def := range winfo.AvailableWallets {
-		if def.Type == walletType {
-			walletDef = def
-		}
-	}
-	if walletDef == nil {
-		return nil, fmt.Errorf("could not find wallet definition for asset %s, type %q", unbip(assetID), walletType)
-	}
-	return walletDef, nil
-}
-
 // WalletLogFilePath returns the path to the wallet's log file.
 func (c *Core) WalletLogFilePath(assetID uint32) (string, error) {
 	wallet, exists := c.wallet(assetID)

client/rpcserver/handlers.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"decred.org/dcrdex/client/asset"
 	"decred.org/dcrdex/client/core"
 	"decred.org/dcrdex/dex"
 	"decred.org/dcrdex/dex/encode"
@@ -192,6 +193,22 @@ func handleNewWallet(s *RPCServer, params *RawParams) *msgjson.ResponsePayload {
 		resErr := msgjson.NewError(msgjson.RPCWalletExistsError, errMsg)
 		return createResponse(newWalletRoute, nil, resErr)
 	}
+
+	walletDef, err := asset.WalletDef(form.assetID, form.walletType)
+	if err != nil {
+		errMsg := fmt.Sprintf("error creating %s wallet: unable to get wallet definition: %v",
+			dex.BipIDSymbol(form.assetID), err)
+		resErr := msgjson.NewError(msgjson.RPCWalletDefinitionError, errMsg)
+		return createResponse(newWalletRoute, nil, resErr)
+	}
+
+	// Apply default config options if they exist.
+	for _, opt := range walletDef.ConfigOpts {
+		if _, has := form.config[opt.Key]; !has && opt.DefaultValue != nil {
+			form.config[opt.Key] = fmt.Sprintf("%v", opt.DefaultValue)
+		}
+	}
+
 	// Wallet does not exist yet. Try to create it.
 	err = s.core.CreateWallet(form.appPass, form.walletPass, &core.WalletForm{
 		Type:    form.walletType,

client/rpcserver/handlers_test.go

@@ -21,6 +21,13 @@ import (
 	"github.com/davecgh/go-spew/spew"
 )
 
+func init() {
+	asset.Register(tUTXOAssetA.ID, &tDriver{
+		decodedCoinID: tUTXOAssetA.Symbol,
+		winfo:         tWalletInfo,
+	})
+}
+
 func verifyResponse(payload *msgjson.ResponsePayload, res interface{}, wantErrCode int) error {
 	if wantErrCode != -1 {
 		if payload.Error == nil {
@@ -40,7 +47,49 @@ func verifyResponse(payload *msgjson.ResponsePayload, res interface{}, wantErrCo
 	return nil
 }
 
-var wsServer = websocket.New(&TCore{}, dex.StdOutLogger("TEST", dex.LevelTrace))
+var (
+	wsServer    = websocket.New(&TCore{}, dex.StdOutLogger("TEST", dex.LevelTrace))
+	tUTXOAssetA = &dex.Asset{
+		ID:           42,
+		Symbol:       "dcr",
+		Version:      0, // match the stubbed (*TXCWallet).Info result
+		SwapSize:     251,
+		SwapSizeBase: 85,
+		RedeemSize:   200,
+		MaxFeeRate:   10,
+		SwapConf:     1,
+	}
+	tWalletInfo = &asset.WalletInfo{
+		Version:           0,
+		SupportedVersions: []uint32{0},
+		UnitInfo: dex.UnitInfo{
+			Conventional: dex.Denomination{
+				ConversionFactor: 1e8,
+			},
+		},
+		AvailableWallets: []*asset.WalletDefinition{{
+			Type: "rpc",
+		}},
+	}
+)
+
+type tDriver struct {
+	wallet        asset.Wallet
+	decodedCoinID string
+	winfo         *asset.WalletInfo
+}
+
+func (drv *tDriver) Open(cfg *asset.WalletConfig, logger dex.Logger, net dex.Network) (asset.Wallet, error) {
+	return drv.wallet, nil
+}
+
+func (drv *tDriver) DecodeCoinID(coinID []byte) (string, error) {
+	return drv.decodedCoinID, nil
+}
+
+func (drv *tDriver) Info() *asset.WalletInfo {
+	return drv.winfo
+}
 
 type Dummy struct {
 	Status string
@@ -277,6 +326,15 @@ func TestHandleNewWallet(t *testing.T) {
 			`{"field":  value"}`,
 		},
 	}
+	badWalletDefParams := &RawParams{
+		PWArgs: []encode.PassBytes{pw, pw},
+		Args: []string{
+			"45",
+			"rpc",
+			"username=tacotime",
+			`{"field":"value"}`,
+		},
+	}
 	tests := []struct {
 		name            string
 		params          *RawParams
@@ -307,6 +365,10 @@ func TestHandleNewWallet(t *testing.T) {
 		name:        "bad JSON error",
 		params:      badJSONParams,
 		wantErrCode: msgjson.RPCArgumentsError,
+	}, {
+		name:        "bad config opts error, unknown coin",
+		params:      badWalletDefParams,
+		wantErrCode: msgjson.RPCWalletDefinitionError,
 	}, {
 		name:        "bad params",
 		params:      &RawParams{},

dex/msgjson/types.go

@@ -86,6 +86,7 @@ const (
 	RPCWalletPeersError                  // 68
 	RPCNotificationsError                // 69
 	RPCPostBondError                     // 70
+	RPCWalletDefinitionError             // 71
 )
 
 // Routes are destinations for a "payload" of data. The type of data being