diff --git a/statediff/indexer/database/dump/indexer.go b/statediff/indexer/database/dump/indexer.go index bfbc5c169..7d2813849 100644 --- a/statediff/indexer/database/dump/indexer.go +++ b/statediff/indexer/database/dump/indexer.go @@ -288,24 +288,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs return err } - // index access list if this is one - for j, accessListElement := range trx.AccessList() { - storageKeys := make([]string, len(accessListElement.StorageKeys)) - for k, storageKey := range accessListElement.StorageKeys { - storageKeys[k] = storageKey.Hex() - } - accessListElementModel := models.AccessListElementModel{ - BlockNumber: args.blockNumber.String(), - TxID: trxID, - Index: int64(j), - Address: accessListElement.Address.Hex(), - StorageKeys: storageKeys, - } - if _, err := fmt.Fprintf(sdi.dump, "%+v\r\n", accessListElementModel); err != nil { - return err - } - } - // this is the contract address if this receipt is for a contract creation tx contract := shared.HandleZeroAddr(receipt.ContractAddress) var contractHash string diff --git a/statediff/indexer/database/file/csv_writer.go b/statediff/indexer/database/file/csv_writer.go index 98d16383a..55f3584d2 100644 --- a/statediff/indexer/database/file/csv_writer.go +++ b/statediff/indexer/database/file/csv_writer.go @@ -271,13 +271,6 @@ func (csw *CSVWriter) upsertTransactionCID(transaction models.TxModel) { indexerMetrics.transactions.Inc(1) } -func (csw *CSVWriter) upsertAccessListElement(accessListElement models.AccessListElementModel) { - var values []interface{} - values = append(values, accessListElement.BlockNumber, accessListElement.TxID, accessListElement.Index, accessListElement.Address, accessListElement.StorageKeys) - csw.rows <- tableRow{types.TableAccessListElement, values} - indexerMetrics.accessListEntries.Inc(1) -} - func (csw *CSVWriter) upsertReceiptCID(rct *models.ReceiptModel) { var values []interface{} values = append(values, rct.BlockNumber, rct.HeaderID, rct.TxID, rct.CID, rct.Contract, rct.ContractHash, diff --git a/statediff/indexer/database/file/indexer.go b/statediff/indexer/database/file/indexer.go index 1cec4fbc6..42ead7cd9 100644 --- a/statediff/indexer/database/file/indexer.go +++ b/statediff/indexer/database/file/indexer.go @@ -340,22 +340,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(args processArgs) error { } sdi.fileWriter.upsertTransactionCID(txModel) - // index access list if this is one - for j, accessListElement := range trx.AccessList() { - storageKeys := make([]string, len(accessListElement.StorageKeys)) - for k, storageKey := range accessListElement.StorageKeys { - storageKeys[k] = storageKey.Hex() - } - accessListElementModel := models.AccessListElementModel{ - BlockNumber: args.blockNumber.String(), - TxID: txID, - Index: int64(j), - Address: accessListElement.Address.Hex(), - StorageKeys: storageKeys, - } - sdi.fileWriter.upsertAccessListElement(accessListElementModel) - } - // this is the contract address if this receipt is for a contract creation tx contract := shared.HandleZeroAddr(receipt.ContractAddress) var contractHash string diff --git a/statediff/indexer/database/file/sql_writer.go b/statediff/indexer/database/file/sql_writer.go index 52ca9761c..73b20e1bb 100644 --- a/statediff/indexer/database/file/sql_writer.go +++ b/statediff/indexer/database/file/sql_writer.go @@ -136,12 +136,12 @@ func (sqw *SQLWriter) flush() error { } const ( - nodeInsert = "INSERT INTO nodes (genesis_block, network_id, node_id, client_name, chain_id) VALUES " + + nodeInsert = "INSERT INTO nodes (genesis_block, network_id, node_ids, client_name, chain_id) VALUES " + "('%s', '%s', '%s', '%s', %d);\n" ipldInsert = "INSERT INTO public.blocks (block_number, key, data) VALUES ('%s', '%s', '\\x%x');\n" - headerInsert = "INSERT INTO eth.header_cids (block_number, block_hash, parent_hash, cid, td, node_id, reward, " + + headerInsert = "INSERT INTO eth.header_cids (block_number, block_hash, parent_hash, cid, td, node_ids, reward, " + "state_root, tx_root, receipt_root, uncles_hash, bloom, timestamp, coinbase) VALUES " + "('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '\\x%x', %d, '%s');\n" @@ -151,9 +151,6 @@ const ( txInsert = "INSERT INTO eth.transaction_cids (block_number, header_id, tx_hash, cid, dst, src, index, tx_type, " + "value) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s');\n" - alInsert = "INSERT INTO eth.access_list_elements (block_number, tx_id, index, address, storage_keys) VALUES " + - "('%s', '%s', %d, '%s', '%s');\n" - rctInsert = "INSERT INTO eth.receipt_cids (block_number, header_id, tx_id, cid, contract, contract_hash, post_state, " + "post_status) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', %d);\n" diff --git a/statediff/indexer/database/sql/indexer.go b/statediff/indexer/database/sql/indexer.go index 2133a6bf3..0e695edd5 100644 --- a/statediff/indexer/database/sql/indexer.go +++ b/statediff/indexer/database/sql/indexer.go @@ -347,24 +347,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs return err } - // index access list if this is one - for j, accessListElement := range trx.AccessList() { - storageKeys := make([]string, len(accessListElement.StorageKeys)) - for k, storageKey := range accessListElement.StorageKeys { - storageKeys[k] = storageKey.Hex() - } - accessListElementModel := models.AccessListElementModel{ - BlockNumber: args.blockNumber.String(), - TxID: txID, - Index: int64(j), - Address: accessListElement.Address.Hex(), - StorageKeys: storageKeys, - } - if err := sdi.dbWriter.upsertAccessListElement(tx.dbtx, accessListElementModel); err != nil { - return err - } - } - // this is the contract address if this receipt is for a contract creation tx contract := shared.HandleZeroAddr(receipt.ContractAddress) var contractHash string diff --git a/statediff/indexer/database/sql/postgres/database.go b/statediff/indexer/database/sql/postgres/database.go index 9d28c9a9b..5bd90dfcb 100644 --- a/statediff/indexer/database/sql/postgres/database.go +++ b/statediff/indexer/database/sql/postgres/database.go @@ -61,12 +61,6 @@ func (db *DB) InsertTxStm() string { ON CONFLICT (tx_hash, header_id, block_number) DO NOTHING` } -// InsertAccessListElementStm satisfies the sql.Statements interface -func (db *DB) InsertAccessListElementStm() string { - return `INSERT INTO eth.access_list_elements (block_number, tx_id, index, address, storage_keys) VALUES ($1, $2, $3, $4, $5) - ON CONFLICT (tx_id, index, block_number) DO NOTHING` -} - // InsertRctStm satisfies the sql.Statements interface func (db *DB) InsertRctStm() string { return `INSERT INTO eth.receipt_cids (block_number, header_id, tx_id, leaf_cid, contract, contract_hash, leaf_mh_key, post_state, post_status, log_root) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) diff --git a/statediff/indexer/database/sql/writer.go b/statediff/indexer/database/sql/writer.go index 61d974eea..fb46cd1cf 100644 --- a/statediff/indexer/database/sql/writer.go +++ b/statediff/indexer/database/sql/writer.go @@ -84,21 +84,6 @@ func (w *Writer) upsertTransactionCID(tx Tx, transaction models.TxModel) error { return nil } -/* -INSERT INTO eth.access_list_elements (block_number, tx_id, index, address, storage_keys) VALUES ($1, $2, $3, $4, $5) -ON CONFLICT (tx_id, index, block_number) DO NOTHING -*/ -func (w *Writer) upsertAccessListElement(tx Tx, accessListElement models.AccessListElementModel) error { - _, err := tx.Exec(w.db.Context(), w.db.InsertAccessListElementStm(), - accessListElement.BlockNumber, accessListElement.TxID, accessListElement.Index, accessListElement.Address, - accessListElement.StorageKeys) - if err != nil { - return insertError{"eth.access_list_elements", err, w.db.InsertAccessListElementStm(), accessListElement} - } - indexerMetrics.accessListEntries.Inc(1) - return nil -} - /* INSERT INTO eth.receipt_cids (block_number, header_id, tx_id, cid, contract, contract_hash, post_state, post_status) VALUES ($1, $2, $3, $4, $5, $6, $7, $8) ON CONFLICT (tx_id, header_id, block_number) DO NOTHING