containers: automatically use ConsignmentResolver

Cargo.toml

@@ -95,3 +95,6 @@ wasm-bindgen-test = "0.3"
 
 [package.metadata.docs.rs]
 features = ["all"]
+
+[patch.crates-io]
+rgb-core = { git = "https://github.com/RGB-WG/rgb-core", branch = "resolvers" }

src/containers/consignment.rs

@@ -49,7 +49,7 @@ use super::{
 };
 use crate::containers::anchors::ToWitnessId;
 use crate::interface::{Iface, IfaceImpl};
-use crate::resolvers::ResolveHeight;
+use crate::resolvers::{ConsignmentResolver, ResolveHeight};
 use crate::{BundleExt, SecretSeal, LIB_NAME_RGB_STD};
 
 pub type Transfer = Consignment<true>;
@@ -349,7 +349,11 @@ impl<const TRANSFER: bool> Consignment<TRANSFER> {
         testnet: bool,
     ) -> Result<ValidConsignment<TRANSFER>, (validation::Status, Consignment<TRANSFER>)> {
         let index = IndexedConsignment::new(&self);
-        let mut status = Validator::validate(&index, resolver, testnet);
+        let resolver = ConsignmentResolver {
+            consignment: &index,
+            fallback: resolver,
+        };
+        let mut status = Validator::validate(&index, &resolver, testnet);
 
         let validity = status.validity();
 

src/resolvers.rs

@@ -28,20 +28,12 @@ pub trait ResolveHeight {
     fn resolve_height(&mut self, witness_id: XWitnessId) -> Result<WitnessAnchor, String>;
 }
 
-pub struct ConsignmentResolver<'cons, R: ResolveWitness + ResolveHeight, const TRANSFER: bool> {
+pub(crate) struct ConsignmentResolver<'cons, R: ResolveWitness, const TRANSFER: bool> {
     pub consignment: &'cons IndexedConsignment<'cons, TRANSFER>,
     pub fallback: R,
 }
 
-impl<'cons, R: ResolveWitness + ResolveHeight, const TRANSFER: bool> ResolveHeight
-    for ConsignmentResolver<'cons, R, TRANSFER>
-{
-    fn resolve_height(&mut self, witness_id: XWitnessId) -> Result<WitnessAnchor, String> {
-        self.fallback.resolve_height(witness_id)
-    }
-}
-
-impl<'cons, R: ResolveWitness + ResolveHeight, const TRANSFER: bool> ResolveWitness
+impl<'cons, R: ResolveWitness, const TRANSFER: bool> ResolveWitness
     for ConsignmentResolver<'cons, R, TRANSFER>
 {
     fn resolve_pub_witness(