{{ niceNum(status.validator_info.voting_power) }} of 100,000,000
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/helpers/helpers.go b/helpers/helpers.go
index df492c909..37e959dba 100644
--- a/helpers/helpers.go
+++ b/helpers/helpers.go
@@ -1,6 +1,8 @@
package helpers
-import "math/big"
+import (
+ "math/big"
+)
func BipToPip(bip *big.Int) *big.Int {
p := big.NewInt(10)
diff --git a/log/log.go b/log/log.go
index 5dc2973f7..754891696 100644
--- a/log/log.go
+++ b/log/log.go
@@ -1,6 +1,7 @@
package log
import (
+ "github.com/tendermint/tendermint/libs/cli/flags"
"github.com/tendermint/tendermint/libs/log"
"os"
)
@@ -10,7 +11,7 @@ var (
)
func init() {
- logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
+ logger, _ := flags.ParseLogLevel("consensus:info,state:info,*:error", log.NewTMLogger(os.Stdout), "info")
SetLogger(logger)
}
@@ -22,6 +23,10 @@ func Info(msg string, ctx ...interface{}) {
logger.Info(msg, ctx...)
}
+func Error(msg string, ctx ...interface{}) {
+ logger.Error(msg, ctx...)
+}
+
func With(keyvals ...interface{}) log.Logger {
return logger.With(keyvals...)
}
diff --git a/networks/testnet/config.toml b/networks/testnet/config.toml
deleted file mode 100644
index 8026d56a9..000000000
--- a/networks/testnet/config.toml
+++ /dev/null
@@ -1,163 +0,0 @@
-# This is a TOML config file.
-# For more information, see https://github.com/toml-lang/toml
-
-##### main base config options #####
-
-# TCP or UNIX socket address of the ABCI application,
-# or the name of an ABCI application compiled in with the Tendermint binary
-proxy_app = "tcp://127.0.0.1:46658"
-
-# A custom human readable name for this node
-moniker = "MinterNode"
-
-# If this node is many blocks behind the tip of the chain, FastSync
-# allows them to catchup quickly by downloading blocks in parallel
-# and verifying their commits
-fast_sync = true
-
-# Database backend: leveldb | memdb
-db_backend = "leveldb"
-
-# Database directory
-db_path = "data"
-
-# Output level for logging, including package level options
-log_level = "main:info,state:info,*:error"
-
-##### additional base config options #####
-
-# Path to the JSON file containing the initial validator set and other meta data
-genesis_file = "config/genesis.json"
-
-# Path to the JSON file containing the private key to use as a validator in the consensus protocol
-priv_validator_file = "config/priv_validator.json"
-
-# Path to the JSON file containing the private key to use for node authentication in the p2p protocol
-node_key_file = "config/node_key.json"
-
-# Mechanism to connect to the ABCI application: socket | grpc
-abci = "socket"
-
-# TCP or UNIX socket address for the profiling server to listen on
-prof_laddr = ""
-
-# If true, query the ABCI app on connecting to a new peer
-# so the app can decide if we should keep the connection or not
-filter_peers = false
-
-##### advanced configuration options #####
-
-##### rpc server configuration options #####
-[rpc]
-
-# TCP or UNIX socket address for the RPC server to listen on
-laddr = "tcp://0.0.0.0:46657"
-
-# TCP or UNIX socket address for the gRPC server to listen on
-# NOTE: This server only supports /broadcast_tx_commit
-grpc_laddr = ""
-
-# Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
-unsafe = false
-
-##### peer to peer configuration options #####
-[p2p]
-
-# Address to listen for incoming connections
-laddr = "tcp://0.0.0.0:46656"
-
-# Comma separated list of seed nodes to connect to
-seeds = ""
-
-# Comma separated list of nodes to keep persistent connections to
-persistent_peers = "249c62818bf4601605a65b5adc35278236bd5312@95.216.148.138:46656"
-
-# Path to address book
-addr_book_file = "config/addrbook.json"
-
-# Set true for strict address routability rules
-addr_book_strict = true
-
-# Time to wait before flushing messages out on the connection, in ms
-flush_throttle_timeout = 100
-
-# Maximum number of peers to connect to
-max_num_peers = 50
-
-# Maximum size of a message packet payload, in bytes
-max_msg_packet_payload_size = 2048
-
-# Rate at which packets can be sent, in bytes/second
-send_rate = 1024000
-
-# Rate at which packets can be received, in bytes/second
-recv_rate = 1024000
-
-# Set true to enable the peer-exchange reactor
-pex = true
-
-# Seed mode, in which node constantly crawls the network and looks for
-# peers. If another node asks it for addresses, it responds and disconnects.
-#
-# Does not work if the peer-exchange reactor is disabled.
-seed_mode = false
-
-##### mempool configuration options #####
-[mempool]
-
-recheck = true
-recheck_empty = false
-broadcast = true
-wal_dir = "data/mempool.wal"
-cache_size = 100000
-
-##### consensus configuration options #####
-[consensus]
-
-wal_file = "data/cs.wal/wal"
-
-# All timeouts are in milliseconds
-timeout_propose = 3000
-timeout_propose_delta = 500
-timeout_prevote = 1000
-timeout_prevote_delta = 500
-timeout_precommit = 1000
-timeout_precommit_delta = 500
-timeout_commit = 5000
-
-# Make progress as soon as we have all the precommits (as if TimeoutCommit = 0)
-skip_timeout_commit = false
-
-# BlockSize
-max_block_size_txs = 10000
-max_block_size_bytes = 1
-
-# EmptyBlocks mode and possible interval between empty blocks in seconds
-create_empty_blocks = true
-create_empty_blocks_interval = 0
-
-# Reactor sleep duration parameters are in milliseconds
-peer_gossip_sleep_duration = 100
-peer_query_maj23_sleep_duration = 2000
-
-##### transactions indexer configuration options #####
-[tx_index]
-
-# What indexer to use for transactions
-#
-# Options:
-# 1) "null" (default)
-# 2) "kv" - the simplest possible indexer, backed by key-value storage (defaults to levelDB; see DBBackend).
-indexer = "kv"
-
-# Comma-separated list of tags to index (by default the only tag is tx hash)
-#
-# It's recommended to index only a subset of tags due to possible memory
-# bloat. This is, of course, depends on the indexer's DB and the volume of
-# transactions.
-index_tags = ""
-
-# When set to true, tells indexer to index all tags. Note this may be not
-# desirable (see the comment above). IndexTags has a precedence over
-# IndexAllTags (i.e. when given both, IndexTags will be indexed).
-index_all_tags = true
\ No newline at end of file
diff --git a/networks/testnet/genesis.json b/networks/testnet/genesis.json
deleted file mode 100644
index cf75e8a27..000000000
--- a/networks/testnet/genesis.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "genesis_time": "2018-06-09T00:00:00Z",
- "chain_id": "minter-test-network-10",
- "validators": [
- {
- "pub_key": {
- "type": "tendermint/PubKeyEd25519",
- "value": "qu4d3zD/VMkHFdkotWZS/FEb7Tci5Ylz6O+Ub12uOXk="
- },
- "power": "100",
- "name": ""
- }
- ],
- "app_state": {
- "first_validator_address": "Mxa93163fdf10724dc4785ff5cbfb9ac0b5949409f",
- "initial_balances": [
- {
- "address": "Mxa93163fdf10724dc4785ff5cbfb9ac0b5949409f",
- "balance": {
- "MNT": "10000000000000000000000000"
- }
- },
- {
- "address": "Mxfe60014a6e9ac91618f5d1cab3fd58cded61ee99",
- "balance": {
- "MNT": "10000000000000000000000000"
- }
- }
- ]
- },
- "app_hash": "0000000000000000000000000000000000000000000000000000000000000000"
-}
\ No newline at end of file
diff --git a/tests/acceptance/api/tests.go b/tests/acceptance/api/tests.go
index b2bd811c5..991323808 100644
--- a/tests/acceptance/api/tests.go
+++ b/tests/acceptance/api/tests.go
@@ -32,11 +32,7 @@ func TestApiStatus() error {
err = json.Unmarshal(data, &status)
- if err != nil {
- return err
- }
-
- return nil
+ return err
}
func TestApiBlock() error {
@@ -59,9 +55,5 @@ func TestApiBlock() error {
err = json.Unmarshal(data, &blockResult)
- if err != nil {
- return err
- }
-
- return nil
+ return err
}
diff --git a/tests/acceptance/docker/docker-compose.yml b/tests/acceptance/docker/docker-compose.yml
index 5f23a56e5..b33434147 100644
--- a/tests/acceptance/docker/docker-compose.yml
+++ b/tests/acceptance/docker/docker-compose.yml
@@ -2,16 +2,7 @@ version: "3.4"
services:
minter:
image: minterteam/minter:latest
- command: --tendermint_addr=tcp://tendermint:46657
volumes:
- ./data/.minter:/minter
ports:
- "8841:8841"
- tendermint:
- image: tendermint/tendermint:0.22.0
- command: node --proxy_app=tcp://minter:46658
- volumes:
- - ./data/.tendermint:/tendermint
- ports:
- - "46656:46656"
- - "46657:46657"
diff --git a/tests/acceptance/main.go b/tests/acceptance/main.go
index 8d568c13b..8c0dce2be 100644
--- a/tests/acceptance/main.go
+++ b/tests/acceptance/main.go
@@ -45,7 +45,7 @@ func main() {
logger.Fatalf("Failed test \"%s\"\nReason: %s", testName, err)
}
- elapsed := time.Now().Sub(start)
+ elapsed := time.Since(start)
logger.Printf("Completed \"%s\" in %s \n", testName, elapsed)
}
diff --git a/version/version.go b/version/version.go
index 7c1c78936..fd87602e6 100755
--- a/version/version.go
+++ b/version/version.go
@@ -3,13 +3,13 @@ package version
// Version components
const (
Maj = "0"
- Min = "0"
- Fix = "6"
+ Min = "1"
+ Fix = "0"
)
var (
// Must be a string because scripts like dist.sh read this file.
- Version = "0.0.6"
+ Version = "0.1.0"
// GitCommit is the current HEAD set using ldflags.
GitCommit string