Browse Source

Version 2.1.5-0.alpha.atlantis+10102018

master
Captain Dero 2 years ago
parent
commit
06df0d79d1
4 changed files with 6 additions and 6 deletions
  1. +2
    -2
      blockchain/rpcserver/getinfo.go
  2. +2
    -2
      cmd/derod/main.go
  3. +1
    -1
      config/version.go
  4. +1
    -1
      globals/log.go

+ 2
- 2
blockchain/rpcserver/getinfo.go View File

@@ -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



+ 2
- 2
cmd/derod/main.go View File

@@ -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))



+ 1
- 1
config/version.go View File

@@ -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")

+ 1
- 1
globals/log.go View File

@@ -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") == "" {


Loading…
Cancel
Save