Merge pull request #43 from algorandfoundation/fix/fast-catchup

fix: fast catchup (beta)

.docker/start_dev.sh

@@ -23,7 +23,7 @@ if [ -d "$ALGORAND_DATA" ]; then
         algod -o -d "$ALGORAND_DATA" -l "0.0.0.0:8080"
     else
         sed -i "s/NUM_ROUNDS/${NUM_ROUNDS:-30000}/" "/node/run/template.json"
-        sed -i "s/\"NetworkName\": \"\"/\"NetworkName\": \"hack-tui\"/" "/node/run/template.json"
+        sed -i "s/\"NetworkName\": \"\"/\"NetworkName\": \"algorun-tui\"/" "/node/run/template.json"
         goal network create --noclean -n tuinet -r "${ALGORAND_DATA}/.." -t "/node/run/template.json"
 
         # Cycle Network

.gitignore

@@ -1,4 +1,4 @@
-hack-tui
+algorun-tui
 bin
 .data
 

CONTRIBUTING.md

@@ -7,13 +7,13 @@ A guide on how to contribute to this project.
 Clone the project
 
 ```bash
-git clone [email protected]:algorandfoundation/hack-tui.git
+git clone [email protected]:algorandfoundation/algorun-tui.git
 ```
 
 Change to the directory
 
 ```bash
-cd hack-tui
+cd algorun-tui
 ```
 
 Build the project

README.md

@@ -1,20 +1,20 @@
-# ⌨️ Hack-TUI
+# ⌨️ AlgoRun-TUI
 
 <div align="center">
     <img alt="Terminal Render" src="/assets/Banner.gif" width="65%">
 </div>
 
 <div align="center">
-    <a target="_blank" href="https://github.com/algorandfoundation/hack-tui/actions/workflows/test.yaml">
-        <img alt="CI Badge" src="https://github.com/algorandfoundation/hack-tui/actions/workflows/test.yaml/badge.svg"/>
+    <a target="_blank" href="https://github.com/algorandfoundation/algorun-tui/actions/workflows/test.yaml">
+        <img alt="CI Badge" src="https://github.com/algorandfoundation/algorun-tui/actions/workflows/test.yaml/badge.svg"/>
     </a>
-    <a target="_blank" href="https://github.com/algorandfoundation/hack-tui">
+    <a target="_blank" href="https://github.com/algorandfoundation/algorun-tui">
         <img alt="CD Badge" src="https://img.shields.io/badge/CD-TODO-red"/>
     </a>
-    <a target="_blank" href="https://github.com/algorandfoundation/hack-tui/stargazers">
-        <img alt="Repository Stars Badge" src="https://img.shields.io/github/stars/algorandfoundation/hack-tui?color=7B1E7A&logo=star&style=flat" />
+    <a target="_blank" href="https://github.com/algorandfoundation/algorun-tui/stargazers">
+        <img alt="Repository Stars Badge" src="https://img.shields.io/github/stars/algorandfoundation/algorun-tui?color=7B1E7A&logo=star&style=flat" />
     </a>
-    <img alt="Repository Visitors Badge" src="https://api.visitorbadge.io/api/visitors?path=https%3A%2F%2Fgithub.com%2Falgorandfoundation%2Fhack-tui&countColor=%237B1E7A&style=flat" />
+    <img alt="Repository Visitors Badge" src="https://api.visitorbadge.io/api/visitors?path=https%3A%2F%2Fgithub.com%2Falgorandfoundation%2Falgorun-tui&countColor=%237B1E7A&style=flat" />
 </div>
 
 ---
