diff --git a/server_config.toml b/server_config.toml index dc9bc5c7fb196e70b2194e868bd37638d74e78e7..c3b17a9196db9da6ed0b7fd462624ac29e00a26b 100644 --- a/server_config.toml +++ b/server_config.toml @@ -104,59 +104,21 @@ listener = "tcp://0.0.0.0:46658" ################################################################################ [tendermint] +# Tendermint requires an external configuration file present on disk +# in the tendermint root directory. +# Eris-DB's tendermint consensus module will copy this configuration file from +# the Eris-DB working directory to the Tendermint working directory +# as `config.toml`. +# Eris-DB will respect the configurations set in this file where applicable, +# but reserves the option to override or block conflicting settings. +configuration_file = "tendermint_config.toml" +# +genesis_file = "genesis.json" +# +genesis_ +addressbook_file = "addrbook.json" +private_validator_file = "priv_validator.json" - # tendermint requires an external configuration file present on disk - # in the tendermint root directory. - # Eris-DB's tendermint consensus module will extract this subtree from - # the configuration file and write it in the tendermint root directory, - # if not already present. - [tendermint.configuration] - # moniker is the name of the node on the tendermint p2p network - moniker = "anonymous_marmot" - # seeds lists the peers tendermint can connect to join the network - seeds = "" - # fast_sync allows a tendermint node to catch up faster when joining - # the network. - # NOTE: Tendermint has reported potential issues with fast_sync enabled. - # The recommended setting is for keeping it disabled. - fast_sync = false - # database backend to use for Tendermint. Supported `leveldb` and `memdb`. - db_backend = "leveldb" - # logging level. Suppored `debug`, `notice`, `info` [ben: incomplete, see Tendermint] - log_level = "notice" - # node local address - node_laddr = "0.0.0.0:46656" - # rpc local address - rpc_laddr = "0.0.0.0:46657" - # proxy application address - used for tmsp connections, - # and this port should not be exposed for in-process Tendermint - proxy_app = "tcp://127.0.0.1:46658" - - # Extended Tendermint configuration settings - # for reference to Tendermint see https://github.com/tendermint/tendermint/blob/master/config/tendermint/config.go - - # genesis_file = "./data/tendermint/genesis.json" - # skip_upnp = false - # addrbook_file = "./data/tendermint/addrbook.json" - # priv_validator_file = "./data/tendermint/priv_validator.json" - # db_dir = "./data/tendermint/data" - # prof_laddr = "" - # revision_file = "./data/tendermint/revision" - # cswal = "./data/tendermint/datat/cswal" - # cswal_light = false - - # block_size = 10000 - # disable_data_hash = false - # timeout_propose = 3000 - # timeout_propose_delta = 500 - # timeout_prevote = 1000 - # timeout_prevote_delta = 500 - # timeout_precommit = 1000 - # timeout_precommit_delta = 500 - # timeout_commit = 1000 - # mempool_recheck = true - # mempool_recheck_empty = true - # mempool_broadcast = true ################################################################################ ## diff --git a/tendermint_config.toml b/tendermint_config.toml new file mode 100644 index 0000000000000000000000000000000000000000..e7eda22c2bd090fedc08f201356a7398f2bb5fee --- /dev/null +++ b/tendermint_config.toml @@ -0,0 +1,71 @@ +# Copyright 2015, 2016 Eris Industries (UK) Ltd. +# This file is part of Eris-RT +# +# Eris-RT is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Eris-RT is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Eris-RT. If not, see <http://www.gnu.org/licenses/>. + +# This is a TOML configuration for Tendermint consensus for Eris-DB chains + +################################################################################ +## +## Tendermint +## version 0.6.0 +## +################################################################################ + +# moniker is the name of the node on the tendermint p2p network +moniker = "anonymous_marmot" +# seeds lists the peers tendermint can connect to join the network +seeds = "" +# fast_sync allows a tendermint node to catch up faster when joining +# the network. +# NOTE: Tendermint has reported potential issues with fast_sync enabled. +# The recommended setting is for keeping it disabled. +fast_sync = false +# database backend to use for Tendermint. Supported `leveldb` and `memdb`. +db_backend = "leveldb" +# logging level. Suppored `debug`, `notice`, `info` [ben: incomplete, see Tendermint] +log_level = "notice" +# node local address +node_laddr = "0.0.0.0:46656" +# rpc local address +rpc_laddr = "0.0.0.0:46657" +# proxy application address - used for tmsp connections, +# and this port should not be exposed for in-process Tendermint +proxy_app = "tcp://127.0.0.1:46658" + +# Extended Tendermint configuration settings +# for reference to Tendermint see https://github.com/tendermint/tendermint/blob/master/config/tendermint/config.go + +# genesis_file = "./data/tendermint/genesis.json" +# skip_upnp = false +# addrbook_file = "./data/tendermint/addrbook.json" +# priv_validator_file = "./data/tendermint/priv_validator.json" +# db_dir = "./data/tendermint/data" +# prof_laddr = "" +# revision_file = "./data/tendermint/revision" +# cswal = "./data/tendermint/data/cswal" +# cswal_light = false + +# block_size = 10000 +# disable_data_hash = false +# timeout_propose = 3000 +# timeout_propose_delta = 500 +# timeout_prevote = 1000 +# timeout_prevote_delta = 500 +# timeout_precommit = 1000 +# timeout_precommit_delta = 500 +# timeout_commit = 1000 +# mempool_recheck = true +# mempool_recheck_empty = true +# mempool_broadcast = true diff --git a/version/version.go b/version/version.go index 92e4a6eab04b59dce93b12f0de3661ac6cf67eca..3b8a0e57e825163617bc53ab0505c11e1e318478 100644 --- a/version/version.go +++ b/version/version.go @@ -16,6 +16,7 @@ // version provides the current Eris-DB version and a VersionIdentifier // for the modules to identify their version with. + package version import (