From 2ac0da49b20f7302627d2d8ac238fc55f6c0c5b3 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 16:30:07 +0100 Subject: [PATCH 01/15] feat: update price-feeder dep to v2.0.2 and remove FTX --- .goreleaser.yml | 13 ++++--------- CHANGELOG.md | 3 ++- Makefile | 7 +++++-- cmd/peggo/orchestrator.go | 5 ++--- go.mod | 2 +- go.sum | 4 ++-- orchestrator/oracle/currency.go | 2 +- orchestrator/oracle/oracle.go | 8 ++++---- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 4137f037..9bc3f966 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -2,11 +2,11 @@ project_name: peggo env: - - GO111MODULE=on + - CGO_ENABLED=1 before: hooks: - - go mod tidy -compat=1.18 + - go mod download builds: - main: ./ @@ -15,17 +15,12 @@ builds: mod_timestamp: "{{ .CommitTimestamp }}" flags: - -trimpath - env: - - CGO_ENABLED=0 ldflags: - -s -w -X main.commit={{.Commit}} -X main.date={{ .CommitDate }} -X github.com/umee-network/peggo/cmd/peggo.Version={{ .Version }} -X github.com/umee-network/peggo/cmd/peggo.Commit=$(COMMIT)={{ .Commit }} goos: - - darwin - linux goarch: - amd64 - - arm - - arm64 archives: - format: tar.gz @@ -35,8 +30,8 @@ archives: format: zip name_template: "{{ .Binary }}-v{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}" files: - - LICENSE - README.md + - LICENSE release: github: @@ -52,4 +47,4 @@ snapshot: name_template: SNAPSHOT-{{ .Commit }} changelog: - skip: true + skip: false diff --git a/CHANGELOG.md b/CHANGELOG.md index 55e77630..55288346 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements +- - [#328f55c](https://github.com/umee-network/peggo/commit/328f55c5944101527df13d43e791c47155ddd8d7) Cosmos SDK to v0.46.7. - [#399](https://github.com/umee-network/peggo/pull/399) Update price-feeder to v101 and umee to v3.1.0. ## [v1.3.0](https://github.com/umee-network/peggo/releases/tag/v1.3.0) - 2022-10-26 @@ -180,7 +181,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Bug Fixes - [#134] Fix logs, CLI help and a panic when a non-function call transaction was - received during the TX pending check. + received during the TX pending check. ## [v0.2.0](https://github.com/umee-network/peggo/releases/tag/v0.2.0) - 2022-01-17 diff --git a/Makefile b/Makefile index 19e24091..8c1e4d38 100644 --- a/Makefile +++ b/Makefile @@ -21,12 +21,15 @@ endif ldflags = -X github.com/umee-network/peggo/cmd/peggo.Version=$(VERSION) \ -X github.com/umee-network/peggo/cmd/peggo.Commit=$(COMMIT) \ -X github.com/umee-network/peggo/cmd/peggo.SDKVersion=$(SDK_VERSION) +ldflags += $(LDFLAGS) +ldflags := $(strip $(ldflags)) -BUILD_FLAGS := -ldflags '$(ldflags)' +build_tags += $(BUILD_TAGS) +BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)' build: go.sum @echo "--> Building..." - CGO_ENABLED=0 go build -mod=readonly -o $(BUILD_DIR)/ $(BUILD_FLAGS) ./... + go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/ ./... install: go.sum @echo "--> Installing..." diff --git a/cmd/peggo/orchestrator.go b/cmd/peggo/orchestrator.go index 15b74ce7..800d3f5f 100644 --- a/cmd/peggo/orchestrator.go +++ b/cmd/peggo/orchestrator.go @@ -21,7 +21,7 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/grpc" - umeepfprovider "github.com/umee-network/umee/price-feeder/oracle/provider" + umeepfprovider "github.com/umee-network/umee/price-feeder/v2/oracle/provider" "github.com/umee-network/peggo/cmd/peggo/client" "github.com/umee-network/peggo/orchestrator" @@ -295,7 +295,6 @@ func getOrchestratorCmd() *cobra.Command { umeepfprovider.ProviderHuobi.String(), umeepfprovider.ProviderOkx.String(), umeepfprovider.ProviderCoinbase.String(), - umeepfprovider.ProviderBinance.String(), umeepfprovider.ProviderBitget.String(), umeepfprovider.ProviderMexc.String(), umeepfprovider.ProviderCrypto.String(), @@ -304,8 +303,8 @@ func getOrchestratorCmd() *cobra.Command { allProviders := append([]string{ umeepfprovider.ProviderKraken.String(), umeepfprovider.ProviderGate.String(), - umeepfprovider.ProviderFTX.String(), umeepfprovider.ProviderMock.String(), + umeepfprovider.ProviderBinance.String(), }, defaultProviders...) cmd.Flags().StringSlice(flagOracleProviders, defaultProviders, diff --git a/go.mod b/go.mod index 09482794..5a6f00a5 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/spf13/viper v1.14.0 github.com/stretchr/testify v1.8.1 github.com/tendermint/tendermint v0.34.24 - github.com/umee-network/umee/price-feeder v1.0.1-0.20221027015322-96357449c737 + github.com/umee-network/umee/price-feeder/v2 v2.0.2 github.com/umee-network/umee/v3 v3.3.0-rc1 golang.org/x/sync v0.1.0 golang.org/x/term v0.2.0 diff --git a/go.sum b/go.sum index a65b5eff..d9260498 100644 --- a/go.sum +++ b/go.sum @@ -1413,8 +1413,8 @@ github.com/umee-network/bech32-ibc v0.3.2 h1:T2QgfMVktA9iAYLYmhmcukJr5qoaEJgRLDo github.com/umee-network/bech32-ibc v0.3.2/go.mod h1:kbT1K+mxxzDkvmcsHtBXgM2meNv6AXroxPdSeWAcZE0= github.com/umee-network/cosmos-sdk v0.46.7-umee h1:6/JO17fjm1kxiFVjfblbNIRbilZcHV2WsC87iD63+kI= github.com/umee-network/cosmos-sdk v0.46.7-umee/go.mod h1:fqKqz39U5IlEFb4nbQ72951myztsDzFKKDtffYJ63nk= -github.com/umee-network/umee/price-feeder v1.0.1-0.20221027015322-96357449c737 h1:8NZaHAl6/Xoss6qfsUvxc6o9JZdPQzUS6ku87UvhJeQ= -github.com/umee-network/umee/price-feeder v1.0.1-0.20221027015322-96357449c737/go.mod h1:qtGLqvFnz9I9gJBpI3918hEIZZbeqJ3r2yJW/1fK8mM= +github.com/umee-network/umee/price-feeder/v2 v2.0.2 h1:pSCH5NAQVnTy1T+DBX2zXr9TtG8mP7VDHoygAvqMNK4= +github.com/umee-network/umee/price-feeder/v2 v2.0.2/go.mod h1:cpN8tgH0aby8FaEAVH5UgFjhKtgLBogHFTH8oXgIjkQ= github.com/umee-network/umee/v3 v3.3.0-rc1 h1:Wm1x42b3N0iY8THCNOyrA78CvImnW8CW7hyfLbcipvg= github.com/umee-network/umee/v3 v3.3.0-rc1/go.mod h1:AMWNhC28k/OPvTLf8IWTCS0eSJJ4A72AWFwt8UB2eaQ= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= diff --git a/orchestrator/oracle/currency.go b/orchestrator/oracle/currency.go index 26c326ce..4a3f7cc8 100644 --- a/orchestrator/oracle/currency.go +++ b/orchestrator/oracle/currency.go @@ -3,7 +3,7 @@ package oracle import ( "strings" - umeepftypes "github.com/umee-network/umee/price-feeder/oracle/types" + umeepftypes "github.com/umee-network/umee/price-feeder/v2/oracle/types" ) const ( diff --git a/orchestrator/oracle/oracle.go b/orchestrator/oracle/oracle.go index dc2af344..7423f683 100644 --- a/orchestrator/oracle/oracle.go +++ b/orchestrator/oracle/oracle.go @@ -11,10 +11,10 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - pforacle "github.com/umee-network/umee/price-feeder/oracle" - pfprovider "github.com/umee-network/umee/price-feeder/oracle/provider" - pftypes "github.com/umee-network/umee/price-feeder/oracle/types" - pfsync "github.com/umee-network/umee/price-feeder/pkg/sync" + pforacle "github.com/umee-network/umee/price-feeder/v2/oracle" + pfprovider "github.com/umee-network/umee/price-feeder/v2/oracle/provider" + pftypes "github.com/umee-network/umee/price-feeder/v2/oracle/types" + pfsync "github.com/umee-network/umee/price-feeder/v2/pkg/sync" umeeparams "github.com/umee-network/umee/v3/app/params" ) From 08c3cbee9da39505bc0541f9526ff94813901f01 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 16:33:35 +0100 Subject: [PATCH 02/15] changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55288346..da814489 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,7 +45,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements -- - [#328f55c](https://github.com/umee-network/peggo/commit/328f55c5944101527df13d43e791c47155ddd8d7) Cosmos SDK to v0.46.7. +- [#412](https://github.com/umee-network/peggo/pull/412) Update price-feeder to v2.0.1 and removed FTX and Binance from default providers. +- [#328f55c](https://github.com/umee-network/peggo/commit/328f55c5944101527df13d43e791c47155ddd8d7) Cosmos SDK to v0.46.7. - [#399](https://github.com/umee-network/peggo/pull/399) Update price-feeder to v101 and umee to v3.1.0. ## [v1.3.0](https://github.com/umee-network/peggo/releases/tag/v1.3.0) - 2022-10-26 From c4d407006242f4163fbe1764f0864af9a8e3ee03 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 16:52:19 +0100 Subject: [PATCH 03/15] update go to 1.19 --- .github/workflows/build.yml | 2 +- .github/workflows/debug.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 6 +++--- CHANGELOG.md | 1 + Dockerfile | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b7a258a..399a223a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 env: GOOS: ${{ matrix.targetos }} GOARCH: ${{ matrix.arch }} diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index ba6d100b..29e6cbf6 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - uses: actions/checkout@v3 - name: Setup tmate session uses: mxschmitt/action-tmate@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80ab9ea6..de7d98e6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Build uses: goreleaser/goreleaser-action@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 32d7a592..aa52fe9d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - name: Display Go Version run: go version - name: Install tparse @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.18 + go-version: 1.19 - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 with: @@ -68,7 +68,7 @@ jobs: - uses: actions/setup-go@v3 if: env.GIT_DIFF with: - go-version: 1.18 + go-version: 1.19 cache: true # In this step, this action saves a list of existing images, diff --git a/CHANGELOG.md b/CHANGELOG.md index da814489..be57ea52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Improvements - [#412](https://github.com/umee-network/peggo/pull/412) Update price-feeder to v2.0.1 and removed FTX and Binance from default providers. + - update go to 1.19 - [#328f55c](https://github.com/umee-network/peggo/commit/328f55c5944101527df13d43e791c47155ddd8d7) Cosmos SDK to v0.46.7. - [#399](https://github.com/umee-network/peggo/pull/399) Update price-feeder to v101 and umee to v3.1.0. diff --git a/Dockerfile b/Dockerfile index 8ea0ab03..16783c0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG IMG_TAG=latest # Fetch base packages -FROM golang:1.18-alpine AS base-builder +FROM golang:1.19-alpine AS base-builder ENV PACKAGES make git libc-dev gcc linux-headers RUN apk add --no-cache $PACKAGES From 27483910d1b7dd00dd483764ea5104e0ec662714 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 16:54:49 +0100 Subject: [PATCH 04/15] fix make install --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8c1e4d38..ac12826c 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ build: go.sum install: go.sum @echo "--> Installing..." - CGO_ENABLED=0 go install -mod=readonly $(BUILD_FLAGS) ./... + go install -mod=readonly $(BUILD_FLAGS) ./... .PHONY: build install From b968af8ae868a568eed34b7cd224056ab1a9d34b Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 16:57:20 +0100 Subject: [PATCH 05/15] fix dockerfile --- Dockerfile | 9 +++++---- contrib/images/Dockerfile | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 16783c0e..96c4d9bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,5 @@ +## image for docker Peggo release + ARG IMG_TAG=latest # Fetch base packages @@ -8,20 +10,19 @@ RUN apk add --no-cache $PACKAGES # Compile the peggo binary FROM base-builder AS peggo-builder WORKDIR /src/app/ -COPY go.mod go.sum* ./ -RUN go mod download COPY . . +RUN go mod download RUN apk add --no-cache $PACKAGES RUN make install # Fetch umeed binary FROM base-builder AS umeed-builder -ARG UMEE_VERSION=v3.0.0-beta1 +ARG UMEE_VERSION=v3.3.0-rc1 ENV PACKAGES curl eudev-dev RUN apk add --no-cache $PACKAGES WORKDIR /downloads/ RUN git clone https://github.com/umee-network/umee.git -RUN cd umee && git checkout ${UMEE_VERSION} && CGO_ENABLED=0 make build && cp ./build/umeed /usr/local/bin/ +RUN cd umee && git checkout ${UMEE_VERSION} && make build && cp ./build/umeed /usr/local/bin/ # Add to a distroless container FROM gcr.io/distroless/cc:$IMG_TAG diff --git a/contrib/images/Dockerfile b/contrib/images/Dockerfile index c48694ee..16444422 100644 --- a/contrib/images/Dockerfile +++ b/contrib/images/Dockerfile @@ -1,3 +1,5 @@ +## image for e2e tests + # Fetch base packages FROM golang:1.19-alpine AS builder ENV PACKAGES make git libc-dev gcc linux-headers From 680fdd741420f9b276ae8334b097d50d23810dbb Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 17:11:05 +0100 Subject: [PATCH 06/15] Fix e2e Dockerfile --- Dockerfile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 96c4d9bb..32f22616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,29 +4,23 @@ ARG IMG_TAG=latest # Fetch base packages FROM golang:1.19-alpine AS base-builder -ENV PACKAGES make git libc-dev gcc linux-headers -RUN apk add --no-cache $PACKAGES +RUN apk add --no-cache make git libc-dev gcc linux-headers # Compile the peggo binary -FROM base-builder AS peggo-builder -WORKDIR /src/app/ +WORKDIR /src/peggo/ COPY . . RUN go mod download -RUN apk add --no-cache $PACKAGES RUN make install -# Fetch umeed binary -FROM base-builder AS umeed-builder +# Build umeed +WORKDIR /src/umee ARG UMEE_VERSION=v3.3.0-rc1 -ENV PACKAGES curl eudev-dev -RUN apk add --no-cache $PACKAGES -WORKDIR /downloads/ RUN git clone https://github.com/umee-network/umee.git RUN cd umee && git checkout ${UMEE_VERSION} && make build && cp ./build/umeed /usr/local/bin/ # Add to a distroless container FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG -COPY --from=peggo-builder /go/bin/peggo /usr/local/bin/ -COPY --from=umeed-builder /usr/local/bin/umeed /usr/local/bin/ +COPY --from=base-builder /go/bin/peggo /usr/local/bin/ +COPY --from=base-builder /usr/local/bin/umeed /usr/local/bin/ EXPOSE 26656 26657 1317 9090 From 1d09150126f7cdeb2f62884a1a50499b734c0534 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 17:20:07 +0100 Subject: [PATCH 07/15] fix dockerfile --- Dockerfile | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 32f22616..e9d6dc1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,7 @@ ARG IMG_TAG=latest # Fetch base packages -FROM golang:1.19-alpine AS base-builder -RUN apk add --no-cache make git libc-dev gcc linux-headers +FROM golang:1.19-bullseye AS builder # Compile the peggo binary WORKDIR /src/peggo/ @@ -14,13 +13,13 @@ RUN make install # Build umeed WORKDIR /src/umee -ARG UMEE_VERSION=v3.3.0-rc1 -RUN git clone https://github.com/umee-network/umee.git -RUN cd umee && git checkout ${UMEE_VERSION} && make build && cp ./build/umeed /usr/local/bin/ +RUN wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 && \ + chmod +x umeed* && \ + cp umeed* /usr/local/bin/umeed # Add to a distroless container FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG -COPY --from=base-builder /go/bin/peggo /usr/local/bin/ -COPY --from=base-builder /usr/local/bin/umeed /usr/local/bin/ +COPY --from=builder /go/bin/peggo /usr/local/bin/ +COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ EXPOSE 26656 26657 1317 9090 From ebcc0626a662ac54f0ca663633e6852b4cf68082 Mon Sep 17 00:00:00 2001 From: Robert Zaremba Date: Thu, 15 Dec 2022 18:26:58 +0100 Subject: [PATCH 08/15] use umeed v3.0.3 and change timeout to 20min --- .github/workflows/tests.yml | 2 +- Dockerfile | 5 ++++- Makefile | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index aa52fe9d..82408572 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,7 +56,7 @@ jobs: test-e2e: runs-on: ubuntu-latest - timeout-minutes: 30 + timeout-minutes: 20 steps: - uses: actions/checkout@v3 - uses: technote-space/get-diff-action@v6.1.1 diff --git a/Dockerfile b/Dockerfile index e9d6dc1b..962361d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,10 @@ RUN make install # Build umeed WORKDIR /src/umee -RUN wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 && \ +# wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 +RUN https://github.com/umee-network/umee/releases/download/v3.0.3/umeed-v3.0.3-darwin-amd64.tar.gz && \ + tar -xvf umeed-v3.0.3-darwin-amd64.tar.gz && \ + cd umeed-v3.0.3-darwin-amd64 && \ chmod +x umeed* && \ cp umeed* /usr/local/bin/umeed diff --git a/Makefile b/Makefile index ac12826c..7fc5c910 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ test-unit: ARGS=-timeout=5m -tags='norace' test-unit: TEST_PACKAGES=$(PACKAGES_UNIT) test-unit-cover: ARGS=-timeout=5m -tags='norace' -coverprofile=coverage.txt -covermode=atomic test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT) -test-e2e: ARGS=-timeout=25m -v +test-e2e: ARGS=-timeout=20m -v test-e2e: TEST_PACKAGES=$(PACKAGES_E2E) $(TEST_TARGETS): run-tests From 75762858d7b71b7dbbdfaf5c2b3e51ac24e342d1 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 17:15:30 -0300 Subject: [PATCH 09/15] try to fix --- Dockerfile | 11 +++++------ Makefile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 962361d8..0e2d0242 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,16 +13,15 @@ RUN make install # Build umeed WORKDIR /src/umee -# wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 -RUN https://github.com/umee-network/umee/releases/download/v3.0.3/umeed-v3.0.3-darwin-amd64.tar.gz && \ - tar -xvf umeed-v3.0.3-darwin-amd64.tar.gz && \ - cd umeed-v3.0.3-darwin-amd64 && \ - chmod +x umeed* && \ - cp umeed* /usr/local/bin/umeed +# RUN wget https://github.com/umee-network/umee/releases/download/v3.0.3/umeed-v3.0.3-linux-amd64.tar.gz && \ +RUN wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 && \ + chmod +x umeed-v3.3.0-rc1-linux-amd64* && \ + cp umeed-v3.3.0-rc1-linux-amd64* /usr/local/bin/umeed # Add to a distroless container FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.$(uname -m).so -O /lib/libwasmvm.$(uname -m).so EXPOSE 26656 26657 1317 9090 diff --git a/Makefile b/Makefile index 7fc5c910..5fc7bb60 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ solidity-wrappers: $(SOLIDITY_DIR)/contracts/*.sol ############################################################################### docker-build: - @docker build -t umeenet/peggo . + @docker build -t umeenet/peggo --platform=linux/amd64 . docker-build-debug: @docker build -t umeenet/peggo --build-arg IMG_TAG=debug . From 96b15ffbc592b86bbde3ed499358cc954a2dd6ae Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 18:50:05 -0300 Subject: [PATCH 10/15] try to fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e2d0242..f898eb1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,5 @@ FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.$(uname -m).so -O /lib/libwasmvm.$(uname -m).so +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -O /usr/local/lib/libwasmvm.x86_64.so EXPOSE 26656 26657 1317 9090 From 3faeccfa502cb411b38074946f7458d6ca1893f4 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 18:59:00 -0300 Subject: [PATCH 11/15] try to fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f898eb1b..ad7b07c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,5 @@ FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -O /usr/local/lib/libwasmvm.x86_64.so +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -O /usr/local/lib/ EXPOSE 26656 26657 1317 9090 From 9a25344e224edf636ab561727eebbc3dc8a4ea71 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 19:03:11 -0300 Subject: [PATCH 12/15] try to fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ad7b07c5..ae1b23f1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,5 @@ FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -O /usr/local/lib/ +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -P /usr/local/lib/ EXPOSE 26656 26657 1317 9090 From 4ee49864c21e514a8107386044c6f4484a14858b Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 19:08:03 -0300 Subject: [PATCH 13/15] try to fix --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ae1b23f1..494cb74f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,5 +23,6 @@ FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -P /usr/local/lib/ +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so +RUN cp libwasmvm.x86_64.so /usr/local/lib/ EXPOSE 26656 26657 1317 9090 From 73c68fa2c971bea403a9e1a434d2ee96ff1f9855 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 19:12:03 -0300 Subject: [PATCH 14/15] try to fix --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 494cb74f..6979f472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,12 +17,12 @@ WORKDIR /src/umee RUN wget https://github.com/umee-network/umee/releases/download/v3.3.0-rc1/umeed-v3.3.0-rc1-linux-amd64 && \ chmod +x umeed-v3.3.0-rc1-linux-amd64* && \ cp umeed-v3.3.0-rc1-linux-amd64* /usr/local/bin/umeed +RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so # Add to a distroless container FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -RUN wget https://raw.githubusercontent.com/CosmWasm/wasmvm/v1.1.1/internal/api/libwasmvm.x86_64.so -RUN cp libwasmvm.x86_64.so /usr/local/lib/ +COPY --from=builder /src/umee/libwasmvm.x86_64.so /usr/local/lib/ EXPOSE 26656 26657 1317 9090 From ac3a0cd5f074c0e223163df910326f240ac4b1ef Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 15 Dec 2022 19:29:08 -0300 Subject: [PATCH 15/15] try to fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6979f472..af6bb8db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,5 +24,5 @@ FROM gcr.io/distroless/cc:$IMG_TAG ARG IMG_TAG COPY --from=builder /go/bin/peggo /usr/local/bin/ COPY --from=builder /usr/local/bin/umeed /usr/local/bin/ -COPY --from=builder /src/umee/libwasmvm.x86_64.so /usr/local/lib/ +COPY --from=builder /src/umee/libwasmvm.x86_64.so /lib/ EXPOSE 26656 26657 1317 9090