Change IPLD block structure

vulcanize · Oct 6, 2021 · 13dfd9e · 13dfd9e
1 parent af4c6d4
commit 13dfd9e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 4 deletions.
diff --git a/packages/codegen/src/templates/hooks-template.handlebars b/packages/codegen/src/templates/hooks-template.handlebars
@@ -26,9 +26,25 @@ export async function handleBlock (indexer: Indexer, jobData: any): Promise<void
     const block = event.block;
     const contractAddress = event.contract;
 
+    const ipldBlockData: any = {};
+
     const oldIpldBlock = await indexer.getIPLDBlock(block, contractAddress);
 
-    const ipldBlockData: any = {};
+    if (!oldIpldBlock) {
+      ipldBlockData.meta = {
+        id: contractAddress,
+        kind: 'diff',
+        parent: {
+          '/': null
+        }
+      };
+
+      ipldBlockData.ethBlock = {
+        cid: await indexer.getBlockCID(block.blockHash),
+        num: block.blockNumber
+      };
+    }
+
     const eventData = indexer.getResultEvent(event);
 
     switch (event.eventName) {
@@ -48,8 +64,8 @@ export async function handleBlock (indexer: Indexer, jobData: any): Promise<void
         //      }
         //   }
         // }
-        _.set(ipldBlockData, `_balances[${from}]`, fromBalance);
-        _.set(ipldBlockData, `_balances[${to}]`, toBalance);
+        _.set(ipldBlockData, `state._balances[${from}]`, fromBalance);
+        _.set(ipldBlockData, `state._balances[${to}]`, toBalance);
 
         break;
       }
@@ -67,7 +83,7 @@ export async function handleBlock (indexer: Indexer, jobData: any): Promise<void
         //      }
         //   }
         // }
-        _.set(ipldBlockData, `_allowances[${owner}][${spender}]`, allowance);
+        _.set(ipldBlockData, `state._allowances[${owner}][${spender}]`, allowance);
 
         break;
       }

diff --git a/packages/codegen/src/templates/indexer-template.handlebars b/packages/codegen/src/templates/indexer-template.handlebars
@@ -178,6 +178,24 @@ export class Indexer {
     return this._db.saveOrUpdateIPLDBlock(ipldBlock);
   }
 
+  async getBlockCID (blockHash: string): Promise<string> {
+    assert(blockHash);
+
+    const {
+      allEthHeaderCids: {
+        nodes: [
+          {
+            cid
+          }
+        ]
+      }
+    } = await this._postgraphileClient.getBlockWithTransactions({ blockHash });
+
+    assert(cid);
+
+    return cid;
+  }
+
   async triggerIndexingOnEvent (event: Event): Promise<void> {
     const resultEvent = this.getResultEvent(event);