4d609b2a22
* evm: move Keeper and Querier to /keeper package * keeper: update keeper_test.go * fix format * evm: use aliased types * bump SDK version to v0.38.1 * app: updates from new version * errors: switch sdk.Error -> error * errors: switch sdk.Error -> error. Continuation * more fixes * update app/ * update keys and client pkgs * build * fix tests * lint * minor changes * changelog * address @austinbell comments * Fix keyring usage in rpc API and CLI * fix keyring * break line * Misc cleanup (#188) * evm: move Begin and EndBlock to abci.go * evm: use expected keeper interfaces * app: use EthermintApp for integration and unit test setup * evm: remove count type; update codec * go mod verify * evm: rename msgs for consistency * evm: events * minor cleanup * lint * ante: update tests * changelog * nolint * evm: update statedb to create ethermint Account instead of BaseAccount * fix importer test * address @austinabell comments * update README * changelog * evm: update codec * fix event sender * store logs in keeper after transition (#210) * add some comments * begin log handler test * update TransitionCSDB to return ReturnData * use rlp for result data encode/decode * update tests * implement SetBlockLogs * implement GetBlockLogs * test log set/get * update keeper get/set logs to use hash as key * fix test * move logsKey to csdb * attempt to fix test * attempt to fix test * attempt to fix test * lint * lint * lint * save logs after handling msg * update k.Logs * cleanup * remove unused * fix issues * comment out handler test * address comments * lint * fix handler test * address comments * use amino * lint * address comments * merge * fix encoding bug * minor fix * rpc: error handling * rpc: simulate only returns gasConsumed * rpc: error ineffassign * go: bump version to 1.14 and SDK version to latest master * rpc: fix simulation return value * breaking changes from SDK * sdk: breaking changes; build * tests: fixes * minor fix * proto: ethermint types attempt * proto: define EthAccount proto type and extend sdk std.Codec * evm: fix panic on handler test * evm: minor state object changes * cleanup * tests: update test-importer * fix pubkey registration * lint * cleanup * more test checks for importer * minor change * codec fixes * rm init func * fix importer test build * fix marshaling for TxDecoder * use amino codec for evm * fix marshaling for SimulationResponse * use jsonpb for unmarshaling * fix method handler crashed * return err on VerifySig * switch stateObject balance to sdk.Int * fixes to codec and encoding * cleanup * set tmhash -> ethhash in state transition * add tmhash->ethereumhash to csdb.GetLogs * attempt to fix tests * update GetLogs to switch with Has * ante panic * diff changes * update SetLogs * evm/cli: use ethermint codec * use LengthPrefixed for encoding * add check for nil *big.Int * add balance to UpdateAccounts * fix previous balance * fix balance bug * prevent panic on make test-import Co-authored-by: austinabell <austinabell8@gmail.com> Co-authored-by: noot <36753753+noot@users.noreply.github.com> Co-authored-by: noot <elizabethjbinks@gmail.com>
241 lines
8.7 KiB
Makefile
241 lines
8.7 KiB
Makefile
# Copyright 2018 Tendermint. All rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
PACKAGES=$(shell go list ./... | grep -Ev 'vendor|importer|rpc/tester')
|
|
COMMIT_HASH := $(shell git rev-parse --short HEAD)
|
|
BUILD_FLAGS = -tags netgo -ldflags "-X github.com/cosmos/ethermint/version.GitCommit=${COMMIT_HASH}"
|
|
DOCKER_TAG = unstable
|
|
DOCKER_IMAGE = cosmos/ethermint
|
|
ETHERMINT_DAEMON_BINARY = emintd
|
|
ETHERMINT_CLI_BINARY = emintcli
|
|
GO_MOD=GO111MODULE=on
|
|
|
|
all: tools verify install
|
|
|
|
#######################
|
|
### Build / Install ###
|
|
#######################
|
|
|
|
build:
|
|
ifeq ($(OS),Windows_NT)
|
|
${GO_MOD} go build $(BUILD_FLAGS) -o build/$(ETHERMINT_DAEMON_BINARY).exe ./cmd/emintd
|
|
${GO_MOD} go build $(BUILD_FLAGS) -o build/$(ETHERMINT_CLI_BINARY).exe ./cmd/emintcli
|
|
else
|
|
${GO_MOD} go build $(BUILD_FLAGS) -o build/$(ETHERMINT_DAEMON_BINARY) ./cmd/emintd/
|
|
${GO_MOD} go build $(BUILD_FLAGS) -o build/$(ETHERMINT_CLI_BINARY) ./cmd/emintcli/
|
|
endif
|
|
|
|
install:
|
|
${GO_MOD} go install $(BUILD_FLAGS) ./cmd/emintd
|
|
${GO_MOD} go install $(BUILD_FLAGS) ./cmd/emintcli
|
|
|
|
clean:
|
|
@rm -rf ./build ./vendor
|
|
|
|
update-tools:
|
|
@echo "--> Updating vendor dependencies"
|
|
${GO_MOD} go get -u -v $(GOLINT) $(UNCONVERT) $(INEFFASSIGN) $(MISSPELL) $(ERRCHECK) $(UNPARAM)
|
|
${GO_MOD} go get -u -v $(GOCILINT)
|
|
|
|
verify:
|
|
@echo "--> Verifying dependencies have not been modified"
|
|
${GO_MOD} go mod verify
|
|
|
|
|
|
############################
|
|
### Tools / Dependencies ###
|
|
############################
|
|
|
|
##########################################################
|
|
### TODO: Move tool depedencies to a separate makefile ###
|
|
##########################################################
|
|
|
|
GOLINT = github.com/tendermint/lint/golint
|
|
GOCILINT = github.com/golangci/golangci-lint/cmd/golangci-lint
|
|
UNCONVERT = github.com/mdempsky/unconvert
|
|
INEFFASSIGN = github.com/gordonklaus/ineffassign
|
|
MISSPELL = github.com/client9/misspell/cmd/misspell
|
|
ERRCHECK = github.com/kisielk/errcheck
|
|
UNPARAM = mvdan.cc/unparam
|
|
|
|
GOLINT_CHECK := $(shell command -v golint 2> /dev/null)
|
|
GOCILINT_CHECK := $(shell command -v golangci-lint 2> /dev/null)
|
|
UNCONVERT_CHECK := $(shell command -v unconvert 2> /dev/null)
|
|
INEFFASSIGN_CHECK := $(shell command -v ineffassign 2> /dev/null)
|
|
MISSPELL_CHECK := $(shell command -v misspell 2> /dev/null)
|
|
ERRCHECK_CHECK := $(shell command -v errcheck 2> /dev/null)
|
|
UNPARAM_CHECK := $(shell command -v unparam 2> /dev/null)
|
|
|
|
tools:
|
|
ifdef GOLINT_CHECK
|
|
@echo "Golint is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing golint"
|
|
${GO_MOD} go get -v $(GOLINT)
|
|
endif
|
|
ifdef GOCILINT_CHECK
|
|
@echo "golangci-lint is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing golangci-lint"
|
|
${GO_MOD} go get -v $(GOCILINT)
|
|
endif
|
|
ifdef UNCONVERT_CHECK
|
|
@echo "Unconvert is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing unconvert"
|
|
${GO_MOD} go get -v $(UNCONVERT)
|
|
endif
|
|
ifdef INEFFASSIGN_CHECK
|
|
@echo "Ineffassign is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing ineffassign"
|
|
${GO_MOD} go get -v $(INEFFASSIGN)
|
|
endif
|
|
ifdef MISSPELL_CHECK
|
|
@echo "misspell is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing misspell"
|
|
${GO_MOD} go get -v $(MISSPELL)
|
|
endif
|
|
ifdef ERRCHECK_CHECK
|
|
@echo "errcheck is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing errcheck"
|
|
${GO_MOD} go get -v $(ERRCHECK)
|
|
endif
|
|
ifdef UNPARAM_CHECK
|
|
@echo "unparam is already installed. Run 'make update-tools' to update."
|
|
else
|
|
@echo "--> Installing unparam"
|
|
${GO_MOD} go get -v $(UNPARAM)
|
|
endif
|
|
|
|
|
|
#######################
|
|
### Testing / Misc. ###
|
|
#######################
|
|
|
|
test: test-unit
|
|
|
|
test-unit:
|
|
@${GO_MOD} go test -v --vet=off $(PACKAGES)
|
|
|
|
test-race:
|
|
@${GO_MOD} go test -v --vet=off -race $(PACKAGES)
|
|
|
|
test-cli:
|
|
@echo "NO CLI TESTS"
|
|
|
|
lint:
|
|
@echo "--> Running golangci-lint..."
|
|
@${GO_MOD} golangci-lint run ./... -c .golangci.yml --deadline=5m
|
|
|
|
test-import:
|
|
@${GO_MOD} go test ./importer -v --vet=off --run=TestImportBlocks --datadir tmp \
|
|
--blockchain blockchain --timeout=5m
|
|
# TODO: remove tmp directory after test run to avoid subsequent errors
|
|
|
|
test-rpc:
|
|
@${GO_MOD} go test -v --vet=off ./rpc/tester
|
|
|
|
it-tests:
|
|
./scripts/integration-test-all.sh -q 1 -z 1 -s 10
|
|
|
|
godocs:
|
|
@echo "--> Wait a few seconds and visit http://localhost:6060/pkg/github.com/cosmos/ethermint"
|
|
godoc -http=:6060
|
|
|
|
docker:
|
|
docker build -t ${DOCKER_IMAGE}:${DOCKER_TAG} .
|
|
docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
|
|
docker tag ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:${COMMIT_HASH}
|
|
|
|
format:
|
|
@echo "--> Formatting go files"
|
|
@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs gofmt -w -s
|
|
@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" | xargs misspell -w
|
|
|
|
|
|
.PHONY: build install update-tools tools godocs clean format lint \
|
|
test-cli test-race test-unit test test-import
|
|
|
|
###############################################################################
|
|
### Protobuf ###
|
|
###############################################################################
|
|
|
|
proto-all: proto-gen proto-lint proto-check-breaking
|
|
|
|
proto-gen:
|
|
@./scripts/protocgen.sh
|
|
|
|
proto-lint:
|
|
@buf check lint --error-format=json
|
|
|
|
# NOTE: should match the default repo branch
|
|
proto-check-breaking:
|
|
@buf check breaking --against-input '.git#branch=development'
|
|
|
|
|
|
TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.33.3
|
|
GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
|
|
COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
|
|
SDK_PROTO_URL = https://raw.githubusercontent.com/cosmos/cosmos-sdk/master
|
|
|
|
TM_KV_TYPES = third_party/proto/tendermint/libs/kv
|
|
TM_MERKLE_TYPES = third_party/proto/tendermint/crypto/merkle
|
|
TM_ABCI_TYPES = third_party/proto/tendermint/abci/types
|
|
GOGO_PROTO_TYPES = third_party/proto/gogoproto
|
|
COSMOS_PROTO_TYPES = third_party/proto/cosmos-proto
|
|
SDK_PROTO_TYPES = third_party/proto/cosmos-sdk/types
|
|
AUTH_PROTO_TYPES = third_party/proto/cosmos-sdk/x/auth/types
|
|
VESTING_PROTO_TYPES = third_party/proto/cosmos-sdk/x/auth/vesting/types
|
|
SUPPLY_PROTO_TYPES = third_party/proto/cosmos-sdk/x/supply/types
|
|
|
|
proto-update-deps:
|
|
@mkdir -p $(GOGO_PROTO_TYPES)
|
|
@curl -sSL $(GOGO_PROTO_URL)/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
|
|
|
|
@mkdir -p $(COSMOS_PROTO_TYPES)
|
|
@curl -sSL $(COSMOS_PROTO_URL)/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto
|
|
|
|
@mkdir -p $(TM_ABCI_TYPES)
|
|
@curl -sSL $(TM_URL)/abci/types/types.proto > $(TM_ABCI_TYPES)/types.proto
|
|
@sed -i '' '8 s|crypto/merkle/merkle.proto|third_party/proto/tendermint/crypto/merkle/merkle.proto|g' $(TM_ABCI_TYPES)/types.proto
|
|
@sed -i '' '9 s|libs/kv/types.proto|third_party/proto/tendermint/libs/kv/types.proto|g' $(TM_ABCI_TYPES)/types.proto
|
|
|
|
@mkdir -p $(TM_KV_TYPES)
|
|
@curl -sSL $(TM_URL)/libs/kv/types.proto > $(TM_KV_TYPES)/types.proto
|
|
|
|
@mkdir -p $(TM_MERKLE_TYPES)
|
|
@curl -sSL $(TM_URL)/crypto/merkle/merkle.proto > $(TM_MERKLE_TYPES)/merkle.proto
|
|
|
|
@mkdir -p $(SDK_PROTO_TYPES)
|
|
@curl -sSL $(SDK_PROTO_URL)/types/types.proto > $(SDK_PROTO_TYPES)/types.proto
|
|
|
|
@mkdir -p $(AUTH_PROTO_TYPES)
|
|
@curl -sSL $(SDK_PROTO_URL)/x/auth/types/types.proto > $(AUTH_PROTO_TYPES)/types.proto
|
|
@sed -i '' '5 s|types/types.proto|third_party/proto/cosmos-sdk/types/types.proto|g' $(AUTH_PROTO_TYPES)/types.proto
|
|
|
|
@mkdir -p $(VESTING_PROTO_TYPES)
|
|
curl -sSL $(SDK_PROTO_URL)/x/auth/vesting/types/types.proto > $(VESTING_PROTO_TYPES)/types.proto
|
|
@sed -i '' '5 s|types/types.proto|third_party/proto/cosmos-sdk/types/types.proto|g' $(VESTING_PROTO_TYPES)/types.proto
|
|
@sed -i '' '6 s|x/auth/types/types.proto|third_party/proto/cosmos-sdk/x/auth/types/types.proto|g' $(VESTING_PROTO_TYPES)/types.proto
|
|
|
|
@mkdir -p $(SUPPLY_PROTO_TYPES)
|
|
curl -sSL $(SDK_PROTO_URL)/x/supply/types/types.proto > $(SUPPLY_PROTO_TYPES)/types.proto
|
|
@sed -i '' '5 s|types/types.proto|third_party/proto/cosmos-sdk/types/types.proto|g' $(SUPPLY_PROTO_TYPES)/types.proto
|
|
@sed -i '' '6 s|x/auth/types/types.proto|third_party/proto/cosmos-sdk/x/auth/types/types.proto|g' $(SUPPLY_PROTO_TYPES)/types.proto
|
|
|
|
|
|
.PHONY: proto-all proto-gen proto-lint proto-check-breaking proto-update-deps |