Update decoding

onflow · Nov 29, 2024 · 42a95f4 · 42a95f4
1 parent 088eeac
commit 42a95f4
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 19 deletions.
diff --git a/packages/transport-http/src/subscribe/handlers/blocks.ts b/packages/transport-http/src/subscribe/handlers/blocks.ts
@@ -1,30 +1,66 @@
 import {SdkTransport} from "@onflow/typedefs"
 import {createSubscriptionHandler} from "./types"
 
+type BlockDataModel = {
+  block: {
+    id: string
+    parent_id: string
+    height: number
+    timestamp: string
+    collection_guarantees: {
+      collection_id: string
+      signer_ids: string[]
+    }[]
+    block_seals: {
+      block_id: string
+      result_id: string
+    }[]
+  }
+}
+
 export const blocksHandler = createSubscriptionHandler<{
   Topic: SdkTransport.SubscriptionTopic.BLOCKS
   Args: SdkTransport.SubscriptionArguments<SdkTransport.SubscriptionTopic.BLOCKS>
   Data: SdkTransport.SubscriptionData<SdkTransport.SubscriptionTopic.BLOCKS>
-  RawData: {
-    data: SdkTransport.SubscriptionData<SdkTransport.SubscriptionTopic.BLOCKS>
-  }
+  RawData: BlockDataModel
 }>({
   topic: SdkTransport.SubscriptionTopic.BLOCKS,
   createSubscriber: (initialArgs, onData, onError) => {
     let resumeArgs: SdkTransport.SubscriptionArguments<SdkTransport.SubscriptionTopic.BLOCKS> =
-      initialArgs
+      {
+        ...initialArgs,
+      }
 
     return {
-      sendData(data: {
-        data: SdkTransport.SubscriptionData<SdkTransport.SubscriptionTopic.BLOCKS>
-      }) {
-        const parsedData = data.data
+      sendData(data: BlockDataModel) {
+        // Parse the raw data
+        const parsedData: SdkTransport.SubscriptionData<SdkTransport.SubscriptionTopic.BLOCKS> =
+          {
+            block: {
+              id: data.block.id,
+              parentId: data.block.parent_id,
+              height: data.block.height,
+              timestamp: data.block.timestamp,
+              collectionGuarantees: data.block.collection_guarantees.map(
+                guarantee => ({
+                  collectionId: guarantee.collection_id,
+                  signerIds: guarantee.signer_ids,
+                })
+              ),
+              blockSeals: data.block.block_seals.map(seal => ({
+                blockId: seal.block_id,
+                executionReceiptId: seal.result_id,
+              })),
+            },
+          }
 
+        // Update the resume args
         resumeArgs = {
-          start: parsedData.placeholder.length,
+          block_status: resumeArgs.block_status,
+          start_block_id: data.block.id,
         }
 
-        onData(data.data)
+        onData(parsedData)
       },
       sendError(error: Error) {
         onError(error)

diff --git a/packages/typedefs/src/index.ts b/packages/typedefs/src/index.ts
@@ -99,10 +99,6 @@ export type Block = {
    * - The details of which nodes executed and sealed the blocks
    */
   blockSeals: Array<BlockSeal>
-  /**
-   * - The cryptographic signature of the block
-   */
-  signatures: Array<number>
 }
 export type CollectionGuarantee = {
   /**
@@ -112,7 +108,7 @@ export type CollectionGuarantee = {
   /**
    * - The signer ids of the block
    */
-  signerIds: Array<object>
+  signerIds: Array<string>
 }
 export type BlockSeal = {
   /**

diff --git a/packages/typedefs/src/sdk-transport/subscriptions.ts b/packages/typedefs/src/sdk-transport/subscriptions.ts
@@ -1,20 +1,28 @@
+import {Block} from ".."
+
 type SchemaItem<TArgs, TData> = {
   args: TArgs
   data: TData
 }
 
-// TODO: PLACEHOLDER - Replace with actual subscription topics
 export enum SubscriptionTopic {
   BLOCKS = "blocks",
 }
 
 export type SubscriptionSchema = {
   [SubscriptionTopic.BLOCKS]: SchemaItem<
     {
-      start: number
-    },
+      block_status?: number
+    } & (
+      | {
+          start_block_id?: string
+        }
+      | {
+          start_block_height?: number
+        }
+    ),
     {
-      placeholder: string
+      block: Block
     }
   >
 }