.gitea/workflows/build.yaml

@@ -17,12 +17,12 @@ jobs:
       name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.23.1
+        go-version: 1.22.1
     -
       name: Run linter
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.61
+        version: v1.56
     -
       name: Run tests
       run: go test ./...
@@ -31,7 +31,7 @@ jobs:
       uses: goreleaser/goreleaser-action@v5
       with:
         distribution: goreleaser
-        version: 2.2.0
+        version: 1.24.0
         args: release --clean --snapshot
       env:
         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

.gitea/workflows/release-tag.yaml

@@ -17,13 +17,13 @@ jobs:
       name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: 1.23.1
+        go-version: 1.22.1
     -
       name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v5
       with:
         distribution: goreleaser
-        version: 2.2.0
+        version: 1.24.0
         args: release --clean
       env:
         GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}

.golangci.yaml

@@ -1,15 +0,0 @@
-linters:
-  disable-all: true
-  enable:
-  - errcheck
-  - godot
-  - goimports
-  - gosimple
-  - govet
-  - ineffassign
-  - nilerr
-  - nilnil
-  - staticcheck
-  - typecheck
-  - unused
-  - usestdlibvars

.goreleaser.yaml

@@ -6,7 +6,7 @@
 # yaml-language-server: $schema=https://goreleaser.com/static/schema.json
 # vim: set ts=2 sw=2 tw=0 fo=cnqoj
 
-version: 2
+version: 1
 
 before:
   hooks:

.idea/.gitignore

@@ -1 +0,0 @@
-workspace.xml

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/moonmath.iml" filepath="$PROJECT_DIR$/.idea/moonmath.iml" />
-    </modules>
-  </component>
-</project>

.idea/moonmath.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="Go" enabled="true" />
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.vscode/launch.json

@@ -0,0 +1,20 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "go",
+            "request": "launch",
+            "mode": "debug",
+            "console": "integratedTerminal",
+            "program": "${workspaceFolder}/moonmath.go",
+            "args": [
+                "--config-file",
+                "moonmath.toml"
+            ]
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,18 @@
+{
+    "cSpell.words": [
+        "alecthomas",
+        "bitcoinity",
+        "Bitfinex",
+        "Bitstamp",
+        "bubbletea",
+        "CDPR",
+        "charmbracelet",
+        "Coindesk",
+        "knadh",
+        "koanf",
+        "lipgloss",
+        "moonmath",
+        "OHLC",
+        "sourcegraph"
+    ]
+}

coindesk/assets.go

@@ -1,6 +1,5 @@
 package coindesk
 
