File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -202,8 +202,8 @@ func consensusCallbackBeginBlockFn(
202202 }
203203
204204 externalReceipts := evmProcessor .Execute (txs , false )
205- evmBlock , skippedTxs , allReceipts := evmProcessor .Finalize ()
206205
206+ evmBlock , skippedTxs , allReceipts := evmProcessor .Finalize ()
207207 block .SkippedTxs = skippedTxs
208208 block .Root = hash .Hash (evmBlock .Root )
209209 block .GasUsed = evmBlock .GasUsed
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ type Block struct {
1010 Time Timestamp
1111 Atropos hash.Event
1212 Events hash.Events
13- Txs []common.Hash
13+ Txs []common.Hash // non events txs (genesis)
1414 InternalTxs []common.Hash
1515 SkippedTxs []uint32 // indexes of skipped txs, starting from first tx of first event, ending with last tx of last event
1616 GasUsed uint64
@@ -21,25 +21,6 @@ func (b *Block) EstimateSize() int {
2121 return (len (b .Events )+ len (b .InternalTxs )+ len (b .Txs )+ 1 + 1 )* 32 + len (b .SkippedTxs )* 4 + 8 + 8
2222}
2323
24- func (b * Block ) NotSkippedTxs () []common.Hash {
25- txs := append (b .InternalTxs , b .Txs ... )
26-
27- if len (b .SkippedTxs ) == 0 {
28- // short circuit if nothing to skip
29- return txs
30- }
31- skipCount := 0
32- res := make ([]common.Hash , 0 , len (txs ))
33- for i , tx := range txs {
34- if skipCount < len (b .SkippedTxs ) && b .SkippedTxs [skipCount ] == uint32 (i ) {
35- skipCount ++
36- } else {
37- res = append (res , tx )
38- }
39- }
40- return res
41- }
42-
4324func FilterSkippedTxs (txs types.Transactions , skippedTxs []uint32 ) types.Transactions {
4425 if len (skippedTxs ) == 0 {
4526 // short circuit if nothing to skip
You can’t perform that action at this time.
0 commit comments