From 73e148f759aad349f3a9d0e23dcc0617f8d94c51 Mon Sep 17 00:00:00 2001 From: i-norden Date: Fri, 10 Feb 2023 10:06:53 -0600 Subject: [PATCH] update models --- statediff/indexer/models/models.go | 91 +++++++++--------------------- 1 file changed, 26 insertions(+), 65 deletions(-) diff --git a/statediff/indexer/models/models.go b/statediff/indexer/models/models.go index d552b0de4..ad0b4971f 100644 --- a/statediff/indexer/models/models.go +++ b/statediff/indexer/models/models.go @@ -27,22 +27,20 @@ type IPLDModel struct { // HeaderModel is the db model for eth.header_cids type HeaderModel struct { - BlockNumber string `db:"block_number"` - BlockHash string `db:"block_hash"` - ParentHash string `db:"parent_hash"` - CID string `db:"cid"` - MhKey string `db:"mh_key"` - TotalDifficulty string `db:"td"` - NodeID string `db:"node_id"` - Reward string `db:"reward"` - StateRoot string `db:"state_root"` - UnclesHash string `db:"uncles_hash"` - TxRoot string `db:"tx_root"` - RctRoot string `db:"receipt_root"` - Bloom []byte `db:"bloom"` - Timestamp uint64 `db:"timestamp"` - TimesValidated int64 `db:"times_validated"` - Coinbase string `db:"coinbase"` + BlockNumber string `db:"block_number"` + BlockHash string `db:"block_hash"` + ParentHash string `db:"parent_hash"` + CID string `db:"cid"` + TotalDifficulty string `db:"td"` + NodeIDs []string `db:"node_ids"` + Reward string `db:"reward"` + StateRoot string `db:"state_root"` + UnclesHash string `db:"uncles_hash"` + TxRoot string `db:"tx_root"` + RctRoot string `db:"receipt_root"` + Bloom []byte `db:"bloom"` + Timestamp uint64 `db:"timestamp"` + Coinbase string `db:"coinbase"` } // UncleModel is the db model for eth.uncle_cids @@ -52,7 +50,6 @@ type UncleModel struct { BlockHash string `db:"block_hash"` ParentHash string `db:"parent_hash"` CID string `db:"cid"` - MhKey string `db:"mh_key"` Reward string `db:"reward"` Index int64 `db:"index"` } @@ -64,10 +61,8 @@ type TxModel struct { Index int64 `db:"index"` TxHash string `db:"tx_hash"` CID string `db:"cid"` - MhKey string `db:"mh_key"` Dst string `db:"dst"` Src string `db:"src"` - Data []byte `db:"tx_data"` Type uint8 `db:"tx_type"` Value string `db:"value"` } @@ -86,63 +81,39 @@ type ReceiptModel struct { BlockNumber string `db:"block_number"` HeaderID string `db:"header_id"` TxID string `db:"tx_id"` - LeafCID string `db:"leaf_cid"` - LeafMhKey string `db:"leaf_mh_key"` + CID string `db:"cid"` PostStatus uint64 `db:"post_status"` PostState string `db:"post_state"` Contract string `db:"contract"` ContractHash string `db:"contract_hash"` - LogRoot string `db:"log_root"` } // StateNodeModel is the db model for eth.state_cids type StateNodeModel struct { BlockNumber string `db:"block_number"` HeaderID string `db:"header_id"` - Path []byte `db:"state_path"` + Path []byte `db:"partial_path"` StateKey string `db:"state_leaf_key"` - NodeType int `db:"node_type"` + Removed bool `db:"removed"` CID string `db:"cid"` - MhKey string `db:"mh_key"` Diff bool `db:"diff"` + Balance string `db:"balance"` + Nonce uint64 `db:"nonce"` + CodeHash []byte `db:"code_hash"` + StorageRoot string `db:"storage_root"` } // StorageNodeModel is the db model for eth.storage_cids type StorageNodeModel struct { BlockNumber string `db:"block_number"` HeaderID string `db:"header_id"` - StatePath []byte `db:"state_path"` - Path []byte `db:"storage_path"` + StateKey []byte `db:"state_leaf_key"` + Path []byte `db:"partial_path"` StorageKey string `db:"storage_leaf_key"` - NodeType int `db:"node_type"` + Removed bool `db:"removed"` CID string `db:"cid"` - MhKey string `db:"mh_key"` Diff bool `db:"diff"` -} - -// StorageNodeWithStateKeyModel is a db model for eth.storage_cids + eth.state_cids.state_key -type StorageNodeWithStateKeyModel struct { - BlockNumber string `db:"block_number"` - HeaderID string `db:"header_id"` - StatePath []byte `db:"state_path"` - Path []byte `db:"storage_path"` - StateKey string `db:"state_leaf_key"` - StorageKey string `db:"storage_leaf_key"` - NodeType int `db:"node_type"` - CID string `db:"cid"` - MhKey string `db:"mh_key"` - Diff bool `db:"diff"` -} - -// StateAccountModel is a db model for an eth state account (decoded value of state leaf node) -type StateAccountModel struct { - BlockNumber string `db:"block_number"` - HeaderID string `db:"header_id"` - StatePath []byte `db:"state_path"` - Balance string `db:"balance"` - Nonce uint64 `db:"nonce"` - CodeHash []byte `db:"code_hash"` - StorageRoot string `db:"storage_root"` + Value []byte `db:"val"` } // LogsModel is the db model for eth.logs @@ -150,21 +121,11 @@ type LogsModel struct { BlockNumber string `db:"block_number"` HeaderID string `db:"header_id"` ReceiptID string `db:"rct_id"` - LeafCID string `db:"leaf_cid"` - LeafMhKey string `db:"leaf_mh_key"` + CID string `db:"cid"` Address string `db:"address"` Index int64 `db:"index"` - Data []byte `db:"log_data"` Topic0 string `db:"topic0"` Topic1 string `db:"topic1"` Topic2 string `db:"topic2"` Topic3 string `db:"topic3"` } - -// KnownGaps is the data structure for eth_meta.known_gaps -type KnownGapsModel struct { - StartingBlockNumber string `db:"starting_block_number"` - EndingBlockNumber string `db:"ending_block_number"` - CheckedOut bool `db:"checked_out"` - ProcessingKey int64 `db:"processing_key"` -}