[release-v0.6] extension mode. matic -> polygon, prepare v0.6.3 (#2486)

* enable reconfiguration restrictions / extension mode

* bip symbol matic -> polygon

* v0.6.3

client/cmd/dexc/config.go

@@ -107,6 +107,8 @@ type Config struct {
 	NoAutoWalletLock   bool `long:"no-wallet-lock" description:"Disable locking of wallets on shutdown or logout. Use this if you want your external wallets to stay unlocked after closing the DEX app."`
 	NoAutoDBBackup     bool `long:"no-db-backup" description:"Disable creation of a database backup on shutdown."`
 	UnlockCoinsOnLogin bool `long:"release-wallet-coins" description:"On login or wallet creation, instruct the wallet to release any coins that it may have locked."`
+
+	ExtensionModeFile string `long:"extension-mode-file" description:"path to a file that specifies options for running core as an extension."`
 }
 
 var defaultConfig = Config{

client/cmd/dexc/main.go

@@ -104,6 +104,7 @@ func runCore() error {
 		UnlockCoinsOnLogin: cfg.UnlockCoinsOnLogin,
 		NoAutoWalletLock:   cfg.NoAutoWalletLock,
 		NoAutoDBBackup:     cfg.NoAutoDBBackup,
+		ExtensionModeFile:  cfg.ExtensionModeFile,
 	})
 	if err != nil {
 		return fmt.Errorf("error creating client core: %w", err)

client/cmd/dexc/version.go

@@ -41,7 +41,7 @@ var (
 	// and build metadata portions MUST only contain characters from
 	// semanticAlphabet.
 	// NOTE: The Version string is overridden on init.
-	Version = "0.6.2+release.local"
+	Version = "0.6.3+release.local"
 )
 
 func init() {

client/core/core.go

@@ -10,6 +10,7 @@ import (
 	"encoding/binary"
 	"encoding/csv"
 	"encoding/hex"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math"
@@ -1378,6 +1379,10 @@ type Config struct {
 	// UnlockCoinsOnLogin indicates that on wallet connect during login, or on
 	// creation of a new wallet, all coins with the wallet should be unlocked.
 	UnlockCoinsOnLogin bool
+	// ExtensionModeFile is the path to a file that specifies configuration
+	// for running core in extension mode, which gives the caller options for
+	// e.g. limiting the ability to configure wallets.
+	ExtensionModeFile string
 }
 
 // Core is the core client application. Core manages DEX connections, wallets,
@@ -1396,6 +1401,8 @@ type Core struct {
 	locale        map[Topic]*translation
 	localePrinter *message.Printer
 
+	extensionModeConfig *ExtensionModeConfig
+
 	// construction or init sets credentials
 	credMtx     sync.RWMutex
 	credentials *db.PrimaryCredentials
@@ -1502,7 +1509,7 @@ func New(cfg *Config) (*Core, error) {
 
 	locale, found := locales[lang.String()]
 	if !found {
-		return nil, fmt.Errorf("No translations for language %s", lang)
+		return nil, fmt.Errorf("no translations for language %s", lang)
 	}
 
 	// Try to get the primary credentials, but ignore no-credentials error here
@@ -1517,6 +1524,17 @@ func New(cfg *Config) (*Core, error) {
 		return nil, err
 	}
 
+	var xCfg *ExtensionModeConfig
+	if cfg.ExtensionModeFile != "" {
+		b, err := os.ReadFile(cfg.ExtensionModeFile)
+		if err != nil {
+			return nil, fmt.Errorf("error reading extension mode file at %q: %w", cfg.ExtensionModeFile, err)
+		}
+		if err := json.Unmarshal(b, &xCfg); err != nil {
+			return nil, fmt.Errorf("error unmarshalling extension mode file: %w", err)
+		}
+	}
+
 	c := &Core{
 		cfg:           cfg,
 		credentials:   creds,
@@ -1538,9 +1556,10 @@ func New(cfg *Config) (*Core, error) {
 		latencyQ:      wait.NewTickerQueue(recheckInterval),
 		noteChans:     make(map[uint64]chan Notification),
 
-		locale:             locale,
-		localePrinter:      message.NewPrinter(lang),
-		seedGenerationTime: seedGenerationTime,
+		locale:              locale,
+		localePrinter:       message.NewPrinter(lang),
+		extensionModeConfig: xCfg,
+		seedGenerationTime:  seedGenerationTime,
 
 		fiatRateSources: make(map[string]*commonRateSource),
 		pendingWallets:  make(map[uint32]bool),
@@ -2319,6 +2338,7 @@ func (c *Core) User() *User {
 		SeedGenerationTime: c.seedGenerationTime,
 		FiatRates:          c.fiatConversions(),
 		Bots:               c.bots(),
+		ExtensionConfig:    c.extensionModeConfig,
 	}
 }
 

client/core/example-extension-config.json

@@ -0,0 +1,17 @@
+{
+    "restrictedWallets": {
+        "dcr": {
+            "hiddenFields": [
+                "account",
+                "unmixedaccount",
+                "tradingaccount",
+                "username",
+                "password",
+                "rpclisten",
+                "rpccert"
+            ],
+            "disableWalletType": true,
+            "disablePassword": true
+        }
+    }
+}

client/core/types.go

@@ -137,6 +137,24 @@ type WalletState struct {
 	Disabled     bool              `json:"disabled"`
 }
 
+// ExtensionModeConfig is configuration for running core in extension mode,
+// primarily for restricting certain wallet reconfiguration options.
+type ExtensionModeConfig struct {
+	// RestrictedWallets are wallets that need restrictions on reconfiguration
+	// options.
+	RestrictedWallets map[string] /*symbol*/ struct {
+		// HiddenFields are configuration fields (asset.ConfigOption.Key) that
+		// should not be displayed to the user.
+		HiddenFields []string `json:"hiddenFields"`
+		// DisableWalletType indicates that we should not offer the user an
+		// an option to change the wallet type.
+		DisableWalletType bool `json:"disableWalletType"`
+		// DisablePassword indicates that we should not offer the user an option
+		// to change the wallet password.
+		DisablePassword bool `json:"disablePassword"`
+	} `json:"restrictedWallets"`
+}
+
 // User is information about the user's wallets and DEX accounts.
 type User struct {
 	Exchanges          map[string]*Exchange       `json:"exchanges"`
@@ -145,6 +163,7 @@ type User struct {
 	Assets             map[uint32]*SupportedAsset `json:"assets"`
 	FiatRates          map[uint32]float64         `json:"fiatRates"`
 	Bots               []*BotReport               `json:"bots"`
+	ExtensionConfig    *ExtensionModeConfig       `json:"extensionModeConfig,omitempty"`
 }
 
 // SupportedAsset is data about an asset and possibly the wallet associated

client/webserver/site/src/html/bodybuilder.tmpl

@@ -9,7 +9,7 @@
   <link rel="icon" href="/img/favicon.png?v=AK4XS4">
   <meta name="description" content="Decred DEX Client Web Portal">
   <title>{{.Title}}</title>
-  <link href="/css/style.css?v=McgiIQS" rel="stylesheet">
+  <link href="/css/style.css?v=McgiIQJ" rel="stylesheet">
 </head>
 <body {{if .UserInfo.DarkMode}} class="dark"{{end}}>
   <div class="popup-notes" id="popupNotes">
@@ -104,7 +104,7 @@
 {{end}}
 
 {{define "bottom"}}
-<script src="/js/entry.js?v=McgiIQS"></script>
+<script src="/js/entry.js?v=McgiIQJ"></script>
 </body>
 </html>
 {{end}}

client/webserver/site/src/js/forms.ts

@@ -324,10 +324,11 @@ export class NewWalletForm {
         break
       }
     }
-    const noWalletPWNeeded = !containsRequired && (walletDef.seeded || Boolean(this.current.asset.token))
-    if (appPwCached && noWalletPWNeeded) {
+    const { asset, parentAsset, winfo } = this.current
+    const displayCreateBtn = walletDef.seeded || Boolean(asset.token)
+    if (appPwCached && displayCreateBtn && !containsRequired) {
       Doc.show(page.oneBttnBox)
-    } else if (noWalletPWNeeded) {
+    } else if (displayCreateBtn) {
       Doc.show(page.auth)
       page.newWalletPass.value = ''
       page.submitAdd.textContent = intl.prep(intl.ID_CREATE)
@@ -337,8 +338,6 @@ export class NewWalletForm {
       page.submitAdd.textContent = intl.prep(intl.ID_ADD)
     }
 
-    const { asset, parentAsset, winfo } = this.current
-
     if (parentAsset) {
       const parentAndTokenOpts = JSON.parse(JSON.stringify(configOpts))
       // Add the regAsset field to the configurations so proper logos will be displayed
@@ -351,8 +350,8 @@ export class NewWalletForm {
         for (const opt of tokenOptsCopy) opt.regAsset = asset.id
         parentAndTokenOpts.push(...tokenOptsCopy)
       }
-      this.subform.update(parentAndTokenOpts, false)
-    } else this.subform.update(configOpts, false)
+      this.subform.update(asset.id, parentAndTokenOpts, false)
+    } else this.subform.update(asset.id, configOpts, false)
     this.setGuideLink(guideLink)
 
     if (this.subform.dynamicOpts.children.length || this.subform.defaultSettings.children.length) {
@@ -440,6 +439,7 @@ export class WalletConfigForm {
   defaultSettingsMsg: PageElement
   defaultSettings: PageElement
   assetHasActiveOrders: boolean
+  assetID: number
 
   constructor (form: HTMLElement, sectionize: boolean) {
     this.page = Doc.idDescendants(form)
@@ -529,6 +529,8 @@ export class WalletConfigForm {
       })
       if (!skipRepeatN) for (let i = 0; i < (opt.repeatN ? opt.repeatN - 1 : 0); i++) this.addOpt(box, opt, insertAfter, true)
     } else el = this.textInputTmpl.cloneNode(true) as HTMLElement
+    const hiddenFields = app().user.extensionModeConfig?.restrictedWallets[baseChainSymbol(this.assetID)]?.hiddenFields || []
+    if (hiddenFields.indexOf(opt.key) !== -1) Doc.hide(el)
     this.configElements.push([opt, el])
     const input = el.querySelector('input') as ConfigOptionInput
     input.dataset.configKey = opt.key
@@ -574,10 +576,11 @@ export class WalletConfigForm {
   /*
    * update creates the dynamic form.
    */
-  update (configOpts: ConfigOption[] | null, activeOrders: boolean) {
+  update (assetID: number, configOpts: ConfigOption[] | null, activeOrders: boolean) {
     this.assetHasActiveOrders = activeOrders
     this.configElements = []
     this.configOpts = configOpts || []
+    this.assetID = assetID
     Doc.empty(this.dynamicOpts, this.defaultSettings, this.loadedSettings)
 
     // If there are no options, just hide the entire form.
@@ -1901,3 +1904,12 @@ function dateToString (date: Date) {
   // Another common hack:
   // date.toLocaleString("sv-SE", { year: "numeric", month: "2-digit", day: "2-digit" })
 }
+
+/*
+ * baseChainSymbol returns the symbol for the asset's parent if the asset is a
+ * token, otherwise the symbol for the asset itself.
+ */
+export function baseChainSymbol (assetID: number) {
+  const asset = app().user.assets[assetID]
+  return asset.token ? app().user.assets[asset.token.parentID].symbol : asset.symbol
+}

client/webserver/site/src/js/registry.ts

@@ -272,6 +272,16 @@ export interface Denomination {
   conversionFactor: number
 }
 
+export interface ExtensionConfiguredWallet {
+  hiddenFields: string[]
+  disableWalletType: boolean
+  disablePassword: boolean
+}
+
+export interface ExtensionModeConfig {
+  restrictedWallets: Record<string, ExtensionConfiguredWallet>
+}
+
 export interface User {
   exchanges: Record<string, Exchange>
   inited: boolean
@@ -281,6 +291,7 @@ export interface User {
   authed: boolean // added by webserver
   ok: boolean // added by webserver
   bots: BotReport[]
+  extensionModeConfig: ExtensionModeConfig
 }
 
 export interface CoreNote {

client/webserver/site/src/js/wallets.ts

@@ -6,7 +6,8 @@ import {
   WalletConfigForm,
   UnlockWalletForm,
   DepositAddress,
-  bind as bindForm
+  bind as bindForm,
+  baseChainSymbol
 } from './forms'
 import State from './state'
 import * as intl from './locales'
@@ -339,15 +340,16 @@ export default class WalletsPage extends BasePage {
    * setPWSettingViz sets the visibility of the password field section.
    */
   setPWSettingViz (visible: boolean) {
+    const page = this.page
     if (visible) {
-      Doc.hide(this.page.showIcon)
-      Doc.show(this.page.hideIcon, this.page.changePW)
-      this.page.switchPWMsg.textContent = intl.prep(intl.ID_KEEP_WALLET_PASS)
+      Doc.hide(page.showIcon)
+      Doc.show(page.hideIcon, page.changePW)
+      page.switchPWMsg.textContent = intl.prep(intl.ID_KEEP_WALLET_PASS)
       return
     }
-    Doc.hide(this.page.hideIcon, this.page.changePW)
-    Doc.show(this.page.showIcon)
-    this.page.switchPWMsg.textContent = intl.prep(intl.ID_NEW_WALLET_PASS)
+    Doc.hide(page.hideIcon, page.changePW)
+    Doc.show(page.showIcon)
+    page.switchPWMsg.textContent = intl.prep(intl.ID_NEW_WALLET_PASS)
   }
 
   /*
@@ -876,18 +878,20 @@ export default class WalletsPage extends BasePage {
   /* Show the form used to change wallet configuration settings. */
   async showReconfig (assetID: number, skipAnimation?: boolean) {
     const page = this.page
-    Doc.hide(page.changeWalletType, page.changeTypeHideIcon, page.reconfigErr, page.showChangeType, page.changeTypeHideIcon)
-    Doc.hide(page.reconfigErr)
-    Doc.hide(page.enableWallet, page.disableWallet)
+    Doc.hide(
+      page.changeWalletType, page.changeTypeHideIcon, page.reconfigErr,
+      page.showChangeType, page.changeTypeHideIcon, page.reconfigErr,
+      page.enableWallet, page.disableWallet
+    )
     // Hide update password section by default
     this.changeWalletPW = false
     this.setPWSettingViz(this.changeWalletPW)
     const asset = app().assets[assetID]
 
     const currentDef = app().currentWalletDefinition(assetID)
     const walletDefs = asset.token ? [asset.token.definition] : asset.info ? asset.info.availablewallets : []
-
-    if (walletDefs.length > 1) {
+    const disableWalletType = app().user.extensionModeConfig?.restrictedWallets[baseChainSymbol(assetID)]?.disableWalletType
+    if (walletDefs.length > 1 && !disableWalletType) {
       Doc.empty(page.changeWalletTypeSelect)
       Doc.show(page.showChangeType, page.changeTypeShowIcon)
       page.changeTypeMsg.textContent = intl.prep(intl.ID_CHANGE_WALLET_TYPE)
@@ -897,8 +901,6 @@ export default class WalletsPage extends BasePage {
         option.value = option.textContent = wDef.type
         page.changeWalletTypeSelect.appendChild(option)
       }
-    } else {
-      Doc.hide(page.showChangeType)
     }
 
     const wallet = app().walletMap[assetID]
@@ -924,7 +926,7 @@ export default class WalletsPage extends BasePage {
       return
     }
     const assetHasActiveOrders = app().haveActiveOrders(assetID)
-    this.reconfigForm.update(currentDef.configopts || [], assetHasActiveOrders)
+    this.reconfigForm.update(asset.id, currentDef.configopts || [], assetHasActiveOrders)
     this.setGuideLink(currentDef.guidelink)
     this.reconfigForm.setConfig(res.map)
     this.updateDisplayedReconfigFields(currentDef)
@@ -934,7 +936,7 @@ export default class WalletsPage extends BasePage {
     const page = this.page
     const walletType = page.changeWalletTypeSelect.value || ''
     const walletDef = app().walletDefinition(this.selectedAssetID, walletType)
-    this.reconfigForm.update(walletDef.configopts || [], false)
+    this.reconfigForm.update(this.selectedAssetID, walletDef.configopts || [], false)
     this.setGuideLink(walletDef.guidelink)
     this.updateDisplayedReconfigFields(walletDef)
   }
@@ -948,7 +950,8 @@ export default class WalletsPage extends BasePage {
   }
 
   updateDisplayedReconfigFields (walletDef: WalletDefinition) {
-    if (walletDef.seeded || walletDef.type === 'token') {
+    const disablePassword = app().user.extensionModeConfig?.restrictedWallets[baseChainSymbol(this.selectedAssetID)]?.disablePassword
+    if (walletDef.seeded || walletDef.type === 'token' || disablePassword) {
       Doc.hide(this.page.showChangePW, this.reconfigForm.fileSelector)
       this.changeWalletPW = false
       this.setPWSettingViz(false)

dex/bip-id.go

@@ -479,7 +479,7 @@ var bipIDs = map[uint32]string{
 	890:   "xsel",
 	900:   "lmo",
 	916:   "meta",
-	966:   "matic",
+	966:   "polygon",
 	970:   "twins",
 	996:   "okp",
 	997:   "sum",

pkg.sh

@@ -3,7 +3,7 @@
 set -e
 
 # For release, remove pre-release info, and set metadata to "release".
-VER="0.6.2" # pre, beta, rc1, etc.
+VER="0.6.3" # pre, beta, rc1, etc.
 META="release" # "release"
 
 export CGO_ENABLED=0

server/cmd/dcrdex/version.go

@@ -39,7 +39,7 @@ var (
 	// and build metadata portions MUST only contain characters from
 	// semanticAlphabet.
 	// NOTE: The Version string is overridden on init.
-	Version = "0.6.2+release.local"
+	Version = "0.6.3+release.local"
 )
 
 func init() {