mirror of
https://github.com/status-im/nimbus-eth1.git
synced 2025-01-16 15:25:24 +00:00
dbe3393f5c
* Fix eth/common & web3 related deprecation warnings for fluffy This commit uses the new types in the new eth/common/ structure to remove deprecation warnings. It is however more than just a mass replace as also all places where eth/common or eth/common/eth_types or eth/common/eth_types_rlp got imported have been revised and adjusted to a better per submodule based import. There are still a bunch of toMDigest deprecation warnings but that convertor is not needed for fluffy code anymore so in theory it should not be used (bug?). It seems to still get imported via export leaks ffrom imported nimbus code I think. * Address review comments * Remove two more unused eth/common imports
178 lines
6.0 KiB
Nim
178 lines
6.0 KiB
Nim
# Fluffy
|
|
# Copyright (c) 2021-2024 Status Research & Development GmbH
|
|
# Licensed and distributed under either of
|
|
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
|
|
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
|
|
# at your option. This file may not be copied, modified, or distributed except according to those terms.
|
|
|
|
{.push raises: [].}
|
|
|
|
import
|
|
results,
|
|
chronos,
|
|
chronicles,
|
|
eth/common/hashes,
|
|
../wire/portal_protocol,
|
|
./state_content,
|
|
./state_utils
|
|
|
|
export results, state_content
|
|
|
|
logScope:
|
|
topics = "portal_state"
|
|
|
|
type ProofWithPath = tuple[path: Nibbles, proof: TrieProof]
|
|
|
|
type AccountTrieOfferWithKey* =
|
|
tuple[key: AccountTrieNodeKey, offer: AccountTrieNodeOffer]
|
|
|
|
type ContractTrieOfferWithKey* =
|
|
tuple[key: ContractTrieNodeKey, offer: ContractTrieNodeOffer]
|
|
|
|
type ContractCodeOfferWithKey* = tuple[key: ContractCodeKey, offer: ContractCodeOffer]
|
|
|
|
func withPath(proof: TrieProof, path: Nibbles): ProofWithPath =
|
|
(path: path, proof: proof)
|
|
|
|
func withKey*(offer: ContentOfferType, key: ContentKeyType): auto =
|
|
(key: key, offer: offer)
|
|
|
|
func getParent(p: ProofWithPath): ProofWithPath =
|
|
# this function assumes that the proof contains valid rlp therefore
|
|
# if required these proofs should be validated beforehand
|
|
try:
|
|
doAssert(p.path.len() > 0, "nibbles too short")
|
|
doAssert(p.proof.len() > 1, "proof too short")
|
|
|
|
let
|
|
parentProof = TrieProof.init(p.proof[0 ..^ 2])
|
|
parentEndNode = rlpFromBytes(parentProof[^1].asSeq())
|
|
|
|
# the trie proof should have already been validated when receiving the offer content
|
|
doAssert(parentEndNode.listLen() == 2 or parentEndNode.listLen() == 17)
|
|
|
|
var unpackedNibbles = p.path.unpackNibbles()
|
|
|
|
if parentEndNode.listLen() == 17:
|
|
# branch node so only need to remove a single nibble
|
|
return parentProof.withPath(unpackedNibbles.dropN(1).packNibbles())
|
|
|
|
# leaf or extension node so we need to remove one or more nibbles
|
|
let (_, _, prefixNibbles) = decodePrefix(parentEndNode.listElem(0))
|
|
|
|
parentProof.withPath(
|
|
unpackedNibbles.dropN(prefixNibbles.unpackNibbles().len()).packNibbles()
|
|
)
|
|
except RlpError as e:
|
|
raiseAssert(e.msg)
|
|
|
|
func getParent*(offerWithKey: AccountTrieOfferWithKey): AccountTrieOfferWithKey =
|
|
let
|
|
(key, offer) = offerWithKey
|
|
parent = offer.proof.withPath(key.path).getParent()
|
|
parentKey =
|
|
AccountTrieNodeKey.init(parent.path, keccak256(parent.proof[^1].asSeq()))
|
|
parentOffer = AccountTrieNodeOffer.init(parent.proof, offer.blockHash)
|
|
|
|
parentOffer.withKey(parentKey)
|
|
|
|
func getParent*(offerWithKey: ContractTrieOfferWithKey): ContractTrieOfferWithKey =
|
|
let
|
|
(key, offer) = offerWithKey
|
|
parent = offer.storageProof.withPath(key.path).getParent()
|
|
parentKey = ContractTrieNodeKey.init(
|
|
key.addressHash, parent.path, keccak256(parent.proof[^1].asSeq())
|
|
)
|
|
parentOffer =
|
|
ContractTrieNodeOffer.init(parent.proof, offer.accountProof, offer.blockHash)
|
|
|
|
parentOffer.withKey(parentKey)
|
|
|
|
proc gossipOffer*(
|
|
p: PortalProtocol,
|
|
srcNodeId: Opt[NodeId],
|
|
keyBytes: ContentKeyByteList,
|
|
offerBytes: seq[byte],
|
|
key: AccountTrieNodeKey,
|
|
offer: AccountTrieNodeOffer,
|
|
) {.async: (raises: [CancelledError]).} =
|
|
let req1Peers = await p.neighborhoodGossip(
|
|
srcNodeId, ContentKeysList.init(@[keyBytes]), @[offerBytes]
|
|
)
|
|
debug "Offered content gossipped successfully with peers", keyBytes, peers = req1Peers
|
|
|
|
proc gossipOffer*(
|
|
p: PortalProtocol,
|
|
srcNodeId: Opt[NodeId],
|
|
keyBytes: ContentKeyByteList,
|
|
offerBytes: seq[byte],
|
|
key: ContractTrieNodeKey,
|
|
offer: ContractTrieNodeOffer,
|
|
) {.async: (raises: [CancelledError]).} =
|
|
let req1Peers = await p.neighborhoodGossip(
|
|
srcNodeId, ContentKeysList.init(@[keyBytes]), @[offerBytes]
|
|
)
|
|
debug "Offered content gossipped successfully with peers", keyBytes, peers = req1Peers
|
|
|
|
proc gossipOffer*(
|
|
p: PortalProtocol,
|
|
srcNodeId: Opt[NodeId],
|
|
keyBytes: ContentKeyByteList,
|
|
offerBytes: seq[byte],
|
|
key: ContractCodeKey,
|
|
offer: ContractCodeOffer,
|
|
) {.async: (raises: [CancelledError]).} =
|
|
let peers = await p.neighborhoodGossip(
|
|
srcNodeId, ContentKeysList.init(@[keyBytes]), @[offerBytes]
|
|
)
|
|
debug "Offered content gossipped successfully with peers", keyBytes, peers
|
|
|
|
# Currently only used for testing to gossip an entire account trie proof
|
|
proc recursiveGossipOffer*(
|
|
p: PortalProtocol,
|
|
srcNodeId: Opt[NodeId],
|
|
keyBytes: ContentKeyByteList,
|
|
offerBytes: seq[byte],
|
|
key: AccountTrieNodeKey,
|
|
offer: AccountTrieNodeOffer,
|
|
): Future[ContentKeyByteList] {.async: (raises: [CancelledError]).} =
|
|
await gossipOffer(p, srcNodeId, keyBytes, offerBytes, key, offer)
|
|
|
|
# root node, recursive gossip is finished
|
|
if key.path.unpackNibbles().len() == 0:
|
|
return keyBytes
|
|
|
|
# continue the recursive gossip by sharing the parent offer with peers
|
|
let
|
|
(parentKey, parentOffer) = offer.withKey(key).getParent()
|
|
parentKeyBytes = parentKey.toContentKey().encode()
|
|
|
|
await recursiveGossipOffer(
|
|
p, srcNodeId, parentKeyBytes, parentOffer.encode(), parentKey, parentOffer
|
|
)
|
|
|
|
# Currently only used for testing to gossip an entire contract trie proof
|
|
# This may also be useful for the state network bridge
|
|
proc recursiveGossipOffer*(
|
|
p: PortalProtocol,
|
|
srcNodeId: Opt[NodeId],
|
|
keyBytes: ContentKeyByteList,
|
|
offerBytes: seq[byte],
|
|
key: ContractTrieNodeKey,
|
|
offer: ContractTrieNodeOffer,
|
|
): Future[ContentKeyByteList] {.async: (raises: [CancelledError]).} =
|
|
await gossipOffer(p, srcNodeId, keyBytes, offerBytes, key, offer)
|
|
|
|
# root node, recursive gossip is finished
|
|
if key.path.unpackNibbles().len() == 0:
|
|
return keyBytes
|
|
|
|
# continue the recursive gossip by sharing the parent offer with peers
|
|
let
|
|
(parentKey, parentOffer) = offer.withKey(key).getParent()
|
|
parentKeyBytes = parentKey.toContentKey().encode()
|
|
|
|
await recursiveGossipOffer(
|
|
p, srcNodeId, parentKeyBytes, parentOffer.encode(), parentKey, parentOffer
|
|
)
|