implement persistTransactions and getBlockBody
This commit is contained in:
parent
a2b9167e2b
commit
161d6adbc7
|
@ -81,9 +81,6 @@ proc getBlockHeader*(self: BaseChainDB; n: BlockNumber): BlockHeader =
|
||||||
## Raises BlockNotFound error if the block is not in the DB.
|
## Raises BlockNotFound error if the block is not in the DB.
|
||||||
self.getBlockHeader(self.getBlockHash(n))
|
self.getBlockHeader(self.getBlockHash(n))
|
||||||
|
|
||||||
proc getBlockBody*(self: BaseChainDB, h: Hash256, output: var BlockBody): bool =
|
|
||||||
discard # TODO:
|
|
||||||
|
|
||||||
proc getScore*(self: BaseChainDB; blockHash: Hash256): int =
|
proc getScore*(self: BaseChainDB; blockHash: Hash256): int =
|
||||||
rlp.decode(self.db.get(blockHashToScoreKey(blockHash).toOpenArray).toRange, int)
|
rlp.decode(self.db.get(blockHashToScoreKey(blockHash).toOpenArray).toRange, int)
|
||||||
|
|
||||||
|
@ -107,15 +104,43 @@ proc addBlockNumberToHashLookup(self: BaseChainDB; header: BlockHeader) =
|
||||||
self.db.put(blockNumberToHashKey(header.blockNumber).toOpenArray,
|
self.db.put(blockNumberToHashKey(header.blockNumber).toOpenArray,
|
||||||
rlp.encode(header.hash))
|
rlp.encode(header.hash))
|
||||||
|
|
||||||
|
proc persistTransactions*(self: BaseChainDB, transactions: openarray[Transaction]) =
|
||||||
|
var tr = initHexaryTrie(self.db)
|
||||||
|
for i, t in transactions:
|
||||||
|
tr.put(rlp.encode(i).toRange, rlp.encode(t).toRange)
|
||||||
|
|
||||||
|
iterator getBlockTransactionData(self: BaseChainDB, transactionRoot: Hash256): BytesRange =
|
||||||
|
var transactionDb = initHexaryTrie(self.db, transactionRoot)
|
||||||
|
var transactionIdx = 0
|
||||||
|
while true:
|
||||||
|
let transactionKey = rlp.encode(transactionIdx).toRange
|
||||||
|
if transactionKey in transactionDb:
|
||||||
|
yield transactionDb.get(transactionKey)
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
inc transactionIdx
|
||||||
|
|
||||||
iterator getBlockTransactionHashes(self: BaseChainDB, blockHeader: BlockHeader): Hash256 =
|
iterator getBlockTransactionHashes(self: BaseChainDB, blockHeader: BlockHeader): Hash256 =
|
||||||
## Returns an iterable of the transaction hashes from th block specified
|
## Returns an iterable of the transaction hashes from th block specified
|
||||||
## by the given block header.
|
## by the given block header.
|
||||||
doAssert(false, "TODO: Implement me")
|
for encodedTx in self.getBlockTransactionData(blockHeader.txRoot):
|
||||||
# let all_encoded_transactions = self._get_block_transaction_data(
|
yield keccak256.digest(encodedTx.toOpenArray)
|
||||||
# blockHeader.transactionRoot,
|
|
||||||
# )
|
proc getBlockBody*(self: BaseChainDB, blockHash: Hash256, output: var BlockBody): bool =
|
||||||
# for encoded_transaction in all_encoded_transactions:
|
var header: BlockHeader
|
||||||
# yield keccak(encoded_transaction)
|
if self.getBlockHeader(blockHash, header):
|
||||||
|
result = true
|
||||||
|
output.transactions = @[]
|
||||||
|
output.uncles = @[]
|
||||||
|
for encodedTx in self.getBlockTransactionData(header.txRoot):
|
||||||
|
output.transactions.add(rlp.decode(encodedTx, Transaction))
|
||||||
|
|
||||||
|
if header.ommersHash != EMPTY_UNCLE_HASH:
|
||||||
|
let encodedUncles = self.db.get(genericHashKey(header.ommersHash).toOpenArray).toRange
|
||||||
|
if encodedUncles.len != 0:
|
||||||
|
output.uncles = rlp.decode(encodedUncles, seq[BlockHeader])
|
||||||
|
else:
|
||||||
|
result = false
|
||||||
|
|
||||||
proc getTransactionKey*(self: BaseChainDB, transactionHash: Hash256): tuple[blockNumber: BlockNumber, index: int] {.inline.} =
|
proc getTransactionKey*(self: BaseChainDB, transactionHash: Hash256): tuple[blockNumber: BlockNumber, index: int] {.inline.} =
|
||||||
let
|
let
|
||||||
|
@ -154,17 +179,6 @@ proc headerExists*(self: BaseChainDB; blockHash: Hash256): bool =
|
||||||
## Returns True if the header with the given block hash is in our DB.
|
## Returns True if the header with the given block hash is in our DB.
|
||||||
self.db.contains(genericHashKey(blockHash).toOpenArray)
|
self.db.contains(genericHashKey(blockHash).toOpenArray)
|
||||||
|
|
||||||
iterator getBlockTransactionData(self: BaseChainDB, transactionRoot: Hash256): BytesRange =
|
|
||||||
var transactionDb = initHexaryTrie(self.db, transactionRoot)
|
|
||||||
var transactionIdx = 0
|
|
||||||
while true:
|
|
||||||
let transactionKey = rlp.encode(transactionIdx).toRange
|
|
||||||
if transactionKey in transactionDb:
|
|
||||||
yield transactionDb.get(transactionKey)
|
|
||||||
else:
|
|
||||||
break
|
|
||||||
inc transactionIdx
|
|
||||||
|
|
||||||
iterator getReceipts*(self: BaseChainDB; header: BlockHeader; receiptClass: typedesc): Receipt =
|
iterator getReceipts*(self: BaseChainDB; header: BlockHeader; receiptClass: typedesc): Receipt =
|
||||||
var receiptDb = initHexaryTrie(self.db, header.receiptRoot)
|
var receiptDb = initHexaryTrie(self.db, header.receiptRoot)
|
||||||
var receiptIdx = 0
|
var receiptIdx = 0
|
||||||
|
|
|
@ -163,5 +163,7 @@ method persistBlocks*(c: Chain, headers: openarray[BlockHeader], bodies: openarr
|
||||||
discard c.db.persistHeaderToDb(headers[i])
|
discard c.db.persistHeaderToDb(headers[i])
|
||||||
assert(c.db.getCanonicalHead().blockHash == headers[i].blockHash)
|
assert(c.db.getCanonicalHead().blockHash == headers[i].blockHash)
|
||||||
|
|
||||||
|
c.db.persistTransactions(bodies[i].transactions)
|
||||||
|
|
||||||
transaction.commit()
|
transaction.commit()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue