@sentio/sdk 2.40.0 → 2.40.1-rc.10

package/src/eth/builtin/internal/erc721-processor.ts

@@ -151,6 +151,23 @@ export type TransferFromCallTrace = TypedCallTrace<
 
 const templateContract = ERC721__factory.connect("0x0", DummyProvider);
 
+const iface = new Interface([
+  "function approve(address to, uint256 tokenId) returns ()",
+  "function totalSupply() view returns (uint256)",
+  "function balanceOf(address owner) view returns (uint256 balance)",
+  "function getApproved(uint256 tokenId) view returns (address operator)",
+  "function isApprovedForAll(address owner, address operator) view returns (bool)",
+  "function name() view returns (string)",
+  "function ownerOf(uint256 tokenId) view returns (address owner)",
+  "function safeTransferFrom(address from, address to, uint256 tokenId) returns ()",
+  "function safeTransferFrom(address from, address to, uint256 tokenId, bytes data) returns ()",
+  "function setApprovalForAll(address operator, bool _approved) returns ()",
+  "function supportsInterface(bytes4 interfaceId) view returns (bool)",
+  "function symbol() view returns (string)",
+  "function tokenURI(uint256 tokenId) view returns (string)",
+  "function transferFrom(address from, address to, uint256 tokenId) returns ()",
+]);
+
 export class ERC721ContractView extends ContractView<ERC721> {
   constructor(contract: ERC721) {
     super(contract);
@@ -164,15 +181,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function totalSupply() view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("totalSupply", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface
             .decodeFunctionResult("totalSupply", ret)
@@ -195,15 +209,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function balanceOf(address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("balanceOf", [owner]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -227,15 +238,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function getApproved(uint256) view returns (address)",
-        ]);
         const calldata = iface.encodeFunctionData("getApproved", [tokenId]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface
             .decodeFunctionResult("getApproved", ret)
@@ -262,18 +270,15 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<boolean> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function isApprovedForAll(address,address) view returns (bool)",
-        ]);
         const calldata = iface.encodeFunctionData("isApprovedForAll", [
           owner,
           operator,
         ]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface
             .decodeFunctionResult("isApprovedForAll", ret)
@@ -297,13 +302,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function name() view returns (string)"]);
         const calldata = iface.encodeFunctionData("name", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("name", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -324,15 +328,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function ownerOf(uint256) view returns (address)",
-        ]);
         const calldata = iface.encodeFunctionData("ownerOf", [tokenId]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("ownerOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -356,17 +357,14 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<boolean> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function supportsInterface(bytes4) view returns (bool)",
-        ]);
         const calldata = iface.encodeFunctionData("supportsInterface", [
           interfaceId,
         ]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface
             .decodeFunctionResult("supportsInterface", ret)
@@ -391,15 +389,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function symbol() view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("symbol", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("symbol", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -420,15 +415,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function tokenURI(uint256) view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("tokenURI", [tokenId]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("tokenURI", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -456,15 +448,12 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function approve(address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("approve", [to, tokenId]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface.decodeFunctionResult("approve", ret).toArray();
             return result.length == 1 ? result[0] : result;
@@ -488,19 +477,16 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function safeTransferFrom(address,address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("safeTransferFrom", [
             from,
             to,
             tokenId,
           ]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("safeTransferFrom", ret)
@@ -527,20 +513,17 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function safeTransferFrom(address,address,uint256,bytes) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("safeTransferFrom", [
             from,
             to,
             tokenId,
             data,
           ]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("safeTransferFrom", ret)
@@ -565,18 +548,15 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function setApprovalForAll(address,bool) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("setApprovalForAll", [
             operator,
             _approved,
           ]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("setApprovalForAll", ret)
@@ -602,19 +582,16 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transferFrom(address,address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("transferFrom", [
             from,
             to,
             tokenId,
           ]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("transferFrom", ret)

package/src/eth/builtin/internal/weth9-processor.ts

@@ -108,6 +108,20 @@ export type AllowanceCallTrace = TypedCallTrace<
 
 const templateContract = WETH9__factory.connect("0x0", DummyProvider);
 
+const iface = new Interface([
+  "function name() view returns (string)",
+  "function approve(address guy, uint256 wad) returns (bool)",
+  "function totalSupply() view returns (uint256)",
+  "function transferFrom(address src, address dst, uint256 wad) returns (bool)",
+  "function withdraw(uint256 wad) returns ()",
+  "function decimals() view returns (uint8)",
+  "function balanceOf(address) view returns (uint256)",
+  "function symbol() view returns (string)",
+  "function transfer(address dst, uint256 wad) returns (bool)",
+  "function deposit() payable returns ()",
+  "function allowance(address, address) view returns (uint256)",
+]);
+
 export class WETH9ContractView extends ContractView<WETH9> {
   constructor(contract: WETH9) {
     super(contract);
@@ -121,13 +135,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function name() view returns (string)"]);
         const calldata = iface.encodeFunctionData("name", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("name", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -147,15 +160,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function totalSupply() view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("totalSupply", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface
             .decodeFunctionResult("totalSupply", ret)
@@ -177,15 +187,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function decimals() view returns (uint8)",
-        ]);
         const calldata = iface.encodeFunctionData("decimals", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("decimals", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -206,15 +213,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function balanceOf(address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("balanceOf", [arg0]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("balanceOf", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -237,15 +241,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function symbol() view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("symbol", []);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("symbol", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -267,15 +268,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function allowance(address,address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("allowance", [arg0, arg1]);
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata,
         });
-        const ret = preparedData.ethCallResults[key];
+        const ret = preparedData.ethCallResults[ethCallKey];
         if (ret) {
           const result = iface.decodeFunctionResult("allowance", ret).toArray();
           return result.length == 1 ? result[0] : result;
@@ -304,15 +302,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function approve(address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("approve", [guy, wad]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface.decodeFunctionResult("approve", ret).toArray();
             return result.length == 1 ? result[0] : result;
@@ -336,19 +331,16 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transferFrom(address,address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("transferFrom", [
             src,
             dst,
             wad,
           ]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("transferFrom", ret)
@@ -372,15 +364,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function withdraw(uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("withdraw", [wad]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("withdraw", ret)
@@ -405,15 +394,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transfer(address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("transfer", [dst, wad]);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface
               .decodeFunctionResult("transfer", ret)
@@ -436,15 +422,12 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function deposit() payable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("deposit", []);
-          const key = makeEthCallKey({
+          const ethCallKey = makeEthCallKey({
             context: ethCallContext,
             calldata,
           });
-          const ret = preparedData.ethCallResults[key];
+          const ret = preparedData.ethCallResults[ethCallKey];
           if (ret) {
             const result = iface.decodeFunctionResult("deposit", ret).toArray();
             return result.length == 1 ? result[0] : result;

package/src/eth/codegen/file.ts

@@ -13,6 +13,7 @@ import {
   generateBoundFunctionCallEncoders,
   generateBoundViewFunctions,
   generateFunctionCallEncoders,
+  generateFunctionSignatures,
   generateViewFunctions
 } from './function-calls.js'
 
@@ -30,6 +31,10 @@ export function codeGenSentioFile(contract: Contract): string {
   ${Object.values(contract.functions).map(codegenCallTraceTypes).join('\n')}
 
   const templateContract = ${contract.name}__factory.connect("0x0", DummyProvider)
+  
+  const iface = new Interface([${Object.values(contract.functions)
+    .filter((f) => !reservedKeywords.has(f[0].name))
+    .flatMap((fs) => generateFunctionSignatures(fs))}])
 
   export class ${contract.name}ContractView extends ContractView<${contract.name}> {
     constructor (contract: ${contract.name}) {

package/src/eth/codegen/function-calls.ts

@@ -17,6 +17,10 @@ export function generateViewFunctions(view: boolean, functions: FunctionDeclarat
   return functions.flatMap((fn) => generateViewFunction(view, fn, includeArgTypes))
 }
 
+export function generateFunctionSignatures(functions: FunctionDeclaration[]): string[] {
+  return functions.map((fn) => `"function ${getFullSignatureWithOutputForFn(fn)}"`)
+}
+
 export function generateViewFunction(view: boolean, fn: FunctionDeclaration, includeArgTypes: boolean): string[] {
   const isView = fn.stateMutability === 'view' || fn.stateMutability === 'pure'
   if (view !== isView) {
@@ -41,17 +45,16 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
   })}overrides?: Overrides, preparedData?: PreparedData, ethCallContext?: EthCallContext): ${generateReturnTypes(fn)} {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function ${getFullSignatureWithOutputForFn(fn)}"])
         const calldata = iface.encodeFunctionData(
           "${fn.name}",[${
             fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
           }] 
         )
-        const key = makeEthCallKey({
+        const ethCallKey = makeEthCallKey({
           context: ethCallContext,
           calldata
         })
-        const ret = preparedData.ethCallResults[key]
+        const ret = preparedData.ethCallResults[ethCallKey]
         if (ret) {
           const result = iface.decodeFunctionResult("${fn.name}", ret).toArray()
           return result.length == 1? result[0]: result

package/src/eth/codegen/types.ts

@@ -1,10 +1,11 @@
 import {
   AbiOutputParameter,
   AbiParameter,
+  ArrayType,
+  EventArgDeclaration,
   EventDeclaration,
   FunctionDeclaration,
-  getArgumentForSignature,
-  getSignatureForFn
+  TupleType
 } from 'typechain'
 import { EvmType } from 'typechain/dist/parser/parseEvmType.js'
 
@@ -48,6 +49,13 @@ export function getFullSignatureForFunction(fn: FunctionDeclaration): string {
     .join(',')})`
 }
 
+export function getFullSignatureWithOutputForFn(fn: FunctionDeclaration) {
+  return `${fn.name}(${fn.inputs.map((i) => getArgumentForSignature(i)).join(', ')}) ${fn.stateMutability != 'nonpayable' ? fn.stateMutability + ' ' : ''}returns (${fn.outputs
+    .map((i) => getOutputArgumentForSignature(i))
+    .filter((s) => s != '')
+    .join(', ')})`
+}
+
 function getOutputArgumentForSignature(argument: AbiOutputParameter) {
   if (argument.type.type == 'void') {
     return ''
@@ -55,9 +63,26 @@ function getOutputArgumentForSignature(argument: AbiOutputParameter) {
   return getArgumentForSignature(argument as AbiParameter)
 }
 
-export function getFullSignatureWithOutputForFn(fn: FunctionDeclaration) {
-  return `${getSignatureForFn(fn)} ${fn.stateMutability} returns (${fn.outputs
-    .map((i) => getOutputArgumentForSignature(i))
-    .filter((s) => s != '')
-    .join(',')})`
+function getArgumentForSignature(argument: EventArgDeclaration | AbiParameter): string {
+  if (argument.type.originalType === 'tuple') {
+    return getTypeWithName(
+      `(${(argument.type as TupleType).components.map((i) => getArgumentForSignature(i)).join(', ')})`,
+      argument.name
+    )
+  } else if (argument.type.originalType.startsWith('tuple')) {
+    const arr = argument.type as ArrayType
+    return getTypeWithName(
+      `${getArgumentForSignature({
+        name: '',
+        type: arr.itemType
+      })}[${arr.size?.toString() || ''}]`,
+      argument.name
+    )
+  } else {
+    return getTypeWithName(argument.type.originalType, argument.name)
+  }
+}
+
+function getTypeWithName(type: string, name?: string) {
+  return (name ?? '').length > 0 ? `${type} ${name}` : type
 }

package/src/store/cache.ts

@@ -1,10 +1,6 @@
 import { ID } from './types.js'
 import type { Entity as EntityStruct } from '@sentio/protos'
 
-export interface Entity {
-  id: ID
-}
-
 export class LocalCache {
   private cache: Map<string, EntityStruct> = new Map()