Merge pull request #535 from sevenlabs-hq/v1/versioned-decoders

KellianDev · web-flow · commit 8edefea7c1f4 · 2026-03-10T18:58:11.000+01:00
[V1] Versioned Decoders
diff --git a/crates/core/src/filter.rs b/crates/core/src/filter.rs
@@ -241,3 +241,145 @@ impl Filter for DatasourceFilter {
         }
     }
 }
+
+#[derive(Debug, Clone)]
+pub struct SlotRangeFilter {
+    from_slot: Option<u64>,
+    from_transaction_index: Option<u64>,
+    to_slot: Option<u64>,
+    to_transaction_index: Option<u64>,
+}
+
+impl SlotRangeFilter {
+    pub fn from(slot: u64, transaction_index: Option<u64>) -> Self {
+        Self {
+            from_slot: Some(slot),
+            from_transaction_index: transaction_index,
+            to_slot: None,
+            to_transaction_index: None,
+        }
+    }
+
+    pub fn to(slot: u64, transaction_index: Option<u64>) -> Self {
+        Self {
+            from_slot: None,
+            from_transaction_index: None,
+            to_slot: Some(slot),
+            to_transaction_index: transaction_index,
+        }
+    }
+
+    pub fn between(
+        from_slot: u64,
+        from_transaction_index: Option<u64>,
+        to_slot: u64,
+        to_transaction_index: Option<u64>,
+    ) -> Self {
+        Self {
+            from_slot: Some(from_slot),
+            from_transaction_index,
+            to_slot: Some(to_slot),
+            to_transaction_index,
+        }
+    }
+
+    #[inline(always)]
+    pub fn contains(&self, slot: u64, index: Option<u64>) -> bool {
+        if let Some(from) = self.from_slot {
+            if slot < from {
+                return false;
+            }
+
+            if slot == from {
+                if let (Some(from_idx), Some(tx_idx)) = (self.from_transaction_index, index) {
+                    if tx_idx < from_idx {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        if let Some(to) = self.to_slot {
+            if slot > to {
+                return false;
+            }
+
+            if slot == to {
+                if let (Some(to_idx), Some(tx_idx)) = (self.to_transaction_index, index) {
+                    if tx_idx >= to_idx {
+                        return false;
+                    }
+                }
+            }
+        }
+
+        true
+    }
+}
+
+impl Filter for SlotRangeFilter {
+    fn filter_instruction(
+        &self,
+        _context: &FilterContext,
+        instruction: &NestedInstruction,
+    ) -> FilterResult {
+        let slot = instruction.metadata.transaction_metadata.slot;
+        let index = instruction.metadata.transaction_metadata.index;
+
+        if self.contains(slot, index) {
+            FilterResult::Accept
+        } else {
+            FilterResult::Reject
+        }
+    }
+
+    fn filter_account(
+        &self,
+        _context: &FilterContext,
+        metadata: &AccountMetadata,
+        _account: &solana_account::Account,
+    ) -> FilterResult {
+        if self.contains(metadata.slot, None) {
+            FilterResult::Accept
+        } else {
+            FilterResult::Reject
+        }
+    }
+
+    fn filter_transaction(
+        &self,
+        _context: &FilterContext,
+        metadata: &TransactionMetadata,
+        _instructions: &NestedInstructions,
+    ) -> FilterResult {
+        if self.contains(metadata.slot, metadata.index) {
+            FilterResult::Accept
+        } else {
+            FilterResult::Reject
+        }
+    }
+
+    fn filter_account_deletion(
+        &self,
+        _context: &FilterContext,
+        deletion: &crate::datasource::AccountDeletion,
+    ) -> FilterResult {
+        if self.contains(deletion.slot, None) {
+            FilterResult::Accept
+        } else {
+            FilterResult::Reject
+        }
+    }
+
+    fn filter_block_details(
+        &self,
+        _context: &FilterContext,
+        details: &crate::datasource::BlockDetails,
+    ) -> FilterResult {
+        if self.contains(details.slot, None) {
+            FilterResult::Accept
+        } else {
+            FilterResult::Reject
+        }
+    }
+}
diff --git a/crates/core/src/pipeline.rs b/crates/core/src/pipeline.rs
@@ -607,7 +607,7 @@ impl PipelineBuilder {
         filters: Vec<Box<dyn Filter + Send + Sync + 'static>>,
     ) -> Self
     where
-        T: Send + Sync + crate::deserialize::ArrangeAccounts + 'static,
+        T: Send + Sync + 'static,
         P: for<'a> Processor<InstructionProcessorInputType<'a, T>> + Send + Sync + 'static,
     {
         log::trace!(
diff --git a/datasources/jetstreamer-datasource/src/lib.rs b/datasources/jetstreamer-datasource/src/lib.rs
@@ -279,7 +279,7 @@ impl JetstreamerDatasource {
                     meta: transaction.transaction_status_meta,
                     is_vote: transaction.is_vote,
                     slot: transaction.slot,
-                    index: None,
+                    index: Some(transaction.transaction_slot_index as u64),
                     block_time: None,
                     block_hash: None,
                 })),
diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -61,6 +61,7 @@ program
     .option('--with-graphql <boolean>', 'Include GraphQL wiring and deps (default: true)')
     .option('--with-serde <boolean>', 'Include serde feature for decoder (default: false)')
     .option('--with-base58 <boolean>', 'Include base58 feature for decoder (default: false)')
+    .option('--version-name <name>', 'Decoder version name (e.g., "v1", "v2")')
     .option('--no-clean', 'Do not delete output directory before rendering', false)
     .action(async opts => {
         showBanner();
@@ -102,6 +103,7 @@ program
                 withSerde,
                 withBase58,
                 standalone: true,
+                versionName: opts.versionName,
             });
 
             logger.succeedSpinner('Decoder generated');
@@ -146,6 +148,7 @@ program
     .option('--with-graphql <boolean>', 'Include GraphQL wiring and deps (default: true)')
     .option('--with-serde <boolean>', 'Include serde feature for decoder (default: false)')
     .option('--with-base58 <boolean>', 'Include base58 feature for decoder (default: false)')
+    .option('--version-name <name>', 'Decoder version name (e.g., "v1", "v2")')
     .option('--postgres-mode <generic|typed>', 'Postgres table storage mode', 'typed')
     .option('--force', 'Overwrite output directory if it exists', false)
     .action(async opts => {
@@ -246,6 +249,7 @@ program
                 withSerde,
                 withBase58,
                 standalone: false,
+                versionName: opts.versionName,
             });
 
             logger.succeedSpinner('Decoder generated successfully');
diff --git a/packages/cli/src/lib/decoder.ts b/packages/cli/src/lib/decoder.ts
@@ -78,6 +78,7 @@ export type DecoderGenerationOptions = {
     withSerde?: boolean;
     withBase58?: boolean;
     standalone?: boolean;
+    versionName?: string;
 };
 
 export type IdlMetadata = {
@@ -287,6 +288,7 @@ export async function generateDecoder(options: DecoderGenerationOptions): Promis
                 withSerde,
                 withBase58,
                 standalone,
+                versionName: options.versionName,
             }),
         );
         return;
@@ -351,6 +353,7 @@ export async function generateDecoder(options: DecoderGenerationOptions): Promis
                 withSerde,
                 withBase58,
                 standalone,
+                versionName: options.versionName,
             }),
         );
     } else {
@@ -365,6 +368,7 @@ export async function generateDecoder(options: DecoderGenerationOptions): Promis
                 withSerde,
                 withBase58,
                 standalone,
+                versionName: options.versionName,
             }),
         );
     }
