json-rpc: Add history_blocks as parameter to create_subgraph_version

core/src/subgraph/registrar.rs

@@ -269,6 +269,7 @@ where
         debug_fork: Option<DeploymentHash>,
         start_block_override: Option<BlockPtr>,
         graft_block_override: Option<BlockPtr>,
+        history_blocks: Option<i32>,
     ) -> 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
@@ -311,6 +312,7 @@ where
                     debug_fork,
                     self.version_switching_mode,
                     &self.resolver,
+                    history_blocks,
                 )
                 .await?
             }
@@ -328,6 +330,7 @@ where
                     debug_fork,
                     self.version_switching_mode,
                     &self.resolver,
+                    history_blocks,
                 )
                 .await?
             }
@@ -345,6 +348,7 @@ where
                     debug_fork,
                     self.version_switching_mode,
                     &self.resolver,
+                    history_blocks,
                 )
                 .await?
             }
@@ -362,6 +366,7 @@ where
                     debug_fork,
                     self.version_switching_mode,
                     &self.resolver,
+                    history_blocks,
                 )
                 .await?
             }
@@ -379,6 +384,7 @@ where
                     debug_fork,
                     self.version_switching_mode,
                     &self.resolver,
+                    history_blocks,
                 )
                 .await?
             }
@@ -541,6 +547,7 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore>(
     debug_fork: Option<DeploymentHash>,
     version_switching_mode: SubgraphVersionSwitchingMode,
     resolver: &Arc<dyn LinkResolver>,
+    history_blocks: Option<i32>,
 ) -> Result<DeploymentLocator, SubgraphRegistrarError> {
     let raw_string = serde_yaml::to_string(&raw).unwrap();
     let unvalidated = UnvalidatedSubgraphManifest::<C>::resolve(
@@ -626,10 +633,13 @@ async fn create_subgraph_version<C: Blockchain, S: SubgraphStore>(
 
     // Apply the subgraph versioning and deployment operations,
     // creating a new subgraph deployment if one doesn't exist.
-    let deployment = DeploymentCreate::new(raw_string, &manifest, start_block)
+    let mut deployment = DeploymentCreate::new(raw_string, &manifest, start_block)
         .graft(base_block)
         .debug(debug_fork)
         .entities_with_causality_region(needs_causality_region);
+    if let Some(history_blocks) = history_blocks {
+        deployment = deployment.with_history_blocks(history_blocks);
+    }
 
     deployment_store
         .create_subgraph_deployment(

graph/src/components/subgraph/registrar.rs

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

graph/src/data/subgraph/schema.rs

@@ -108,6 +108,7 @@ pub struct DeploymentCreate {
     pub graft_base: Option<DeploymentHash>,
     pub graft_block: Option<BlockPtr>,
     pub debug_fork: Option<DeploymentHash>,
+    pub history_blocks: Option<i32>,
 }
 
 impl DeploymentCreate {
@@ -122,9 +123,15 @@ impl DeploymentCreate {
             graft_base: None,
             graft_block: None,
             debug_fork: None,
+            history_blocks: None,
         }
     }
 
+    pub fn with_history_blocks(mut self, blocks: i32) -> Self {
+        self.history_blocks = Some(blocks);
+        self
+    }
+
     pub fn graft(mut self, base: Option<(DeploymentHash, BlockPtr)>) -> Self {
         if let Some((subgraph, ptr)) = base {
             self.graft_base = Some(subgraph);

node/src/main.rs

@@ -546,6 +546,7 @@ async fn main() {
                             debug_fork,
                             start_block,
                             None,
+                            None,
                         )
                         .await
                 }

node/src/manager/commands/run.rs

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

server/json-rpc/src/lib.rs

@@ -123,6 +123,7 @@ impl<R: SubgraphRegistrar> ServerState<R> {
                 // startBlock, we'll use the one from the manifest.
                 None,
                 None,
+                params.history_blocks,
             )
             .await
         {
@@ -236,6 +237,7 @@ struct SubgraphDeployParams {
     ipfs_hash: DeploymentHash,
     node_id: Option<NodeId>,
     debug_fork: Option<DeploymentHash>,
+    history_blocks: Option<i32>,
 }
 
 #[derive(Debug, Deserialize)]

store/postgres/src/deployment.rs

@@ -1049,6 +1049,7 @@ pub fn create_deployment(
         graft_base,
         graft_block,
         debug_fork,
+        history_blocks: history_blocks_override,
     } = deployment;
     let earliest_block_number = start_block.as_ref().map(|ptr| ptr.number).unwrap_or(0);
     let entities_with_causality_region = Vec::from_iter(entities_with_causality_region.into_iter());
@@ -1088,7 +1089,7 @@ pub fn create_deployment(
         m::start_block_number.eq(start_block.as_ref().map(|ptr| ptr.number)),
         m::raw_yaml.eq(raw_yaml),
         m::entities_with_causality_region.eq(entities_with_causality_region),
-        m::history_blocks.eq(history_blocks),
+        m::history_blocks.eq(history_blocks_override.unwrap_or(history_blocks)),
     );
 
     if exists && replace {

store/postgres/src/subgraph_store.rs

@@ -621,13 +621,16 @@ impl SubgraphStoreInner {
             )));
         }
 
+        let history_blocks = deployment.manifest.history_blocks;
+
         // Transmogrify the deployment into a new one
         let deployment = DeploymentCreate {
             manifest: deployment.manifest,
             start_block: deployment.start_block.clone(),
             graft_base: Some(src.deployment.clone()),
             graft_block: Some(block),
             debug_fork: deployment.debug_fork,
+            history_blocks: Some(history_blocks),
         };
 
         let graft_base = self.layout(&src.deployment)?;

tests/src/fixture/mod.rs

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