change: update tendermint and cosmos-sdk versions (#261)

* change: update tendermint and cosmos-sdk versions * update: CHANGELOG.md * update: release CHANGELOG.md * update: remove block metrics CI * chore: update CHANGELOG.md * fix: travis CI file * change: upgrade faucet to tendermint 0.33.6 * fix: imports and go mod
iov-one · Jul 7, 2020 · 5409c2f · 5409c2f
1 parent ab4f6f3
commit 5409c2f
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -37,7 +37,6 @@ env:
     - COMMIT=$(git log -1 --format='%H')
     - IMAGE_NAME="iov1/iovns:${BUILD_VERSION}"
     - FAUCET_IMAGE_NAME="iov1/iovns-faucet:${BUILD_VERSION}"
-    - BLOCk_METRICS_IMAGE_NAME="iov1/iovns-block-metrics:${BUILD_VERSION}"
 
 script:
   - set -eo pipefail
@@ -56,7 +55,6 @@ script:
     mkdir -p ${TRAVIS_BUILD_DIR}/build && tar -zxf $TRAVIS_BUILD_DIR/iovns-build-linux/build/out/iovns-${VERSION}-linux-amd64.tar.gz -C ${TRAVIS_BUILD_DIR}/build ;
     docker build --pull --tag ${IMAGE_NAME} . ;
     cd cmd/faucet && make build && docker build --pull --tag ${FAUCET_IMAGE_NAME} . ;
-    cd cmd/block-metrics && make build && docker build --pull --tag ${BLOCK_METRICS_IMAGE_NAME} . ;
     fi;
 
     if [[ $release_latest == "yes" ]]; then
@@ -66,8 +64,6 @@ script:
 
     docker tag  "iov1/iovns-faucet:${BUILD_VERSION}" "iov1/iovns-faucet:latest" ;
     docker push "iov1/iovns-faucet:latest";
-    docker tag  "iov1/iovns-block-metrics:${BUILD_VERSION}" "iov1/iovns-block-metrics:latest" ;
-    docker push "iov1/iovns-block-metrics:latest";
     docker logout;
     fi;
 
@@ -79,9 +75,6 @@ script:
     docker tag  "iov1/iovns-faucet:${BUILD_VERSION}" "iov1/iovns-faucet:$TRAVIS_TAG" ;
     docker push "iov1/iovns-faucet:$TRAVIS_TAG";
 
-    docker tag  "iov1/iovns-block-metrics:${BUILD_VERSION}" "iov1/iovns-block-metrics:$TRAVIS_TAG" ;
-    docker push "iov1/iovns-block-metrics:$TRAVIS_TAG";
-
     docker logout;
     fi;
     fi;

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,10 +2,13 @@
 
 ## HEAD
 
+## v0.4.5
+- CHANGE: bump cosmos-sdk and tendermint version
 - FIX: AccountRenewalCountMax and DomainRenewalCountMax bumped at configuration update
 - FIX: fix cli tests
 - FIX: fix domain renewal
 - Implement block-metrics
+- disable block metrics CI
 
 ## v0.4.4
 

diff --git a/cmd/faucet/main.go b/cmd/faucet/main.go
@@ -9,10 +9,9 @@ import (
 	"time"
 
 	keys2 "github.com/cosmos/cosmos-sdk/crypto/keys"
-
 	"github.com/gorilla/mux"
 	"github.com/iov-one/iovns/cmd/faucet/pkg"
-	rpchttp "github.com/tendermint/tendermint/rpc/client"
+	rpchttp "github.com/tendermint/tendermint/rpc/client/http"
 )
 
 func main() {
@@ -22,7 +21,7 @@ func main() {
 		log.Fatalf("configuration: %s", err)
 	}
 	// setup node
-	node, err := rpchttp.NewHTTP(conf.TendermintRPC, "/websocket")
+	node, err := rpchttp.New(conf.TendermintRPC, "/websocket")
 	kb := keys2.NewInMemory()
 	if err := kb.ImportPrivKey("faucet", conf.Armor, conf.Passphrase); err != nil {
 		log.Fatalf("keybase: %v", err)

diff --git a/go.mod b/go.mod
@@ -3,12 +3,12 @@ module github.com/iov-one/iovns
 go 1.14
 
 require (
-	github.com/btcsuite/btcd v0.0.0-20190807005414-4063feeff79a // indirect
-	github.com/cosmos/cosmos-sdk v0.38.4
+	github.com/cosmos/cosmos-sdk v0.38.5
 	github.com/fatih/structs v1.1.0
 	github.com/golang/mock v1.3.1 // indirect
 	github.com/gorilla/mux v1.7.3
-	github.com/gorilla/websocket v1.4.1
+	github.com/gorilla/websocket v1.4.2
+	github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
 	github.com/jinzhu/gorm v1.9.14
 	github.com/lib/pq v1.1.1
 	github.com/onsi/ginkgo v1.8.0 // indirect
@@ -17,14 +17,13 @@ require (
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/prometheus/common v0.9.1
 	github.com/rakyll/statik v0.1.7
-	github.com/rcrowley/go-metrics v0.0.0-20190706150252-9beb055b7962 // indirect
 	github.com/spf13/afero v1.2.2 // indirect
-	github.com/spf13/cobra v0.0.6
-	github.com/spf13/viper v1.6.2
+	github.com/spf13/cobra v1.0.0
+	github.com/spf13/viper v1.6.3
 	github.com/stretchr/testify v1.5.1
 	github.com/tendermint/go-amino v0.15.1
-	github.com/tendermint/tendermint v0.33.3
-	github.com/tendermint/tm-db v0.5.0
+	github.com/tendermint/tendermint v0.33.6
+	github.com/tendermint/tm-db v0.5.1
 )
 
 // patch bech32 decoding, TODO this should not be the fix for the multisig isue