Adding support for eip-1186 proofs

Cargo.toml

@@ -9,6 +9,8 @@ members = [
 	"test-support/trie-bench",
 	"trie-db",
 	"trie-db/test",
+	"trie-eip1186",
+	"trie-eip1186/test",
 	"trie-root",
 	"trie-root/test"
 ]

trie-eip1186/CHANGELOG.md

@@ -0,0 +1,8 @@
+# Changelog
+
+The format is based on [Keep a Changelog].
+
+[Keep a Changelog]: http://keepachangelog.com/en/1.0.0/
+
+## [Unreleased]
+Support eip 1186 trie proofs. [#146](https://github.com/paritytech/trie/pull/146)

trie-eip1186/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "trie-eip1186"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "EIP-1186 compliant proof generation and verification"
+repository = "https://github.com/paritytech/trie"
+license = "Apache-2.0"
+edition = "2018"
+
+[dependencies]
+log = "0.4"
+smallvec = "1.0.0"
+trie-db = { path = "../trie-db", default-features = false, version = "0.23"}
+hash-db = { path = "../hash-db", default-features = false, version = "0.15.2"}
+
+[features]
+default = ["std"]
+std = [
+  "trie-db/std",
+  "hash-db/std",
+]

trie-eip1186/src/eip1186.rs

@@ -0,0 +1,305 @@
+use crate::rstd::{result::Result, vec::Vec};
+use hash_db::Hasher;
+use trie_db::{
+	node::{decode_hash, Node, NodeHandle, Value},
+	recorder::Recorder,
+	CError, NibbleSlice, NodeCodec, Result as TrieResult, Trie, TrieHash, TrieLayout,
+};
+
+/// Generate an eip-1186 compatible proof for key-value pairs in a trie given a key.
+pub fn generate_proof<T, L>(
+	trie: &T,
+	key: &[u8],
+) -> TrieResult<(Vec<Vec<u8>>, Option<Vec<u8>>), TrieHash<L>, CError<L>>
+where
+	T: Trie<L>,
+	L: TrieLayout,
+{
+	let mut recorder = Recorder::new();
+	let item = trie.get_with(key, &mut recorder)?;
+	let proof: Vec<Vec<u8>> = recorder.drain().into_iter().map(|r| r.data).collect();
+	Ok((proof, item))
+}
+
+/// Errors that may occur during proof verification. Most of the errors types simply indicate that
+/// the proof is invalid with respect to the statement being verified, and the exact error type can
+/// be used for debugging.
+#[derive(PartialEq, Eq)]
+#[cfg_attr(feature = "std", derive(Debug))]
+pub enum VerifyError<'a, HO, CE> {
+	/// The proof does not contain any value for the given key
+	/// the error carries the nibbles left after traversing the trie
+	NonExistingValue(NibbleSlice<'a>),
+	/// The proof contains a value for the given key
+	/// while we were expecting to find a non-existence proof
+	ExistingValue(Vec<u8>),
+	/// The proof indicates that the trie contains a different value.
+	/// the error carries the value contained in the trie
+	ValueMismatch(Vec<u8>),
+	/// The proof is missing trie nodes required to verify.
+	IncompleteProof,
+	/// The node hash computed from the proof is not matching.
+	HashMismatch(HO),
+	/// One of the proof nodes could not be decoded.
+	DecodeError(CE),
+	/// Error in converting a plain hash into a HO
+	HashDecodeError(&'a [u8]),
+}
+
+#[cfg(feature = "std")]
+impl<'a, HO: std::fmt::Debug, CE: std::error::Error> std::fmt::Display for VerifyError<'a, HO, CE> {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
+		match self {
+			VerifyError::NonExistingValue(key) => {
+				write!(f, "Key does not exist in trie: reaming key={:?}", key)
+			},
+			VerifyError::ExistingValue(value) => {
+				write!(f, "trie contains a value for given key value={:?}", value)
+			},
+			VerifyError::ValueMismatch(key) => {
+				write!(f, "Expected value was not found in the trie: key={:?}", key)
+			},
+			VerifyError::IncompleteProof => write!(f, "Proof is incomplete -- expected more nodes"),
+			VerifyError::HashMismatch(hash) => write!(f, "hash mismatch found: hash={:?}", hash),
+			VerifyError::DecodeError(err) => write!(f, "Unable to decode proof node: {}", err),
+			VerifyError::HashDecodeError(plain_hash) => {
+				write!(f, "Unable to decode hash value plain_hash: {:?}", plain_hash)
+			},
+		}
+	}
+}
+
+#[cfg(feature = "std")]
+impl<'a, HO: std::fmt::Debug, CE: std::error::Error + 'static> std::error::Error
+	for VerifyError<'a, HO, CE>
+{
+	fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+		match self {
+			VerifyError::DecodeError(err) => Some(err),
+			_ => None,
+		}
+	}
+}
+
+/// Verify a compact proof for key-value pairs in a trie given a root hash.
+pub fn verify_proof<'a, L>(
+	root: &<L::Hash as Hasher>::Out,
+	proof: &'a [Vec<u8>],
+	raw_key: &'a [u8],
+	expected_value: Option<&[u8]>,
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if proof.is_empty() {
+		return Err(VerifyError::IncompleteProof)
+	}
+	let key = NibbleSlice::new(raw_key);
+	process_node::<L>(Some(root), &proof[0], key, expected_value, &proof[1..])
+}
+
+fn process_node<'a, L>(
+	expected_node_hash: Option<&<L::Hash as Hasher>::Out>,
+	encoded_node: &'a [u8],
+	key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if let Some(value) = expected_value {
+		if encoded_node == value {
+			return Ok(())
+		}
+	}
+	if let Some(expected) = expected_node_hash {
+		let calculated_node_hash = <L::Hash as Hasher>::hash(encoded_node);
+		if calculated_node_hash != *expected {
+			return Err(VerifyError::HashMismatch(calculated_node_hash))
+		}
+	}
+	let node = <L::Codec as NodeCodec>::decode(encoded_node).map_err(VerifyError::DecodeError)?;
+	match node {
+		Node::Empty => process_empty::<L>(key, expected_value, proof),
+		Node::Leaf(nib, data) => process_leaf::<L>(nib, data, key, expected_value, proof),
+		Node::Extension(nib, handle) =>
+			process_extension::<L>(&nib, handle, key, expected_value, proof),
+		Node::Branch(children, maybe_data) =>
+			process_branch::<L>(children, maybe_data, key, expected_value, proof),
+		Node::NibbledBranch(nib, children, maybe_data) =>
+			process_nibbledbranch::<L>(nib, children, maybe_data, key, expected_value, proof),
+	}
+}
+
+fn process_empty<'a, L>(
+	key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	_: &[Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if expected_value.is_none() {
+		Ok(())
+	} else {
+		Err(VerifyError::NonExistingValue(key))
+	}
+}
+
+fn process_leaf<'a, L>(
+	nib: NibbleSlice,
+	data: Value<'a>,
+	key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if key != nib && expected_value.is_none() {
+		return Ok(())
+	} else if key != nib {
+		return Err(VerifyError::NonExistingValue(key))
+	}
+	match_value::<L>(Some(data), key, expected_value, proof)
+}
+fn process_extension<'a, L>(
+	nib: &NibbleSlice,
+	handle: NodeHandle<'a>,
+	mut key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if !key.starts_with(nib) && expected_value.is_none() {
+		return Ok(())
+	} else if !key.starts_with(nib) {
+		return Err(VerifyError::NonExistingValue(key))
+	}
+	key.advance(nib.len());
+
+	match handle {
+		NodeHandle::Inline(encoded_node) =>
+			process_node::<L>(None, encoded_node, key, expected_value, proof),
+		NodeHandle::Hash(plain_hash) => {
+			let new_root = decode_hash::<L::Hash>(plain_hash)
+				.ok_or(VerifyError::HashDecodeError(plain_hash))?;
+			process_node::<L>(Some(&new_root), &proof[0], key, expected_value, &proof[1..])
+		},
+	}
+}
+
+fn process_nibbledbranch<'a, L>(
+	nib: NibbleSlice,
+	children: [Option<NodeHandle<'a>>; 16],
+	maybe_data: Option<Value<'a>>,
+	mut key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if !key.starts_with(&nib) && expected_value.is_none() {
+		return Ok(())
+	} else if !key.starts_with(&nib) && expected_value.is_some() {
+		return Err(VerifyError::NonExistingValue(key))
+	}
+	key.advance(nib.len());
+
+	if key.is_empty() {
+		match_value::<L>(maybe_data, key, expected_value, proof)
+	} else {
+		match_children::<L>(children, key, expected_value, proof)
+	}
+}
+
+fn process_branch<'a, L>(
+	children: [Option<NodeHandle<'a>>; 16],
+	maybe_data: Option<Value<'a>>,
+	key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	if key.is_empty() {
+		match_value::<L>(maybe_data, key, expected_value, proof)
+	} else {
+		match_children::<L>(children, key, expected_value, proof)
+	}
+}
+fn match_children<'a, L>(
+	children: [Option<NodeHandle<'a>>; 16],
+	mut key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	match children.get(key.at(0) as usize) {
+		Some(Some(NodeHandle::Hash(hash))) =>
+			if proof.is_empty() {
+				Err(VerifyError::IncompleteProof)
+			} else {
+				key.advance(1);
+				let new_root =
+					decode_hash::<L::Hash>(hash).ok_or(VerifyError::HashDecodeError(hash))?;
+				process_node::<L>(Some(&new_root), &proof[0], key, expected_value, &proof[1..])
+			},
+		Some(Some(NodeHandle::Inline(encoded_node))) => {
+			key.advance(1);
+			process_node::<L>(None, encoded_node, key, expected_value, proof)
+		},
+		Some(None) =>
+			if expected_value.is_none() {
+				Ok(())
+			} else {
+				Err(VerifyError::NonExistingValue(key))
+			},
+		None => panic!("key index is out of range in children array"),
+	}
+}
+
+fn match_value<'a, L>(
+	maybe_data: Option<Value<'a>>,
+	key: NibbleSlice<'a>,
+	expected_value: Option<&[u8]>,
+	proof: &'a [Vec<u8>],
+) -> Result<(), VerifyError<'a, TrieHash<L>, CError<L>>>
+where
+	L: TrieLayout,
+{
+	match (maybe_data, proof.first(), expected_value) {
+		(None, _, None) => Ok(()),
+		(None, _, Some(_)) => Err(VerifyError::NonExistingValue(key)),
+		(Some(Value::Inline(inline_data)), _, Some(value)) =>
+			if inline_data == value {
+				Ok(())
+			} else {
+				Err(VerifyError::ValueMismatch(inline_data.to_vec()))
+			},
+		(Some(Value::Inline(inline_data)), _, None) =>
+			Err(VerifyError::ExistingValue(inline_data.to_vec())),
+		(Some(Value::Node(plain_hash, _)), Some(next_proof_item), Some(value)) => {
+			let value_hash = L::Hash::hash(value);
+			let node_hash = decode_hash::<L::Hash>(plain_hash)
+				.ok_or(VerifyError::HashDecodeError(plain_hash))?;
+			if node_hash != value_hash {
+				Err(VerifyError::HashMismatch(node_hash))
+			} else if next_proof_item != value {
+				Err(VerifyError::ValueMismatch(next_proof_item.to_vec()))
+			} else {
+				Ok(())
+			}
+		},
+		(Some(Value::Node(_, _)), None, _) => Err(VerifyError::IncompleteProof),
+		(Some(Value::Node(_, _)), Some(proof_item), None) =>
+			Err(VerifyError::ExistingValue(proof_item.to_vec())),
+	}
+}

trie-eip1186/src/lib.rs

@@ -0,0 +1,30 @@
+// Copyright 2021, 2021 Parity Technologies
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#![cfg_attr(not(feature = "std"), no_std)]
+
+#[cfg(feature = "std")]
+mod rstd {
+	pub use std::{result, vec};
+}
+
+#[cfg(not(feature = "std"))]
+mod rstd {
+	pub use alloc::vec;
+	pub use core::result;
+	pub trait Error {}
+	impl<T> Error for T {}
+}
+
+mod eip1186;
+pub use eip1186::{generate_proof, verify_proof, VerifyError};

trie-eip1186/test/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "trie-eip1186-test"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+description = "Tests for trie-eip1186 crate"
+repository = "https://github.com/paritytech/trie"
+license = "Apache-2.0"
+edition = "2018"
+
+[dependencies]
+trie-eip1186 = { path = "..", version = "0.1.0"}
+trie-db = { path = "../../trie-db", version = "0.23.0"}
+hash-db = { path = "../../hash-db", version = "0.15.2"}
+reference-trie = { path = "../../test-support/reference-trie", version = "0.24.0" }
+memory-db = { path = "../../memory-db", version = "0.28.0" }