diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 1ea0ba0f1d5c321d47e53b73df1aacbb71e1359d..e80543c222854120e1bfdcea68cd4e56bf646ad7 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -1,13 +1,7 @@ # 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 diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go index 3fa8f3dc7e60042b49e692d75727c861e7a49e42..fed65416c8ba60df030869fb80774f1d5df62ba9 100644 --- a/Godeps/_workspace/src/github.com/tendermint/tendermint/permission/types/permissions.go +++ b/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 diff --git a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go b/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go index b497364d7d111a77c1c64cadda65a29ec8adb742..c62e948d03a33a847ce492e63608911dfb98bb70 100644 --- a/Godeps/_workspace/src/github.com/tendermint/tendermint/vm/snative.go +++ b/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) { diff --git a/README.md b/README.md index 2749b1e839fe2ff7e69a2bc33f1ff38cb08539dc..2b179e864dc03f55c4f2b5502c67bd2e9b23e14b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ -Master [](https://circleci.com/gh/eris-ltd/eris-db) - Develop [](https://circleci.com/gh/eris-ltd/eris-db) +|[](https://godoc.org/github.com/eris-ltd/eris-db) | Linux | +|---|-------| +| Master | [](https://circleci.com/gh/eris-ltd/eris-db/tree/master) | +| Develop | [](https://circleci.com/gh/eris-ltd/eris-db/tree/develop) | # Eris-DB (Alpha) @@ -7,9 +9,9 @@ Master [ (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 diff --git a/circle.yml b/circle.yml index 4e911bb0c0750e69e506d9fb9fe1d4a5eb580950..409908f27afea3249b62893f5e8bd2f7930029af 100644 --- a/circle.yml +++ b/circle.yml @@ -36,3 +36,4 @@ deployment: branch: develop commands: - DOCKER/build.sh + - docker push quay.io/eris/erisdb diff --git a/version/version.go b/version/version.go index 3ae112067c56caef2cfc0fb6b0c34a205a8118c7..0704ecb6f78258fbb44759f63ac1a031f3e1eebb 100644 --- a/version/version.go +++ b/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"