update broken ws endpoint

Bump github.com/fatih/color from 1.13.0 to 1.14.1

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13.x
+          go-version: 1.17.x
       -
         name: Docker login
         run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}

.goreleaser.yml

@@ -16,13 +16,6 @@ builds:
     - arm
     - arm64
 
-dockers:
--
-  dockerfile: Dockerfile.goreleaser
-  image_templates:
-    - "gchaincl/mempool:latest"
-    - "gchaincl/mempool:{{ .Tag }}"
-
 archives:
 - replacements:
     linux: Linux

Dockerfile

@@ -0,0 +1,10 @@
+FROM golang:1.17-alpine@sha256:b35984144ec2c2dfd6200e112a9b8ecec4a8fd9eff0babaff330f1f82f14cb2a
+RUN apk --no-cache add ca-certificates
+WORKDIR /src
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o mempool-cli .
+
+FROM scratch
+COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=0 /src/mempool-cli /
+ENTRYPOINT ["/mempool-cli"]

Dockerfile.goreleaser

@@ -1,7 +0,0 @@
-FROM alpine as certs
-RUN apk --no-cache add ca-certificates
-
-FROM scratch
-COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
-COPY mempool /
-ENTRYPOINT ["/mempool"]

README.md

@@ -1,4 +1,5 @@
-# mempool ![release](https://github.com/gchaincl/mempool/workflows/release/badge.svg)
+# mempool-cli
+
 [mempool.space](https://mempool.space/) for the terminal
 ![mempool screenshot](https://github.com/gchaincl/mempool/raw/master/share/screenshot.png)
 
@@ -11,12 +12,12 @@ Get a pre-built [release](https://github.com/gchaincl/mempool/releases/latest)
 
 ### development version
 ```bash
-go get -u github.com/gchaincl/mempool
+go get -u github.com/mempool/mempool-cli
 ```
 
 ### Docker
 ```bash
-docker run -it gchaincl/mempool
+docker run -it mempool/mempool-cli
 ```
 
 # Usage

client/client.go

@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	API_URL = "https://mempool.space/api/v1/"
+	API_URL = "https://mempool.space/api/v1/ws"
 )
 
 type MempoolInfo struct {
@@ -25,7 +25,7 @@ type Block struct {
 	Size      int       `json:"size"`
 	Time      int       `json:"timestamp"`
 	Weight    int       `json:"weight"`
-	FeeRange  []float64 `json:"fee_range"`
+	FeeRange  []float64 `json:"feeRange"`
 	MedianFee float64   `json:"medianFee"`
 }
 
@@ -74,7 +74,7 @@ type Client struct {
 
 func New() (*Client, error) {
 	dialer := websocket.Dialer{}
-	conn, _, err := dialer.Dial("wss://mempool.space/ws", nil)
+	conn, _, err := dialer.Dial("wss://mempool.space/api/v1/ws", nil)
 	if err != nil {
 		return nil, err
 	}

go.mod

@@ -1,11 +1,18 @@
-module github.com/gchaincl/mempool
+module github.com/mempool/mempool-cli
 
-go 1.13
+go 1.17
 
 require (
-	github.com/fatih/color v1.9.0
-	github.com/gorilla/websocket v1.4.1
-	github.com/jroimartin/gocui v0.4.0
-	github.com/mattn/go-runewidth v0.0.8 // indirect
-	github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be // indirect
+	github.com/fatih/color v1.14.1
+	github.com/gorilla/websocket v1.5.0
+	github.com/jroimartin/gocui v0.5.0
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+)
+
+require (
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/nsf/termbox-go v1.1.1 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 )

go.sum

@@ -1,17 +1,21 @@
-github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
-github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0=
-github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be h1:yzmWtPyxEUIKdZg4RcPq64MfS8NA6A5fNOJgYhpR9EQ=
-github.com/nsf/termbox-go v0.0.0-20200204031403-4d2b513ad8be/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
+github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/jroimartin/gocui v0.5.0 h1:DCZc97zY9dMnHXJSJLLmx9VqiEnAj0yh0eTNpuEtG/4=
+github.com/jroimartin/gocui v0.5.0/go.mod h1:l7Hz8DoYoL6NoYnlnaX6XCNR62G7J5FfSW5jEogzaxE=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
+github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

main.go

@@ -3,7 +3,7 @@ package main
 import (
 	"log"
 
-	"github.com/gchaincl/mempool/ui"
+	"github.com/mempool/mempool-cli/ui"
 )
 
 func main() {

ui/blocks.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/fatih/color"
-	"github.com/gchaincl/mempool/client"
+	"github.com/mempool/mempool-cli/client"
 )
 
 type Box struct {

ui/fee_distribution.go

@@ -7,8 +7,9 @@ import (
 	"sync"
 
 	"github.com/fatih/color"
-	"github.com/gchaincl/mempool/client"
 	"github.com/jroimartin/gocui"
+
+	"github.com/mempool/mempool-cli/client"
 )
 
 type FeeDistribution struct {

ui/ui.go

@@ -7,12 +7,14 @@ import (
 	"strings"
 
 	"github.com/fatih/color"
-	"github.com/gchaincl/mempool/client"
 	"github.com/jroimartin/gocui"
+
+	"github.com/mempool/mempool-cli/client"
 )
 
 const (
-	BLOCK_WIDTH = 22
+	BLOCK_WIDTH  = 22
+	NEXT_HALVING = 630_000
 )
 
 type state struct {
@@ -143,7 +145,7 @@ func (ui *UI) Layout(g *gocui.Gui) error {
 
 	track := ui.state.tracking
 
-	// draw projected blocks (mempool)
+	// draw mempool blocks
 	for i, _ := range ui.state.mempool {
 		name := fmt.Sprintf("mempool-block-%d", i)
 		var x0, x1, y0, y1 int
@@ -177,7 +179,7 @@ func (ui *UI) Layout(g *gocui.Gui) error {
 		}
 
 		v.Clear()
-		if _, err := v.Write(ui.printProjectedBlock(i, x1-x0, y1-y0)); err != nil {
+		if _, err := v.Write(ui.printMempoolBlock(i, x1-x0, y1-y0)); err != nil {
 			return err
 		}
 	}
@@ -230,6 +232,11 @@ func (ui *UI) Layout(g *gocui.Gui) error {
 		return err
 	}
 
+	// halving
+	if err := ui.halvingBanner(); err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -245,7 +252,7 @@ func (ui *UI) loading(g *gocui.Gui, x, y int) error {
 	return nil
 }
 
-func (ui *UI) printProjectedBlock(n int, x, y int) []byte {
+func (ui *UI) printMempoolBlock(n int, x, y int) []byte {
 	b := ui.state.mempool[n]
 	return MempoolBlock(b).Print(n, x, y)
 }
@@ -325,10 +332,32 @@ func (ui *UI) info(g *gocui.Gui, x, y int) error {
 	return nil
 }
 
+func (ui *UI) halvingBanner() error {
+	blocks := ui.state.blocks
+	if len(blocks) == 0 {
+		return nil
+	}
+	height := blocks[0].Height
+	if height >= NEXT_HALVING {
+		return nil
+	}
+
+	in := NEXT_HALVING - height
+	msg := fmt.Sprintf("Quantitative Hardening in %d blocks", in)
+	v, err := ui.gui.SetView("halving", 1, 1, len(msg)+2, 3)
+	if err != nil {
+		if err != gocui.ErrUnknownView {
+			return err
+		}
+	}
+	_, err = fmt.Fprintf(v, msg)
+	return err
+}
+
 func (ui *UI) onBlockClick(g *gocui.Gui, v *gocui.View) error {
 	name := v.Name()
-	if strings.HasPrefix(name, "projected-block-") {
-		id := strings.TrimPrefix(name, "projected-block-")
+	if strings.HasPrefix(name, "mempool-block-") {
+		id := strings.TrimPrefix(name, "mempool-block-")
 		n, _ := strconv.Atoi(id)
 		return ui.fd.FetchProjection(n)
 	}