• R/O
  • HTTP
  • SSH
  • HTTPS

bytom: コミット

Official Go implementation of the Bytom protocol


コミットメタ情報

リビジョンd0f242d7d35219d4af984827b4dac02361cd1e6b (tree)
日時2019-08-14 17:55:35
作者Paladz <yzhu101@uott...>
コミッターGitHub

ログメッセージ

Merge pull request #1777 from Bytom/txpool

restore Tx back to Tx pool when chain is reorganized

変更サマリ

差分

--- a/protocol/block.go
+++ b/protocol/block.go
@@ -102,6 +102,7 @@ func (c *Chain) reorganizeChain(node *state.BlockNode) error {
102102 attachNodes, detachNodes := c.calcReorganizeNodes(node)
103103 utxoView := state.NewUtxoViewpoint()
104104
105+ txsToRestore := map[bc.Hash]*types.Tx{}
105106 for _, detachNode := range detachNodes {
106107 b, err := c.store.GetBlock(&detachNode.Hash)
107108 if err != nil {
@@ -120,9 +121,13 @@ func (c *Chain) reorganizeChain(node *state.BlockNode) error {
120121 return err
121122 }
122123
124+ for _, tx := range b.Transactions {
125+ txsToRestore[tx.ID] = tx
126+ }
123127 log.WithFields(log.Fields{"module": logModule, "height": node.Height, "hash": node.Hash.String()}).Debug("detach from mainchain")
124128 }
125129
130+ txsToRemove := map[bc.Hash]*types.Tx{}
126131 for _, attachNode := range attachNodes {
127132 b, err := c.store.GetBlock(&attachNode.Hash)
128133 if err != nil {
@@ -141,10 +146,39 @@ func (c *Chain) reorganizeChain(node *state.BlockNode) error {
141146 return err
142147 }
143148
149+ for _, tx := range b.Transactions {
150+ if _, ok := txsToRestore[tx.ID]; !ok {
151+ txsToRemove[tx.ID] = tx
152+ } else {
153+ delete(txsToRestore, tx.ID)
154+ }
155+ }
156+
144157 log.WithFields(log.Fields{"module": logModule, "height": node.Height, "hash": node.Hash.String()}).Debug("attach from mainchain")
145158 }
146159
147- return c.setState(node, utxoView)
160+ if err := c.setState(node, utxoView); err != nil {
161+ return err
162+ }
163+
164+ for txHash := range txsToRemove {
165+ c.txPool.RemoveTransaction(&txHash)
166+ }
167+
168+ for _, tx := range txsToRestore {
169+ // the number of restored Tx should be very small or most of time ZERO
170+ // Error returned from validation is ignored, tx could still be lost if validation fails.
171+ // TODO: adjust tx timestamp so that it won't starve in pool.
172+ if _, err := c.ValidateTx(tx); err != nil {
173+ log.WithFields(log.Fields{"module": logModule, "tx_id": tx.Tx.ID.String(), "error": err}).Info("restore tx fail")
174+ }
175+ }
176+
177+ if len(txsToRestore) > 0 {
178+ log.WithFields(log.Fields{"module": logModule, "num": len(txsToRestore)}).Debug("restore txs back to pool")
179+ }
180+
181+ return nil
148182 }
149183
150184 // SaveBlock will validate and save block into storage
旧リポジトリブラウザで表示