core, node, graph: Ignore graft base in dev mode

Author: incrypto32

core/src/subgraph/registrar.rs

@@ -278,6 +278,7 @@ where
         start_block_override: Option<BlockPtr>,
         graft_block_override: Option<BlockPtr>,
         history_blocks: Option<i32>,
+        ignore_graft_base: bool,
     ) -> Result<DeploymentLocator, SubgraphRegistrarError> {
         // We don't have a location for the subgraph yet; that will be
         // assigned when we deploy for real. For logging purposes, make up a
@@ -330,6 +331,7 @@ where
                     self.version_switching_mode,
                     &resolver,
                     history_blocks,
+                    ignore_graft_base,
                 )
                 .await?
             }
@@ -348,6 +350,7 @@ where
                     self.version_switching_mode,
                     &resolver,
                     history_blocks,
+                    ignore_graft_base,
                 )
                 .await?
             }
@@ -366,6 +369,7 @@ where
                     self.version_switching_mode,
                     &resolver,
                     history_blocks,
+                    ignore_graft_base,
                 )
                 .await?
             }
@@ -384,6 +388,7 @@ where
                     self.version_switching_mode,
                     &resolver,
                     history_blocks,
+                    ignore_graft_base,
                 )
                 .await?
             }
@@ -570,6 +575,7 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore>(
     version_switching_mode: SubgraphVersionSwitchingMode,
     resolver: &Arc<dyn LinkResolver>,
     history_blocks_override: Option<i32>,
+    ignore_graft_base: bool,
 ) -> Result<DeploymentLocator, SubgraphRegistrarError> {
     let raw_string = serde_yaml::to_string(&raw).unwrap();
 
@@ -591,10 +597,21 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore>(
         Err(StoreError::DeploymentNotFound(_)) => true,
         Err(e) => return Err(SubgraphRegistrarError::StoreError(e)),
     };
-    let manifest = unvalidated
-        .validate(store.cheap_clone(), should_validate)
-        .await
-        .map_err(SubgraphRegistrarError::ManifestValidationError)?;
+
+    let manifest = {
+        let should_validate = should_validate && !ignore_graft_base;
+
+        let mut manifest = unvalidated
+            .validate(store.cheap_clone(), should_validate)
+            .await
+            .map_err(SubgraphRegistrarError::ManifestValidationError)?;
+
+        if ignore_graft_base {
+            manifest.graft = None;
+        }
+
+        manifest
+    };
 
     let network_name: Word = manifest.network_name().into();
 

graph/src/components/subgraph/registrar.rs

@@ -45,6 +45,7 @@ pub trait SubgraphRegistrar: Send + Sync + 'static {
         start_block_block: Option<BlockPtr>,
         graft_block_override: Option<BlockPtr>,
         history_blocks: Option<i32>,
+        ignore_graft_base: bool,
     ) -> Result<DeploymentLocator, SubgraphRegistrarError>;
 
     async fn remove_subgraph(&self, name: SubgraphName) -> Result<(), SubgraphRegistrarError>;

node/src/dev/helpers.rs

@@ -55,6 +55,7 @@ async fn deploy_subgraph(
             start_block,
             None,
             None,
+            true
         )
         .await
         .and_then(|locator| {

node/src/launcher.rs

@@ -253,6 +253,7 @@ fn deploy_subgraph_from_flag(
                     start_block,
                     None,
                     None,
+                    false,
                 )
                 .await
         }

node/src/manager/commands/run.rs

@@ -213,6 +213,7 @@ pub async fn run(
         None,
         None,
         None,
+        false,
     )
     .await?;
 

server/json-rpc/src/lib.rs

@@ -133,6 +133,7 @@ impl<R: SubgraphRegistrar> ServerState<R> {
                 None,
                 None,
                 params.history_blocks,
+                false,
             )
             .await
         {

tests/src/fixture/mod.rs

@@ -612,6 +612,7 @@ pub async fn setup_inner<C: Blockchain>(
         None,
         graft_block,
         None,
+        false,
     )
     .await
     .expect("failed to create subgraph version");