diff --git a/packages/renderer/src/cargoTomlGenerator.ts b/packages/renderer/src/cargoTomlGenerator.ts
@@ -6,6 +6,7 @@ export type DecoderCargoTomlOptions = {
     packageName?: string;
     programName: string;
     originalProgramName?: string; // Original program name from IDL (for token-2022 checks)
+    versionName?: string;
     withPostgres: boolean;
     withGraphQL: boolean;
     withSerde: boolean;
@@ -19,6 +20,7 @@ export function generateDecoderCargoToml(options: DecoderCargoTomlOptions): stri
         packageName,
         programName,
         originalProgramName,
+        versionName,
         withPostgres,
         withGraphQL,
         withSerde,
@@ -27,13 +29,17 @@ export function generateDecoderCargoToml(options: DecoderCargoTomlOptions): stri
         standalone = true,
     } = options;
 
-    const decoderPackageName =
+    let decoderPackageName =
         packageName && packageName.trim()
             ? `carbon-${kebabCase(packageName)}-decoder`
             : programName && programName.trim()
               ? `carbon-${kebabCase(programName)}-decoder`
               : 'carbon-decoder';
 
+    if (versionName && versionName.trim()) {
+        decoderPackageName = `${decoderPackageName}-${kebabCase(versionName)}`;
+    }
+
     const carbonCoreDep = getCrateDependencyString('carbon-core', VERSIONS['carbon-core'], ['macros']);
     const carbonTestUtilsDep = getCrateDependencyString('carbon-test-utils', VERSIONS['carbon-test-utils']);
     const borshDep = getCrateDependencyString('borsh', VERSIONS['borsh'], ['derive']);
diff --git a/packages/renderer/src/getRenderMapVisitor.ts b/packages/renderer/src/getRenderMapVisitor.ts
@@ -41,6 +41,7 @@ export type GetRenderMapOptions = {
     withSerde?: boolean;
     withBase58?: boolean;
     standalone?: boolean;
+    versionName?: string;
 };
 
 type FlattenedField = {
@@ -892,6 +893,7 @@ export function getRenderMapVisitor(options: GetRenderMapOptions = {}) {
                         packageName: options.packageName,
                         programName: programName,
                         originalProgramName: originalProgramName, // Pass original program name for token-2022 checks
+                        versionName: options.versionName,
                         withPostgres: options.withPostgres !== false,
                         withGraphQL: options.withGraphql !== false,
                         withSerde: options.withSerde ?? false,
diff --git a/packages/renderer/src/renderVisitor.ts b/packages/renderer/src/renderVisitor.ts
@@ -10,6 +10,7 @@ export type RenderOptions = GetRenderMapOptions & {
         discriminator: number[];
     }[];
     postgresMode?: 'generic' | 'typed';
+    versionName?: string;
 };
 
 export function renderVisitor(path: string, options: RenderOptions = {}) {

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@ impl PipelineBuilder {`
`607`	`607`	`filters: Vec<Box<dyn Filter + Send + Sync + 'static>>,`
`608`	`608`	`) -> Self`
`609`	`609`	`where`
`610`		`- T: Send + Sync + crate::deserialize::ArrangeAccounts + 'static,`
	`610`	`+ T: Send + Sync + 'static,`
`611`	`611`	`P: for<'a> Processor<InstructionProcessorInputType<'a, T>> + Send + Sync + 'static,`
`612`	`612`	`{`
`613`	`613`	`log::trace!(`