diff --git a/manager/eris-mint/eris-mint.go b/manager/eris-mint/eris-mint.go index 29050723ae9e89850b0ebbb91d432591ffdb4ef1..85c3165b3ffdf9f3e3b0efb312f6a790bc13fe49 100644 --- a/manager/eris-mint/eris-mint.go +++ b/manager/eris-mint/eris-mint.go @@ -168,13 +168,13 @@ func (app *ErisMint) Commit() (res tmsp.Result) { // flush events to listeners (XXX: note issue with blocking) app.evc.Flush() - // MARMOT: - // set internal time as two seconds per block + // TODO: [ben] over the tendermint 0.6 TMSP interface we have + // no access to the block header implemented; + // On Tendermint v0.8 load the blockheader into the application + // state and remove the fixed 2-"seconds" per block internal clock. + // NOTE: set internal time as two seconds per block app.state.LastBlockTime = app.state.LastBlockTime.Add(time.Duration(2) * time.Second) - fmt.Printf("\n\nMARMOT TIME: %s\n\n", app.state.LastBlockTime) - // MARMOT: appHash := app.state.Hash() - fmt.Printf("\n\nMARMOT COMMIT: %X\n\n", appHash) // return tmsp.NewResultOK(app.state.Hash(), "Success") return tmsp.NewResultOK(appHash, "Success") } diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go index a9dd607fff77964105a6da01e0aedf1035b47a24..2960cc566832cb234159d55668f1610b364d897f 100644 --- a/manager/eris-mint/state/state.go +++ b/manager/eris-mint/state/state.go @@ -416,10 +416,12 @@ func MakeGenesisState(db dbm.DB, genDoc *genesis.GenesisDoc) *State { } if genDoc.GenesisTime.IsZero() { - // MARMOT: really? - // set time to 11/18/2016 @ 4:09am (UTC) + // NOTE: [ben] change GenesisTime to requirement on v0.17 + // GenesisTime needs to be deterministic across the chain + // and should be required in the genesis file; + // the requirement is not yet enforced when lacking set + // time to 11/18/2016 @ 4:09am (UTC) genDoc.GenesisTime = time.Unix(1479442162, 0) - // genDoc.GenesisTime = time.Now() } // Make accounts state tree