aboutsummaryrefslogtreecommitdiffstats
path: root/light
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-07-15 00:39:53 +0800
committerGitHub <noreply@github.com>2017-07-15 00:39:53 +0800
commit0ff35e170d1b913082313089d13e3e6d5490839b (patch)
tree42b8eafa61c6e5894768c41a97d51e4e5427b50f /light
parent8d6a5a3581ce6221786eb464bfef7e8c31e7ad95 (diff)
downloaddexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar.gz
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar.bz2
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar.lz
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar.xz
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.tar.zst
dexon-0ff35e170d1b913082313089d13e3e6d5490839b.zip
core: remove redundant storage of transactions and receipts (#14801)
* core: remove redundant storage of transactions and receipts * core, eth, internal: new transaction schema usage polishes * eth: implement upgrade mechanism for db deduplication * core, eth: drop old sequential key db upgrader * eth: close last iterator on successful db upgrage * core: prefix the lookup entries to make their purpose clearer
Diffstat (limited to 'light')
-rw-r--r--light/txpool.go66
1 files changed, 21 insertions, 45 deletions
diff --git a/light/txpool.go b/light/txpool.go
index 0430b280f..416148b7e 100644
--- a/light/txpool.go
+++ b/light/txpool.go
@@ -130,19 +130,6 @@ type txBlockData struct {
Index uint64
}
-// storeTxBlockData stores the block position of a mined tx in the local db
-func (pool *TxPool) storeTxBlockData(txh common.Hash, tbd txBlockData) {
- //fmt.Println("storeTxBlockData", txh, tbd)
- data, _ := rlp.EncodeToBytes(tbd)
- pool.chainDb.Put(append(txh[:], byte(1)), data)
-}
-
-// removeTxBlockData removes the stored block position of a rolled back tx
-func (pool *TxPool) removeTxBlockData(txh common.Hash) {
- //fmt.Println("removeTxBlockData", txh)
- pool.chainDb.Delete(append(txh[:], byte(1)))
-}
-
// txStateChanges stores the recent changes between pending/mined states of
// transactions. True means mined, false means rolled back, no entry means no change
type txStateChanges map[common.Hash]bool
@@ -172,59 +159,48 @@ func (txc txStateChanges) getLists() (mined []common.Hash, rollback []common.Has
// checkMinedTxs checks newly added blocks for the currently pending transactions
// and marks them as mined if necessary. It also stores block position in the db
// and adds them to the received txStateChanges map.
-func (pool *TxPool) checkMinedTxs(ctx context.Context, hash common.Hash, idx uint64, txc txStateChanges) error {
- //fmt.Println("checkMinedTxs")
+func (pool *TxPool) checkMinedTxs(ctx context.Context, hash common.Hash, number uint64, txc txStateChanges) error {
+ // If no transactions are pending, we don't care about anything
if len(pool.pending) == 0 {
return nil
}
- //fmt.Println("len(pool) =", len(pool.pending))
-
- block, err := GetBlock(ctx, pool.odr, hash, idx)
- var receipts types.Receipts
+ block, err := GetBlock(ctx, pool.odr, hash, number)
if err != nil {
- //fmt.Println(err)
return err
}
- //fmt.Println("len(block.Transactions()) =", len(block.Transactions()))
-
+ // Gather all the local transaction mined in this block
list := pool.mined[hash]
- for i, tx := range block.Transactions() {
- txHash := tx.Hash()
- //fmt.Println(" txHash:", txHash)
- if tx, ok := pool.pending[txHash]; ok {
- //fmt.Println("TX FOUND")
- if receipts == nil {
- receipts, err = GetBlockReceipts(ctx, pool.odr, hash, idx)
- if err != nil {
- return err
- }
- if len(receipts) != len(block.Transactions()) {
- panic(nil) // should never happen if hashes did match
- }
- core.SetReceiptsData(pool.config, block, receipts)
- }
- //fmt.Println("WriteReceipt", receipts[i].TxHash)
- core.WriteReceipt(pool.chainDb, receipts[i])
- pool.storeTxBlockData(txHash, txBlockData{hash, idx, uint64(i)})
- delete(pool.pending, txHash)
+ for _, tx := range block.Transactions() {
+ if _, ok := pool.pending[tx.Hash()]; ok {
list = append(list, tx)
- txc.setState(txHash, true)
}
}
+ // If some transactions have been mined, write the needed data to disk and update
if list != nil {
+ // Retrieve all the receipts belonging to this block and write the loopup table
+ if _, err := GetBlockReceipts(ctx, pool.odr, hash, number); err != nil { // ODR caches, ignore results
+ return err
+ }
+ if err := core.WriteTxLookupEntries(pool.chainDb, block); err != nil {
+ return err
+ }
+ // Update the transaction pool's state
+ for _, tx := range list {
+ delete(pool.pending, tx.Hash())
+ txc.setState(tx.Hash(), true)
+ }
pool.mined[hash] = list
}
return nil
}
// rollbackTxs marks the transactions contained in recently rolled back blocks
-// as rolled back. It also removes block position info from the db and adds them
-// to the received txStateChanges map.
+// as rolled back. It also removes any positional lookup entries.
func (pool *TxPool) rollbackTxs(hash common.Hash, txc txStateChanges) {
if list, ok := pool.mined[hash]; ok {
for _, tx := range list {
txHash := tx.Hash()
- pool.removeTxBlockData(txHash)
+ core.DeleteTxLookupEntry(pool.chainDb, txHash)
pool.pending[txHash] = tx
txc.setState(txHash, false)
}