@@ -100,7 +100,6 @@ func (d *executionPayloadsExporter) maintainTable() (err error) {
100100 blockChan := make (chan * types.Eth1BlockIndexed , 1000 )
101101 type Result struct {
102102 BlockHash []byte
103- BlockNumber uint64
104103 FeeRecipientReward decimal.Decimal
105104 }
106105 resData := make ([]Result , 0 , maxBlock - minBlock + 1 )
@@ -139,7 +138,7 @@ func (d *executionPayloadsExporter) maintainTable() (err error) {
139138 if err != nil {
140139 return fmt .Errorf ("error converting tx reward to decimal for block %v: %w" , block .Number , err )
141140 }
142- resData = append (resData , Result {BlockHash : hash , FeeRecipientReward : dec , BlockNumber : block . Number })
141+ resData = append (resData , Result {BlockHash : hash , FeeRecipientReward : dec })
143142 }
144143 })
145144
@@ -157,40 +156,23 @@ func (d *executionPayloadsExporter) maintainTable() (err error) {
157156 return fmt .Errorf ("error processing blocks: %w" , err )
158157 }
159158 // sanity checks: check if any block hashes are 0x0000000000000000000000000000000000000000000000000000000000000000 or duplicate, check if count matches expected
159+ if uint64 (len (resData )) != maxBlock - minBlock + 1 {
160+ return fmt .Errorf ("error processing blocks: expected %v blocks, got %v" , maxBlock - minBlock + 1 , len (resData ))
161+ }
160162 seen := make (map [string ]bool )
161163 emptyBlockHash := bytes .Repeat ([]byte {0 }, 32 )
162- err = error (nil )
163- counter := 0
164164 for _ , r := range resData {
165- if counter > 25 {
166- err = fmt .Errorf ("too many errors, aborting" )
167- log .Error (err , "error processing blocks" , 0 )
168- break
169- }
170165 if len (r .BlockHash ) == 0 {
171- err = fmt .Errorf ("error processing blocks: block hash is empty, block number: %v" , r .BlockNumber )
172- log .Error (err , "error processing blocks" , 0 )
173- counter ++
166+ return fmt .Errorf ("error processing blocks: block hash is empty" )
174167 }
175168 if bytes .Equal (r .BlockHash , emptyBlockHash ) {
176- err = fmt .Errorf ("error processing blocks: block hash is all zeros, block number: %v" , r .BlockNumber )
177- log .Error (err , "error processing blocks" , 0 )
178- counter ++
169+ return fmt .Errorf ("error processing blocks: block hash is all zeros" )
179170 }
180171 if _ , ok := seen [string (r .BlockHash )]; ok {
181- err = fmt .Errorf ("error processing blocks: duplicate block hash, block number: %v" , r .BlockNumber )
182- log .Error (err , "error processing blocks" , 0 )
183- counter ++
172+ return fmt .Errorf ("error processing blocks: duplicate block hash" )
184173 }
185174 seen [string (r .BlockHash )] = true
186175 }
187- if err != nil {
188- return err
189- }
190-
191- if uint64 (len (resData )) != maxBlock - minBlock + 1 {
192- return fmt .Errorf ("error processing blocks: expected %v blocks, got %v" , maxBlock - minBlock + 1 , len (resData ))
193- }
194176
195177 // update the execution_payloads table
196178 log .Infof ("preparing copy update to temp table" )
0 commit comments