From f513ac95d760dd38d185e4ac57cb04035acf6a11 Mon Sep 17 00:00:00 2001 From: i-norden Date: Mon, 13 Feb 2023 12:52:15 -0600 Subject: [PATCH] match DB model changes in indexers --- statediff/indexer/database/dump/indexer.go | 22 +++++------------- statediff/indexer/database/file/indexer.go | 26 ++++++---------------- statediff/indexer/database/sql/indexer.go | 24 +++++--------------- 3 files changed, 18 insertions(+), 54 deletions(-) diff --git a/statediff/indexer/database/dump/indexer.go b/statediff/indexer/database/dump/indexer.go index 723a13350..1764d5512 100644 --- a/statediff/indexer/database/dump/indexer.go +++ b/statediff/indexer/database/dump/indexer.go @@ -191,7 +191,6 @@ func (sdi *StateDiffIndexer) processHeader(tx *BatchTx, header *types.Header, he headerID := header.Hash().String() mod := models.HeaderModel{ CID: headerNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(headerNode.Cid()), ParentHash: header.ParentHash.String(), BlockNumber: header.Number.String(), BlockHash: headerID, @@ -238,7 +237,6 @@ func (sdi *StateDiffIndexer) processUncles(tx *BatchTx, headerID string, blockNu BlockNumber: blockNumber.String(), HeaderID: headerID, CID: unclesCID.String(), - MhKey: shared.MultihashKeyFromCID(unclesCID), ParentHash: uncle.ParentHash.String(), BlockHash: uncle.Hash().String(), Reward: uncleReward.String(), @@ -299,9 +297,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs Src: shared.HandleZeroAddr(from), TxHash: trxID, Index: int64(i), - Data: trx.Data(), CID: txNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(txNode.Cid()), Type: trx.Type(), Value: val, } @@ -346,8 +342,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs Contract: contract, ContractHash: contractHash, LeafCID: args.rctLeafNodeCIDs[i].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.rctLeafNodeCIDs[i]), - LogRoot: args.rctNodes[i].LogRoot.String(), } if len(receipt.PostState) == 0 { rctModel.PostStatus = receipt.Status @@ -376,9 +370,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs ReceiptID: trxID, Address: l.Address.String(), Index: int64(l.Index), - Data: l.Data, LeafCID: args.logLeafNodeCIDs[i][idx].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.logLeafNodeCIDs[i][idx]), Topic0: topicSet[0], Topic1: topicSet[1], Topic2: topicSet[2], @@ -417,11 +409,10 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: shared.RemovedNodeStateCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: true, } } else { - stateCIDStr, stateMhKey, err := tx.cacheRaw(ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) + stateCIDStr, _, err := tx.cacheRaw(ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) if err != nil { return fmt.Errorf("error generating and cacheing state node IPLD: %v", err) } @@ -431,8 +422,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: stateCIDStr, - MhKey: stateMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: false, } } @@ -480,8 +470,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: shared.RemovedNodeStorageCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: true, } if _, err := fmt.Fprintf(sdi.dump, "%+v\r\n", storageModel); err != nil { return err @@ -499,8 +488,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: storageCIDStr, - MhKey: storageMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: false, } if _, err := fmt.Fprintf(sdi.dump, "%+v\r\n", storageModel); err != nil { return err diff --git a/statediff/indexer/database/file/indexer.go b/statediff/indexer/database/file/indexer.go index 3159ea8fd..61dd7410d 100644 --- a/statediff/indexer/database/file/indexer.go +++ b/statediff/indexer/database/file/indexer.go @@ -247,9 +247,8 @@ func (sdi *StateDiffIndexer) processHeader(header *types.Header, headerNode node } headerID := header.Hash().String() sdi.fileWriter.upsertHeaderCID(models.HeaderModel{ - NodeID: sdi.nodeID, + NodeIDs: []string{sdi.nodeID}, CID: headerNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(headerNode.Cid()), ParentHash: header.ParentHash.String(), BlockNumber: header.Number.String(), BlockHash: headerID, @@ -295,7 +294,6 @@ func (sdi *StateDiffIndexer) processUncles(headerID string, blockNumber *big.Int BlockNumber: blockNumber.String(), HeaderID: headerID, CID: unclesCID.String(), - MhKey: shared.MultihashKeyFromCID(unclesCID), ParentHash: uncle.ParentHash.String(), BlockHash: uncle.Hash().String(), Reward: uncleReward.String(), @@ -352,9 +350,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(args processArgs) error { Src: shared.HandleZeroAddr(from), TxHash: txID, Index: int64(i), - Data: trx.Data(), CID: txNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(txNode.Cid()), Type: trx.Type(), Value: val, } @@ -395,8 +391,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(args processArgs) error { Contract: contract, ContractHash: contractHash, LeafCID: args.rctLeafNodeCIDs[i].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.rctLeafNodeCIDs[i]), - LogRoot: args.rctNodes[i].LogRoot.String(), } if len(receipt.PostState) == 0 { rctModel.PostStatus = receipt.Status @@ -423,9 +417,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(args processArgs) error { ReceiptID: txID, Address: l.Address.String(), Index: int64(l.Index), - Data: l.Data, LeafCID: args.logLeafNodeCIDs[i][idx].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.logLeafNodeCIDs[i][idx]), Topic0: topicSet[0], Topic1: topicSet[1], Topic2: topicSet[2], @@ -463,11 +455,10 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: shared.RemovedNodeStateCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: true, } } else { - stateCIDStr, stateMhKey, err := sdi.fileWriter.upsertIPLDRaw(tx.BlockNumber, ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) + stateCIDStr, _, err := sdi.fileWriter.upsertIPLDRaw(tx.BlockNumber, ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) if err != nil { return fmt.Errorf("error generating and cacheing state node IPLD: %v", err) } @@ -477,8 +468,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: stateCIDStr, - MhKey: stateMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: false, } } @@ -524,13 +514,12 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: shared.RemovedNodeStorageCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: true, } sdi.fileWriter.upsertStorageCID(storageModel) continue } - storageCIDStr, storageMhKey, err := sdi.fileWriter.upsertIPLDRaw(tx.BlockNumber, ipld2.MEthStorageTrie, multihash.KECCAK_256, storageNode.NodeValue) + storageCIDStr, _, err := sdi.fileWriter.upsertIPLDRaw(tx.BlockNumber, ipld2.MEthStorageTrie, multihash.KECCAK_256, storageNode.NodeValue) if err != nil { return fmt.Errorf("error generating and cacheing storage node IPLD: %v", err) } @@ -541,8 +530,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: storageCIDStr, - MhKey: storageMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: false, } sdi.fileWriter.upsertStorageCID(storageModel) } diff --git a/statediff/indexer/database/sql/indexer.go b/statediff/indexer/database/sql/indexer.go index cb680a302..a2f61d5a6 100644 --- a/statediff/indexer/database/sql/indexer.go +++ b/statediff/indexer/database/sql/indexer.go @@ -249,7 +249,6 @@ func (sdi *StateDiffIndexer) processHeader(tx *BatchTx, header *types.Header, he // index header return headerID, sdi.dbWriter.upsertHeaderCID(tx.dbtx, models.HeaderModel{ CID: headerNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(headerNode.Cid()), ParentHash: header.ParentHash.String(), BlockNumber: header.Number.String(), BlockHash: headerID, @@ -294,7 +293,6 @@ func (sdi *StateDiffIndexer) processUncles(tx *BatchTx, headerID string, blockNu BlockNumber: blockNumber.String(), HeaderID: headerID, CID: unclesCID.String(), - MhKey: shared.MultihashKeyFromCID(unclesCID), ParentHash: uncle.ParentHash.String(), BlockHash: uncle.Hash().String(), Reward: uncleReward.String(), @@ -354,9 +352,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs Src: shared.HandleZeroAddr(from), TxHash: txID, Index: int64(i), - Data: trx.Data(), CID: txNode.Cid().String(), - MhKey: shared.MultihashKeyFromCID(txNode.Cid()), Type: trx.Type(), Value: val, } @@ -401,8 +397,6 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs Contract: contract, ContractHash: contractHash, LeafCID: args.rctLeafNodeCIDs[i].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.rctLeafNodeCIDs[i]), - LogRoot: args.rctNodes[i].LogRoot.String(), } if len(receipt.PostState) == 0 { rctModel.PostStatus = receipt.Status @@ -432,9 +426,7 @@ func (sdi *StateDiffIndexer) processReceiptsAndTxs(tx *BatchTx, args processArgs ReceiptID: txID, Address: l.Address.String(), Index: int64(l.Index), - Data: l.Data, LeafCID: args.logLeafNodeCIDs[i][idx].String(), - LeafMhKey: shared.MultihashKeyFromCID(args.logLeafNodeCIDs[i][idx]), Topic0: topicSet[0], Topic1: topicSet[1], Topic2: topicSet[2], @@ -472,11 +464,10 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: shared.RemovedNodeStateCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: true, } } else { - stateCIDStr, stateMhKey, err := tx.cacheRaw(ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) + stateCIDStr, _, err := tx.cacheRaw(ipld2.MEthStateTrie, multihash.KECCAK_256, stateNode.NodeValue) if err != nil { return fmt.Errorf("error generating and cacheing state node IPLD: %v", err) } @@ -486,8 +477,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: stateNode.Path, StateKey: common.BytesToHash(stateNode.LeafKey).String(), CID: stateCIDStr, - MhKey: stateMhKey, - NodeType: stateNode.NodeType.Int(), + Removed: false, } } @@ -534,15 +524,14 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: shared.RemovedNodeStorageCID, - MhKey: shared.RemovedNodeMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: true, } if err := sdi.dbWriter.upsertStorageCID(tx.dbtx, storageModel); err != nil { return err } continue } - storageCIDStr, storageMhKey, err := tx.cacheRaw(ipld2.MEthStorageTrie, multihash.KECCAK_256, storageNode.NodeValue) + storageCIDStr, _, err := tx.cacheRaw(ipld2.MEthStorageTrie, multihash.KECCAK_256, storageNode.NodeValue) if err != nil { return fmt.Errorf("error generating and cacheing storage node IPLD: %v", err) } @@ -553,8 +542,7 @@ func (sdi *StateDiffIndexer) PushStateNode(batch interfaces.Batch, stateNode sdt Path: storageNode.Path, StorageKey: common.BytesToHash(storageNode.LeafKey).String(), CID: storageCIDStr, - MhKey: storageMhKey, - NodeType: storageNode.NodeType.Int(), + Removed: true, } if err := sdi.dbWriter.upsertStorageCID(tx.dbtx, storageModel); err != nil { return err