feat: integrade key control commands (#26)

fixes ovrclk/engineering#579 add ledger support Signed-off-by: Artur Troian <[email protected]>
akash-network · Oct 4, 2022 · a25856c · a25856c
1 parent 09fc4b4
commit a25856c
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 17 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -1,41 +1,85 @@
 env:
   - GO111MODULE=on
   - DOCKER_CLI_EXPERIMENTAL="enabled"
+  - CGO_ENABLED=1
 builds:
-  - id: provider-services-darwin
+  - id: provider-services-darwin-arm64
     binary: provider-services
     main: ./cmd/provider-services
     goarch:
-      - amd64
       - arm64
     goos:
       - darwin
+    env:
+      - CC=oa64-clang
+      - CXX=oa64-clang++
     flags:
       - "-mod={{ .Env.MOD }}"
       - "-tags={{ .Env.BUILD_TAGS }}"
       - -trimpath
     ldflags:
       - "{{ .Env.BUILD_VARS }}"
       - "{{ .Env.STRIP_FLAGS }}"
-  - id: provider-services-linux
+      - "-linkmode={{ .Env.LINKMODE }}"
+  - id: provider-services-darwin-amd64
     binary: provider-services
     main: ./cmd/provider-services
     goarch:
       - amd64
+    goos:
+      - darwin
+    env:
+      - CC=o64-clang
+      - CXX=o64-clang++
+    flags:
+      - "-mod={{ .Env.MOD }}"
+      - "-tags={{ .Env.BUILD_TAGS }}"
+      - -trimpath
+    ldflags:
+      - "{{ .Env.BUILD_VARS }}"
+      - "{{ .Env.STRIP_FLAGS }}"
+      - "-linkmode={{ .Env.LINKMODE }}"
+  - id: provider-services-linux-arm64
+    binary: provider-services
+    main: ./cmd/provider-services
+    goarch:
       - arm64
     goos:
       - linux
+    env:
+      - CC=aarch64-linux-gnu-gcc
+      - CXX=aarch64-linux-gnu-g++
     flags:
       - "-mod={{ .Env.MOD }}"
       - "-tags={{ .Env.BUILD_TAGS }}"
       - -trimpath
     ldflags:
       - "{{ .Env.BUILD_VARS }}"
       - "{{ .Env.STRIP_FLAGS }}"
+      - "-linkmode={{ .Env.LINKMODE }}"
+  - id: provider-services-linux-amd64
+    binary: provider-services
+    main: ./cmd/provider-services
+    goarch:
+      - amd64
+    goos:
+      - linux
+    env:
+      - CC=x86_64-linux-gnu-gcc
+      - CXX=x86_64-linux-gnu-g++
+    flags:
+      - "-mod={{ .Env.MOD }}"
+      - "-tags={{ .Env.BUILD_TAGS }}"
+      - -trimpath
+    ldflags:
+      - "{{ .Env.BUILD_VARS }}"
+      - "{{ .Env.STRIP_FLAGS }}"
+      - "-linkmode={{ .Env.LINKMODE }}"
 universal_binaries:
   - id: darwin-universal
     ids:
-      - provider-services-darwin
+      - provider-services-darwin-arm64
+      - provider-services-darwin-amd64
     replace: true
     name_template: "{{.ProjectName}}"
 archives:
@@ -51,7 +95,8 @@ archives:
   - id: provider-services
     builds:
       - darwin-universal
-      - provider-services-linux
+      - provider-services-linux-arm64
+      - provider-services-linux-amd64
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     wrap_in_directory: true
     format: zip

diff --git a/Makefile b/Makefile
@@ -3,6 +3,8 @@ KIND_APP_IP            ?= $(shell make -sC _run/kube kind-k8s-ip)
 KIND_APP_PORT          ?= $(shell make -sC _run/kube app-http-port)
 KIND_VARS              ?= KUBE_INGRESS_IP="$(KIND_APP_IP)" KUBE_INGRESS_PORT="$(KIND_APP_PORT)"
 
+LEDGER_ENABLED         ?= true
+
 include make/init.mk
 
 .DEFAULT_GOAL          := $(PROVIDER)
@@ -25,6 +27,12 @@ GO_MOD                 ?= readonly
 BUILD_TAGS             ?= osusergo,netgo,static_build
 GORELEASER_STRIP_FLAGS ?=
 
+GO_LINKMODE            ?= external
+
+ifeq ($(LEDGER_ENABLED),true)
+	BUILD_TAGS := $(BUILD_TAGS),ledger
+endif
+
 GORELEASER_BUILD_VARS := \
 -X github.com/ovrclk/provider-services/version.Name=provider-services \
 -X github.com/ovrclk/provider-services/version.AppName=provider-services \

diff --git a/cmd/provider-services/cmd/root.go b/cmd/provider-services/cmd/root.go
@@ -1,19 +1,25 @@
 package cmd
 
 import (
+	"github.com/cosmos/cosmos-sdk/client/debug"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/keys"
+	"github.com/cosmos/cosmos-sdk/client/rpc"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
+	genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli"
 	"github.com/ovrclk/akash/app"
 	"github.com/ovrclk/akash/sdkutil"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	tmcli "github.com/tendermint/tendermint/libs/cli"
+
+	acmd "github.com/ovrclk/akash/cmd/akash/cmd"
+	ecmd "github.com/ovrclk/akash/events/cmd"
 
 	"github.com/ovrclk/provider-services/operator"
 	"github.com/ovrclk/provider-services/operator/hostnameoperator"
 	"github.com/ovrclk/provider-services/operator/ipoperator"
 	"github.com/ovrclk/provider-services/version"
-
-	"github.com/cosmos/cosmos-sdk/client/flags"
-
-	acmd "github.com/ovrclk/akash/cmd/akash/cmd"
 )
 
 func NewRootCmd() *cobra.Command {
@@ -55,5 +61,17 @@ func NewRootCmd() *cobra.Command {
 	cmd.AddCommand(acmd.QueryCmd())
 	cmd.AddCommand(acmd.TxCmd())
 
+	cmd.AddCommand(rpc.StatusCommand())
+	cmd.AddCommand(ecmd.EventCmd())
+	cmd.AddCommand(keys.Commands(app.DefaultHome))
+	cmd.AddCommand(genutilcli.InitCmd(app.ModuleBasics(), app.DefaultHome))
+	cmd.AddCommand(genutilcli.CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultHome))
+	cmd.AddCommand(genutilcli.MigrateGenesisCmd())
+	cmd.AddCommand(genutilcli.GenTxCmd(app.ModuleBasics(), encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultHome))
+	cmd.AddCommand(genutilcli.ValidateGenesisCmd(app.ModuleBasics()))
+	cmd.AddCommand(acmd.AddGenesisAccountCmd(app.DefaultHome))
+	cmd.AddCommand(tmcli.NewCompletionCmd(cmd, true))
+	cmd.AddCommand(debug.Cmd())
+
 	return cmd
 }
diff --git a/go.mod b/go.mod
@@ -67,7 +67,6 @@ require (
 	github.com/cosmos/iavl v0.17.3 // indirect
 	github.com/cosmos/ibc-go/v3 v3.1.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect
-	github.com/cosmos/ledger-go v0.9.2 // indirect
 	github.com/danieljoos/wincred v1.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgraph-io/badger/v2 v2.2007.2 // indirect
@@ -181,6 +180,7 @@ require (
 	github.com/tendermint/go-amino v0.16.0 // indirect
 	github.com/tendermint/tm-db v0.6.7 // indirect
 	github.com/zondax/hid v0.9.0 // indirect
+	github.com/zondax/ledger-go v0.12.1 // indirect
 	go.etcd.io/bbolt v1.3.6 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
@@ -224,9 +224,12 @@ require (
 
 replace (
 	github.com/cosmos/cosmos-sdk => github.com/ovrclk/cosmos-sdk v0.45.4-akash.1
+	github.com/cosmos/ledger-cosmos-go => github.com/ovrclk/ledger-cosmos-go v0.13.2
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/keybase/go-keychain => github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4
 	github.com/tendermint/tendermint => github.com/ovrclk/tendermint v0.34.19-patches
+	github.com/zondax/hid => github.com/troian/hid v0.9.9
+	github.com/zondax/ledger-go => github.com/ovrclk/ledger-go v0.13.4
 	google.golang.org/grpc => google.golang.org/grpc v1.33.2
 )
 

diff --git a/go.sum b/go.sum
@@ -366,10 +366,6 @@ github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y=
 github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w=
 github.com/cosmos/ibc-go/v3 v3.1.0 h1:aVPqkrGBluz6t9+d/sLZIG/zQ9O1KJzVeR4UlL/IFTQ=
 github.com/cosmos/ibc-go/v3 v3.1.0/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBdAfL9tT40=
-github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
-github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
-github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
-github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
@@ -1324,6 +1320,10 @@ github.com/ovrclk/akash v0.17.2-rc0 h1:FPCdi3iZh7sVdZhUyTFhwfTb8Aldm6N83tyjXePRs
 github.com/ovrclk/akash v0.17.2-rc0/go.mod h1:9hOlCaRZwYa7ttzQw/7fXly89eKHAJ5gq9M6ruf6AwM=
 github.com/ovrclk/cosmos-sdk v0.45.4-akash.1 h1:ZuBoK0jELPPUtrFZhQWzBRi9LY8oBYTJRuTHt6irLRo=
 github.com/ovrclk/cosmos-sdk v0.45.4-akash.1/go.mod h1:WOqtDxN3eCCmnYLVla10xG7lEXkFjpTaqm2a2WasgCc=
+github.com/ovrclk/ledger-cosmos-go v0.13.2 h1:MwjDy5tw1olqUHaVIGrPexvdkAl/5wMQubnfjgvT8M4=
+github.com/ovrclk/ledger-cosmos-go v0.13.2/go.mod h1:yFLa7PuoNE5B4kcZhurZbVXMae2jJeaijmh91+RiSto=
+github.com/ovrclk/ledger-go v0.13.4 h1:etwWczrjFota24DRSFctc0kA3MkabLfsExWxdXqvWuk=
+github.com/ovrclk/ledger-go v0.13.4/go.mod h1:ePOnJDViaVfCnOfW5A4SjvgyqWupEEdsbvUEAqwliwA=
 github.com/ovrclk/tendermint v0.34.19-patches h1:4BppAEGV1P+pU3R8pzbriswK03enldY9UqkeWj3NGBg=
 github.com/ovrclk/tendermint v0.34.19-patches/go.mod h1:R5+wgIwSxMdKQcmOaeudL0Cjkr3HDkhpcdum6VeU3R4=
 github.com/oxtoacart/bpool v0.0.0-20150712133111-4e1c5567d7c2/go.mod h1:L3UMQOThbttwfYRNFOWLLVXMhk5Lkio4GGOtw5UrxS0=
@@ -1595,6 +1595,8 @@ github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev
 github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/troian/hid v0.9.9 h1:5cSdziibXdFwmcP80t00SbHW+YDCFGTqNHqzH1qt6TI=
+github.com/troian/hid v0.9.9/go.mod h1:n6adloQ1876oEXZr6fFsthy4FDHxwJhh7QYQspm30Ds=
 github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c h1:u6SKchux2yDvFQnDHS3lPnIRmfVJ5Sxy3ao2SIdysLQ=
@@ -1630,8 +1632,6 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8=
-github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=

diff --git a/make/releasing.mk b/make/releasing.mk
@@ -1,6 +1,6 @@
 GORELEASER_RELEASE       ?= false
 GORELEASER_DEBUG         ?= false
-GORELEASER_IMAGE         := ghcr.io/goreleaser/goreleaser:$(GORELEASER_VERSION)
+GORELEASER_IMAGE         := ghcr.io/goreleaser/goreleaser-cross:v$(GOLANG_VERSION)
 
 ifeq ($(GORELEASER_RELEASE),true)
 	GORELEASER_SKIP_VALIDATE := false
@@ -47,6 +47,7 @@ docker-image: modvendor
 		-e BUILD_TAGS="$(BUILD_TAGS)" \
 		-e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \
 		-e STRIP_FLAGS="$(GORELEASER_STRIP_FLAGS)" \
+		-e LINKMODE="$(GO_LINKMODE)" \
 		-v /var/run/docker.sock:/var/run/docker.sock $(AKASH_BIND_LOCAL) \
 		-v $(shell pwd):/go/src/$(GO_MOD_NAME) \
 		-w /go/src/$(GO_MOD_NAME) \