From eb981cbb18a813910e57e6f3531efd188466e393 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@monax.io>
Date: Fri, 18 Nov 2016 05:46:11 +0100
Subject: [PATCH] time: introduce marmot time
---
manager/eris-mint/eris-mint.go | 11 ++++++++++-
manager/eris-mint/state/state.go | 5 ++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/manager/eris-mint/eris-mint.go b/manager/eris-mint/eris-mint.go
index 2c08757c..772174fe 100644
--- a/manager/eris-mint/eris-mint.go
+++ b/manager/eris-mint/eris-mint.go
@@ -20,6 +20,7 @@ import (
"bytes"
"fmt"
"sync"
+ "time"
tendermint_events "github.com/tendermint/go-events"
wire "github.com/tendermint/go-wire"
@@ -165,7 +166,15 @@ func (app *ErisMint) Commit() (res tmsp.Result) {
// flush events to listeners (XXX: note issue with blocking)
app.evc.Flush()
- return tmsp.NewResultOK(app.state.Hash(), "Success")
+ // MARMOT:
+ // 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")
}
func (app *ErisMint) Query(query []byte) (res tmsp.Result) {
diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go
index a36bc8ec..6a3945ae 100644
--- a/manager/eris-mint/state/state.go
+++ b/manager/eris-mint/state/state.go
@@ -413,7 +413,10 @@ func MakeGenesisState(db dbm.DB, genDoc *GenesisDoc) *State {
}
if genDoc.GenesisTime.IsZero() {
- genDoc.GenesisTime = time.Now()
+ // MARMOT: really?
+ // set time to 11/18/2016 @ 4:09am (UTC)
+ genDoc.GenesisTime = time.Unix(1479442162, 0)
+ // genDoc.GenesisTime = time.Now()
}
// Make accounts state tree
--
GitLab