RanchiMall/blockbook
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle blocks with zero transactions

Browse Source
This commit is contained in:
Martin Boehm 2018-11-26 13:55:29 +01:00
parent 995d169172
commit 1f32a39d16
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
db/rocksdb_ethereumtype.go
View File

@ -249,6 +249,11 @@ func (d *RocksDB) getBlockTxsEthereumType(height uint32) ([]ethBlockTx, error) {
} }
defer val.Free() defer val.Free()
buf := val.Data() buf := val.Data()
// nil data means the key was not found in DB
if buf == nil {
return nil, nil
}
// buf can be empty slice, this means the block did not contain any transactions
bt := make([]ethBlockTx, 0, 8) bt := make([]ethBlockTx, 0, 8)
getAddress := func(i int) (bchain.AddressDescriptor, int, error) { getAddress := func(i int) (bchain.AddressDescriptor, int, error) {
if len(buf)-i < eth.EthereumTypeAddressDescriptorLen { if len(buf)-i < eth.EthereumTypeAddressDescriptorLen {
@ -306,8 +311,12 @@ func (d *RocksDB) getBlockTxsEthereumType(height uint32) ([]ethBlockTx, error) {
func (d *RocksDB) disconnectBlockTxsEthereumType(wb *gorocksdb.WriteBatch, height uint32, blockTxs []ethBlockTx, contracts map[string]*AddrContracts) error { func (d *RocksDB) disconnectBlockTxsEthereumType(wb *gorocksdb.WriteBatch, height uint32, blockTxs []ethBlockTx, contracts map[string]*AddrContracts) error {
glog.Info("Disconnecting block ", height, " containing ", len(blockTxs), " transactions") glog.Info("Disconnecting block ", height, " containing ", len(blockTxs), " transactions")
addresses := make(map[string]struct{}) addresses := make(map[string]struct{})
disconnectAddress := func(addrDesc, contract bchain.AddressDescriptor) error { disconnectAddress := func(btxID []byte, addrDesc, contract bchain.AddressDescriptor) error {
var err error var err error
// do not process empty address
if len(addrDesc) == 0 {
return nil
}
s := string(addrDesc) s := string(addrDesc)
addresses[s] = struct{}{} addresses[s] = struct{}{}
c, fc := contracts[s] c, fc := contracts[s]
@ -323,7 +332,7 @@ func (d *RocksDB) disconnectBlockTxsEthereumType(wb *gorocksdb.WriteBatch, heigh
if c.EthTxs > 0 { if c.EthTxs > 0 {
c.EthTxs-- c.EthTxs--
} else { } else {
glog.Warning("AddressContracts ", addrDesc, ", EthTxs would be negative") glog.Warning("AddressContracts ", addrDesc, ", EthTxs would be negative, tx ", hex.EncodeToString(btxID))
} }
} else { } else {
i, found := findContractInAddressContracts(contract, c.Contracts) i, found := findContractInAddressContracts(contract, c.Contracts)
@ -334,27 +343,27 @@ func (d *RocksDB) disconnectBlockTxsEthereumType(wb *gorocksdb.WriteBatch, heigh
c.Contracts = append(c.Contracts[:i], c.Contracts[i+1:]...) c.Contracts = append(c.Contracts[:i], c.Contracts[i+1:]...)
} }
} else { } else {
glog.Warning("AddressContracts ", addrDesc, ", contract ", i, " Txs would be negative") glog.Warning("AddressContracts ", addrDesc, ", contract ", i, " Txs would be negative, tx ", hex.EncodeToString(btxID))
} }
} else { } else {
glog.Warning("AddressContracts ", addrDesc, ", contract ", contract, " not found") glog.Warning("AddressContracts ", addrDesc, ", contract ", contract, " not found, tx ", hex.EncodeToString(btxID))
} }
} }
} else { } else {
glog.Warning("AddressContracts ", addrDesc, " not found") glog.Warning("AddressContracts ", addrDesc, " not found, tx ", hex.EncodeToString(btxID))
} }
return nil return nil
} }
for i := range blockTxs { for i := range blockTxs {
blockTx := &blockTxs[i] blockTx := &blockTxs[i]
if err := disconnectAddress(blockTx.from, nil); err != nil { if err := disconnectAddress(blockTx.btxID, blockTx.from, nil); err != nil {
return err return err
} }
if err := disconnectAddress(blockTx.to, nil); err != nil { if err := disconnectAddress(blockTx.btxID, blockTx.to, nil); err != nil {
return err return err
} }
for _, c := range blockTx.contracts { for _, c := range blockTx.contracts {
if err := disconnectAddress(c.addr, c.contract); err != nil { if err := disconnectAddress(blockTx.btxID, c.addr, c.contract); err != nil {
return err return err
} }
} }
@ -376,7 +385,8 @@ func (d *RocksDB) DisconnectBlockRangeEthereumType(lower uint32, higher uint32)
if err != nil { if err != nil {
return err return err
} }
if len(blockTxs) == 0 { // nil blockTxs means blockTxs were not found in db
if blockTxs == nil {
return errors.Errorf("Cannot disconnect blocks with height %v and lower. It is necessary to rebuild index.", height) return errors.Errorf("Cannot disconnect blocks with height %v and lower. It is necessary to rebuild index.", height)
} }
blocks[height-lower] = blockTxs blocks[height-lower] = blockTxs