diff options
author | Wei-Ning Huang <w@cobinhood.com> | 2018-10-12 11:08:15 +0800 |
---|---|---|
committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
commit | ba01972f09a63ad5bfbb81367be907b89e1b5102 (patch) | |
tree | 4dcb6902babc9e405e052c6dee04d82e911ff191 | |
parent | 6300ddf645979d088903391705f77b2a72bff3c5 (diff) | |
download | dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar.gz dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar.bz2 dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar.lz dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar.xz dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.tar.zst dexon-ba01972f09a63ad5bfbb81367be907b89e1b5102.zip |
dex: update application interface
-rw-r--r-- | dex/app.go | 47 |
1 files changed, 27 insertions, 20 deletions
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) + */ } |