From 7ad7715c59ec38fd19c06de54d03a982afebf961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Kunze=20K=C3=BCllmer?= <31522760+fedekunze@users.noreply.github.com> Date: Sun, 24 Oct 2021 14:35:01 +0200 Subject: [PATCH] release: v0.1.3 changes (#64) * bump ethermint * cmd: fix debug command (#41) * release: v0.1.0 changelog (#29) * backport fix version (#31) * build: fix version (#30) * release: v0.1.0 changelog (#29) * build: version * changelog * backport #30 * release: cherry pick `v0.1.2` (#35) * deps: bump ethermint to `v0.7.1` (#34) * release: v0.1.0 changelog (#29) * backport fix version (#31) * build: fix version (#30) * release: v0.1.0 changelog (#29) * build: version * changelog * backport #30 * bump ethermint * gitignore * fix changelog * changelog * ci: add bencher config (#33) Add bencher config with global +-10% threshold for improvements and regressions Co-authored-by: Daniel Burckhardt * cmd: fix debug command * c++ * c++ Co-authored-by: Daniel Burckhardt * release: cross builder using go 1.17.1 and goreleaser.yml updated (#39) * docker cross builder pointing to the correct version, goreleaser.yml updated for evmosd * release using the correct docker image * changelog * changelog * fix Co-authored-by: Daniel Burckhardt Co-authored-by: Guillermo Paoletti --- .goreleaser.yml | 50 +++++++++++++++++++++++----------------------- CHANGELOG.md | 10 ++++++++++ Makefile | 9 +++++---- cmd/evmosd/root.go | 9 ++++++--- go.mod | 9 +++++---- go.sum | 18 ++++++++--------- 6 files changed, 60 insertions(+), 45 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index e63e016b3a..98acd58d81 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -3,9 +3,9 @@ before: - go mod download builds: - - id: "ethermintd-darwin" - main: ./cmd/ethermintd - binary: bin/ethermintd + - id: "evmosd-darwin" + main: ./cmd/evmosd + binary: bin/evmosd env: - CGO_ENABLED=1 - CC=o64-clang @@ -17,10 +17,10 @@ builds: flags: - -tags=cgo ldflags: - - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=ethermintd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} - - id: "ethermintd-darwin-arm64" - main: ./cmd/ethermintd - binary: bin/ethermintd + - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=evmosd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} + - id: "evmosd-darwin-arm64" + main: ./cmd/evmosd + binary: bin/evmosd env: - CGO_ENABLED=1 - CC=oa64-clang @@ -32,10 +32,10 @@ builds: flags: - -tags=cgo ldflags: - - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=ethermintd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} - - id: "ethermintd-linux" - main: ./cmd/ethermintd - binary: bin/ethermintd + - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=evmosd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} + - id: "evmosd-linux" + main: ./cmd/evmosd + binary: bin/evmosd env: - CGO_ENABLED=1 - CC=gcc @@ -47,10 +47,10 @@ builds: flags: - -tags=cgo ldflags: - - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=ethermintd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} - - id: "ethermintd-linux-arm64" - main: ./cmd/ethermintd - binary: bin/ethermintd + - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=evmosd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} + - id: "evmosd-linux-arm64" + main: ./cmd/evmosd + binary: bin/evmosd env: - CGO_ENABLED=1 - CC=aarch64-linux-gnu-gcc @@ -62,10 +62,10 @@ builds: flags: - -tags=cgo ldflags: - - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=ethermintd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} - - id: "ethermintd-windows" - main: ./cmd/ethermintd - binary: bin/ethermintd + - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=evmosd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} + - id: "evmosd-windows" + main: ./cmd/evmosd + binary: bin/evmosd env: - CGO_ENABLED=1 - CC=x86_64-w64-mingw32-gcc @@ -78,7 +78,7 @@ builds: - -tags=cgo - -buildmode=exe ldflags: - - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=ethermintd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} + - -s -w -X github.com/cosmos/cosmos-sdk/version.Name=ethermint -X github.com/cosmos/cosmos-sdk/version.AppName=evmosd -X github.com/cosmos/cosmos-sdk/version.Version={{.Version}} -X github.com/cosmos/cosmos-sdk/version.Commit={{.Commit}} archives: - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}' @@ -91,11 +91,11 @@ archives: - goos: windows format: zip builds: - - ethermintd-darwin - - ethermintd-darwin-arm64 - - ethermintd-windows - - ethermintd-linux - - ethermintd-linux-arm64 + - evmosd-darwin + - evmosd-darwin-arm64 + - evmosd-windows + - evmosd-linux + - evmosd-linux-arm64 checksum: name_template: 'checksums.txt' diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c5b955bc5..8c2e4b47c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,16 @@ Ref: https://keepachangelog.com/en/1.0.0/ # Changelog +## [v0.1.3] - 2021-10-24 + +### Improvements + +* (deps) [\#64](https://github.com/tharsis/evmos/pull/64) Bump Ethermint version to `v0.7.2` + +## Bug Fixes + +* (cmd) [\#41](https://github.com/tharsis/evmos/pull/41) Fix `debug` command. + ## [v0.1.2] - 2021-10-08 ### Improvements diff --git a/Makefile b/Makefile index 05c4ef36f4..f2993988ea 100755 --- a/Makefile +++ b/Makefile @@ -544,7 +544,8 @@ localnet-show-logstream: ############################################################################### PACKAGE_NAME:=github.com/tharsis/evmos -GOLANG_CROSS_VERSION = v1.17 +GOLANG_CROSS_VERSION = v1.17.1 +GOPATH ?= '$(HOME)/go' release-dry-run: docker run \ --rm \ @@ -554,8 +555,8 @@ release-dry-run: -v `pwd`:/go/src/$(PACKAGE_NAME) \ -v ${GOPATH}/pkg:/go/pkg \ -w /go/src/$(PACKAGE_NAME) \ - troian/golang-cross:${GOLANG_CROSS_VERSION} \ - --rm-dist --skip-validate --skip-publish + ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ + --rm-dist --skip-validate --skip-publish --snapshot release: @if [ ! -f ".release-env" ]; then \ @@ -570,7 +571,7 @@ release: -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ -w /go/src/$(PACKAGE_NAME) \ - troian/golang-cross:${GOLANG_CROSS_VERSION} \ + ghcr.io/troian/golang-cross:${GOLANG_CROSS_VERSION} \ release --rm-dist --skip-validate .PHONY: release-dry-run release diff --git a/cmd/evmosd/root.go b/cmd/evmosd/root.go index 3f7c732411..499044e9b8 100644 --- a/cmd/evmosd/root.go +++ b/cmd/evmosd/root.go @@ -19,7 +19,6 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/config" - "github.com/cosmos/cosmos-sdk/client/debug" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/rpc" sdkserver "github.com/cosmos/cosmos-sdk/server" @@ -32,6 +31,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" ethermintclient "github.com/tharsis/ethermint/client" + "github.com/tharsis/ethermint/client/debug" "github.com/tharsis/ethermint/crypto/hd" "github.com/tharsis/ethermint/encoding" ethermintserver "github.com/tharsis/ethermint/server" @@ -70,9 +70,12 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { cmd.SetOut(cmd.OutOrStdout()) cmd.SetErr(cmd.ErrOrStderr()) - initClientCtx = client.ReadHomeFlag(initClientCtx, cmd) + initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags()) + if err != nil { + return err + } - initClientCtx, err := config.ReadFromClientConfig(initClientCtx) + initClientCtx, err = config.ReadFromClientConfig(initClientCtx) if err != nil { return err } diff --git a/go.mod b/go.mod index 2008617201..441ad62580 100644 --- a/go.mod +++ b/go.mod @@ -3,17 +3,17 @@ module github.com/tharsis/evmos go 1.17 require ( - github.com/cosmos/cosmos-sdk v0.44.1 - github.com/cosmos/ibc-go v1.2.1 + github.com/cosmos/cosmos-sdk v0.44.3 + github.com/cosmos/ibc-go v1.2.2 github.com/ethereum/go-ethereum v1.10.3 github.com/gorilla/mux v1.8.0 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.4.1 github.com/spf13/cobra v1.2.1 github.com/stretchr/testify v1.7.0 - github.com/tendermint/tendermint v0.34.13 + github.com/tendermint/tendermint v0.34.14 github.com/tendermint/tm-db v0.6.4 - github.com/tharsis/ethermint v0.7.1 + github.com/tharsis/ethermint v0.7.2 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect ) @@ -85,6 +85,7 @@ require ( github.com/jmhodges/levigo v1.0.0 // indirect github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect github.com/klauspost/compress v1.11.9 // indirect + github.com/lib/pq v1.10.2 // indirect github.com/libp2p/go-buffer-pool v0.0.2 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mattn/go-isatty v0.0.14 // indirect diff --git a/go.sum b/go.sum index fe1ea13e6f..6eb21f6533 100644 --- a/go.sum +++ b/go.sum @@ -242,8 +242,9 @@ github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/go.mod h1:F5haX7 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosmos/cosmos-sdk v0.44.1 h1:UspmTMwKNGf6mH8k388v2T5csP9BYpPJkbQ/eG30PtM= -github.com/cosmos/cosmos-sdk v0.44.1/go.mod h1:fwQJdw+aECatpTvQTo1tSfHEsxACdZYU80QCZUPnHr4= +github.com/cosmos/cosmos-sdk v0.44.2/go.mod h1:fwQJdw+aECatpTvQTo1tSfHEsxACdZYU80QCZUPnHr4= +github.com/cosmos/cosmos-sdk v0.44.3 h1:F71n1jCqPi4F0wXg8AU4AUdUF8llw0x3D3o6aLt/j2A= +github.com/cosmos/cosmos-sdk v0.44.3/go.mod h1:bA3+VenaR/l/vDiYzaiwbWvRPWHMBX2jG0ygiFtiBp0= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -252,8 +253,8 @@ github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7u github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= github.com/cosmos/iavl v0.17.1 h1:b/Cl8h1PRMvsu24+TYNlKchIu7W6tmxIBGe6E9u2Ybw= github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk= -github.com/cosmos/ibc-go v1.2.1 h1:eWi8EzcgSwVipvhyQ7Rh1KfBe66C1ZdDSskeKMtIg0Q= -github.com/cosmos/ibc-go v1.2.1/go.mod h1:YieSs25Y0TSFR67qg6Elge34yJNEOjYhYB+HNQQLoSQ= +github.com/cosmos/ibc-go v1.2.2 h1:bs6TZ8Es1kycIu2AHlRZ9dzJ+mveqlLN/0sjWtRH88o= +github.com/cosmos/ibc-go v1.2.2/go.mod h1:XmYjsRFOs6Q9Cz+CSsX21icNoH27vQKb3squgnCOCbs= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76 h1:DdzS1m6o/pCqeZ8VOAit/gyATedRgjvkVI+UCrLpyuU= github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76/go.mod h1:0mkLWIoZuQ7uBoospo5Q9zIpqq6rYCPJDSUdeCJvPM8= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= @@ -1144,17 +1145,16 @@ github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoM github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= -github.com/tendermint/tendermint v0.34.13 h1:fu+tsHudbOr5PvepjH0q47Jae59hQAvn3IqAHv2EbC8= github.com/tendermint/tendermint v0.34.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI= +github.com/tendermint/tendermint v0.34.14 h1:GCXmlS8Bqd2Ix3TQCpwYLUNHe+Y+QyJsm5YE+S/FkPo= +github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tetafro/godot v1.4.9/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tharsis/ethermint v0.7.0 h1:MxnrTSaD5pdAx+IQ0bLP8wuteSPkkfKgOxxgB0YoECc= -github.com/tharsis/ethermint v0.7.0/go.mod h1:Ynkg+ZJPs3cO5+Wkz5dRQ8R2DScwgtwGOctIgCgMuFs= -github.com/tharsis/ethermint v0.7.1 h1:i3TGpGqhM5R4kbTp6ySCbChZD0bDJ/nHZtZNIL4W30g= -github.com/tharsis/ethermint v0.7.1/go.mod h1:Ynkg+ZJPs3cO5+Wkz5dRQ8R2DScwgtwGOctIgCgMuFs= +github.com/tharsis/ethermint v0.7.2 h1:TYk8QGwPkI4ZelGpNXgILx7PBjNO06OjM1pIM9vUr/o= +github.com/tharsis/ethermint v0.7.2/go.mod h1:Dwqhtm/ktN/t/hfqVOtz7EWkLGelR1F0OxDs8cGmibY= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=