Merge branch 'master' into dev

# Conflicts:
#	CHANGELOG.md
#	Gopkg.lock
#	Makefile
#	cmd/export/main.go
#	cmd/minter/cmd/node.go
#	config/config.go
#	core/minter/minter.go
#	core/state/statedb.go
#	upgrades/blocks.go
#	version/version.go

.github/workflows/main.yml

@@ -0,0 +1,21 @@
+name: docker
+
+on: push
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+        with:
+          fetch-depth: 1
+
+      - name: Build & Push to Docker Hub
+        uses: opspresso/action-docker@master
+        env:
+          USERNAME: ${{ secrets.DOCKER_HUB_USER }}
+          PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+          IMAGE_NAME: "minterteam/minter"
+          LATEST: "true" 
+          TAG_NAME: "v1.0.5"

CHANGELOG.md

@@ -22,6 +22,18 @@ BREAKING CHANGES
 - [config] Add state_cache_size option
 - [tendermint] Upgrade to [v0.33.0](https://github.com/tendermint/tendermint/blob/master/CHANGELOG.md#v0330) 
 
+## 1.0.5
+
+BUG FIXES
+
+- [core] Fix coin liquidation issue
+
+IMPROVEMENT
+
+- [core] Add grace period from 4262457 to 4262500 block
+- [cmd] Set start time at 7:00 AM Wednesday, January 22, 2020
+- [config] Add halt_height param
+
 ## 1.0.4
 
 IMPROVEMENT

Dockerfile

@@ -0,0 +1,21 @@
+FROM tazhate/dockerfile-gox as builder
+
+COPY . /gopath/src/github.com/MinterTeam/minter-go-node
+WORKDIR /gopath/src/github.com/MinterTeam/minter-go-node
+RUN apt-get update && apt-get install libleveldb-dev -y --no-install-recommends -q
+RUN make get_tools
+RUN make get_vendor_deps
+RUN make build
+
+FROM ubuntu:bionic
+
+COPY --from=builder /gopath/src/github.com/MinterTeam/minter-go-node/build/minter/ /usr/bin/minter
+RUN apt update && apt install libleveldb1v5 -y --no-install-recommends -q
+RUN addgroup minteruser && useradd --no-log-init -r -m -d /minter -g minteruser minteruser
+RUN chown -R minteruser:minteruser /minter
+USER minteruser
+WORKDIR /minter
+RUN mkdir /minter/data 
+EXPOSE 8841
+ENTRYPOINT ["/usr/bin/minter"]
+CMD ["node", "--home-dir", "/minter"]

Makefile

@@ -1,7 +1,8 @@
 GOTOOLS = \
 	github.com/mitchellh/gox \
-    github.com/alecthomas/gometalinter \
-    github.com/gogo/protobuf/protoc-gen-gogo \
+	github.com/golang/dep/cmd/dep \
+	github.com/alecthomas/gometalinter \
+	github.com/gogo/protobuf/protoc-gen-gogo \
 	github.com/gobuffalo/packr/packr
 PACKAGES=$(shell go list ./... | grep -v '/vendor/')
 BUILD_TAGS?=minter
@@ -11,6 +12,8 @@ all: check build test install
 
 check: check_tools ensure_deps
 
+docker: build_docker
+
 ########################################
 ### Build
 
@@ -97,13 +100,8 @@ metalinter_all:
 ###########################################################
 ### Docker image
 
-build-docker:
-	cp build/minter DOCKER/minter
-	cd DOCKER && make build
-	rm -f minter
-
-push-docker:
-	cd DOCKER && make push
+build_docker:
+	docker build . --tag minter-go-node:local
 
 ###########################################################
 ### Local testnet using docker
@@ -113,4 +111,4 @@ build-linux:
 	GOOS=linux GOARCH=amd64 $(MAKE) build
 
 build-compress:
-	upx build/minter
+	upx build/minter

README.md

@@ -4,16 +4,24 @@
 <a href="https://github.com/MinterTeam/minter-go-node/releases/latest"><img src="https://img.shields.io/github/tag/MinterTeam/minter-go-node.svg" alt="Version"></a>
 <a href="https://github.com/moovweb/gvm"><img src="https://img.shields.io/badge/go-1.10-blue.svg" alt="Go version"></a>
 <a href="https://github.com/MinterTeam/minter-go-node/blob/master/LICENSE"><img src="https://img.shields.io/github/license/MinterTeam/minter-go-node.svg" alt="License"></a>
-  <a href="https://github.com/MinterTeam/minter-go-node/commits/master"><img src="https://img.shields.io/github/last-commit/MinterTeam/minter-go-node.svg" alt="Last commit"></a>
-  <a href="https://goreportcard.com/report/github.com/MinterTeam/minter-go-node"><img src="https://goreportcard.com/badge/github.com/MinterTeam/minter-go-node" alt="Go Report Card"></a>
+<a href="https://github.com/MinterTeam/minter-go-node/commits/master"><img src="https://img.shields.io/github/last-commit/MinterTeam/minter-go-node.svg" alt="Last commit"></a>
+<a href="https://goreportcard.com/report/github.com/MinterTeam/minter-go-node"><img src="https://goreportcard.com/badge/github.com/MinterTeam/minter-go-node" alt="Go Report Card"></a>
+<a href="https://github.com/MinterTeam/minter-go-node/actions"><img src="https://github.com/MinterTeam/minter-go-node/workflows/docker/badge.svg" alt="Github Actions Report Card"></a>
+<a href="https://hub.docker.com/r/MinterTeam/minter-go-node"><img alt="Docker Pulls" src="https://img.shields.io/docker/pulls/minterteam/minter"></a>
 </p>
 
 Minter is a blockchain network that lets people, projects, and companies issue and manage their own coins and trade them at a fair market price with absolute and instant liquidity.
 
 _NOTE: This is alpha software. Please contact us if you intend to run it in production._
 
 ## Installation
+### Docker
+1. Grab latest docker-compose, save <a href="https://raw.githubusercontent.com/MinterTeam/minter-go-node/master/docker-compose.yml">docker-compose.yml</a> and run ```docker-compose up -d```. 
+To run it in production we recommend to use bind host mount instead of volume. 
 
+2. To build from source clone this repo, make your changes and run ```docker-compose up --build -d```
+
+### Manual
 You can get official installation instructions in our [docs](https://docs.minter.network/#section/Install-Minter).
 
 1. Download Minter Node

cmd/export/readme.md

@@ -0,0 +1,8 @@
+# Export Command
+
+Command to convert the genesis file from version 1.0 to 1.1
+More details will be disclosed later.
+#####Example
+```bash
+./export --height=4350342 --chain_id="minter-mainnnet-2" --genesis_time=1580206824s
+```