runtime: Pass EnsLookup to host exports

Author: lutter

runtime/test/src/common.rs

@@ -50,13 +50,15 @@ fn mock_host_exports(
     }];
 
     let network = data_source.network.clone().unwrap();
+    let ens_lookup = store.ens_lookup();
     HostExports::new(
         subgraph_id,
         &data_source,
         network,
         Arc::new(templates),
         Arc::new(graph_core::LinkResolver::from(IpfsClient::localhost())),
         store,
+        ens_lookup,
     )
 }
 

runtime/wasm/src/host.rs

@@ -8,7 +8,7 @@ use futures03::channel::oneshot::channel;
 use graph::blockchain::RuntimeAdapter;
 use graph::blockchain::{Blockchain, DataSource};
 use graph::blockchain::{HostFn, TriggerWithHandler};
-use graph::components::store::SubgraphStore;
+use graph::components::store::{EnsLookup, SubgraphStore};
 use graph::components::subgraph::{MappingError, SharedProofOfIndexing};
 use graph::prelude::{
     RuntimeHost as RuntimeHostTrait, RuntimeHostBuilder as RuntimeHostBuilderTrait, *,
@@ -100,6 +100,7 @@ impl<C: Blockchain> RuntimeHostBuilderTrait<C> for RuntimeHostBuilder<C> {
             templates,
             mapping_request_sender,
             metrics,
+            self.store.ens_lookup(),
         )
     }
 }
@@ -126,6 +127,7 @@ where
         templates: Arc<Vec<C::DataSourceTemplate>>,
         mapping_request_sender: Sender<MappingRequest<C>>,
         metrics: Arc<HostMetrics>,
+        ens_lookup: Arc<dyn EnsLookup>,
     ) -> Result<Self, Error> {
         // Create new instance of externally hosted functions invoker. The `Arc` is simply to avoid
         // implementing `Clone` for `HostExports`.
@@ -136,6 +138,7 @@ where
             templates,
             link_resolver,
             store,
+            ens_lookup,
         ));
 
         let host_fns = Arc::new(runtime_adapter.host_fns(&data_source)?);

runtime/wasm/src/host_exports.rs

@@ -1,8 +1,8 @@
 use crate::{error::DeterminismLevel, module::IntoTrap};
 use graph::blockchain::DataSource;
 use graph::blockchain::{Blockchain, DataSourceTemplate as _};
-use graph::components::store::EntityKey;
 use graph::components::store::EntityType;
+use graph::components::store::{EnsLookup, EntityKey};
 use graph::components::subgraph::{CausalityRegion, ProofOfIndexingEvent, SharedProofOfIndexing};
 use graph::data::store;
 use graph::prelude::ethabi::param_type::Reader;
@@ -69,6 +69,7 @@ pub struct HostExports<C: Blockchain> {
     templates: Arc<Vec<C::DataSourceTemplate>>,
     pub(crate) link_resolver: Arc<dyn LinkResolver>,
     store: Arc<dyn SubgraphStore>,
+    ens_lookup: Arc<dyn EnsLookup>,
 }
 
 impl<C: Blockchain> HostExports<C> {
@@ -79,6 +80,7 @@ impl<C: Blockchain> HostExports<C> {
         templates: Arc<Vec<C::DataSourceTemplate>>,
         link_resolver: Arc<dyn LinkResolver>,
         store: Arc<dyn SubgraphStore>,
+        ens_lookup: Arc<dyn EnsLookup>,
     ) -> Self {
         Self {
             subgraph_id,
@@ -91,6 +93,7 @@ impl<C: Blockchain> HostExports<C> {
             templates,
             link_resolver,
             store,
+            ens_lookup,
         }
     }
 
@@ -670,7 +673,7 @@ impl<C: Blockchain> HostExports<C> {
     }
 
     pub(crate) fn ens_name_by_hash(&self, hash: &str) -> Result<Option<String>, anyhow::Error> {
-        Ok(self.store.find_ens_name(hash)?)
+        Ok(self.ens_lookup.find_name(hash)?)
     }
 
     pub(crate) fn log_log(