@@ -30,7 +30,7 @@ Built with [bubbles](https://github.com/charmbracelet/bubbles) & [bubbletea](htt
 Download the latest release by running
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/algorandfoundation/hack-tui/refs/heads/main/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/algorandfoundation/algorun-tui/refs/heads/main/install.sh | bash
 ```
 
 Launch the TUI by replacing the `<ENDPOINT>` and `<TOKEN>` 

cmd/root.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal"
-	"github.com/algorandfoundation/hack-tui/ui"
-	"github.com/algorandfoundation/hack-tui/ui/explanations"
-	"github.com/algorandfoundation/hack-tui/ui/style"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/ui"
+	"github.com/algorandfoundation/algorun-tui/ui/explanations"
+	"github.com/algorandfoundation/algorun-tui/ui/style"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/log"

cmd/status.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/algorandfoundation/hack-tui/internal"
-	"github.com/algorandfoundation/hack-tui/ui"
-	"github.com/algorandfoundation/hack-tui/ui/style"
+	"github.com/algorandfoundation/algorun-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/ui"
+	"github.com/algorandfoundation/algorun-tui/ui/style"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

go.mod

@@ -1,4 +1,4 @@
-module github.com/algorandfoundation/hack-tui
+module github.com/algorandfoundation/algorun-tui
 
 go 1.22.0
 

install.sh

@@ -14,7 +14,7 @@ EOF
 )
 
 os=$(uname -ms)
-release="https://github.com/algorandfoundation/hack-tui/releases/download"
+release="https://github.com/algorandfoundation/algorun-tui/releases/download"
 version="v1.0.0-beta.1"
 
 Red=''

internal/accounts.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/algorand/go-algorand-sdk/v2/types"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 )
 
 // Account represents a user's account, including address, status, balance, and number of keys.

internal/accounts_test.go

@@ -2,9 +2,9 @@ package internal
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal/test"
-	"github.com/algorandfoundation/hack-tui/internal/test/mock"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal/test"
+	"github.com/algorandfoundation/algorun-tui/internal/test/mock"
 	"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
 	"github.com/stretchr/testify/assert"
 	"testing"

internal/block.go

@@ -3,7 +3,7 @@ package internal
 import (
 	"context"
 	"errors"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	"time"
 )
 

internal/block_test.go

@@ -2,7 +2,7 @@ package internal
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	"testing"
 	"time"
 )

internal/metrics.go

@@ -3,7 +3,7 @@ package internal
 import (
 	"context"
 	"errors"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	"regexp"
 	"strconv"
 	"strings"

internal/metrics_test.go

@@ -2,7 +2,7 @@ package internal
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/internal/test"
+	"github.com/algorandfoundation/algorun-tui/internal/test"
 	"strconv"
 	"testing"
 )

internal/participation.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 )
 
 // GetPartKeys get the participation keys from the node

internal/participation_test.go

@@ -3,9 +3,9 @@ package internal
 import (
 	"context"
 	"fmt"
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal/test"
-	"github.com/algorandfoundation/hack-tui/internal/test/mock"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal/test"
+	"github.com/algorandfoundation/algorun-tui/internal/test/mock"
 	"testing"
 )
 

internal/state.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 )
 
 type StateModel struct {
@@ -75,7 +75,7 @@ func (s *StateModel) Watch(cb func(model *StateModel, err error), ctx context.Co
 		s.Status.State = "Unknown"
 
 		// Update Status
-		s.Status.Update(status.JSON200.LastRound, status.JSON200.CatchupTime, status.JSON200.CatchpointAcquiredBlocks, status.JSON200.UpgradeNodeVote)
+		s.Status.Update(status.JSON200.LastRound, status.JSON200.CatchupTime, status.JSON200.Catchpoint, status.JSON200.UpgradeNodeVote)
 
 		// Fetch Keys
 		s.UpdateKeys()

internal/state_test.go

@@ -2,7 +2,7 @@ package internal
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	"github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider"
 	"testing"
 	"time"

internal/status.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 )
 
 type State string
@@ -29,10 +29,10 @@ type StatusModel struct {
 func (m *StatusModel) String() string {
 	return fmt.Sprintf("\nLastRound: %d\n", m.LastRound)
 }
-func (m *StatusModel) Update(lastRound int, catchupTime int, aquiredBlocks *int, upgradeNodeVote *bool) {
+func (m *StatusModel) Update(lastRound int, catchupTime int, catchpoint *string, upgradeNodeVote *bool) {
 	m.LastRound = uint64(lastRound)
 	if catchupTime > 0 {
-		if aquiredBlocks != nil {
+		if catchpoint != nil && *catchpoint != "" {
 			m.State = FastCatchupState
 		} else {
 			m.State = SyncingState
@@ -77,6 +77,6 @@ func (m *StatusModel) Fetch(ctx context.Context, client api.ClientWithResponsesI
 		return fmt.Errorf("Status code %d: %s", s.StatusCode(), s.Status())
 	}
 
-	m.Update(s.JSON200.LastRound, s.JSON200.CatchupTime, s.JSON200.CatchpointAcquiredBlocks, s.JSON200.UpgradeNodeVote)
+	m.Update(s.JSON200.LastRound, s.JSON200.CatchupTime, s.JSON200.Catchpoint, s.JSON200.UpgradeNodeVote)
 	return nil
 }

internal/status_test.go

@@ -2,7 +2,7 @@ package internal
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/internal/test"
+	"github.com/algorandfoundation/algorun-tui/internal/test"
 	"strings"
 	"testing"
 )

internal/test/client.go

@@ -3,8 +3,8 @@ package test
 import (
 	"context"
 	"errors"
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal/test/mock"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal/test/mock"
 	"net/http"
 )
 

internal/test/mock/fixtures.go

@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 )
 
 var VoteKey = []byte("TESTKEY")

internal/test/utils.go

@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	"io"
 )
 

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/algorandfoundation/hack-tui/cmd"
+	"github.com/algorandfoundation/algorun-tui/cmd"
 )
 
 func main() {

ui/README.md

@@ -15,7 +15,7 @@ Example for `status.go` single file component:
 ```go
 package ui
 
-import "github.com/algorandfoundation/hack-tui/internal"
+import "github.com/algorandfoundation/algorun-tui/internal"
 
 type StatusViewModel struct {
 	Data internal.StateModel
@@ -34,7 +34,7 @@ Example refactor for `status.go` to a package:
 #### ui/status/model.go
 ```go
 package status
-import "github.com/algorandfoundation/hack-tui/internal"
+import "github.com/algorandfoundation/algorun-tui/internal"
 
 type ViewModel struct {
 	Data internal.StateModel

ui/app/accounts.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/algorandfoundation/hack-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/internal"
 	tea "github.com/charmbracelet/bubbletea"
 )
 

ui/app/app_test.go

@@ -2,9 +2,9 @@ package app
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/internal"
-	"github.com/algorandfoundation/hack-tui/internal/test"
-	uitest "github.com/algorandfoundation/hack-tui/ui/internal/test"
+	"github.com/algorandfoundation/algorun-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/internal/test"
+	uitest "github.com/algorandfoundation/algorun-tui/ui/internal/test"
 	"testing"
 	"time"
 )

ui/app/keys.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal"
 	tea "github.com/charmbracelet/bubbletea"
 )
 

ui/app/modal.go

@@ -1,7 +1,7 @@
 package app
 
 import (
-	"github.com/algorandfoundation/hack-tui/api"
+	"github.com/algorandfoundation/algorun-tui/api"
 	tea "github.com/charmbracelet/bubbletea"
 )
 

ui/explanations/explanations.go

@@ -1,7 +1,7 @@
 package explanations
 
 import (
-	"github.com/algorandfoundation/hack-tui/ui/style"
+	"github.com/algorandfoundation/algorun-tui/ui/style"
 )
 
 var NodeNotFound = "\n\nExplanation: algorun could not find your node automatically. Provide --algod-endpoint and --algod-token, or set the goal-compatible ALGORAND_DATA environment variable to the algod data directory, e.g. /var/lib/algorand\n"

ui/internal/test/state.go

@@ -2,9 +2,9 @@ package test
 
 import (
 	"context"
-	"github.com/algorandfoundation/hack-tui/api"
-	"github.com/algorandfoundation/hack-tui/internal"
-	mock2 "github.com/algorandfoundation/hack-tui/internal/test/mock"
+	"github.com/algorandfoundation/algorun-tui/api"
+	"github.com/algorandfoundation/algorun-tui/internal"
+	mock2 "github.com/algorandfoundation/algorun-tui/internal/test/mock"
 	"time"
 )
 

ui/modal/controller.go

@@ -1,10 +1,10 @@
 package modal
 
 import (
-	"github.com/algorandfoundation/hack-tui/internal"
-	"github.com/algorandfoundation/hack-tui/ui/app"
-	"github.com/algorandfoundation/hack-tui/ui/modals/generate"
-	"github.com/algorandfoundation/hack-tui/ui/style"
+	"github.com/algorandfoundation/algorun-tui/internal"
+	"github.com/algorandfoundation/algorun-tui/ui/app"
+	"github.com/algorandfoundation/algorun-tui/ui/modals/generate"
+	"github.com/algorandfoundation/algorun-tui/ui/style"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 )