Skip to content

Commit 4d27742

Browse files
zhiqiangxuzhiqiangxu
committed
fix bug
1 parent 98e18c7 commit 4d27742

File tree

5 files changed

+25
-7
lines changed

5 files changed

+25
-7
lines changed

‎consensus/bihs/adapter/block.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ func DefaultBlock() bihs.Block {
1515
return &Block{}
1616
}
1717

18+
func (b *Block) TimeMil() uint64 {
19+
return (*types.Block)(b).Header().Time * 1000
20+
}
21+
1822
func (b *Block) Height() uint64 {
1923
return (*types.Block)(b).Header().Number.Uint64()
2024
}

‎consensus/bihs/engine.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,13 @@ func (bh *BiHS) Init(chain *ethcore.BlockChain, bc adapter.Broadcaster, consensu
8888

8989
bh.chainHeadSub = chain.SubscribeChainHeadEvent(bh.chainHeadCh)
9090
util.GoFunc(&bh.wg, func() {
91-
select {
92-
case <-bh.chainHeadCh:
93-
store.HeightChanged()
94-
case <-bh.chainHeadSub.Err():
91+
for {
92+
select {
93+
case <-bh.chainHeadCh:
94+
store.HeightChanged()
95+
case <-bh.chainHeadSub.Err():
96+
return
97+
}
9598
}
9699
})
97100
}

‎core/blockchain.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ func (bc *BlockChain) InsertChain(chain types.Blocks) (int, error) {
13821382
func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals, setHead bool) (int, error) {
13831383
log.Info("insertChain called")
13841384
defer func() {
1385-
log.Info("insertChain done")
1385+
log.Info("insertChain done2")
13861386
}()
13871387
// If the chain is terminating, don't even bother starting up.
13881388
if bc.insertStopped() {
@@ -1400,7 +1400,9 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals, setHead bool)
14001400
// Fire a single chain head event if we've progressed the chain
14011401
defer func() {
14021402
if lastCanon != nil && bc.CurrentBlock().Hash() == lastCanon.Hash() {
1403+
log.Info("insertChain before fire ChainHeadEvent", "number", lastCanon.NumberU64(), "hash", lastCanon.Hash())
14031404
bc.chainHeadFeed.Send(ChainHeadEvent{lastCanon})
1405+
log.Info("insertChain after fire ChainHeadEvent", "number", lastCanon.NumberU64(), "hash", lastCanon.Hash())
14041406
}
14051407
}()
14061408
// Start the parallel header verifier
@@ -1517,7 +1519,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals, setHead bool)
15171519
}
15181520
}()
15191521

1520-
log.Info("insertChain for loop")
1522+
log.Info("insertChain for loop", "err", err)
15211523
for ; block != nil && err == nil || errors.Is(err, ErrKnownBlock); block, err = it.next() {
15221524
// If the chain is terminating, stop processing blocks
15231525
if bc.insertStopped() {
@@ -1716,6 +1718,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals, setHead bool)
17161718
}
17171719
stats.ignored += it.remaining()
17181720

1721+
log.Info("insertChain done1")
17191722
return it.index, err
17201723
}
17211724

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ require (
5656
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
5757
github.com/tklauser/go-sysconf v0.3.5 // indirect
5858
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
59-
github.com/zhiqiangxu/bihs v0.0.0-20220220032203-95944f6425a6
59+
github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3
6060
github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f
6161
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
6262
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect

‎go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,14 @@ github.com/zhiqiangxu/bihs v0.0.0-20220220022935-e5eb2adf0ce0 h1:TsFtUDpUAaqX0SW
533533
github.com/zhiqiangxu/bihs v0.0.0-20220220022935-e5eb2adf0ce0/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
534534
github.com/zhiqiangxu/bihs v0.0.0-20220220032203-95944f6425a6 h1:SXhjHn4AZla/ekwvHGZE5NFAIaufd1Ft8/Mxr5DzRbU=
535535
github.com/zhiqiangxu/bihs v0.0.0-20220220032203-95944f6425a6/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
536+
github.com/zhiqiangxu/bihs v0.0.0-20220220070852-1d39930e6ad8 h1:l+NtduSLoJqwhBlJ+bQrLQweT15yio9Oz+7wCep7Pf8=
537+
github.com/zhiqiangxu/bihs v0.0.0-20220220070852-1d39930e6ad8/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
538+
github.com/zhiqiangxu/bihs v0.0.0-20220220072005-2ffbf1c352d2 h1:pXTioy51nSrr66CIx96qMEfFejUaEdL0TZicfBKPElw=
539+
github.com/zhiqiangxu/bihs v0.0.0-20220220072005-2ffbf1c352d2/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
540+
github.com/zhiqiangxu/bihs v0.0.0-20220220074118-099a9e15a091 h1:bMtwWQXNa6CGg3vUtPS9LJvEeRRHfm57yg+/veiQ5Q4=
541+
github.com/zhiqiangxu/bihs v0.0.0-20220220074118-099a9e15a091/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
542+
github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3 h1:PAhRf0aN9eZ2E5/OKdyPIn5VcRC1kWjXDDrLwuDfY9I=
543+
github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
536544
github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1 h1:9i/8yn4zcZL85rmOMp9AskgJJhb2HzducF1EahdxEME=
537545
github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1/go.mod h1:aYy7SAJP4LY667NfqoMR/ZJAy8HQ8KVtQTvEDrGS5ks=
538546
github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f h1:Qj4r6VNJRHJOy50ixhmPerKf0r/qM+SSpuuIY5J/hiM=

0 commit comments

Comments
 (0)