From ff34e9ca7796aad535953c2345d4a272d45a106b Mon Sep 17 00:00:00 2001 From: Charlie <31941002+CharlieMc0@users.noreply.github.com> Date: Fri, 5 May 2023 12:35:40 -0600 Subject: [PATCH] Enabled support for ledger and hardware wallets (#550) * Enabled support for ledger and hardware wallets --- Dockerfile | 4 ++-- Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9a9c6dadf..f1e380dc47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ENV GOPATH /go ENV GOOS=linux ENV CGO_ENABLED=1 -RUN apk --no-cache add git make build-base jq openssh +RUN apk --no-cache add git make build-base jq openssh libusb-dev linux-headers RUN ssh-keygen -b 2048 -t rsa -f /root/.ssh/localtest.pem -q -N "" WORKDIR /go/delivery/zeta-node @@ -21,7 +21,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build \ FROM golang:1.19-alpine -RUN apk --no-cache add openssh jq tmux vim curl bash +RUN apk --no-cache add openssh jq tmux vim curl bash RUN ssh-keygen -A COPY --from=builder /root/.ssh/localtest.pem.pub /root/.ssh/authorized_keys diff --git a/Makefile b/Makefile index 1f1dce548d..eab16c68f1 100644 --- a/Makefile +++ b/Makefile @@ -19,12 +19,12 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=zetacore \ -X github.com/zeta-chain/zetacore/common.BuildTime=$(BUILDTIME) \ -X github.com/cosmos/cosmos-sdk/types.DBBackend=pebbledb -BUILD_FLAGS := -ldflags '$(ldflags)' -tags PRIVNET,pebbledb -TESTNET_BUILD_FLAGS := -ldflags '$(ldflags)' -tags TESTNET,pebbledb +BUILD_FLAGS := -ldflags '$(ldflags)' -tags PRIVNET,pebbledb,ledger +TESTNET_BUILD_FLAGS := -ldflags '$(ldflags)' -tags TESTNET,pebbledb,ledger TEST_DIR?="./..." -TEST_BUILD_FLAGS := -tags TESTNET,pebbledb -PRIV_BUILD_FLAGS := -tags PRIVNET,pebbledb +TEST_BUILD_FLAGS := -tags TESTNET,pebbledb,ledger +PRIV_BUILD_FLAGS := -tags PRIVNET,pebbledb,ledger clean: clean-binaries clean-dir