aboutsummaryrefslogtreecommitdiffstats
path: root/dex/app.go
diff options
context:
space:
mode:
authorWei-Ning Huang <w@cobinhood.com>2018-10-16 19:26:29 +0800
committerWei-Ning Huang <w@byzantine-lab.io>2019-06-12 17:23:39 +0800
commit7d938ac7fd4f787f6e4507ce69c6acc677eb8080 (patch)
tree664c98a1f37787d4352d2527b4f6752d9b9bc755 /dex/app.go
parentab284ca86e5181cbd009aaa1e9b49d56eb532f97 (diff)
downloadgo-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar.gz
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar.bz2
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar.lz
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar.xz
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.tar.zst
go-tangerine-7d938ac7fd4f787f6e4507ce69c6acc677eb8080.zip
dex/core: misc bug fixes
Diffstat (limited to 'dex/app.go')
-rw-r--r--dex/app.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/dex/app.go b/dex/app.go
index 35a771460..85d7ea621 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -308,11 +308,12 @@ func (d *DexconApp) BlockDelivered(blockHash coreCommon.Hash, result coreTypes.F
_, err = d.blockchain.InsertChain(
[]*types.Block{types.NewBlock(&types.Header{
- ParentHash: common.Hash(block.ParentHash),
+ ParentHash: d.blockchain.CurrentBlock().Hash(),
Number: new(big.Int).SetUint64(result.Height),
- Time: new(big.Int).SetInt64(result.Timestamp.Unix()),
+ Time: big.NewInt(result.Timestamp.Unix()),
TxHash: types.DeriveSha(transactions),
Coinbase: common.BytesToAddress(block.ProposerID.Hash[:]),
+ GasLimit: 800000,
}, transactions, nil, nil)})
if err != nil {
log.Error("insert chain", "error", err)