Merge pull request #14 from dReam-dApps/release/v0.11.x

Merge release/v0.11.x
dReam-dApps · Jan 20, 2024 · 019b43f · 019b43f
2 parents 870d6a0 + 335ce8d
commit 019b43f
Show file tree

Hide file tree

Showing 15 changed files with 351 additions and 206 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -16,7 +16,7 @@ Please select the right one.
 
 - [ ] (Patch) Bug fix (non-breaking change which fixes an issue)
 - [ ] (Minor) New feature (non-breaking change which adds functionality)
-- [ ] (Major) Breaking change (ffix or feature that would cause existing functionality to not work as expected and requires modifications in existing functionality to ensure expected behavior)
+- [ ] (Major) Breaking change (fix or feature that would cause existing functionality to not work as expected and requires modifications in existing functionality to ensure expected behavior)
 - [ ] This change requires a documentation update
 
 ## Which package(s) are impacted ?
@@ -36,6 +36,7 @@ Please select the right one.
 - [ ] I have commented my code
 - [ ] I have tested with all DB types
 - [ ] My changes generate no new warnings
+- [ ] I have updated the semver version (rpc.version)
 
 ## License
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,31 @@
 
 This file lists the changes to dReams repo with each version.
 
+## 0.11.1 - January 19 2024
+
+### Added
+* Xeggex price feed
+* `gnomes` Version var to SC
+* `rpc` GetUintKey()
+
+### Changed
+* Go 1.21.5
+* Fyne 2.4.3
+* Gnomon 2.0.3-alpha.5
+* Baccarat 0.3.1
+* Holdero 0.3.1
+* dPrediction 0.3.1
+* Iluma 0.3.1
+* Duels 0.1.1
+* Grokked 0.1.1
+* Clean up client var names in `rpc`
+
+### Fixed
+* High memory use (#13)
+* False TX fail prints (#11)
+* Template typo
+
+
 ## 0.11.0 - December 23 2023
 
 ### Added

diff --git a/cmd/dReams/functions.go b/cmd/dReams/functions.go
@@ -201,16 +201,12 @@ func fetch(done chan struct{}) {
 					go menuRefresh(offset)
 
 					offset++
-					if offset >= 21 {
+					if offset >= 41 {
 						offset = 0
 					}
 				}
 
 				if rpc.Daemon.IsConnected() {
-					if rpc.Startup {
-						go menu.Info.RefreshPrice(App_Name)
-					}
-
 					rpc.Startup = false
 				}
 
@@ -248,7 +244,7 @@ func menuRefresh(offset int) {
 			menu.Info.SetStatus("Gnomon Syncing...")
 		}
 
-		if offset == 20 {
+		if offset == 40 || menu.Info.Price.Text == "" {
 			go menu.Info.RefreshPrice(App_Name)
 		}
 	}
@@ -506,16 +502,14 @@ func checkConnection() {
 		menu.Control.Check.Daemon.SetChecked(true)
 	} else {
 		menu.Control.Check.Daemon.SetChecked(false)
-		disableActions(true)
 		disconnected()
 	}
 
 	if rpc.Wallet.IsConnected() {
 		if rpc.Daemon.IsConnected() {
-			disableActions(false)
+			menu.Assets.Swap.Show()
 		}
 	} else {
-		disableActions(true)
 		disconnected()
 		gnomon.Checked(false)
 	}
@@ -526,23 +520,13 @@ func disconnected() {
 	holdero.Disconnected(menu.DappEnabled("Holdero"))
 	prediction.Disconnected()
 	rpc.Wallet.Address = ""
+	menu.Assets.Swap.Hide()
 	menu.Assets.Names.ClearSelected()
 	menu.Theme.Select.Options = menu.Control.Themes
 	menu.Theme.Select.Refresh()
 	menu.Assets.Asset = []menu.Asset{}
 }
 
-// Disable actions requiring connection
-func disableActions(d bool) {
-	if d {
-		menu.Assets.Swap.Hide()
-	} else {
-		menu.Assets.Swap.Show()
-	}
-
-	menu.Assets.Swap.Refresh()
-}
-
 // dReams search filters for Gnomon index
 func gnomonFilters() (filter []string) {
 	if menu.DappEnabled("Holdero") {
@@ -611,9 +595,14 @@ func gnomonFilters() (filter []string) {
 	}
 
 	if menu.DappEnabled("Grokked") {
-		grok := rpc.GetSCCode(grok.GROKSCID)
-		if grok != "" {
-			filter = append(filter, grok)
+		grokked := rpc.GetSCCode(grok.GROKSCID)
+		if grokked != "" {
+			filter = append(filter, grokked)
+		}
+
+		grokked = rpc.GetSCCode(grok.GROKOG)
+		if grokked != "" {
+			filter = append(filter, grokked)
 		}
 	}
 

diff --git a/cmd/dReams/layout.go b/cmd/dReams/layout.go
@@ -173,6 +173,9 @@ func introScreen() *fyne.Container {
 		menu.Control.Dapps = enabled_dapps
 		menu.Control.Unlock()
 
+		gnomon_gif.Stop()
+		gnomon_gif = nil
+
 		dReams.SetChannels(menu.EnabledDappCount())
 		logger.Println("[dReams] Loading dApps")
 		go func() {
@@ -249,10 +252,10 @@ func dAppScreen(reset fyne.CanvasObject) *fyne.Container {
 	back_button := widget.NewButton("Back", func() {
 		dReams.Configure(false)
 		gnomon_gif.Stop()
+		gnomon_gif = nil
 		menu.RestartGif(gnomes.Indicator.Icon)
 		go func() {
 			dReams.Window.Content().(*fyne.Container).Objects[1] = reset
-			dReams.Window.Content().(*fyne.Container).Objects[1].Refresh()
 		}()
 	})
 
@@ -280,7 +283,6 @@ func dAppScreen(reset fyne.CanvasObject) *fyne.Container {
 		img.SetMinSize(fyne.NewSize(180, 180))
 
 		dReams.Window.Content().(*fyne.Container).Objects[1] = container.NewStack(container.NewCenter(img, status_text), widget.NewProgressBarInfinite())
-		dReams.Window.Content().(*fyne.Container).Objects[1].Refresh()
 
 		logger.Println("[dReams] Closing dApps")
 		dReams.CloseAllDapps()
@@ -293,6 +295,7 @@ func dAppScreen(reset fyne.CanvasObject) *fyne.Container {
 		gnomon.Checked(false)
 		bundle.AppColor = skin_choice
 		gnomon_gif.Stop()
+		gnomon_gif = nil
 		status_text.Text = "Loading dApps..."
 		status_text.Refresh()
 		go func() {

diff --git a/dwidget/dlists.go b/dwidget/dlists.go
@@ -37,10 +37,6 @@ func (l *Lists) RemoveIndex(u uint64) {
 	if index != -1 {
 		l.All = append(l.All[:index], l.All[index+1:]...)
 	}
-
-	if l.List != nil {
-		l.List.Refresh()
-	}
 }
 
 // Check if u exists in All

diff --git a/gnomes/gnomon.go b/gnomes/gnomon.go
@@ -57,9 +57,10 @@ type SCHeaders struct {
 
 // SCID with Gnomon headers
 type SC struct {
-	ID     string
-	Rating uint64
-	Header SCHeaders
+	ID      string
+	Rating  uint64
+	Version uint64
+	Header  SCHeaders
 }
 
 var logger = structures.Logger.WithFields(logrus.Fields{})

diff --git a/go.mod b/go.mod
@@ -1,18 +1,18 @@
 module github.com/dReam-dApps/dReams
 
-go 1.20
+go 1.21.5
 
 require (
-	fyne.io/fyne/v2 v2.4.1
+	fyne.io/fyne/v2 v2.4.4-0.20231224124904-a09bbd790b98
 	fyne.io/x/fyne v0.0.0-20230411205836-1ca0ead20763
-	github.com/SixofClubsss/Baccarat v0.3.0
-	github.com/SixofClubsss/Duels v0.1.0
-	github.com/SixofClubsss/Grokked v0.1.0
-	github.com/SixofClubsss/Holdero v0.3.0
-	github.com/SixofClubsss/Iluma v0.3.0
-	github.com/SixofClubsss/dPrediction v0.3.0
+	github.com/SixofClubsss/Baccarat v0.3.1
+	github.com/SixofClubsss/Duels v0.1.1
+	github.com/SixofClubsss/Grokked v0.1.1
+	github.com/SixofClubsss/Holdero v0.3.1
+	github.com/SixofClubsss/Iluma v0.3.1
+	github.com/SixofClubsss/dPrediction v0.3.1
 	github.com/blang/semver/v4 v4.0.0
-	github.com/civilware/Gnomon v0.0.0-20231218151558-0ee387e75195
+	github.com/civilware/Gnomon v0.0.0-20240102201536-a5900d5a61da
 	github.com/deroproject/derohe v0.0.0-20230604143809-765b2db1f482
 	github.com/sirupsen/logrus v1.9.3
 	github.com/superoo7/go-gecko v1.0.0
@@ -21,7 +21,7 @@ require (
 )
 
 require (
-	fyne.io/systray v1.10.1-0.20230722100817-88df1e0ffa9a // indirect
+	fyne.io/systray v1.10.1-0.20231115130155-104f5ef7839e // indirect
 	github.com/caarlos0/env/v6 v6.10.1 // indirect
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/creachadair/jrpc2 v0.43.0 // indirect