diff --git a/eth/api.go b/eth/api.go index 604639f77dc8..7ec802b15852 100644 --- a/eth/api.go +++ b/eth/api.go @@ -353,7 +353,7 @@ func (api *PublicDebugAPI) DumpBlock(blockNr rpc.BlockNumber) (state.Dump, error if blockNr == rpc.LatestBlockNumber { block = api.eth.blockchain.CurrentBlock() } else if blockNr == rpc.FinalizedBlockNumber { - block = api.eth.blockchain.CurrentFinalizedBlock() + block = api.eth.blockchain.CurrentBlock() } else { block = api.eth.blockchain.GetBlockByNumber(uint64(blockNr)) } @@ -443,7 +443,7 @@ func (api *PublicDebugAPI) AccountRange(blockNrOrHash rpc.BlockNumberOrHash, sta if number == rpc.LatestBlockNumber { block = api.eth.blockchain.CurrentBlock() } else if number == rpc.FinalizedBlockNumber { - block = api.eth.blockchain.CurrentFinalizedBlock() + block = api.eth.blockchain.CurrentBlock() } else { block = api.eth.blockchain.GetBlockByNumber(uint64(number)) } diff --git a/eth/api_backend.go b/eth/api_backend.go index 330fb870e3ba..fb344635d76e 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -76,7 +76,7 @@ func (b *EthAPIBackend) HeaderByNumber(ctx context.Context, number rpc.BlockNumb return b.eth.blockchain.CurrentBlock().Header(), nil } if number == rpc.FinalizedBlockNumber { - return b.eth.blockchain.CurrentFinalizedBlock().Header(), nil + return b.eth.blockchain.CurrentBlock().Header(), nil } return b.eth.blockchain.GetHeaderByNumber(uint64(number)), nil } @@ -113,7 +113,7 @@ func (b *EthAPIBackend) BlockByNumber(ctx context.Context, number rpc.BlockNumbe return b.eth.blockchain.CurrentBlock(), nil } if number == rpc.FinalizedBlockNumber { - return b.eth.blockchain.CurrentFinalizedBlock(), nil + return b.eth.blockchain.CurrentBlock(), nil } return b.eth.blockchain.GetBlockByNumber(uint64(number)), nil } diff --git a/params/version.go b/params/version.go index b87c0955db2c..fe5e96fcb700 100644 --- a/params/version.go +++ b/params/version.go @@ -23,7 +23,7 @@ import ( const ( VersionMajor = 0 // Major version component of the current release VersionMinor = 10 // Minor version component of the current release - VersionPatch = 5 // Patch version component of the current release + VersionPatch = 6 // Patch version component of the current release VersionMeta = "stable" // Version metadata to append to the version string ) diff --git a/wemix/scripts/gwemix.sh b/wemix/scripts/gwemix.sh index ce1c11715349..94dea671eaa9 100755 --- a/wemix/scripts/gwemix.sh +++ b/wemix/scripts/gwemix.sh @@ -172,14 +172,16 @@ function start () [ "$MAX_TXS_PER_BLOCK" = "" ] || OPTS="${OPTS} --maxtxsperblock ${MAX_TXS_PER_BLOCK}" [ -d "$d/logs" ] || mkdir -p $d/logs + [ "$LOG_FILESIZE" = "" ] && LOG_FILESIZE="10M" + [ "$LOG_FILECOUNT" = "" ] && LOG_FILECOUNT="5" cd $d if [ ! "$2" = "inner" ]; then $GWEMIX --datadir ${PWD} --metrics $OPTS 2>&1 | \ - ${d}/bin/logrot ${d}/logs/log 10M 5 & + ${d}/bin/logrot ${d}/logs/log ${LOG_FILESIZE} ${LOG_FILECOUNT} & else if [ -x "$d/bin/logrot" ]; then - exec > >($d/bin/logrot $d/logs/log 10M 5) + exec > >($d/bin/logrot $d/logs/log ${LOG_FILESIZE} ${LOG_FILECOUNT}) exec 2>&1 fi exec $GWEMIX --datadir ${PWD} --metrics $OPTS