start new user interface

Lays out the structure for the new React-based
user interface. Implements wallet initialization sequence.
Implements basic header and sidebar interface used for most
views. Implements functionality related to forms and context
management.

Author: buck54321

client/core/core.go

@@ -1736,13 +1736,13 @@ func (c *Core) Run(ctx context.Context) {
 
 	// Construct enabled fiat rate sources.
 fetchers:
-	for token, rateFetcher := range fiatRateFetchers {
+	for src, f := range fiatRateFetchers {
 		for _, v := range disabledSources {
-			if token == v {
+			if src == v {
 				continue fetchers
 			}
 		}
-		c.fiatRateSources[token] = newCommonRateSource(rateFetcher)
+		c.fiatRateSources[src] = newCommonRateSource(src, f)
 	}
 	c.fetchFiatExchangeRates(ctx)
 
@@ -2537,12 +2537,14 @@ func (c *Core) assetMap() map[uint32]*SupportedAsset {
 // User is a thread-safe getter for the User.
 func (c *Core) User() *User {
 	m := c.coreMesh()
+	idRates, tickerRates := c.fiatConversions()
 	return &User{
 		Assets:             c.assetMap(),
 		Exchanges:          c.Exchanges(),
 		Initialized:        c.IsInitialized(),
 		SeedGenerationTime: c.seedGenerationTime,
-		FiatRates:          c.fiatConversions(),
+		FiatRates:          idRates,
+		TickerRates:        tickerRates,
 		Net:                c.net,
 		ExtensionConfig:    c.extensionModeConfig,
 		Actions:            c.requestedActionsList(),
@@ -10725,9 +10727,9 @@ func (c *Core) refreshFiatRates(ctx context.Context) {
 	// Remove expired rate source if any.
 	c.removeExpiredRateSources()
 
-	fiatRatesMap := c.fiatConversions()
-	if len(fiatRatesMap) != 0 {
-		c.notify(newFiatRatesUpdate(fiatRatesMap))
+	idRates, tickerRates := c.fiatConversions()
+	if len(idRates) != 0 {
+		c.notify(newFiatRatesUpdate(idRates, tickerRates))
 	}
 }
 
@@ -10746,12 +10748,13 @@ func (c *Core) FiatRateSources() map[string]bool {
 // FiatConversionRates are the currently cached fiat conversion rates. Must have
 // 1 or more fiat rate sources enabled.
 func (c *Core) FiatConversionRates() map[uint32]float64 {
-	return c.fiatConversions()
+	idRates, _ := c.fiatConversions()
+	return idRates
 }
 
 // fiatConversions returns fiat rate for all supported assets that have a
 // wallet.
-func (c *Core) fiatConversions() map[uint32]float64 {
+func (c *Core) fiatConversions() (map[uint32]float64, map[string]float64) {
 	assetIDs := make(map[uint32]struct{})
 	supportedAssets := asset.Assets()
 	for assetID, asset := range supportedAssets {
@@ -10762,6 +10765,7 @@ func (c *Core) fiatConversions() map[uint32]float64 {
 	}
 
 	fiatRatesMap := make(map[uint32]float64, len(supportedAssets))
+	tickerRatesMap := make(map[string]float64)
 	for assetID := range assetIDs {
 		var rateSum float64
 		var sources int
@@ -10780,19 +10784,22 @@ func (c *Core) fiatConversions() map[uint32]float64 {
 			}
 		}
 		if rateSum != 0 {
-			fiatRatesMap[assetID] = rateSum / float64(sources) // get average rate.
+			r := rateSum / float64(sources) // get average rate.
+			fiatRatesMap[assetID] = r
+			ui, _ := asset.UnitInfo(assetID)
+			tickerRatesMap[ui.Conventional.Unit] = r
 		}
 	}
-	return fiatRatesMap
+	return fiatRatesMap, tickerRatesMap
 }
 
 // ToggleRateSourceStatus toggles a fiat rate source status. If disable is true,
 // the fiat rate source is disabled, otherwise the rate source is enabled.
-func (c *Core) ToggleRateSourceStatus(source string, disable bool) error {
-	if disable {
-		return c.disableRateSource(source)
+func (c *Core) ToggleRateSourceStatus(source string, enable bool) error {
+	if enable {
+		return c.enableRateSource(source)
 	}
-	return c.enableRateSource(source)
+	return c.disableRateSource(source)
 }
 
 // enableRateSource enables a fiat rate source.
@@ -10810,7 +10817,7 @@ func (c *Core) enableRateSource(source string) error {
 	}
 
 	// Build fiat rate source.
-	rateSource := newCommonRateSource(rateFetcher)
+	rateSource := newCommonRateSource(source, rateFetcher)
 	c.fiatRateSources[source] = rateSource
 
 	select {
@@ -11294,6 +11301,11 @@ func (c *Core) ExtensionModeConfig() *ExtensionModeConfig {
 	return c.extensionModeConfig
 }
 
+func (c *Core) ValidateSeed(seed string) (bool, error) {
+	_, _, err := decodeSeedString(seed)
+	return err == nil, nil
+}
+
 // calcParcelLimit computes the users score-scaled user parcel limit.
 func calcParcelLimit(tier int64, score, maxScore int32) uint32 {
 	// Users limit starts at 2 parcels per tier.

client/core/core_test.go

@@ -10524,7 +10524,7 @@ func TestToggleRateSourceStatus(t *testing.T) {
 
 	// Test disabling fiat rate source.
 	for _, test := range tests {
-		err := tCore.ToggleRateSourceStatus(test.source, true)
+		err := tCore.ToggleRateSourceStatus(test.source, false)
 		if test.wantErr != (err != nil) {
 			t.Fatalf("%s: wantErr = %t, err = %v", test.name, test.wantErr, err)
 		}
@@ -10533,76 +10533,15 @@ func TestToggleRateSourceStatus(t *testing.T) {
 	// Test enabling fiat rate source.
 	for _, test := range tests {
 		if test.init {
-			tCore.fiatRateSources[test.source] = newCommonRateSource(tFetcher)
+			tCore.fiatRateSources[test.source] = newCommonRateSource(test.source, tFetcher)
 		}
-		err := tCore.ToggleRateSourceStatus(test.source, false)
+		err := tCore.ToggleRateSourceStatus(test.source, true)
 		if test.wantErr != (err != nil) {
 			t.Fatalf("%s: wantErr = %t, err = %v", test.name, test.wantErr, err)
 		}
 	}
 }
 
-func TestFiatRateSources(t *testing.T) {
-	rig := newTestRig()
-	defer rig.shutdown()
-	tCore := rig.core
-	supportedFetchers := len(fiatRateFetchers)
-	rateSources := tCore.FiatRateSources()
-	if len(rateSources) != supportedFetchers {
-		t.Fatalf("Expected %d number of fiat rate source/fetchers", supportedFetchers)
-	}
-}
-
-func TestFiatConversions(t *testing.T) {
-	rig := newTestRig()
-	defer rig.shutdown()
-	tCore := rig.core
-
-	// No fiat rate source initialized
-	fiatRates := tCore.fiatConversions()
-	if len(fiatRates) != 0 {
-		t.Fatal("Unexpected asset rate values.")
-	}
-
-	// Initialize fiat rate sources.
-	for token := range fiatRateFetchers {
-		tCore.fiatRateSources[token] = newCommonRateSource(tFetcher)
-	}
-
-	// Fetch fiat rates.
-	tCore.wg.Add(1)
-	go func() {
-		defer tCore.wg.Done()
-		tCore.refreshFiatRates(tCtx)
-	}()
-	tCore.wg.Wait()
-
-	// Expects assets fiat rate values.
-	fiatRates = tCore.fiatConversions()
-	if len(fiatRates) != 2 {
-		t.Fatal("Expected assets fiat rate for two assets")
-	}
-
-	// fiat rates for assets can expire, and fiat rate fetchers can be
-	// removed if expired.
-	for token, source := range tCore.fiatRateSources {
-		source.fiatRates[tUTXOAssetA.ID].lastUpdate = time.Now().Add(-time.Minute)
-		source.fiatRates[tUTXOAssetB.ID].lastUpdate = time.Now().Add(-time.Minute)
-		if source.isExpired(55 * time.Second) {
-			delete(tCore.fiatRateSources, token)
-		}
-	}
-
-	fiatRates = tCore.fiatConversions()
-	if len(fiatRates) != 0 {
-		t.Fatal("Unexpected assets fiat rate values, expected to ignore expired fiat rates.")
-	}
-
-	if len(tCore.fiatRateSources) != 0 {
-		t.Fatal("Expected fiat conversion to be disabled, all rate source data has expired.")
-	}
-}
-
 func TestValidateAddress(t *testing.T) {
 	rig := newTestRig()
 	defer rig.shutdown()

client/core/exchangeratefetcher.go

@@ -25,7 +25,6 @@ const (
 
 	// Tokens. Used to identify fiat rate source, source name must not contain a
 	// comma.
-	messari       = "Messari"
 	coinpaprika   = "Coinpaprika"
 	dcrdataDotOrg = "dcrdata"
 )
@@ -64,6 +63,7 @@ type fiatRateInfo struct {
 type rateFetcher func(context context.Context, logger dex.Logger, assets map[uint32]*SupportedAsset) map[uint32]float64
 
 type commonRateSource struct {
+	source     string
 	fetchRates rateFetcher
 
 	mtx       sync.RWMutex
@@ -114,7 +114,7 @@ func (source *commonRateSource) refreshRates(ctx context.Context, logger dex.Log
 }
 
 // Used to initialize a fiat rate source.
-func newCommonRateSource(fetcher rateFetcher) *commonRateSource {
+func newCommonRateSource(name string, fetcher rateFetcher) *commonRateSource {
 	return &commonRateSource{
 		fetchRates: fetcher,
 		fiatRates:  make(map[uint32]*fiatRateInfo),

client/core/notification.go

@@ -522,15 +522,17 @@ func newConnEventNote(topic Topic, subject, host string, status comms.Connection
 // FiatRatesNote is an update of fiat rate data for assets.
 type FiatRatesNote struct {
 	db.Notification
-	FiatRates map[uint32]float64 `json:"fiatRates"`
+	FiatRates   map[uint32]float64 `json:"fiatRates"`
+	TickerRates map[string]float64 `json:"tickerRates"`
 }
 
 const TopicFiatRatesUpdate Topic = "fiatrateupdate"
 
-func newFiatRatesUpdate(rates map[uint32]float64) *FiatRatesNote {
+func newFiatRatesUpdate(idRates map[uint32]float64, tickerRates map[string]float64) *FiatRatesNote {
 	return &FiatRatesNote{
 		Notification: db.NewNotification(NoteTypeFiatRates, TopicFiatRatesUpdate, "", "", db.Data),
-		FiatRates:    rates,
+		FiatRates:    idRates,
+		TickerRates:  tickerRates,
 	}
 }
 

client/core/types.go

@@ -203,6 +203,7 @@ type User struct {
 	SeedGenerationTime uint64                      `json:"seedgentime"`
 	Assets             map[uint32]*SupportedAsset  `json:"assets"`
 	FiatRates          map[uint32]float64          `json:"fiatRates"`
+	TickerRates        map[string]float64          `json:"tickerRates"`
 	Net                dex.Network                 `json:"net"`
 	ExtensionConfig    *ExtensionModeConfig        `json:"extensionModeConfig,omitempty"`
 	Actions            []*asset.ActionRequiredNote `json:"actions,omitempty"`

client/webserver/api.go

@@ -964,6 +964,25 @@ func (s *WebServer) apiInit(w http.ResponseWriter, r *http.Request) {
 	})
 }
 
+func (s *WebServer) apiValidateSeed(w http.ResponseWriter, r *http.Request) {
+	var seed string
+	if !readPost(w, r, &seed) {
+		return
+	}
+
+	ok, err := s.core.ValidateSeed(seed)
+	if err != nil {
+		s.writeAPIError(w, fmt.Errorf("error validating seed: %w", err))
+		return
+	}
+
+	writeJSON(w, struct {
+		OK bool `json:"ok"`
+	}{
+		OK: ok,
+	})
+}
+
 // apiIsInitialized is the handler for the '/isinitialized' request.
 func (s *WebServer) apiIsInitialized(w http.ResponseWriter, r *http.Request) {
 	writeJSON(w, &struct {
@@ -1607,13 +1626,13 @@ func (s *WebServer) apiUser(w http.ResponseWriter, r *http.Request) {
 // apiToggleRateSource handles the /toggleratesource API request.
 func (s *WebServer) apiToggleRateSource(w http.ResponseWriter, r *http.Request) {
 	form := &struct {
-		Disable bool   `json:"disable"`
-		Source  string `json:"source"`
+		Enable bool   `json:"enable"`
+		Source string `json:"source"`
 	}{}
 	if !readPost(w, r, form) {
 		return
 	}
-	err := s.core.ToggleRateSourceStatus(form.Source, form.Disable)
+	err := s.core.ToggleRateSourceStatus(form.Source, form.Enable)
 	if err != nil {
 		s.writeAPIError(w, fmt.Errorf("error disabling/enabling rate source: %w", err))
 		return
@@ -2256,6 +2275,7 @@ func (s *WebServer) writeAPIError(w http.ResponseWriter, err error) {
 	innerErr := core.UnwrapErr(err)
 	resp := &standardResponse{
 		OK:   false,
+		Bad:  true,
 		Msg:  innerErr.Error(),
 		Code: code,
 	}

client/webserver/live_test.go

@@ -1890,8 +1890,8 @@ func (c *TCore) UpdateDEXHost(string, string, []byte, any) (*core.Exchange, erro
 func (c *TCore) WalletRestorationInfo(pw []byte, assetID uint32) ([]*asset.WalletRestoration, error) {
 	return nil, nil
 }
-func (c *TCore) ToggleRateSourceStatus(src string, disable bool) error {
-	c.fiatSources[src] = !disable
+func (c *TCore) ToggleRateSourceStatus(src string, enable bool) error {
+	c.fiatSources[src] = enable
 	return nil
 }
 func (c *TCore) FiatRateSources() map[string]bool {
@@ -2038,6 +2038,10 @@ func (c *TCore) BridgeHistory(assetID uint32, n int, refID *string, past bool) (
 	return nil, nil
 }
 
+func (*TCore) ValidateSeed(string) (bool, error) {
+	return true, nil
+}
+
 func newMarketDay() *libxc.MarketDay {
 	avgPrice := tenToThe(7)
 	return &libxc.MarketDay{

client/webserver/middleware.go

@@ -63,21 +63,6 @@ func (s *WebServer) tokenAuthMiddleware(next http.Handler) http.Handler {
 	})
 }
 
-// extractBooleanCookie extracts the cookie value with key k from the Request,
-// and interprets the value as true only if it's equal to the string "1".
-func extractBooleanCookie(r *http.Request, k string, defaultVal bool) bool {
-	cookie, err := r.Cookie(k)
-	switch {
-	// Dark mode is the default
-	case err == nil:
-		return cookie.Value == "1"
-	case errors.Is(err, http.ErrNoCookie):
-	default:
-		log.Errorf("Cookie %q retrieval error: %v", k, err)
-	}
-	return defaultVal
-}
-
 // requireInit ensures that the core app is initialized before allowing the
 // incoming request to proceed. Redirects to the register page if the app is
 // not initialized.

client/webserver/newui.go

@@ -0,0 +1,27 @@
+//go:build newui
+
+// This code is available on the terms of the project LICENSE.md file,
+// also available online at https://blueoakcouncil.org/license/1.0.0.
+
+package webserver
+
+import (
+	"embed"
+	"io/fs"
+)
+
+const (
+	newUI = true
+	// site is the common prefix for the site resources with respect to this
+	// webserver package.
+	site = "newui"
+)
+
+var (
+	//go:embed newui/dist newui/src/img newui/src/font
+	staticSiteRes embed.FS
+
+	// Unused for New UI
+	htmlTmplRes embed.FS
+	htmlTmplSub fs.FS
+)