feat: ingest missing ordhook fields

hirosystems · Jul 29, 2024 · 96ac172 · 96ac172
1 parent 939286e
commit 96ac172
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 1 deletion.
diff --git a/docker/docker-compose.dev.postgres.yml b/docker/docker-compose.dev.postgres.yml
@@ -1,4 +1,3 @@
-version: '3.7'
 services:
   postgres:
     image: "postgres:15"

diff --git a/migrations/1676395230930_inscriptions.ts b/migrations/1676395230930_inscriptions.ts
@@ -59,12 +59,25 @@ export function up(pgm: MigrationBuilder): void {
       type: 'boolean',
       default: false,
     },
+    input_index: {
+      type: 'bigint',
+      notNull: true,
+    },
+    pointer: {
+      type: 'bigint',
+    },
     metadata: {
       type: 'text',
     },
+    metaprotocol: {
+      type: 'text',
+    },
     parent: {
       type: 'text',
     },
+    delegate: {
+      type: 'text',
+    },
     timestamp: {
       type: 'timestamptz',
       notNull: true,

diff --git a/src/api/schemas.ts b/src/api/schemas.ts
@@ -331,7 +331,17 @@ export const InscriptionResponse = Type.Object(
         examples: ['1463d48e9248159084929294f64bda04487503d30ce7ab58365df1dc6fd58218i0'],
       })
     ),
+    delegate: Nullable(
+      Type.String({
+        examples: ['1463d48e9248159084929294f64bda04487503d30ce7ab58365df1dc6fd58218i0'],
+      })
+    ),
     metadata: Nullable(Type.Any()),
+    meta_protocol: Nullable(
+      Type.String({
+        examples: ['brc20'],
+      })
+    ),
   },
   { title: 'Inscription Response' }
 );

diff --git a/src/api/util/helpers.ts b/src/api/util/helpers.ts
@@ -57,6 +57,8 @@ export function parseDbInscriptions(
     recursion_refs: i.recursion_refs?.split(',') ?? null,
     parent: i.parent,
     metadata: i.metadata ? JSON.parse(i.metadata) : null,
+    delegate: i.delegate ?? null,
+    meta_protocol: i.metaprotocol ?? null,
   }));
 }
 export function parseDbInscription(item: DbFullyLocatedInscriptionResult): InscriptionResponseType {

diff --git a/src/pg/block-cache.ts b/src/pg/block-cache.ts
@@ -71,6 +71,10 @@ export class BlockCache {
       recursive: recursive_refs.length > 0,
       metadata: reveal.metadata ? JSON.stringify(reveal.metadata) : null,
       parent: reveal.parent,
+      delegate: reveal.delegate,
+      input_index: reveal.inscription_input_index,
+      pointer: reveal.inscription_pointer,
+      metaprotocol: reveal.metaprotocol,
       timestamp: this.timestamp,
     });
     this.revealedNumbers.push(reveal.inscription_number.jubilee);

diff --git a/src/pg/types.ts b/src/pg/types.ts
@@ -25,6 +25,10 @@ export type DbInscriptionInsert = {
   recursive: boolean;
   metadata: string | null;
   parent: string | null;
+  input_index: number;
+  pointer: number | null;
+  metaprotocol: string | null;
+  delegate: string | null;
   timestamp: number;
 };
 
@@ -102,6 +106,10 @@ export type DbFullyLocatedInscriptionResult = {
   recursion_refs: string | null;
   parent: string | null;
   metadata: string | null;
+  input_index: number;
+  pointer: number | null;
+  metaprotocol: string | null;
+  delegate: string | null;
 };
 
 export enum DbLocationTransferType {

diff --git a/tests/api/inscriptions.test.ts b/tests/api/inscriptions.test.ts
@@ -126,6 +126,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       };
 
       // By inscription id
@@ -284,6 +286,8 @@ describe('/inscriptions', () => {
         ],
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       };
 
       // By inscription id
@@ -489,6 +493,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       };
 
       // By inscription id
@@ -573,6 +579,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       };
 
       // By inscription id
@@ -686,6 +694,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       });
 
       // Transfer 2
@@ -743,6 +753,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       });
     });
 
@@ -855,6 +867,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       });
     });
 
@@ -952,6 +966,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       });
 
       // Transfer 2
@@ -1009,6 +1025,8 @@ describe('/inscriptions', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       });
     });
   });
@@ -1656,6 +1674,8 @@ describe('/inscriptions', () => {
           recursion_refs: null,
           parent: null,
           metadata: null,
+          meta_protocol: null,
+          delegate: null,
         },
         {
           address: 'bc1pscktlmn99gyzlvymvrezh6vwd0l4kg06tg5rvssw0czg8873gz5sdkteqj',
@@ -1684,6 +1704,8 @@ describe('/inscriptions', () => {
           recursion_refs: null,
           parent: null,
           metadata: null,
+          meta_protocol: null,
+          delegate: null,
         },
       ]);
     });
@@ -1799,6 +1821,8 @@ describe('/inscriptions', () => {
           recursion_refs: null,
           parent: null,
           metadata: null,
+          meta_protocol: null,
+          delegate: null,
         };
         expect(responseJson1.results[0]).toStrictEqual(result1);
 
@@ -1836,6 +1860,8 @@ describe('/inscriptions', () => {
           recursion_refs: null,
           parent: null,
           metadata: null,
+          meta_protocol: null,
+          delegate: null,
         };
         expect(responseJson2.results[0]).toStrictEqual(result2);
 

diff --git a/tests/api/sats.test.ts b/tests/api/sats.test.ts
@@ -186,6 +186,8 @@ describe('/sats', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       },
       {
         address: 'bc1p3cyx5e2hgh53w7kpxcvm8s4kkega9gv5wfw7c4qxsvxl0u8x834qf0u2td',
@@ -215,6 +217,8 @@ describe('/sats', () => {
         recursion_refs: null,
         parent: null,
         metadata: null,
+        meta_protocol: null,
+        delegate: null,
       },
     ]);