-//goland:noinspection ALL
 const (
 	BTC      Asset = "BTC"
 	ETH      Asset = "ETH"

config/config.go

@@ -16,58 +16,62 @@ import (
 
 var k = koanf.New(".")
 
-func Load(filePath string) (r Root, err error) {
+func Load(path string) (all All, err error) {
 	err = k.Load(structs.Provider(Default, "koanf"), nil)
 	if err != nil {
 		return
 	}
-	if filePath != "" {
+	if path != "" {
-		err = k.Load(file.Provider(filePath), yaml.Parser())
+		err = k.Load(file.Provider(path), yaml.Parser())
 		if err != nil {
 			return
 		}
 	}
-	err = k.Unmarshal("", &r)
+	err = k.Unmarshal("", &all)
+	if err != nil {
+		return
+	}
 
 	return
 }
 
-var Default Root
+var Default All
 
-type Root struct {
+type All struct {
-	Defaults Asset                    `koanf:"defaults"`
+	Defaults Data                    `koanf:"defaults"`
-	Assets   map[coindesk.Asset]Asset `koanf:"assets"`
+	Assets   map[coindesk.Asset]Data `koanf:"assets"`
 }
 
-type Asset struct {
+type Data struct {
 	Asset         coindesk.Asset      `koanf:"asset"`
 	Goals         []moon.Goal         `koanf:"goals"`
 	ConstantBases []moon.ConstantBase `koanf:"constantBases"`
 	RelativeBases []moon.RelativeBase `koanf:"relativeBases"`
 }
 
-func (r Root) ForAsset(a coindesk.Asset) (cfg Asset) {
+func (all All) GetData(asset coindesk.Asset) (data Data) {
-	cfg = merge(r.Assets[a], r.Defaults)
+	data, ok := all.Assets[asset]
-	cfg.Asset = a
+	if !ok {
+		data = all.Defaults
+	}
+	if data.Asset == "" {
+		data.Asset = asset
+	}
+	if data.Goals == nil || len(data.Goals) == 0 {
+		data.Goals = all.Defaults.Goals
+	}
+	if data.ConstantBases == nil || len(data.ConstantBases) == 0 {
+		data.ConstantBases = all.Defaults.ConstantBases
+	}
+	if data.RelativeBases == nil || len(data.RelativeBases) == 0 {
+		data.RelativeBases = all.Defaults.RelativeBases
+	}
 	return
 }
 
-func merge(dst, src Asset) Asset {
-	if len(dst.Goals) == 0 {
-		dst.Goals = src.Goals
-	}
-	if len(dst.ConstantBases) == 0 {
-		dst.ConstantBases = src.ConstantBases
-	}
-	if len(dst.RelativeBases) == 0 {
-		dst.RelativeBases = src.RelativeBases
-	}
-	return dst
-}
-
 // GetBases returns the concatenation of the constant and relative bases, sorted
 // from most recent to least recent in time.
-func GetBases(d *Asset) (bases []moon.Base) {
+func GetBases(d *Data) (bases []moon.Base) {
 	for _, b := range d.ConstantBases {
 		bases = append(bases, b)
 	}

config/default.yaml

@@ -28,12 +28,6 @@ defaults:
     time: 2019-12-31T16:00:00-08:00
   - name: 2017-
     time: 2016-12-31T16:00:00-08:00
-  - name: 2013-
-    time: 2012-12-31T16:00:00-08:00
-    startingPrice: 13.30
-  - name: 2011-
-    time: 2010-12-31T16:00:00-08:00
-    startingPrice: 0.30
 
 assets:
   ETH:
@@ -50,11 +44,6 @@ assets:
       value: 20000
     - name: $25k
       value: 25000
-    constantBases:
-    - name: 2020-
-      time: 2019-12-31T16:00:00-08:00
-    - name: 2017-
-      time: 2016-12-31T16:00:00-08:00
   LTC:
     goals:
     - name: $100

go.mod

@@ -36,7 +36,8 @@ require (
 	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/termenv v0.15.2 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/term v0.18.0 // indirect

go.sum

@@ -17,6 +17,7 @@ github.com/charmbracelet/lipgloss v0.10.0/go.mod h1:Wig9DSfvANsxqkRsqj6x87irdy12
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
 github.com/containerd/console v1.0.4/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
@@ -74,10 +75,14 @@ github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZV
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
 github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
 golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=

moon/moon.go

@@ -2,7 +2,6 @@ package moon
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math"
 	"time"
@@ -76,10 +75,30 @@ func (m *Math) Refresh(ctx context.Context) (err error) {
 	tasks.WithMaxGoroutines(len(m.Columns))
 	//tasks.WithMaxGoroutines(1)
 	now := time.Now()
+
 	for i := range m.Columns {
 		c := &m.Columns[i]
 		tasks.Go(func() error {
-			return c.project(ctx, m, now)
+			c.StartingDate = c.Base.From(now)
+			nextDay := c.StartingDate.Add(time.Hour * 24)
+			resp, err := coindesk.GetPriceValues(ctx,
+				m.Asset, c.StartingDate, nextDay)
+			if err != nil {
+				return err
+			}
+			if len(resp.Data.Entries) == 0 {
+				c.Projections.Dates = nil
+				return nil
+			}
+			c.StartingPrice = resp.Data.Entries[0].Price
+			c.Gain = float64(m.CurrentPrice) / float64(c.StartingPrice)
+			days := now.Sub(c.StartingDate).Hours() / 24
+			c.CDPR = CDPR(days, c.Gain)
+			c.Projections = ProjectDates(
+				now, float64(m.CurrentPrice),
+				c.CDPR, m.Goals,
+			)
+			return nil
 		})
 	}
 	err = tasks.Wait()
@@ -96,49 +115,46 @@ type Column struct {
 	Projections   Projection
 }
 
-func (c *Column) project(ctx context.Context, m *Math, now time.Time) (err error) {
+func (c *Column) Column() (entries []string) {
-	err = c.fillStartingPrice(ctx, m.Asset, now)
+	entries = append(entries, fmt.Sprintf("$%.2f", c.StartingPrice))
-	if err != nil {
+	entries = append(entries, fmt.Sprintf("%.2f%%", (c.CDPR-1)*100))
+	never := c.CDPR <= 1
+	for i := range c.Projections.Dates {
+		var cell string
+		if never {
+			cell = "NEVER!!!!!"
+		} else {
+			cell = c.
+				Projections.
+				Dates[i].
+				Format("2006-01-02")
+		}
+		entries = append(entries, cell)
+	}
 	return
 }
 
-	c.Gain = float64(m.CurrentPrice) / float64(c.StartingPrice)
+var DefaultGoals = []Goal{
-	days := now.Sub(c.StartingDate).Hours() / 24
+	{"$100k", 100000},
-	c.CDPR = CDPR(days, c.Gain)
+	{"$150k", 150000},
-	c.Projections = ProjectDates(
+	{"$200k", 200000},
-		now, float64(m.CurrentPrice),
+	{"$250k", 250000},
-		c.CDPR, m.Goals,
+	{"$300k", 300000},
-	)
+	{"$500k", 500000},
-	return
+	{"$1m", 1000000},
 }
 
-func (c *Column) fillStartingPrice(
+var DefaultConstantBases = []ConstantBase{
-	ctx context.Context, asset coindesk.Asset, now time.Time,
+	{"2020-", time.Unix(1577836800, 0)},
-) error {
+	{"2017-", time.Unix(1483228800, 0)},
-	// if base provides a hardcoded starting price, use it
-	c.StartingDate = c.Base.From(now)
-	c.StartingPrice = coindesk.Price(c.Base.GetStartingPrice())
-	if c.StartingPrice != 0 {
-		return nil
 }
 
-	// otherwise, look up the starting price via Coindesk
+var DefaultRelativeBases = []RelativeBase{
-	nextDay := c.StartingDate.Add(time.Hour * 24)
+	{"Month", time.Duration(-30) * time.Hour * 24},
-	resp, err := coindesk.GetPriceValues(ctx, asset, c.StartingDate, nextDay)
+	{"Quarter", time.Duration(-90) * time.Hour * 24},
-	if err != nil {
+	{"Half-Year", time.Duration(-182) * time.Hour * 24},
-		err = fmt.Errorf("getting price for %s on %v: %w",
+	{"Year", time.Duration(-365) * time.Hour * 24},
-			asset, c.StartingDate, err)
-		return err
 }
-	if len(resp.Data.Entries) == 0 {
-		c.Projections.Dates = nil
-		return errEmptyPriceEntries
-	}
-	c.StartingPrice = resp.Data.Entries[0].Price
-	return nil
-}
-
-var errEmptyPriceEntries = errors.New("price values response has no entries")
 
 type Goal struct {
 	Name  string  `koanf:"name"`
@@ -149,14 +165,12 @@ type Goal struct {
 type Base interface {
 	From(now time.Time) time.Time
 	Label() string
-	GetStartingPrice() float64
 }
 
 // ConstantBase is a base that is a constant time, e.g. 2020-01-01.
 type ConstantBase struct {
 	Name string    `koanf:"name"`
 	Time time.Time `koanf:"time"`
-	StartingPrice float64   `koanf:"startingPrice"`
 }
 
 func (cb ConstantBase) From(_ time.Time) time.Time {
@@ -167,25 +181,17 @@ func (cb ConstantBase) Label() string {
 	return cb.Name
 }
 
-func (cb ConstantBase) GetStartingPrice() float64 {
+// RelativeBase is a base that is relative, e.g. "90 days ago."
-	return cb.StartingPrice
-}
-
-// RelativeBase is a base that is relative, e.g. "90 days ago".
 type RelativeBase struct {
 	Name   string        `koanf:"name"`
 	Offset time.Duration `koanf:"offset"`
 }
 
 func (rb RelativeBase) From(now time.Time) time.Time {
-	then := now.Add(rb.Offset)
+	then := now.Add(time.Duration(rb.Offset))
 	return then
 }
 
 func (rb RelativeBase) Label() string {
 	return rb.Name
 }
-
-func (rb RelativeBase) GetStartingPrice() float64 {
-	return 0
-}

moon/moon_test.go

@@ -11,14 +11,6 @@ func TestCDPR(t *testing.T) {
 }
 
 func TestProjection(t *testing.T) {
-	p := moon.ProjectDates(time.Now(), 68900, 1.0055, []moon.Goal{
+	p := moon.ProjectDates(time.Now(), 68900, 1.0055, moon.DefaultGoals)
-		{"$100k", 100000},
-		{"$150k", 150000},
-		{"$200k", 200000},
-		{"$250k", 250000},
-		{"$300k", 300000},
-		{"$500k", 500000},
-		{"$1m", 1000000},
-	})
 	_ = p
 }

tui/asset/asset.go

@@ -30,7 +30,7 @@ type Msg struct {
 	inner tea.Msg
 }
 
-func New(cfg config.Asset) (m Model) {
+func New(cfg config.Data) (m Model) {
 	m.math = moon.NewMath(
 		cfg.Asset,
 		cfg.Goals,
@@ -89,6 +89,10 @@ func New(cfg config.Asset) (m Model) {
 	return
 }
 
+func (m Model) Handles(a coindesk.Asset) bool {
+	return m.math.Asset == a
+}
+
 func (m Model) Init() tea.Cmd {
 	return tea.Batch(
 		m.indicator.Tick,
@@ -98,10 +102,6 @@ func (m Model) Init() tea.Cmd {
 	)
 }
 
-func (m Model) Handles(a coindesk.Asset) bool {
-	return m.math.Asset == a
-}
-
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case Msg:
@@ -112,19 +112,18 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			return m, tea.Batch(
 				m.resumeIndicator,
 				m.refresh,
-				m.scheduleRefresh(),
 			)
 		case update:
-			var cmd tea.Cmd
+			commands := []tea.Cmd{m.scheduleRefresh()}
 			if msg.err == nil {
 				m.math = msg.math
 				refillProperties(&m)
 				refillProjections(&m)
-				cmd = m.stopIndicator()
+				commands = append(commands, m.stopIndicator())
 			} else {
 				m.indicator.Style = indicatorErrorStyle
 			}
-			return m, cmd
+			return m, tea.Batch(commands...)
 		case stopIndicator:
 			m.refreshing = false
 			return m, nil
@@ -148,9 +147,9 @@ type update struct {
 type stopIndicator struct{}
 
 func (m Model) refresh() tea.Msg {
-	ctx, cancel := context.WithTimeout(
+	ctx, cancel := context.WithDeadline(
 		context.Background(),
-		refreshTimeout)
+		time.Now().Add(time.Second*15))
 	defer cancel()
 	err := m.math.Refresh(ctx)
 	if err != nil {
@@ -167,7 +166,7 @@ func (m Model) resumeIndicator() tea.Msg {
 }
 
 func (m Model) scheduleRefresh() tea.Cmd {
-	return tea.Tick(refreshInterval,
+	return tea.Tick(time.Second*30,
 		func(t time.Time) tea.Msg {
 			return Msg{m.math.Asset, refresh{}}
 		})
@@ -176,16 +175,12 @@ func (m Model) scheduleRefresh() tea.Cmd {
 func (m Model) stopIndicator() tea.Cmd {
 	// wait a bit to stop the indicator, so that it's more obvious
 	// even when the refresh completes quickly.
-	return tea.Tick(stopIndicatorDelay,
+	return tea.Tick(time.Millisecond*500,
 		func(t time.Time) tea.Msg {
 			return Msg{m.math.Asset, stopIndicator{}}
 		})
 }
 
-var refreshInterval = time.Second * 30
-var refreshTimeout = time.Second * 15
-var stopIndicatorDelay = time.Millisecond * 500
-
 func refillProperties(m *Model) {
 	rows := []table.Row{
 		{"Asset", string(m.math.Asset)},
@@ -195,34 +190,14 @@ func refillProperties(m *Model) {
 }
 
 func refillProjections(m *Model) {
-	cols := []table.Row{m.math.Labels}
+	rows := []table.Row{m.math.Labels}
 	for i := range m.math.Columns {
-		entries := renderEntries(m.math.Columns[i])
+		rows = append(rows, m.math.Columns[i].Column())
-		cols = append(cols, entries)
 	}
-	rows := transpose(cols)
+	rows = transpose(rows)
 	m.projections.SetRows(rows)
 }
 
-func renderEntries(c moon.Column) (entries []string) {
-	entries = append(entries, fmt.Sprintf("$%.2f", c.StartingPrice))
-	entries = append(entries, fmt.Sprintf("%.4f%%", (c.CDPR-1)*100))
-	never := c.CDPR <= 1
-	for i := range c.Projections.Dates {
-		var cell string
-		if never {
-			cell = "NEVER!!!!!"
-		} else {
-			cell = c.
-				Projections.
-				Dates[i].
-				Format("2006-01-02")
-		}
-		entries = append(entries, cell)
-	}
-	return
-}
-
 func transpose(slice []table.Row) []table.Row {
 	xl := len(slice[0])
 	yl := len(slice)

tui/perf/perf.go

@@ -22,7 +22,7 @@ func (m Model) Init() tea.Cmd {
 	return nil
 }
 
-func (m Model) Update(_ tea.Msg) (Model, tea.Cmd) {
+func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 	return m, nil
 }
 

tui/tui.go

@@ -17,16 +17,17 @@ type Model struct {
 	displayStats bool
 }
 
-func New(assets []coindesk.Asset, cfg config.Root, displayStats bool) (m Model) {
+func New(assets []coindesk.Asset, cfg config.All, displayStats bool) (m Model) {
 	m.stats = perf.New()
 	m.displayStats = displayStats
-	// construct models for each asset, but remove dupes
+	// construct models for each asset, but don't filter out dupes
 	seen := map[coindesk.Asset]struct{}{}
 	for _, a := range assets {
-		if _, ok := seen[a]; ok {
+		_, ok := seen[a]
+		if ok {
 			continue
 		}
-		assetCfg := cfg.ForAsset(a)
+		assetCfg := cfg.GetData(a)
 		assetModel := asset.New(assetCfg)
 		m.assets = append(m.assets, assetModel)
 		seen[a] = struct{}{}