From 47b4be274b72cecfd653702413d4cae0f97f710e Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@cobinhood.com>
Date: Fri, 12 Oct 2018 11:08:15 +0800
Subject: dex: update application interface
---
dex/app.go | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
(limited to 'dex')
diff --git a/dex/app.go b/dex/app.go
index cdbcdbda6..b34c9f553 100644
--- a/dex/app.go
+++ b/dex/app.go
@@ -19,11 +19,13 @@ package dex
import (
"bytes"
- "github.com/dexon-foundation/dexon/core/rawdb"
"math/big"
"sync"
"time"
+ "github.com/dexon-foundation/dexon/core/rawdb"
+
+ coreCommon "github.com/dexon-foundation/dexon-consensus-core/common"
coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types"
"github.com/dexon-foundation/dexon/common"
@@ -232,26 +234,31 @@ func (d *DexconApp) VerifyBlock(block *coreTypes.Block) bool {
return true
}
+func (d *DexconApp) BlockConfirmed(block coreTypes.Block) {
+}
+
// BlockDelivered is called when a block is add to the compaction chain.
-func (d *DexconApp) BlockDelivered(block coreTypes.Block) {
- var transactions types.Transactions
- err := rlp.Decode(bytes.NewReader(block.Payload), &transactions)
- if err != nil {
- return
- }
+func (d *DexconApp) BlockDelivered(blockHash coreCommon.Hash, result coreTypes.FinalizationResult) {
+ /*
+ var transactions types.Transactions
+ err := rlp.Decode(bytes.NewReader(block.Payload), &transactions)
+ if err != nil {
+ return
+ }
- _, err = d.blockchain.InsertChain(
- []*types.Block{types.NewBlock(&types.Header{
- ParentHash: common.Hash(block.ParentHash),
- Number: new(big.Int).SetUint64(block.ConsensusHeight),
- Time: new(big.Int).SetInt64(block.ConsensusTimestamp.Unix()),
- TxHash: types.DeriveSha(transactions),
- Coinbase: common.BytesToAddress(block.ProposerID.Hash[:]),
- }, transactions, nil, nil)})
- if err != nil {
- // do something
- return
- }
+ _, err = d.blockchain.InsertChain(
+ []*types.Block{types.NewBlock(&types.Header{
+ ParentHash: common.Hash(block.ParentHash),
+ Number: new(big.Int).SetUint64(result.Height),
+ Time: new(big.Int).SetInt64(result.Timestamp.Unix()),
+ TxHash: types.DeriveSha(transactions),
+ Coinbase: common.BytesToAddress(block.ProposerID.Hash[:]),
+ }, transactions, nil, nil)})
+ if err != nil {
+ // do something
+ return
+ }
- d.notify(block.ConsensusHeight)
+ d.notify(result.Height)
+ */
}
--
cgit v1.2.3