Merge pull request #51 from subquery/update/dictionary-mapping

Convert Promise.all to for loop

.gitignore

@@ -1 +1,2 @@
-.idea/
+.idea/
+.DS_Store

aleph-zero/.project-cid

@@ -0,0 +1 @@
+Qmdna69rQRECMJRSPsqeRAaYdWoCGBQWp3F8u4jyKuoBQb

aleph-zero/project.yaml

@@ -4,7 +4,10 @@ version: 1.0.0
 runner:
   node:
     name: '@subql/node'
-    version: '*'
+    version: '>=3.0.0'
+    options:
+      unfinalizedBlocks: false
+      historical: false
   query:
     name: '@subql/query'
     version: '*'

aleph-zero/src/mappings/mappingHandlers.ts

@@ -20,27 +20,30 @@ export async function handleBlock(block: SubstrateBlock): Promise<void> {
 
   // Process all events in block
   const events = block.events
-    .filter(
-      (evt) =>
-        !(
-          evt.event.section === "system" &&
-          evt.event.method === "ExtrinsicSuccess"
-        )
-    )
-    .map((evt, idx) =>
-      handleEvent(block.block.header.number.toString(), idx, evt)
-    );
+      .filter(
+          (evt) =>
+              !(
+                  evt.event.section === "system" &&
+                  evt.event.method === "ExtrinsicSuccess"
+              )
+      )
+      .map((evt, idx) =>
+          handleEvent(block.block.header.number.toString(), idx, evt)
+      );
 
   // Process all calls in block
   const calls = wrapExtrinsics(block).map((ext, idx) =>
-    handleCall(`${block.block.header.number.toString()}-${idx}`, ext)
+      handleCall(`${block.block.header.number.toString()}-${idx}`, ext)
   );
 
   // Save all data
-  await Promise.all([
-    store.bulkCreate("Event", events),
-    store.bulkCreate("Extrinsic", calls),
-  ]);
+  // All save order should always follow this structure
+  for (const event of events) {
+    await event.save()
+  }
+  for (const call of calls) {
+    await call.save()
+  }
 }
 
 function handleEvent(

astar/.project_shiden-cid

@@ -1 +1 @@
-QmRrdfmc1p5FYQovtTPK3twvW2woT3EukRo38kU8hMSsYg
+QmctexaEReioxaCK7FYwz653fU8iyByMFzf6Ztx9Yg1Z3w

astar/project_shiden.yaml

@@ -4,7 +4,10 @@ version: 1.0.0
 runner:
   node:
     name: '@subql/node'
-    version: '*'
+    version: '>=3.0.0'
+    options:
+      unfinalizedBlocks: false
+      historical: false
   query:
     name: '@subql/query'
     version: '*'

astar/src/mappings/mappingHandlers.ts

@@ -80,16 +80,25 @@ export async function handleBlock(block: SubstrateBlock): Promise<void> {
   // seems there is a concurrent limitation for promise.all and bulkCreate work together,
   // the last entity upsertion are missed
   // We will put them into two promise for now.
-  await Promise.all([
-    store.bulkCreate('Event', events),
-    store.bulkCreate('ContractEmitted', contractEmittedEvents),
-    store.bulkCreate('EvmLog', evmLogs),
-  ]);
-  await Promise.all([
-    store.bulkCreate('Extrinsic', calls),
-    store.bulkCreate('ContractsCall', contractCalls),
-    store.bulkCreate('EvmTransaction', evmTransactions)
-  ]);
+  // All save order should always follow this structure
+  for (const event of events) {
+    await event.save()
+  }
+  for (const call of calls) {
+    await call.save()
+  }
+  for (const evmLog of evmLogs) {
+    await evmLog.save()
+  }
+  for (const evmTransaction of evmTransactions) {
+    await evmTransaction.save()
+  }
+  for (const contractEmittedEvent of contractEmittedEvents) {
+    await contractEmittedEvent.save()
+  }
+  for (const contractCall of contractCalls) {
+    await contractCall.save()
+  }
 }
 
 export function handleEvent(event: SubstrateEvent): Event {

bifrost-parachain/.project-cid

@@ -1 +1 @@
-QmX5dnwJsZf1nvVTNwJKQBpsNmzRCAZRrQfPFT283Zm3i2
+QmZGzbBmKYX2GLQQg2burWfPCgHpMy97Nb2x7Jbtr4znUQ

calamari/.project-cid

@@ -0,0 +1 @@
+QmcsYi6v2yCezutCt4p8gWHqn9NsFYEYY3pV4DudEZeAVZ

calamari/project.yaml

@@ -4,7 +4,10 @@ version: 1.0.0
 runner:
   node:
     name: '@subql/node'
-    version: '*'
+    version: '>=3.0.0'
+    options:
+      unfinalizedBlocks: false
+      historical: false
   query:
     name: '@subql/query'
     version: '*'

calamari/src/mappings/mappingHandlers.ts

@@ -11,8 +11,10 @@ export async function handleBlock(block: SubstrateBlock): Promise<void> {
 
   // Check for updates to Spec Version
   if (!specVersion || specVersion.id !== block.specVersion.toString()) {
-    specVersion = new SpecVersion(block.specVersion.toString());
-    specVersion.blockHeight = block.block.header.number.toBigInt();
+    specVersion = SpecVersion.create({
+      id: block.specVersion.toString(),
+      blockHeight: block.block.header.number.toBigInt()
+    });
     await specVersion.save();
   }
 
@@ -33,33 +35,38 @@ export async function handleBlock(block: SubstrateBlock): Promise<void> {
   );
 
   // Save all data
-  await Promise.all([
-    store.bulkCreate("Event", events),
-    store.bulkCreate("Extrinsic", calls),
-  ]);
+  // All save order should always follow this structure
+  for (const event of events) {
+    await event.save()
+  }
+  for (const call of calls) {
+    await call.save()
+  }
 }
 
 function handleEvent(
   blockNumber: string,
   eventIdx: number,
   event: EventRecord
 ): Event {
-  const newEvent = new Event(`${blockNumber}-${eventIdx}`);
-  newEvent.blockHeight = BigInt(blockNumber);
-  newEvent.module = event.event.section;
-  newEvent.event = event.event.method;
-  return newEvent;
+  return Event.create({
+    id: `${blockNumber}-${eventIdx}`,
+    blockHeight : BigInt(blockNumber),
+    module : event.event.section,
+    event : event.event.method,
+  });
 }
 
 function handleCall(idx: string, extrinsic: SubstrateExtrinsic): Extrinsic {
-  const newExtrinsic = new Extrinsic(idx);
-  newExtrinsic.txHash = extrinsic.extrinsic.hash.toString();
-  newExtrinsic.module = extrinsic.extrinsic.method.section;
-  newExtrinsic.call = extrinsic.extrinsic.method.method;
-  newExtrinsic.blockHeight = extrinsic.block.block.header.number.toBigInt();
-  newExtrinsic.success = extrinsic.success;
-  newExtrinsic.isSigned = extrinsic.extrinsic.isSigned;
-  return newExtrinsic;
+  return Extrinsic.create({
+    id: idx,
+    txHash : extrinsic.extrinsic.hash.toString(),
+    module : extrinsic.extrinsic.method.section,
+    call : extrinsic.extrinsic.method.method,
+    blockHeight : extrinsic.block.block.header.number.toBigInt(),
+    success : extrinsic.success,
+    isSigned : extrinsic.extrinsic.isSigned,
+  });
 }
 
 function wrapExtrinsics(wrappedBlock: SubstrateBlock): SubstrateExtrinsic[] {

kilt-spiritnet/.project-cid

@@ -0,0 +1 @@
+QmXcbyJ77Zv2YPe2yRoMVwasCjYof6h2DoHPxvYzxb8wJt

kilt-spiritnet/project.yaml

@@ -4,7 +4,10 @@ version: 1.0.0
 runner:
   node:
     name: '@subql/node'
-    version: '*'
+    version: '>=3.0.0'
+    options:
+      unfinalizedBlocks: false
+      historical: false
   query:
     name: '@subql/query'
     version: '*'

kilt-spiritnet/src/mappings/mappingHandlers.ts

@@ -37,10 +37,13 @@ export async function handleBlock(block: SubstrateBlock): Promise<void> {
   );
 
   // Save all data
-  await Promise.all([
-    store.bulkCreate("Event", events),
-    store.bulkCreate("Extrinsic", calls),
-  ]);
+  // All save order should always follow this structure
+  for (const event of events) {
+    await event.save()
+  }
+  for (const call of calls) {
+    await call.save()
+  }
 }
 
 function handleEvent(