Skip to content
Snippets Groups Projects
Commit 050ed87d authored by Benjamin Bollen's avatar Benjamin Bollen Committed by GitHub
Browse files

Merge pull request #365 from eris-ltd/develop

release v0.12.0
parents 11b9a3e2 116a5c1e
No related branches found
No related tags found
No related merge requests found
...@@ -25,13 +25,20 @@ See the [eris-db documentation](https://monax.io/docs/documentation/db/) for mor ...@@ -25,13 +25,20 @@ See the [eris-db documentation](https://monax.io/docs/documentation/db/) for mor
`eris-db` is intended to be used by the `eris chains` command via [eris-cli](https://monax.io/docs/documentation/cli/latest/eris_chains). Available commands such as `make | start | stop | logs | inspect | update` are used for chain lifecycle management. `eris-db` is intended to be used by the `eris chains` command via [eris-cli](https://monax.io/docs/documentation/cli/latest/eris_chains). Available commands such as `make | start | stop | logs | inspect | update` are used for chain lifecycle management.
### For Developers ### For Developers
Dependency management for eris-db is managed with [glide](github.com/Masterminds/glide), and you can build eris-db from source by following
1. [Install go](https://golang.org/doc/install) 1. [Install go](https://golang.org/doc/install)
2. Ensure you have `gmp` installed (`sudo apt-get install libgmp3-dev || brew install gmp`) 2. Ensure you have `gmp` installed (`sudo apt-get install libgmp3-dev || brew install gmp`)
3. `go get github.com/eris-ltd/eris-db/cmd/eris-db` 3. and execute following commands in a terminal:
```
go get github.com/Masterminds/glide
go get -d github.com/eris-ltd/eris-db
REPO=$($GOPATH/src/github.com/eris-ltd/eris-db)
cd $REPO && glide install
cd $REPO/cmd/eris-db && go install```
To run `eris-db`, just type `$ eris-db serve --work-dir <path to chain directory>` To run `eris-db`, just type `$ eris-db serve --work-dir <path to chain directory>`, where the chain directory needs to contain the configuration files as generated by `eris chains make`.
This will start the node using the provided folder as working dir. If the path is omitted it defaults to `~/.erisdb` This will start the node using the provided folder as working dir. If the path is omitted it defaults to `~/.erisdb`
......
...@@ -21,6 +21,9 @@ import ( ...@@ -21,6 +21,9 @@ import (
// "strings" // "strings"
"github.com/tendermint/go-rpc/client" "github.com/tendermint/go-rpc/client"
// Note [ben]: this is included to silence the logger from tendermint/go-rpc/client
// see func init()
tendermint_log "github.com/tendermint/log15"
log "github.com/eris-ltd/eris-logger" log "github.com/eris-ltd/eris-logger"
...@@ -73,6 +76,13 @@ func NewErisNodeClient(rpcString string) *ErisNodeClient { ...@@ -73,6 +76,13 @@ func NewErisNodeClient(rpcString string) *ErisNodeClient {
} }
} }
// Note [Ben]: This is a hack to silence Tendermint logger from tendermint/go-rpc
// it needs to be initialised before go-rpc, hence it's placement here.
func init() {
h := tendermint_log.LvlFilterHandler(tendermint_log.LvlWarn, tendermint_log.StdoutHandler)
tendermint_log.Root().SetHandler(h)
}
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------
// broadcast to blockchain node // broadcast to blockchain node
// NOTE: [ben] Eris Client first continues from tendermint rpc, but will have handshake to negotiate // NOTE: [ben] Eris Client first continues from tendermint rpc, but will have handshake to negotiate
......
...@@ -23,8 +23,11 @@ imports: ...@@ -23,8 +23,11 @@ imports:
version: f0aeabca5a127c4078abb8c8d64298b147264b55 version: f0aeabca5a127c4078abb8c8d64298b147264b55
- name: github.com/davecgh/go-spew - name: github.com/davecgh/go-spew
version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
- name: github.com/eris-ltd/common
version: 8ca15f5455104403db4202c995e2f6e161654c02
subpackages: subpackages:
- spew - go/docs
- go/common
- name: github.com/eris-ltd/eris-keys - name: github.com/eris-ltd/eris-keys
version: 114ebc77443db9a153692233294e48bc7e184215 version: 114ebc77443db9a153692233294e48bc7e184215
- name: github.com/eris-ltd/eris-logger - name: github.com/eris-ltd/eris-logger
...@@ -212,6 +215,4 @@ imports: ...@@ -212,6 +215,4 @@ imports:
version: ecde8c8f16df93a994dda8936c8f60f0c26c28ab version: ecde8c8f16df93a994dda8936c8f60f0c26c28ab
- name: gopkg.in/yaml.v2 - name: gopkg.in/yaml.v2
version: a83829b6f1293c91addabc89d0571c246397bbf4 version: a83829b6f1293c91addabc89d0571c246397bbf4
- name: github.com/eris-ltd/common
version: 8d928eec1d46942444f81eaa33c06da1c6e48ed9
devImports: [] devImports: []
...@@ -129,4 +129,4 @@ func (version *VersionIdentifier) MatchesMinorVersion( ...@@ -129,4 +129,4 @@ func (version *VersionIdentifier) MatchesMinorVersion(
// IMPORTANT: Eris-DB version must be on the last line of this file for // IMPORTANT: Eris-DB version must be on the last line of this file for
// the deployment script tests/build_tool.sh to pick up the right label. // the deployment script tests/build_tool.sh to pick up the right label.
const VERSION = "0.12.0-rc3" const VERSION = "0.12.0"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment