deep-stack/ipld-eth-server
6
0
Fork 0
forked from cerc-io/ipld-eth-server
Code Pull Requests Activity

add back raw contract address

Browse Source
This commit is contained in:
Ian Norden 2020-04-04 14:56:11 -05:00
parent 8960cde4f7
commit f2e853e9c9
8 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/migrations/00032_update_receipt_cids.sql
View File

@ -3,7 +3,7 @@ ALTER TABLE eth.receipt_cids
ADD COLUMN log_contracts VARCHAR(66)[]; ADD COLUMN log_contracts VARCHAR(66)[];
ALTER TABLE eth.receipt_cids ALTER TABLE eth.receipt_cids
RENAME COLUMN contract TO contract_hash; ADD COLUMN contract_hash VARCHAR(66);
WITH uniques AS (SELECT DISTINCT ON (tx_id) * FROM eth.receipt_cids) WITH uniques AS (SELECT DISTINCT ON (tx_id) * FROM eth.receipt_cids)
DELETE FROM eth.receipt_cids WHERE receipt_cids.id NOT IN (SELECT id FROM uniques); DELETE FROM eth.receipt_cids WHERE receipt_cids.id NOT IN (SELECT id FROM uniques);
@ -16,7 +16,7 @@ ALTER TABLE eth.receipt_cids
DROP CONSTRAINT receipt_cids_tx_id_key; DROP CONSTRAINT receipt_cids_tx_id_key;
ALTER TABLE eth.receipt_cids ALTER TABLE eth.receipt_cids
RENAME COLUMN contract_hash TO contract; DROP COLUMN contract_hash;
ALTER TABLE eth.receipt_cids ALTER TABLE eth.receipt_cids
DROP COLUMN log_contracts; DROP COLUMN log_contracts;

5
db/schema.sql
View File

@ -353,12 +353,13 @@ CREATE TABLE eth.receipt_cids (
id integer NOT NULL, id integer NOT NULL,
tx_id integer NOT NULL, tx_id integer NOT NULL,
cid text NOT NULL, cid text NOT NULL,
contract_hash character varying(66), contract character varying(66),
topic0s character varying(66)[], topic0s character varying(66)[],
topic1s character varying(66)[], topic1s character varying(66)[],
topic2s character varying(66)[], topic2s character varying(66)[],
topic3s character varying(66)[], topic3s character varying(66)[],
log_contracts character varying(66)[] log_contracts character varying(66)[],
contract_hash character varying(66)
); );

1
pkg/super_node/eth/converter.go
View File

@ -114,6 +114,7 @@ func (pc *PayloadConverter) Convert(payload shared.RawChainData) (shared.Convert
Topic1s: topicSets[1], Topic1s: topicSets[1],
Topic2s: topicSets[2], Topic2s: topicSets[2],
Topic3s: topicSets[3], Topic3s: topicSets[3],
Contract: contract,
ContractHash: contractHash, ContractHash: contractHash,
LogContracts: logContracts, LogContracts: logContracts,
} }

6
pkg/super_node/eth/indexer.go
View File

@ -127,9 +127,9 @@ func (in *CIDIndexer) indexTransactionAndReceiptCIDs(tx *sqlx.Tx, payload *CIDPa
} }
func (in *CIDIndexer) indexReceiptCID(tx *sqlx.Tx, cidMeta ReceiptModel, txID int64) error { func (in *CIDIndexer) indexReceiptCID(tx *sqlx.Tx, cidMeta ReceiptModel, txID int64) error {
_, err := tx.Exec(`INSERT INTO eth.receipt_cids (tx_id, cid, contract_hash, topic0s, topic1s, topic2s, topic3s, log_contracts) VALUES ($1, $2, $3, $4, $5, $6, $7, $8) _, err := tx.Exec(`INSERT INTO eth.receipt_cids (tx_id, cid, contract, contract_hash, topic0s, topic1s, topic2s, topic3s, log_contracts) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
ON CONFLICT (tx_id) DO UPDATE SET (cid, contract_hash, topic0s, topic1s, topic2s, topic3s, log_contracts) = ($2, $3, $4, $5, $6, $7, $8)`, ON CONFLICT (tx_id) DO UPDATE SET (cid, contract, contract_hash, topic0s, topic1s, topic2s, topic3s, log_contracts) = ($2, $3, $4, $5, $6, $7, $8, $9)`,
txID, cidMeta.CID, cidMeta.ContractHash, cidMeta.Topic0s, cidMeta.Topic1s, cidMeta.Topic2s, cidMeta.Topic3s, cidMeta.LogContracts) txID, cidMeta.CID, cidMeta.Contract, cidMeta.ContractHash, cidMeta.Topic0s, cidMeta.Topic1s, cidMeta.Topic2s, cidMeta.Topic3s, cidMeta.LogContracts)
return err return err
} }

6
pkg/super_node/eth/mocks/test_data.go
View File

@ -141,6 +141,7 @@ var (
Topic1s: []string{ Topic1s: []string{
mockTopic12.String(), mockTopic12.String(),
}, },
Contract: "",
ContractHash: "", ContractHash: "",
LogContracts: []string{ LogContracts: []string{
Address.String(), Address.String(),
@ -154,6 +155,7 @@ var (
Topic1s: []string{ Topic1s: []string{
mockTopic22.String(), mockTopic22.String(),
}, },
Contract: "",
ContractHash: "", ContractHash: "",
LogContracts: []string{ LogContracts: []string{
AnotherAddress.String(), AnotherAddress.String(),
@ -161,6 +163,7 @@ var (
}, },
{ {
CID: "", CID: "",
Contract: ContractAddress.String(),
ContractHash: ContractHash, ContractHash: ContractHash,
LogContracts: []string{}, LogContracts: []string{},
}, },
@ -174,6 +177,7 @@ var (
Topic1s: []string{ Topic1s: []string{
mockTopic12.String(), mockTopic12.String(),
}, },
Contract: "",
ContractHash: "", ContractHash: "",
LogContracts: []string{ LogContracts: []string{
Address.String(), Address.String(),
@ -187,6 +191,7 @@ var (
Topic1s: []string{ Topic1s: []string{
mockTopic22.String(), mockTopic22.String(),
}, },
Contract: "",
ContractHash: "", ContractHash: "",
LogContracts: []string{ LogContracts: []string{
AnotherAddress.String(), AnotherAddress.String(),
@ -194,6 +199,7 @@ var (
}, },
{ {
CID: Rct3CID.String(), CID: Rct3CID.String(),
Contract: ContractAddress.String(),
ContractHash: ContractHash, ContractHash: ContractHash,
LogContracts: []string{}, LogContracts: []string{},
}, },

1
pkg/super_node/eth/models.go
View File

@ -63,6 +63,7 @@ type ReceiptModel struct {
ID int64 `db:"id"` ID int64 `db:"id"`
TxID int64 `db:"tx_id"` TxID int64 `db:"tx_id"`
CID string `db:"cid"` CID string `db:"cid"`
Contract string `db:"contract"`
ContractHash string `db:"contract_hash"` ContractHash string `db:"contract_hash"`
LogContracts pq.StringArray `db:"log_contracts"` LogContracts pq.StringArray `db:"log_contracts"`
Topic0s pq.StringArray `db:"topic0s"` Topic0s pq.StringArray `db:"topic0s"`

1
pkg/super_node/eth/publisher.go
View File

@ -189,6 +189,7 @@ func (pub *IPLDPublisher) publishReceipts(receipts []*ipld.EthReceipt, receiptTr
} }
rctCids[rct.TxHash] = ReceiptModel{ rctCids[rct.TxHash] = ReceiptModel{
CID: cid, CID: cid,
Contract: receiptMeta[i].Contract,
ContractHash: receiptMeta[i].ContractHash, ContractHash: receiptMeta[i].ContractHash,
Topic0s: receiptMeta[i].Topic0s, Topic0s: receiptMeta[i].Topic0s,
Topic1s: receiptMeta[i].Topic1s, Topic1s: receiptMeta[i].Topic1s,

6
pkg/super_node/eth/retriever.go
View File

@ -214,7 +214,7 @@ func (ecr *CIDRetriever) RetrieveTxCIDs(tx *sqlx.Tx, txFilter TxFilter, headerID
func (ecr *CIDRetriever) RetrieveRctCIDsByHeaderID(tx *sqlx.Tx, rctFilter ReceiptFilter, headerID int64, trxIds []int64) ([]ReceiptModel, error) { func (ecr *CIDRetriever) RetrieveRctCIDsByHeaderID(tx *sqlx.Tx, rctFilter ReceiptFilter, headerID int64, trxIds []int64) ([]ReceiptModel, error) {
log.Debug("retrieving receipt cids for header id ", headerID) log.Debug("retrieving receipt cids for header id ", headerID)
args := make([]interface{}, 0, 4) args := make([]interface{}, 0, 4)
pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, receipt_cids.contract,
receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s, receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s,
receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts
FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids
@ -294,7 +294,7 @@ func (ecr *CIDRetriever) RetrieveRctCIDsByHeaderID(tx *sqlx.Tx, rctFilter Receip
func (ecr *CIDRetriever) RetrieveRctCIDs(tx *sqlx.Tx, rctFilter ReceiptFilter, blockNumber int64, blockHash *common.Hash, trxIds []int64) ([]ReceiptModel, error) { func (ecr *CIDRetriever) RetrieveRctCIDs(tx *sqlx.Tx, rctFilter ReceiptFilter, blockNumber int64, blockHash *common.Hash, trxIds []int64) ([]ReceiptModel, error) {
log.Debug("retrieving receipt cids for block ", blockNumber) log.Debug("retrieving receipt cids for block ", blockNumber)
args := make([]interface{}, 0, 5) args := make([]interface{}, 0, 5)
pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, receipt_cids.contract,
receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s, receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s,
receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts
FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids FROM eth.receipt_cids, eth.transaction_cids, eth.header_cids
@ -614,7 +614,7 @@ func (ecr *CIDRetriever) RetrieveTxCIDsByHeaderID(tx *sqlx.Tx, headerID int64) (
// RetrieveReceiptCIDsByTxIDs retrieves receipt CIDs by their associated tx IDs // RetrieveReceiptCIDsByTxIDs retrieves receipt CIDs by their associated tx IDs
func (ecr *CIDRetriever) RetrieveReceiptCIDsByTxIDs(tx *sqlx.Tx, txIDs []int64) ([]ReceiptModel, error) { func (ecr *CIDRetriever) RetrieveReceiptCIDsByTxIDs(tx *sqlx.Tx, txIDs []int64) ([]ReceiptModel, error) {
log.Debugf("retrieving receipt cids for tx ids %v", txIDs) log.Debugf("retrieving receipt cids for tx ids %v", txIDs)
pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, pgStr := `SELECT receipt_cids.id, receipt_cids.tx_id, receipt_cids.cid, receipt_cids.contract,
receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s, receipt_cids.contract_hash, receipt_cids.topic0s, receipt_cids.topic1s,
receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts receipt_cids.topic2s, receipt_cids.topic3s, receipt_cids.log_contracts
FROM eth.receipt_cids, eth.transaction_cids FROM eth.receipt_cids, eth.transaction_cids