Merge pull request #1090 from hyperledger/develop

Merge for 0.25.0

Author: Silas Davis

.circleci/Dockerfile

@@ -1,17 +1,34 @@
-FROM golang:1.11.5-alpine3.8
+FROM golang:1.12.1-alpine3.9
 MAINTAINER Monax <[email protected]>
 
 ENV DOCKER_VERSION "17.12.1-ce"
-ENV GORELEASER_VERSION "v0.83.0"
+ENV GORELEASER_VERSION "v0.104.1"
 # This is the image used by the Circle CI config
 # Update remote with 'make push_ci_image'
-RUN apk add --update --no-cache nodejs npm netcat-openbsd git openssh-client openssl make bash gcc g++ jq curl parallel docker py-pip
+RUN apk add --update --no-cache \
+ nodejs \
+ npm \
+ netcat-openbsd \
+ git \
+ openssh-client \
+ openssl \
+ make \
+ bash \
+ gcc \
+ g++ \
+ jq \
+ curl \
+ docker \
+ libffi-dev \
+ openssl-dev \
+ python-dev \
+ py-pip
 RUN pip install docker-compose
-RUN echo -ne "will cite" | parallel --citation || true
 # get docker client
 WORKDIR /usr/bin
 RUN curl -L https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz | tar xz --strip-components 1 docker/docker
 RUN curl -L https://github.com/goreleaser/goreleaser/releases/download/$GORELEASER_VERSION/goreleaser_Linux_x86_64.tar.gz | tar xz goreleaser
 RUN npm install -g mocha
 RUN npm install -g mocha-circleci-reporter
+ENV CI=true
 WORKDIR /go/src/github.com/hyperledger/burrow

.gitignore

@@ -6,6 +6,8 @@ bin/
 test_scratch/
 *.log
 .burrow
+.keys
+burrow.toml
 
 # Temporary / cached
 *.swp

CHANGELOG.md

@@ -1,5 +1,24 @@
 # [Hyperledger Burrow](https://github.com/hyperledger/burrow) Changelog
 ## [Unreleased]
+### Added
+- [CLI] Introduced burrow configure --pool for generation of multiple validator configs suitable for running on a single (or many) machines
+
+
+## [0.25.0] - 2019-04-05
+### Changed
+- [Tendermint] Upgraded to 0.31.2
+- [IAVL] upgraded to 0.12.2
+- [Config] Tendermint.TimeoutFactor moved to Execution.TimeoutFactor (and reused for NoConsensus mode)
+- [Kernel] Refactored and various exported methods changed
+
+### Added
+- [CLI] Burrow deploy can now run multiple burrow deploy files (aka playbooks) and run them in parallel
+- [Consensus] Now possible to run Burrow without Tendermint in 'NoConsensus' mode by setting Tendermint.Enabled = false  for faster local testing. Execution.TimeoutFactor can be used to control how regularly Burrow commits (and is used 
+
+### Fixed
+- [Execution] Fixed uint64 underflow (when subtracting fee from balance) not protected against in CallContext
+- [Tests] Various concurrency issues fixed in tests and execution tests parallelised
+
 
 
 ## [0.24.6] - 2019-03-19
@@ -439,7 +458,8 @@ This release marks the start of Eris-DB as the full permissioned blockchain node
   - [Blockchain] Fix getBlocks to respect block height cap.
 
 
-[Unreleased]: https://github.com/hyperledger/burrow/compare/v0.24.6...HEAD
+[Unreleased]: https://github.com/hyperledger/burrow/compare/v0.25.0...HEAD
+[0.25.0]: https://github.com/hyperledger/burrow/compare/v0.24.6...v0.25.0
 [0.24.6]: https://github.com/hyperledger/burrow/compare/v0.24.5...v0.24.6
 [0.24.5]: https://github.com/hyperledger/burrow/compare/v0.24.4...v0.24.5
 [0.24.4]: https://github.com/hyperledger/burrow/compare/v0.24.3...v0.24.4

Gopkg.lock

@@ -13,15 +13,13 @@
     name = "github.com/tendermint/tmlibs"
     non-go = false
 
-[[constraint]]
+[[override]]
   name = "github.com/tendermint/tendermint"
-  source = "github.com/silasdavis/tendermint"
-  # Until Tendermint remove go-ethereum
-  version = "v0.30.1-libsecp256k1"
+  version = "=v0.31.2"
 
-[[constraint]]
+[[override]]
   name = "github.com/tendermint/iavl"
-  version = "=0.12.1"
+  version = "=0.12.2"
 
 # Allow only patch releases for serialization libraries (from Tendermint)
 [[override]]
@@ -52,4 +50,4 @@
 
 [[constraint]]
   name = "golang.org/x/net"
-  revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f"
+  revision = "292b43bbf7cb8d35ddf40f8d5100ef3837cced3f"