aboutsummaryrefslogtreecommitdiffstats
path: root/dex
diff options
context:
space:
mode:
authorJimmy Hu <jimmy.hu@dexon.org>2018-12-13 10:45:29 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-12 17:27:19 +0800
commit7a587feaa582fcecdcc0388f720e54614cb6b8f4 (patch)
treed7669f53ccbb1533a6ddd7d87852f27cf4f71de6 /dex
parentff5d1d96642ddbe6d30c02f477e1c2ff5bd85909 (diff)
downloadgo-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar.gz
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar.bz2
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar.lz
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar.xz
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.tar.zst
go-tangerine-7a587feaa582fcecdcc0388f720e54614cb6b8f4.zip
dex, cmd: Add DMoment to command line (#87)
Diffstat (limited to 'dex')
-rw-r--r--dex/backend.go8
-rw-r--r--dex/config.go3
2 files changed, 5 insertions, 6 deletions
diff --git a/dex/backend.go b/dex/backend.go
index 8153dc2ed..5ea30b1a9 100644
--- a/dex/backend.go
+++ b/dex/backend.go
@@ -166,12 +166,8 @@ func New(ctx *node.ServiceContext, config *Config) (*Dexon, error) {
privKey := coreEcdsa.NewPrivateKeyFromECDSA(config.PrivateKey)
- // TODO(w): set this correctly in config.
- now := time.Now()
- dMoment := time.Date(
- now.Year(), now.Month(), now.Day(),
- now.Hour(), now.Minute(), (now.Second()/5+1)*5,
- 0, now.Location())
+ dMoment := time.Unix(config.DMoment, int64(0))
+ log.Info("DEXON Consensus DMoment", "time", dMoment)
dex.consensus = dexCore.NewConsensus(dMoment,
dex.app, dex.governance, blockdb.NewDatabase(chainDb), dex.network, privKey, log.Root())
diff --git a/dex/config.go b/dex/config.go
index 924e18d53..5f148cc03 100644
--- a/dex/config.go
+++ b/dex/config.go
@@ -118,4 +118,7 @@ type Config struct {
// RPCGasCap is the global gas cap for eth-call variants.
RPCGasCap *big.Int `toml:",omitempty"`
+
+ // Dexon options
+ DMoment int64
}