@sentio/sdk 2.17.1-rc.1 → 2.18.0-rc.1

package/src/eth/codegen/file.ts

@@ -9,7 +9,7 @@ import {
 import { reservedKeywords } from '@sentio/ethers-v6/dist/codegen/reserved-keywords.js'
 import { codegenCallTraceTypes, generateCallHandlers } from './functions-handler.js'
 import { generateEventFilters, generateEventHandlers } from './event-handler.js'
-import { generateBoundViewFunctions, generateViewFunctions } from './view-function.js'
+import { generateBoundViewFunctions, generateViewFunctions } from './function-calls.js'
 
 export function codeGenIndex(contract: Contract): string {
   return ` 
@@ -29,23 +29,41 @@ export function codeGenSentioFile(contract: Contract): string {
   export class ${contract.name}ContractView extends ContractView<${contract.name}> {
     constructor (contract: ${contract.name}) {
       super(contract);
+      this.callStatic.contract = contract;
     }
 
     ${Object.values(contract.functions)
       .filter((f) => !reservedKeywords.has(f[0].name))
-      .map((fs) => generateViewFunctions(fs))
+      .flatMap((fs) => generateViewFunctions(true, fs))
       .join('\n')}
+    
+    callStatic = {
+      contract: this.contract,
+      ${Object.values(contract.functions)
+        .filter((f) => !reservedKeywords.has(f[0].name))
+        .flatMap((fs) => generateViewFunctions(false, fs))
+        .join(',\n')}
+    }
   }
   
   export class ${contract.name}BoundContractView extends BoundContractView<${contract.name}, 
     ${contract.name}ContractView> {
   ${Object.values(contract.functions)
     .filter((f) => !reservedKeywords.has(f[0].name))
-    .map((fs) => generateBoundViewFunctions(fs))
+    .flatMap((fs) => generateBoundViewFunctions(true, fs))
     .join('\n')}
+  
+    callStatic = {
+      view: this.view,
+      context: this.context,
+      ${Object.values(contract.functions)
+        .filter((f) => !reservedKeywords.has(f[0].name))
+        .flatMap((fs) => generateBoundViewFunctions(false, fs))
+        .join(',\n')}
+    }
   }
 
-    export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>
+  export type ${contract.name}Context = ContractContext<${contract.name}, ${contract.name}BoundContractView>
 
   export class ${contract.name}Processor extends BaseProcessor<${contract.name}, ${contract.name}BoundContractView> {
     ${Object.values(contract.events)

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

@@ -0,0 +1,78 @@
+// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54
+import { FunctionDeclaration } from 'typechain'
+import { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js'
+import { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js'
+
+function generateReturnTypes(fn: FunctionDeclaration) {
+  // sounds like returnResultObject should be true but we need to set false to make it work
+  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`
+}
+
+export function generateViewFunctions(view: boolean, functions: FunctionDeclaration[]): string[] {
+  const includeArgTypes = functions.length !== 1
+  return functions.flatMap((fn) => generateViewFunction(view, fn, includeArgTypes))
+}
+
+export function generateViewFunction(view: boolean, fn: FunctionDeclaration, includeArgTypes: boolean): string[] {
+  const isView = fn.stateMutability === 'view' || fn.stateMutability === 'pure'
+  if (view !== isView) {
+    return []
+  }
+  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name
+
+  const call = view ? '' : '.staticCall'
+
+  const func = `this.contract.getFunction("` + getFullSignatureForFunction(fn) + '")'
+  // if (overrides) {
+  //   return await ${call}(${
+  //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+  // } overrides)
+  //     } else {
+  //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
+  //     }
+  return [
+    `
+  async ${declName}(${generateInputTypes(fn.inputs, {
+      useStructs: true,
+    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
+    try {    
+       return await ${func}${call}(${
+      fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+    } overrides || {})
+    } catch (e) {
+      throw transformEtherError(e, undefined)
+    }
+  }
+  `,
+  ]
+}
+
+export function generateBoundViewFunctions(view: boolean, functions: FunctionDeclaration[]): string[] {
+  const includeArgTypes = functions.length !== 1
+  return functions.flatMap((fn) => generateBoundViewFunction(view, fn, includeArgTypes))
+}
+
+export function generateBoundViewFunction(view: boolean, fn: FunctionDeclaration, includeArgTypes: boolean): string[] {
+  const isView = fn.stateMutability === 'view' || fn.stateMutability === 'pure'
+  if (view !== isView) {
+    return []
+  }
+  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name
+
+  const qualifier = view ? 'view' : 'view.callStatic'
+
+  return [
+    `
+  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
+      useStructs: true,
+    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
+    return await this.${qualifier}.${declName}(${
+      fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+    } {
+      blockTag: this.context.blockNumber,
+      ...overrides
+    })
+  }
+  `,
+  ]
+}

package/lib/eth/codegen/view-function.d.ts

@@ -1,5 +0,0 @@
-import { FunctionDeclaration } from 'typechain';
-export declare function generateViewFunctions(functions: FunctionDeclaration[]): string;
-export declare function generateViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string;
-export declare function generateBoundViewFunctions(functions: FunctionDeclaration[]): string;
-export declare function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string;

package/lib/eth/codegen/view-function.js

@@ -1,60 +0,0 @@
-import { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js';
-import { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js';
-function generateReturnTypes(fn) {
-    // sounds like returnResultObject should be true but we need to set false to make it work
-    return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`;
-}
-export function generateViewFunctions(functions) {
-    if (functions.length === 1) {
-        return generateViewFunction(functions[0], false);
-    }
-    return functions.map((fn) => generateViewFunction(fn, true)).join('\n');
-}
-export function generateViewFunction(fn, includeArgTypes) {
-    if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {
-        return '';
-    }
-    const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name;
-    const call = 'this.contract.getFunction("' + getFullSignatureForFunction(fn) + '")';
-    // if (overrides) {
-    //   return await ${call}(${
-    //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-    // } overrides)
-    //     } else {
-    //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
-    //     }
-    return `
-  async ${declName}(${generateInputTypes(fn.inputs, {
-        useStructs: true,
-    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    try {    
-       return await ${call}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} overrides || {})
-    } catch (e) {
-      throw transformEtherError(e, undefined)
-    }
-  }
-  `;
-}
-export function generateBoundViewFunctions(functions) {
-    if (functions.length === 1) {
-        return generateBoundViewFunction(functions[0], false);
-    }
-    return functions.map((fn) => generateBoundViewFunction(fn, true)).join('\n');
-}
-export function generateBoundViewFunction(fn, includeArgTypes) {
-    if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {
-        return '';
-    }
-    const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name;
-    return `
-  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
-        useStructs: true,
-    })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    return await this.view.${declName}(${fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''} {
-      blockTag: this.context.blockNumber,
-      ...overrides
-    })
-  }
-  `;
-}
-//# sourceMappingURL=view-function.js.map

package/lib/eth/codegen/view-function.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"view-function.js","sourceRoot":"","sources":["../../../src/eth/codegen/view-function.ts"],"names":[],"mappings":"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","sourcesContent":["// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54\nimport { FunctionDeclaration } from 'typechain'\nimport { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js'\nimport { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js'\n\nfunction generateReturnTypes(fn: FunctionDeclaration) {\n  // sounds like returnResultObject should be true but we need to set false to make it work\n  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`\n}\n\nexport function generateViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n  const call = 'this.contract.getFunction(\"' + getFullSignatureForFunction(fn) + '\")'\n  // if (overrides) {\n  //   return await ${call}(${\n  //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  // } overrides)\n  //     } else {\n  //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})\n  //     }\n  return `\n  async ${declName}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    try {    \n       return await ${call}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } overrides || {})\n    } catch (e) {\n      throw transformEtherError(e, undefined)\n    }\n  }\n  `\n}\n\nexport function generateBoundViewFunctions(functions: FunctionDeclaration[]): string {\n  if (functions.length === 1) {\n    return generateBoundViewFunction(functions[0], false)\n  }\n  return functions.map((fn) => generateBoundViewFunction(fn, true)).join('\\n')\n}\n\nexport function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {\n  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {\n    return ''\n  }\n  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name\n\n  return `\n  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {\n    useStructs: true,\n  })}overrides?: Overrides): ${generateReturnTypes(fn)} {\n    return await this.view.${declName}(${\n    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''\n  } {\n      blockTag: this.context.blockNumber,\n      ...overrides\n    })\n  }\n  `\n}\n"]}

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

@@ -1,71 +0,0 @@
-// https://github.com/dethcrypto/TypeChain/blob/015abb28bd22826611051f27e0ec96a00f9a0b61/packages/target-ethers-v5/src/codegen/functions.ts#L54
-import { FunctionDeclaration } from 'typechain'
-import { generateInputTypes, generateOutputTypes } from '@sentio/ethers-v6/dist/codegen/types.js'
-import { getFullSignatureAsSymbolForFunction, getFullSignatureForFunction } from './types.js'
-
-function generateReturnTypes(fn: FunctionDeclaration) {
-  // sounds like returnResultObject should be true but we need to set false to make it work
-  return `Promise<${generateOutputTypes({ returnResultObject: false, useStructs: true }, fn.outputs)}>`
-}
-
-export function generateViewFunctions(functions: FunctionDeclaration[]): string {
-  if (functions.length === 1) {
-    return generateViewFunction(functions[0], false)
-  }
-  return functions.map((fn) => generateViewFunction(fn, true)).join('\n')
-}
-
-export function generateViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {
-  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {
-    return ''
-  }
-  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name
-  const call = 'this.contract.getFunction("' + getFullSignatureForFunction(fn) + '")'
-  // if (overrides) {
-  //   return await ${call}(${
-  //   fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-  // } overrides)
-  //     } else {
-  //       return await ${call}(${fn.inputs.map((input, index) => input.name || `arg${index}`).join(',')})
-  //     }
-  return `
-  async ${declName}(${generateInputTypes(fn.inputs, {
-    useStructs: true,
-  })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    try {    
-       return await ${call}(${
-    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-  } overrides || {})
-    } catch (e) {
-      throw transformEtherError(e, undefined)
-    }
-  }
-  `
-}
-
-export function generateBoundViewFunctions(functions: FunctionDeclaration[]): string {
-  if (functions.length === 1) {
-    return generateBoundViewFunction(functions[0], false)
-  }
-  return functions.map((fn) => generateBoundViewFunction(fn, true)).join('\n')
-}
-
-export function generateBoundViewFunction(fn: FunctionDeclaration, includeArgTypes: boolean): string {
-  if (fn.stateMutability !== 'view' && fn.stateMutability !== 'pure') {
-    return ''
-  }
-  const declName = includeArgTypes ? getFullSignatureAsSymbolForFunction(fn) : fn.name
-
-  return `
-  async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
-    useStructs: true,
-  })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    return await this.view.${declName}(${
-    fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-  } {
-      blockTag: this.context.blockNumber,
-      ...overrides
-    })
-  }
-  `
-}