Commit d6054880 authored by Ethen Pociask's avatar Ethen Pociask

[indexer.bridge_offset_fix] Addressing PR feedback

parent dd0f9ccf
......@@ -122,7 +122,7 @@ func (l1Etl *L1ETL) Start(ctx context.Context) error {
// Continually try to persist this batch. If it fails after 10 attempts, we simply error out
retryStrategy := &retry.ExponentialStrategy{Min: 1000, Max: 20_000, MaxJitter: 250}
if _, err := retry.Do[interface{}](ctx, 10, retryStrategy, func() (interface{}, error) {
err := l1Etl.db.Transaction(func(tx *database.DB) error {
if err := l1Etl.db.Transaction(func(tx *database.DB) error {
if err := tx.Blocks.StoreL1BlockHeaders(l1BlockHeaders); err != nil {
return err
}
......@@ -131,14 +131,7 @@ func (l1Etl *L1ETL) Start(ctx context.Context) error {
return err
}
return nil
})
if err != nil && strings.Contains(err.Error(), "duplicate key value violates unique constraint") {
batch.Logger.Warn("duplicate key error, ignoring insertion", "err", err)
return nil, nil
}
if err != nil {
}); err != nil {
batch.Logger.Error("unable to persist batch", "err", err)
return nil, err
}
......
......@@ -16,21 +16,6 @@ END $$;
* BLOCK DATA
*/
DROP TABLE IF EXISTS l1_block_headers CASCADE;
DROP TABLE IF EXISTS l2_block_headers CASCADE;
DROP TABLE IF EXISTS l1_contract_events CASCADE;
DROP TABLE IF EXISTS l2_contract_events CASCADE;
DROP TABLE IF EXISTS l1_transaction_deposits CASCADE;
DROP TABLE IF EXISTS l2_transaction_withdrawals CASCADE;
DROP TABLE IF EXISTS l1_bridge_messages CASCADE;
DROP TABLE IF EXISTS l2_bridge_messages CASCADE;
DROP TABLE IF EXISTS l1_bridged_tokens CASCADE;
DROP TABLE IF EXISTS l2_bridged_tokens CASCADE;
DROP TABLE IF EXISTS l1_bridge_deposits CASCADE;
DROP TABLE IF EXISTS l2_bridge_withdrawals CASCADE;
CREATE TABLE IF NOT EXISTS l1_block_headers (
-- Searchable fields
hash VARCHAR PRIMARY KEY,
......
......@@ -15,7 +15,6 @@ var (
)
type HeaderTraversal struct {
started bool
ethClient EthClient
lastHeader *types.Header
......
......@@ -4,6 +4,7 @@ import (
"errors"
"math/big"
"github.com/ethereum-optimism/optimism/indexer/bigint"
"github.com/ethereum-optimism/optimism/indexer/database"
"github.com/ethereum-optimism/optimism/op-bindings/bindings"
"github.com/ethereum-optimism/optimism/op-node/rollup/derive"
......@@ -66,7 +67,7 @@ func OptimismPortalTransactionDepositEvents(contractAddress common.Address, db *
mint := depositTx.Mint
if mint == nil {
mint = big.NewInt(0)
mint = bigint.Zero
}
optimismPortalTxDeposits[i] = OptimismPortalTransactionDepositEvent{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment