cerc-io/ipld-eth-server
18
0
Fork 1
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 37 Wiki Activity

Update to geth 1.11.5-statediff-v5 #238

Merged
telackey merged 40 commits from roy/v5-dev into v5 2023-06-01 13:53:57 +00:00
Conversation 1 Commits 40 Files Changed 103 +15 -18
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 87013110f9 - Show all commits

11
pkg/eth/backend.go
View File

@ -61,9 +61,6 @@ var (
errMultipleHeadersForHash = errors.New("more than one headers for the given hash") errMultipleHeadersForHash = errors.New("more than one headers for the given hash")
errTxHashNotFound = errors.New("transaction for hash not found") errTxHashNotFound = errors.New("transaction for hash not found")
errTxHashInMultipleBlocks = errors.New("transaction for hash found in more than one canonical block") errTxHashInMultipleBlocks = errors.New("transaction for hash found in more than one canonical block")
// errMissingSignature is returned if a block's extra-data section doesn't seem
// to contain a 65 byte secp256k1 signature.
) )
const ( const (
@ -71,15 +68,15 @@ const (
FROM canonical_header_hash($1) AS block_hash FROM canonical_header_hash($1) AS block_hash
WHERE block_hash IS NOT NULL` WHERE block_hash IS NOT NULL`
RetrieveCanonicalHeaderByNumber = `SELECT cid, data FROM eth.header_cids RetrieveCanonicalHeaderByNumber = `SELECT cid, data FROM eth.header_cids
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
header_cids.mh_key = blocks.key header_cids.mh_key = blocks.key
AND header_cids.block_number = blocks.block_number AND header_cids.block_number = blocks.block_number
) )
WHERE block_hash = (SELECT canonical_header_hash($1))` WHERE block_hash = (SELECT canonical_header_hash($1))`
RetrieveTD = `SELECT CAST(td as Text) FROM eth.header_cids RetrieveTD = `SELECT CAST(td as TEXT) FROM eth.header_cids
WHERE header_cids.block_hash = $1` WHERE header_cids.block_hash = $1`
RetrieveRPCTransaction = `SELECT blocks.data, header_id, transaction_cids.block_number, index RetrieveRPCTransaction = `SELECT blocks.data, header_id, transaction_cids.block_number, index
FROM public.blocks, eth.transaction_cids FROM ipld.blocks, eth.transaction_cids
WHERE blocks.key = transaction_cids.mh_key WHERE blocks.key = transaction_cids.mh_key
AND blocks.block_number = transaction_cids.block_number AND blocks.block_number = transaction_cids.block_number
AND transaction_cids.tx_hash = $1 AND transaction_cids.tx_hash = $1
@ -97,7 +94,7 @@ const (
AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number)) AND header_cids.block_hash = (SELECT canonical_header_hash(header_cids.block_number))
ORDER BY header_cids.block_number DESC ORDER BY header_cids.block_number DESC
LIMIT 1` LIMIT 1`
RetrieveCodeByMhKey = `SELECT data FROM public.blocks WHERE key = $1` RetrieveCodeByMhKey = `SELECT data FROM ipld.blocks WHERE key = $1`
) )
const ( const (

4
pkg/eth/cid_retriever.go
View File

@ -41,7 +41,7 @@ type IPLDModelRecord struct {
// TableName overrides the table name used by IPLD // TableName overrides the table name used by IPLD
func (IPLDModelRecord) TableName() string { func (IPLDModelRecord) TableName() string {
return "public.blocks" return "ipld.blocks"
} }
type HeaderCIDRecord struct { type HeaderCIDRecord struct {
@ -205,7 +205,7 @@ func (ecr *CIDRetriever) RetrieveFilteredGQLLogs(tx *sqlx.Tx, rctFilter ReceiptF
eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id, eth.log_cids.address, eth.log_cids.leaf_cid, eth.log_cids.index, eth.log_cids.rct_id, eth.log_cids.address,
eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3, eth.log_cids.log_data, eth.log_cids.topic0, eth.log_cids.topic1, eth.log_cids.topic2, eth.log_cids.topic3, eth.log_cids.log_data,
data, eth.receipt_cids.leaf_cid as cid, eth.receipt_cids.post_status, eth.receipt_cids.tx_id AS tx_hash data, eth.receipt_cids.leaf_cid as cid, eth.receipt_cids.post_status, eth.receipt_cids.tx_id AS tx_hash
FROM eth.log_cids, eth.receipt_cids, public.blocks FROM eth.log_cids, eth.receipt_cids, ipld.blocks
WHERE eth.log_cids.rct_id = receipt_cids.tx_id WHERE eth.log_cids.rct_id = receipt_cids.tx_id
AND eth.log_cids.header_id = receipt_cids.header_id AND eth.log_cids.header_id = receipt_cids.header_id
AND eth.log_cids.block_number = receipt_cids.block_number AND eth.log_cids.block_number = receipt_cids.block_number

14
pkg/eth/ipld_retriever.go
View File

@ -33,7 +33,7 @@ import (
const ( const (
RetrieveHeaderByHashPgStr = `SELECT cid, data RetrieveHeaderByHashPgStr = `SELECT cid, data
FROM eth.header_cids FROM eth.header_cids
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
header_cids.mh_key = blocks.key header_cids.mh_key = blocks.key
AND header_cids.block_number = blocks.block_number AND header_cids.block_number = blocks.block_number
) )
@ -44,7 +44,7 @@ const (
uncle_cids.header_id = header_cids.block_hash uncle_cids.header_id = header_cids.block_hash
AND uncle_cids.block_number = header_cids.block_number AND uncle_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
uncle_cids.mh_key = blocks.key uncle_cids.mh_key = blocks.key
AND uncle_cids.block_number = blocks.block_number AND uncle_cids.block_number = blocks.block_number
) )
@ -57,7 +57,7 @@ const (
uncle_cids.header_id = header_cids.block_hash uncle_cids.header_id = header_cids.block_hash
AND uncle_cids.block_number = header_cids.block_number AND uncle_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
uncle_cids.mh_key = blocks.key uncle_cids.mh_key = blocks.key
AND uncle_cids.block_number = blocks.block_number AND uncle_cids.block_number = blocks.block_number
) )
@ -69,7 +69,7 @@ const (
transaction_cids.header_id = header_cids.block_hash transaction_cids.header_id = header_cids.block_hash
AND transaction_cids.block_number = header_cids.block_number AND transaction_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
transaction_cids.mh_key = blocks.key transaction_cids.mh_key = blocks.key
AND transaction_cids.block_number = blocks.block_number AND transaction_cids.block_number = blocks.block_number
) )
@ -82,7 +82,7 @@ const (
transaction_cids.header_id = header_cids.block_hash transaction_cids.header_id = header_cids.block_hash
AND transaction_cids.block_number = header_cids.block_number AND transaction_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
transaction_cids.mh_key = blocks.key transaction_cids.mh_key = blocks.key
AND transaction_cids.block_number = blocks.block_number AND transaction_cids.block_number = blocks.block_number
) )
@ -99,7 +99,7 @@ const (
transaction_cids.header_id = header_cids.block_hash transaction_cids.header_id = header_cids.block_hash
AND transaction_cids.block_number = header_cids.block_number AND transaction_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
receipt_cids.leaf_mh_key = blocks.key receipt_cids.leaf_mh_key = blocks.key
AND receipt_cids.block_number = blocks.block_number AND receipt_cids.block_number = blocks.block_number
) )
@ -117,7 +117,7 @@ const (
transaction_cids.header_id = header_cids.block_hash transaction_cids.header_id = header_cids.block_hash
AND transaction_cids.block_number = header_cids.block_number AND transaction_cids.block_number = header_cids.block_number
) )
INNER JOIN public.blocks ON ( INNER JOIN ipld.blocks ON (
receipt_cids.leaf_mh_key = blocks.key receipt_cids.leaf_mh_key = blocks.key
AND receipt_cids.block_number = blocks.block_number AND receipt_cids.block_number = blocks.block_number
) )

4
pkg/shared/functions.go
View File

@ -50,14 +50,14 @@ func Rollback(tx *sqlx.Tx) {
// FetchIPLDByMhKeyAndBlockNumber is used to retrieve an ipld from Postgres blockstore with the provided tx, mhkey string and blockNumber // FetchIPLDByMhKeyAndBlockNumber is used to retrieve an ipld from Postgres blockstore with the provided tx, mhkey string and blockNumber
func FetchIPLDByMhKeyAndBlockNumber(tx *sqlx.Tx, mhKey string, blockNumber uint64) ([]byte, error) { func FetchIPLDByMhKeyAndBlockNumber(tx *sqlx.Tx, mhKey string, blockNumber uint64) ([]byte, error) {
pgStr := `SELECT data FROM public.blocks WHERE key = $1 AND block_number = $2` pgStr := `SELECT data FROM ipld.blocks WHERE key = $1 AND block_number = $2`
var block []byte var block []byte
return block, tx.Get(&block, pgStr, mhKey, blockNumber) return block, tx.Get(&block, pgStr, mhKey, blockNumber)
} }
// FetchIPLD is used to retrieve an IPLD from Postgres mhkey and blockNumber // FetchIPLD is used to retrieve an IPLD from Postgres mhkey and blockNumber
func FetchIPLD(db *sqlx.DB, mhKey string, blockNumber uint64) ([]byte, error) { func FetchIPLD(db *sqlx.DB, mhKey string, blockNumber uint64) ([]byte, error) {
pgStr := `SELECT data FROM public.blocks WHERE key = $1 AND block_number = $2` pgStr := `SELECT data FROM ipld.blocks WHERE key = $1 AND block_number = $2`
var block []byte var block []byte
return block, db.Get(&block, pgStr, mhKey, blockNumber) return block, db.Get(&block, pgStr, mhKey, blockNumber)
} }