From fc48fdcee71627fd57baa6fbe19889c53c51a37e Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Mon, 6 Apr 2020 18:16:23 +0900 Subject: [PATCH 1/8] Fix libsodium build setting bug in the `Makefile` --- .circleci/config.yml | 46 +++++++++++++++++++++----------------------- Makefile | 18 +++++++++++------ 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e9786d9e..873788b5f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -149,27 +149,25 @@ jobs: - store_artifacts: path: /tmp/logs -# TODO We need to replace the docker image with the image that adds libsodium library. -# localnet: -# working_directory: /home/circleci/.go_workspace/src/github.com/tendermint/tendermint -# machine: -# image: circleci/classic:latest -# environment: -# GOBIN: /home/circleci/.go_workspace/bin -# GOPATH: /home/circleci/.go_workspace/ -# GOOS: linux -# GOARCH: amd64 -# parallelism: 1 -# steps: -# - checkout_with_submodules -# - make_libsodium -# - run: -# name: run localnet and exit on failure -# command: | -# set -x -# docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux -# make localnet-start & -# ./scripts/localnet-blocks-test.sh 40 5 10 localhost + localnet: + working_directory: /home/circleci/.go_workspace/src/github.com/tendermint/tendermint + machine: + image: circleci/classic:latest + environment: + GOBIN: /home/circleci/.go_workspace/bin + GOPATH: /home/circleci/.go_workspace/ + GOOS: linux + GOARCH: amd64 + parallelism: 1 + steps: + - checkout_with_submodules + - run: + name: run localnet and exit on failure + command: | + set -x + docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux + make localnet-start & + ./scripts/localnet-blocks-test.sh 40 5 10 localhost test_p2p: environment: @@ -418,9 +416,9 @@ workflows: - test_persistence: requires: - setup_dependencies -# - localnet: -# requires: -# - setup_dependencies + - localnet: + requires: + - setup_dependencies - test_p2p - reproducible_builds: filters: diff --git a/Makefile b/Makefile index bea4667a6..edd0638a8 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,22 @@ INCLUDE = -I=${GOPATH}/src/github.com/tendermint/tendermint -I=${GOPATH}/src -I= BUILD_TAGS?='tendermint' CGO_OPTPTION=0 LIBSODIUM_TARGET= +PREPARE_LIBSODIUM_TARGET= ifeq ($(LIBSODIUM), 1) BUILD_TAGS='libsodium tendermint' CGO_OPTPTION=1 LIBSODIUM_TARGET=libsodium +ifneq ($(OS), Windows_NT) +ifeq ($(shell uname -s), Linux) + PREPARE_LIBSODIUM_TARGET=prepare-libsodium-linux +endif +endif endif LIBSODIM_BUILD_TAGS='libsodium tendermint' LD_FLAGS = -X github.com/tendermint/tendermint/version.GitCommit=`git rev-parse --short=8 HEAD` -s -w BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)" -all: check $(LIBSODIUM_TARGET) build test install +all: check build test install # The below include contains the tools. include tools.mk @@ -24,13 +30,13 @@ include tests.mk ######################################## ### Build Tendermint -build: +build: $(LIBSODIUM_TARGET) CGO_ENABLED=$(CGO_OPTION) go build $(BUILD_FLAGS) -tags $(BUILD_TAGS) -o $(OUTPUT) ./cmd/tendermint/ -build_c: +build_c: $(LIBSODIUM_TARGET) CGO_ENABLED=$(CGO_OPTION) go build $(BUILD_FLAGS) -tags "$(BUILD_TAGS) cleveldb" -o $(OUTPUT) ./cmd/tendermint/ -build_race: +build_race: $(LIBSODIUM_TARGET) CGO_ENABLED=$(CGO_OPTION) go build -race $(BUILD_FLAGS) -tags $(BUILD_TAGS) -o $(OUTPUT) ./cmd/tendermint install: @@ -69,7 +75,7 @@ install_abci: ######################################## ### libsodium -prepare_libsodium: +prepare-libsodium-linux: apt-get update && apt-get -y install libtool libboost-all-dev autoconf build-essential libsodium: @@ -189,7 +195,7 @@ build-docker: ### Local testnet using docker # Build linux binary on other platforms -build-linux: tools prepare_libsodium libsodium +build-linux: tools $(PREPARE_LIBSODIUM_TARGET) $(LIBSODIUM_TARGET) GOOS=linux GOARCH=amd64 $(MAKE) build build-docker-localnode: From 5ffa3959a245f195226a385ed6c2b863171bace1 Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Tue, 7 Apr 2020 14:19:57 +0900 Subject: [PATCH 2/8] Fix `localnet` of circleCI --- .circleci/config.yml | 2 +- go.mod | 1 + go.sum | 7 +++++++ networks/local/localnode/Dockerfile | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 873788b5f..0b5061bd4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: name: run localnet and exit on failure command: | set -x - docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang make build-linux + docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang:1.14.1-alpine apk add --update make && make build-linux make localnet-start & ./scripts/localnet-blocks-test.sh 40 5 10 localhost diff --git a/go.mod b/go.mod index 3114fb770..21abf4bae 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.6.1 + github.com/square/certstrap v1.2.0 // indirect github.com/stretchr/testify v1.4.0 github.com/tendermint/go-amino v0.14.1 github.com/tendermint/tm-db v0.4.0 diff --git a/go.sum b/go.sum index 005cd2f99..b41a92944 100644 --- a/go.sum +++ b/go.sum @@ -317,6 +317,8 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= @@ -586,6 +588,8 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/square/certstrap v1.2.0 h1:ecgyABrbFLr8jSbOC6oTBmBek0t/HqtgrMUZCPuyfdw= +github.com/square/certstrap v1.2.0/go.mod h1:CUHqV+fxJW0Y5UQFnnbYwQ7bpKXO1AKbic9g73799yw= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= @@ -624,6 +628,7 @@ github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lP github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= @@ -666,6 +671,7 @@ go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181127143415-eb0de9b17e85/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= @@ -740,6 +746,7 @@ golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= diff --git a/networks/local/localnode/Dockerfile b/networks/local/localnode/Dockerfile index 03af5aa3c..008952eb5 100644 --- a/networks/local/localnode/Dockerfile +++ b/networks/local/localnode/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.7 +FROM alpine:3.11 MAINTAINER Greg Szabo <greg@tendermint.com> RUN apk update && \ From 9e40a7de51d85dfe73b58229fd6be16ede6525af Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Tue, 7 Apr 2020 14:20:34 +0900 Subject: [PATCH 3/8] Add state module log about `create block`. --- state/execution.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/state/execution.go b/state/execution.go index 170beaa7f..335e0d4f4 100644 --- a/state/execution.go +++ b/state/execution.go @@ -2,6 +2,7 @@ package state import ( "fmt" + "github.com/tendermint/tendermint/libs/bytes" "time" abci "github.com/tendermint/tendermint/abci/types" @@ -108,6 +109,7 @@ func (blockExec *BlockExecutor) CreateProposalBlock( maxDataBytes := types.MaxDataBytes(maxBytes, state.Validators.Size(), len(evidence)) txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas) + blockExec.logger.Info("Create Block", "Height", height, "Round", round, "ProposerAddr", bytes.HexBytes(proposerAddr).String()) return state.MakeBlock(height, txs, commit, evidence, proposerAddr, round, proof) } From 2f5b11847e68a5fa76a0b858ce2927a34c54d76b Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Tue, 7 Apr 2020 14:27:02 +0900 Subject: [PATCH 4/8] Fix lint warning --- state/execution.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/state/execution.go b/state/execution.go index 335e0d4f4..db465a5e7 100644 --- a/state/execution.go +++ b/state/execution.go @@ -2,11 +2,11 @@ package state import ( "fmt" - "github.com/tendermint/tendermint/libs/bytes" "time" abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/vrf" + "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/fail" "github.com/tendermint/tendermint/libs/log" mempl "github.com/tendermint/tendermint/mempool" @@ -109,7 +109,8 @@ func (blockExec *BlockExecutor) CreateProposalBlock( maxDataBytes := types.MaxDataBytes(maxBytes, state.Validators.Size(), len(evidence)) txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas) - blockExec.logger.Info("Create Block", "Height", height, "Round", round, "ProposerAddr", bytes.HexBytes(proposerAddr).String()) + blockExec.logger.Info("Create Block", "Height", height, "Round", round, + "ProposerAddr", bytes.HexBytes(proposerAddr).String()) return state.MakeBlock(height, txs, commit, evidence, proposerAddr, round, proof) } From 93e27ab73f78218ab391ac168a3e7c11a659b113 Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Tue, 7 Apr 2020 14:50:40 +0900 Subject: [PATCH 5/8] Remove unused mod `certstrap` --- go.mod | 1 - go.sum | 5 ----- 2 files changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 21abf4bae..3114fb770 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,6 @@ require ( github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.6.1 - github.com/square/certstrap v1.2.0 // indirect github.com/stretchr/testify v1.4.0 github.com/tendermint/go-amino v0.14.1 github.com/tendermint/tm-db v0.4.0 diff --git a/go.sum b/go.sum index b41a92944..7dfcfbc59 100644 --- a/go.sum +++ b/go.sum @@ -317,8 +317,6 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= -github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= @@ -588,8 +586,6 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= -github.com/square/certstrap v1.2.0 h1:ecgyABrbFLr8jSbOC6oTBmBek0t/HqtgrMUZCPuyfdw= -github.com/square/certstrap v1.2.0/go.mod h1:CUHqV+fxJW0Y5UQFnnbYwQ7bpKXO1AKbic9g73799yw= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= @@ -628,7 +624,6 @@ github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lP github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= From 12643279e8f924d04a2e8153086b20b4bcf03463 Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Tue, 7 Apr 2020 15:44:04 +0900 Subject: [PATCH 6/8] Change `localnet` setting of circleCI --- .circleci/config.yml | 2 +- go.mod | 1 + go.sum | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b5061bd4..53171f9a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -165,7 +165,7 @@ jobs: name: run localnet and exit on failure command: | set -x - docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang:1.14.1-alpine apk add --update make && make build-linux + docker run --rm -v "$PWD":/go/src/github.com/tendermint/tendermint -w /go/src/github.com/tendermint/tendermint golang:1.14.1-alpine /bin/sh -c "apk add --update make && make build-linux" make localnet-start & ./scripts/localnet-blocks-test.sh 40 5 10 localhost diff --git a/go.mod b/go.mod index 3114fb770..21abf4bae 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.6.1 + github.com/square/certstrap v1.2.0 // indirect github.com/stretchr/testify v1.4.0 github.com/tendermint/go-amino v0.14.1 github.com/tendermint/tm-db v0.4.0 diff --git a/go.sum b/go.sum index 7dfcfbc59..b41a92944 100644 --- a/go.sum +++ b/go.sum @@ -317,6 +317,8 @@ github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c h1:kQWxfPIHVLbgLzphqk3QUflDy9QdksZR4ygR807bpy0= +github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c/go.mod h1:lADxMC39cJJqL93Duh1xhAs4I2Zs8mKS89XWXFGp9cs= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= @@ -586,6 +588,8 @@ github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/y github.com/spf13/viper v1.5.0/go.mod h1:AkYRkVJF8TkSG/xet6PzXX+l39KhhXa2pdqVSxnTcn4= github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk= github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= +github.com/square/certstrap v1.2.0 h1:ecgyABrbFLr8jSbOC6oTBmBek0t/HqtgrMUZCPuyfdw= +github.com/square/certstrap v1.2.0/go.mod h1:CUHqV+fxJW0Y5UQFnnbYwQ7bpKXO1AKbic9g73799yw= github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= @@ -624,6 +628,7 @@ github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lP github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/uudashr/gocognit v0.0.0-20190926065955-1655d0de0517/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= From 4256fbfe66ea559b2b43fdc73e0ffe7da652ee33 Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Thu, 9 Apr 2020 11:01:07 +0900 Subject: [PATCH 7/8] Move the block creation log from `BlockExecutor` to `consensus.State` --- consensus/state.go | 3 +++ state/execution.go | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/consensus/state.go b/consensus/state.go index d631af6d1..8b62d1169 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -9,6 +9,7 @@ import ( "time" "github.com/pkg/errors" + tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/fail" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" @@ -962,6 +963,8 @@ func (cs *State) defaultDecideProposal(height int64, round int) { if block == nil { // on error return } + cs.Logger.Info("Create Block", "Height", height, "Round", round, + "ProposerAddr", tmbytes.HexBytes(block.Header.ProposerAddress).String()) } // Flush the WAL. Otherwise, we may not recompute the same proposal to sign, diff --git a/state/execution.go b/state/execution.go index db465a5e7..170beaa7f 100644 --- a/state/execution.go +++ b/state/execution.go @@ -6,7 +6,6 @@ import ( abci "github.com/tendermint/tendermint/abci/types" "github.com/tendermint/tendermint/crypto/vrf" - "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/fail" "github.com/tendermint/tendermint/libs/log" mempl "github.com/tendermint/tendermint/mempool" @@ -109,8 +108,6 @@ func (blockExec *BlockExecutor) CreateProposalBlock( maxDataBytes := types.MaxDataBytes(maxBytes, state.Validators.Size(), len(evidence)) txs := blockExec.mempool.ReapMaxBytesMaxGas(maxDataBytes, maxGas) - blockExec.logger.Info("Create Block", "Height", height, "Round", round, - "ProposerAddr", bytes.HexBytes(proposerAddr).String()) return state.MakeBlock(height, txs, commit, evidence, proposerAddr, round, proof) } From 8c285231d1f7f31992cb9f8032a55c91b7fb7269 Mon Sep 17 00:00:00 2001 From: zemyblue <zemyblue@gmail.com> Date: Thu, 9 Apr 2020 11:05:46 +0900 Subject: [PATCH 8/8] Fix lint error. --- consensus/state.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/consensus/state.go b/consensus/state.go index 8b62d1169..f0e61bca2 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -9,7 +9,6 @@ import ( "time" "github.com/pkg/errors" - tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/tendermint/tendermint/libs/fail" "github.com/tendermint/tendermint/libs/log" tmos "github.com/tendermint/tendermint/libs/os" @@ -964,7 +963,7 @@ func (cs *State) defaultDecideProposal(height int64, round int) { return } cs.Logger.Info("Create Block", "Height", height, "Round", round, - "ProposerAddr", tmbytes.HexBytes(block.Header.ProposerAddress).String()) + "ProposerAddr", block.Header.ProposerAddress.String()) } // Flush the WAL. Otherwise, we may not recompute the same proposal to sign,