chore: revert to using retrieveExtrinsicFromBlock

Author: rflechtner

packages/asset-credentials/src/credentials/PublicCredential.chain.ts

@@ -146,35 +146,24 @@ export async function fetchCredentialFromChain(
     attester: attesterId,
   } = publicCredentialEntry.unwrap()
 
-  const { extrinsics, events } = await api.derive.chain.getBlockByNumber(
-    blockNumber
+  const extrinsic = await Blockchain.retrieveExtrinsicFromBlock(
+    blockNumber,
+    ({ events }) =>
+      events.some(
+        (event) =>
+          api.events.publicCredentials.CredentialStored.is(event) &&
+          event.data[1].toString() === credentialId
+      )
   )
 
-  const createdEvent = events
-    .reverse()
-    .find(
-      ({ event }) =>
-        api.events.publicCredentials.CredentialStored.is(event) &&
-        event.data[1].toString() === credentialId
-    )
-
-  if (typeof createdEvent === 'undefined') {
-    throw new Error(
-      `A credential stored event was not found at the specified block`
-    )
-  }
-
-  const extrinsicIndex = createdEvent.phase.asApplyExtrinsic.toNumber()
-  const extrinsic = extrinsics[extrinsicIndex]
-
   if (extrinsic === null) {
     throw new SDKErrors.PublicCredentialError(
       `The block number as specified in the provided credential entry (${blockNumber}) does not have any extrinsic that includes a credential creation.`
     )
   }
 
   // Unpack any nested calls, e.g., within a batch or `submit_did_call`
-  const extrinsicCalls = Blockchain.flattenCalls(extrinsic.extrinsic, api)
+  const extrinsicCalls = Blockchain.flattenCalls(extrinsic, api)
 
   // only consider public_credentials::add calls
   const publicCredentialCalls = extrinsicCalls.filter(

packages/credentials/src/ctype/CType.chain.ts

@@ -137,35 +137,24 @@ export async function fetchFromChain(
       'Cannot fetch CType definitions on a chain that does not store the createdAt block'
     )
 
-  const { extrinsics, events } = await api.derive.chain.getBlockByNumber(
-    createdAt
+  const extrinsic = await Blockchain.retrieveExtrinsicFromBlock(
+    createdAt,
+    ({ events }) =>
+      events.some(
+        (event) =>
+          api.events.ctype.CTypeCreated.is(event) &&
+          event.data[1].toHex() === cTypeHash
+      )
   )
 
-  const createdEvent = events
-    .reverse()
-    .find(
-      ({ event }) =>
-        api.events.ctype.CTypeCreated.is(event) &&
-        event.data[1].toHex() === cTypeHash
-    )
-
-  if (typeof createdEvent === 'undefined') {
-    throw new Error(
-      `A ctype creation event was not found at the specified block`
-    )
-  }
-
-  const extrinsicIndex = createdEvent.phase.asApplyExtrinsic.toNumber()
-  const extrinsic = extrinsics[extrinsicIndex]
-
-  if (typeof extrinsic === 'undefined') {
+  if (extrinsic === null) {
     throw new SDKErrors.CTypeError(
       `There is no CType with the provided ID "${cTypeId}" on chain.`
     )
   }
 
   // Unpack any nested calls, e.g., within a batch or `submit_did_call`
-  const extrinsicCalls = Blockchain.flattenCalls(extrinsic.extrinsic, api)
+  const extrinsicCalls = Blockchain.flattenCalls(extrinsic, api)
 
   // only consider ctype::add calls
   const ctypeCreationCalls = extrinsicCalls.filter(