Merge branch 'develop' of https://github.com/eris-ltd/eris-db into alpine-arm

DOCKER/Dockerfile

 # Pull base image.
-FROM quay.io/eris/base
+FROM quay.io/eris/build
 MAINTAINER Eris Industries <support@erisindustries.com>
 
-#-----------------------------------------------------------------------------
-# dependencies
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends \
-    libgmp3-dev jq && \
-  rm -rf /var/lib/apt/lists/*
 
 #-----------------------------------------------------------------------------
 # install tendermint
@@ -19,7 +13,7 @@ ENV REPO github.com/eris-ltd/tendermint
 ENV COMMIT working
 # note, we want to lock in the same commit number
 #  as eris-db has vendored.
-RUN mkdir --parents $GOPATH/src/$REPO
+RUN mkdir -p $GOPATH/src/$REPO
 WORKDIR $GOPATH/src/$REPO_ALIAS
 RUN git clone --quiet https://$REPO . && \
   git checkout --quiet $COMMIT && \
@@ -31,7 +25,7 @@ RUN git clone --quiet https://$REPO . && \
 # set the repo and install mint-client
 ENV REPO github.com/eris-ltd/mint-client
 ENV BRANCH master
-RUN mkdir --parents $GOPATH/src/$REPO
+RUN mkdir -p $GOPATH/src/$REPO
 WORKDIR $GOPATH/src/$REPO
 RUN git clone --quiet https://$REPO . && \
   git checkout --quiet $BRANCH && \
@@ -84,7 +78,7 @@ RUN chown -R eris $ECM_PATH
 VOLUME /home/$USER/.eris
 WORKDIR /home/$USER/.eris
 USER $USER
-RUN mkdir --parents /home/$USER/.eris/chains/tendermint
+RUN mkdir -p /home/$USER/.eris/chains/tendermint
 ENV TMROOT /home/$USER/.eris/chains/tendermint
 
 # run tendermint

Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go

@@ -135,7 +135,7 @@ func (aP *AccountPermissions) HasRole(role string) bool {
 
 // Returns true if the role is added, and false if it already exists
 func (aP *AccountPermissions) AddRole(role string) bool {
-	role = string(LeftPadBytes([]byte(role), 32))
+	role = string(RightPadBytes([]byte(role), 32))
 	for _, r := range aP.Roles {
 		if r == role {
 			return false

Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go

@@ -53,13 +53,14 @@ contract Permissions {
 
 // function identifiers from the solidity abi
 var PermsMap = map[string]SNativeFuncDescription{
-	"054556ac": SNativeFuncDescription{"has_role", 2, ptypes.HasRole, has_role},
+	//"054556ac": SNativeFuncDescription{"has_role", 2, ptypes.HasRole, has_role},
+	"e8145855": SNativeFuncDescription{"has_role", 2, ptypes.HasRole, has_role},
 	"180d26f2": SNativeFuncDescription{"unset_base", 2, ptypes.UnsetBase, unset_base},
 	"3a3fcc59": SNativeFuncDescription{"set_global", 2, ptypes.SetGlobal, set_global},
-	"9a1c4141": SNativeFuncDescription{"add_role", 2, ptypes.AddRole, add_role},
+	"3fbf7da5": SNativeFuncDescription{"add_role", 2, ptypes.AddRole, add_role},
 	"9ea53314": SNativeFuncDescription{"set_base", 3, ptypes.SetBase, set_base},
 	"bb37737a": SNativeFuncDescription{"has_base", 2, ptypes.HasBase, has_base},
-	"ded3350a": SNativeFuncDescription{"rm_role", 2, ptypes.RmRole, rm_role},
+	"28fd0194": SNativeFuncDescription{"rm_role", 2, ptypes.RmRole, rm_role},
 }
 
 func permissionsContract(appState AppState, caller *Account, args []byte, gas *int64) (output []byte, err error) {

README.md

-Master [![Circle CI](https://circleci.com/gh/eris-ltd/eris-db/tree/master.svg?style=svg)](https://circleci.com/gh/eris-ltd/eris-db)
- Develop [![Circle CI (develop)](https://circleci.com/gh/eris-ltd/eris-db/tree/develop.svg?style=svg)](https://circleci.com/gh/eris-ltd/eris-db)
+|[![GoDoc](https://godoc.org/github.com/eris-db?status.png)](https://godoc.org/github.com/eris-ltd/eris-db) | Linux |
+|---|-------|
+| Master | [![Circle CI](https://circleci.com/gh/eris-ltd/eris-db/tree/master.svg?style=svg)](https://circleci.com/gh/eris-ltd/eris-db/tree/master) |
+| Develop | [![Circle CI (develop)](https://circleci.com/gh/eris-ltd/eris-db/tree/develop.svg?style=svg)](https://circleci.com/gh/eris-ltd/eris-db/tree/develop) |
 
 # Eris-DB (Alpha)
 
@@ -7,9 +9,9 @@ Master [![Circle CI](https://circleci.com/gh/eris-ltd/eris-db/tree/master.svg?st
 
 ## Installation
 
-There are no pre-built releases other then the docker images.
+There are no pre-built releases other than the docker images.
 
-The recommended way of working with eris-db is through [eris-cli](https://github.com/eris-ltd/eris-cli) (develop branch as of now).
+The recommended way of working with eris-db is through [eris-cli](https://github.com/eris-ltd/eris-cli). See the [eris-db documentation](https://erisindustries.com/components/erisdb/) for more information.
 
 ### Building from source
 

circle.yml

@@ -36,3 +36,4 @@ deployment:
     branch: develop
     commands:
       - DOCKER/build.sh
+      - docker push quay.io/eris/erisdb

version/version.go

@@ -16,5 +16,7 @@
 
 package version
 
-const VERSION = "0.12.0"
 const TENDERMINT_VERSION = "0.5.0"
+// IMPORTANT: Eris-DB version must be on the last line of this file for
+// the deployment script DOCKER/build.sh to pick up the right label.
+const VERSION = "0.12.0"