Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor/broadcaster-cli keyset utxos command #565

Merged
merged 2 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions cmd/broadcaster-cli/app/keyset/utxos/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ package utxos
import (
"context"
"errors"
"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
"log/slog"
"sort"
"strconv"
"time"

"github.com/enescakir/emoji"
"github.com/jedib0t/go-pretty/v6/table"

"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
"github.com/bitcoin-sv/arc/internal/broadcaster"
"github.com/bitcoin-sv/arc/pkg/keyset"
"github.com/jedib0t/go-pretty/v6/table"
)

func getUtxosTable(ctx context.Context, logger *slog.Logger, keySets map[string]*keyset.KeySet, isTestnet bool, wocClient broadcaster.UtxoClient, maxRows int) table.Writer {
t := table.NewWriter()
func getUtxosTable(ctx context.Context, logger *slog.Logger, t table.Writer, keySets map[string]*keyset.KeySet, isTestnet bool, wocClient broadcaster.UtxoClient, maxRows int) table.Writer {
keyTotalOutputs := make([]int, len(keySets))
keyHeaderRow := make([]interface{}, 0)
headerRow := make([]interface{}, 0)
Expand Down Expand Up @@ -63,12 +64,22 @@ func getUtxosTable(ctx context.Context, logger *slog.Logger, keySets map[string]

totalOutputs := 0
for _, satoshi := range satoshiSlice {
satString := strconv.FormatUint(satoshi, 10)

if satoshi == 1 {
satString = satString + " " + emoji.CrossMark.String()
}

columns[counter] = append(columns[counter], row{
satoshis: strconv.FormatUint(satoshi, 10),
satoshis: satString,
outputs: strconv.Itoa(outputsMap[satoshi]),
})

// Do not count 1-sat outputs, as they can't be used as utxos for transactions
if satoshi == 1 {
continue
}

totalOutputs += outputsMap[satoshi]
}

Expand Down
33 changes: 29 additions & 4 deletions cmd/broadcaster-cli/app/keyset/utxos/utxos.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@ import (
"os"
"os/signal"

"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
"github.com/bitcoin-sv/arc/internal/woc_client"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/spf13/cobra"
"github.com/spf13/viper"

"github.com/bitcoin-sv/arc/cmd/broadcaster-cli/helper"
"github.com/bitcoin-sv/arc/internal/woc_client"
"github.com/bitcoin-sv/arc/pkg/keyset"
)

var Cmd = &cobra.Command{
Expand Down Expand Up @@ -46,8 +49,30 @@ var Cmd = &cobra.Command{
cancel()
}()

t := getUtxosTable(ctx, logger, keySets, isTestnet, wocClient, maxRows)
fmt.Println(t.Render())
names := helper.GetOrderedKeys(keySets)
counter := 0
var t table.Writer
ksRow := map[string]*keyset.KeySet{}
for _, name := range names {
ksRow[name] = keySets[name]
if counter >= 9 {
t = table.NewWriter()
t := getUtxosTable(ctx, logger, t, ksRow, isTestnet, wocClient, maxRows)
t.SetStyle(table.StyleColoredBright)
fmt.Println(t.Render())
fmt.Println()
ksRow = map[string]*keyset.KeySet{}
counter = 0
continue
}
counter++
}
if len(ksRow) > 0 {
t = table.NewWriter()
t := getUtxosTable(ctx, logger, t, ksRow, isTestnet, wocClient, maxRows)
t.SetStyle(table.StyleColoredBright)
fmt.Println(t.Render())
}

return nil
},
Expand Down
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ require (
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/enescakir/emoji v1.0.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.6.1 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/enescakir/emoji v1.0.0 h1:W+HsNql8swfCQFtioDGDHCHri8nudlK1n5p2rHCJoog=
github.com/enescakir/emoji v1.0.0/go.mod h1:Bt1EKuLnKDTYpLALApstIkAjdDrS/8IAgTkKp+WKFD0=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
Expand Down
Loading