Skip to content
This repository has been archived by the owner on Apr 3, 2022. It is now read-only.

Commit

Permalink
Version 2.1.5-0.alpha.atlantis+10102018
Browse files Browse the repository at this point in the history
  • Loading branch information
Captain Dero committed Oct 10, 2018
1 parent 82347c0 commit 06df0d7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions blockchain/rpcserver/getinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ func (h GetInfo_Handler) ServeJSONRPC(c context.Context, params *fastjson.RawMes
result.Median_Block_Size = config.CRYPTONOTE_MAX_BLOCK_SIZE

result.Total_Supply = chain.Load_Already_Generated_Coins_for_Topo_Index(nil, result.TopoHeight)
if result.Total_Supply > (2000000 * 1000000000000) {
result.Total_Supply -= (2000000 * 1000000000000) // remove premine
if result.Total_Supply > (1000000 * 1000000000000) {
result.Total_Supply -= (1000000 * 1000000000000) // remove premine
}
result.Total_Supply = result.Total_Supply / 1000000000000

Expand Down
4 changes: 2 additions & 2 deletions cmd/derod/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -758,8 +758,8 @@ func main() {

supply := chain.Load_Already_Generated_Coins_for_Topo_Index(nil, chain.Load_TOPO_HEIGHT(nil))

if supply > (2000000 * 1000000000000) {
supply -= (2000000 * 1000000000000) // remove premine
if supply > (1000000 * 1000000000000) {
supply -= (1000000 * 1000000000000) // remove premine
}
fmt.Printf("Network %s Height %d NW Hashrate %0.03f MH/sec TH %s Peers %d inc, %d out MEMPOOL size %d Total Supply %s DERO \n", globals.Config.Name, chain.Get_Height(), float64(chain.Get_Network_HashRate())/1000000.0, chain.Get_Top_ID(), inc, out, len(chain.Mempool.Mempool_List_TX()), globals.FormatMoney(supply))

Expand Down
2 changes: 1 addition & 1 deletion config/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ import "github.com/blang/semver"

// right now it has to be manually changed
// do we need to include git commitsha??
var Version = semver.MustParse("2.1.4-0.alpha.atlantis+04102018")
var Version = semver.MustParse("2.1.5-0.alpha.atlantis+10102018")
2 changes: 1 addition & 1 deletion globals/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func Init_rlog() {
HOOK.formatter.DisableTimestamp = true

if os.Getenv("RLOG_LOG_LEVEL") == "" {
os.Setenv("RLOG_LOG_LEVEL", "INFO") // default logging in debug mode
os.Setenv("RLOG_LOG_LEVEL", "WARN") // default logging in debug mode
}

if os.Getenv("RLOG_LOG_FILE") == "" {
Expand Down

0 comments on commit 06df0d7

Please sign in to comment.