diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-13 10:45:29 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | b59955ee9da30f2eb2652a7a38aa58cd7e07be56 (patch) | |
| tree | 02298d0637a3799106dd229f04e151138d06d281 /dex | |
| parent | 5d8800ff15319f0588b37959385a6e235cffd72e (diff) | |
| download | dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar.gz dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar.bz2 dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar.lz dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar.xz dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.tar.zst dexon-b59955ee9da30f2eb2652a7a38aa58cd7e07be56.zip | |
dex, cmd: Add DMoment to command line (#87)
Diffstat (limited to 'dex')
| -rw-r--r-- | dex/backend.go | 8 | ||||
| -rw-r--r-- | dex/config.go | 3 |
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 5fa7d87e8..404be2fb0 100644 --- a/dex/config.go +++ b/dex/config.go @@ -114,4 +114,7 @@ type Config struct { EWASMInterpreter string // Type of the EVM interpreter ("" for default) EVMInterpreter string + + // Dexon options + DMoment int64 } |