Merge pull request #16 from polkascan/develop

Develop
polkascan · Sep 21, 2023 · 9782a3e · 9782a3e
2 parents ff48c94 + 160e4ba
commit 9782a3e
Show file tree

Hide file tree

Showing 5 changed files with 89 additions and 92 deletions.
diff --git a/projects/subsquid/package-lock.json b/projects/subsquid/package-lock.json
diff --git a/projects/subsquid/package.json b/projects/subsquid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@polkadapt/subsquid",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "Apache-2.0",
   "author": "Polkascan Foundation <info@polkascan.org>",
   "description": "PolkADAPT plug-in to fetch data from the Subsquid APIs.",

diff --git a/projects/subsquid/src/lib/queries/event.functions.ts b/projects/subsquid/src/lib/queries/event.functions.ts
@@ -440,7 +440,7 @@ export const getEventsBase = (
           eventName: (event as GSExplorerEventInput).eventName || splittenName && splittenName[1],
           attributes: (event as ArchiveEventInput).args
             ? (event as ArchiveEventInput).args
-            : (event as GSExplorerEventInput).call.argsStr,
+            : (event as GSExplorerEventInput)?.call?.argsStr || null,
           blockDatetime: (event as GSExplorerEventInput).timestamp || (event as ArchiveEventInput).block?.timestamp,
           blockHash: event.block.hash,
           eventPhaseName: (event as ArchiveEventInput).phase,

diff --git a/projects/subsquid/src/lib/queries/extrinsic.functions.ts b/projects/subsquid/src/lib/queries/extrinsic.functions.ts
@@ -449,13 +449,13 @@ export const getExtrinsicsBase = (
         let callArguments: { [key: string]: any } | null = null;
 
         if ((extrinsic as GSExplorerExtrinsicInput).mainCall) {
-          callerAccountId = (extrinsic as GSExplorerExtrinsicInput).mainCall.callerPublicKey || null;
+          callerAccountId = (extrinsic as GSExplorerExtrinsicInput).signerPublicKey || null;
           callName = (extrinsic as GSExplorerExtrinsicInput).mainCall?.callName || null;
           callModule = (extrinsic as GSExplorerExtrinsicInput).mainCall?.palletName || null;
           callArguments = (extrinsic as GSExplorerExtrinsicInput).mainCall?.argsStr || null;
         } else {
           if ((extrinsic as ArchiveExtrinsicInput).signature) {
-            callerAccountId = ((extrinsic as ArchiveExtrinsicInput).signature as unknown as {address: {value: string}}).address?.value || null;
+            callerAccountId = callerAccountId || ((extrinsic as ArchiveExtrinsicInput).signature as unknown as {address: {value: string}}).address?.value || null;
           }
           if ((extrinsic as ArchiveExtrinsicInput).call) {
             callArguments = (extrinsic as ArchiveExtrinsicInput).call.args;

diff --git a/projects/substrate-rpc/package-lock.json b/projects/substrate-rpc/package-lock.json