Golang implemented sidechain for Bytom
リビジョン | 2f844a03b7abb8b42a89bbfdd084095d55954063 (tree) |
---|---|
日時 | 2020-04-02 18:53:46 |
作者 | shenao78 <shenao.78@163....> |
コミッター | shenao78 |
Merge branch 'master' into mov_late_node_sync_test
@@ -53,15 +53,10 @@ func NewCoreWithDB(store *database.LevelDBMovStore, startBlockHeight uint64) *Co | ||
53 | 53 | // ApplyBlock parse pending order and cancel from the the transactions of block |
54 | 54 | // and add pending order to the dex db, remove cancel order from dex db. |
55 | 55 | func (m *Core) ApplyBlock(block *types.Block) error { |
56 | - if block.Height < m.startBlockHeight { | |
56 | + if block.Height <= m.startBlockHeight { | |
57 | 57 | return nil |
58 | 58 | } |
59 | 59 | |
60 | - if block.Height == m.startBlockHeight { | |
61 | - blockHash := block.Hash() | |
62 | - return m.InitChainStatus(&blockHash) | |
63 | - } | |
64 | - | |
65 | 60 | if err := m.validateMatchedTxSequence(block.Transactions); err != nil { |
66 | 61 | return err |
67 | 62 | } |