@sentio/sdk 2.45.2 → 2.45.3-rc.2

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

@@ -75,17 +75,12 @@ export function generateBoundViewFunction(view: boolean, fn: FunctionDeclaration
   async ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
     useStructs: true
   })}overrides?: Overrides): ${generateReturnTypes(fn)} {
-    const ethCallContext = {
-      chainId: this.context.chainId,
-      blockTag: "0x" + this.context.blockNumber.toString(16),
-      address: this.context.address,
-    }
     return await this.${qualifier}.${declName}(${
       fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
     } {
       blockTag: this.context.blockNumber,
       ...overrides
-    }, this.context.preparedData, ethCallContext)
+    }, this.context.preparedData, this.context.getEthCallContext())
   }
   `
   ]
@@ -103,22 +98,10 @@ export function generateFunctionCallEncoder(fn: FunctionDeclaration, includeArgT
     `
   ${declName}(${generateInputTypes(fn.inputs, {
     useStructs: true
-  })}ethCallContext: EthCallContext): EthCallParam {
-    try {
-      const iface = new Interface(["function ${getSignatureForFn(fn)}"])
-      const calldata = iface.encodeFunctionData(
-        "${fn.name}",[${
-          fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-        }] 
-      )
-      return {
-        context: ethCallContext,
-        calldata
-      }
-    } catch (e) {
-      const stack = new Error().stack
-      throw transformEtherError(e, undefined, stack)
-    }
+  })}callContext: EthCallContext): EthCallParam {
+    return encodeCallData(callContext, "${fn.name}", "function ${getSignatureForFn(fn)}", [${
+      fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
+    }])
   }
   `
   ]
@@ -137,15 +120,10 @@ export function generateBoundFunctionCallEncoder(fn: FunctionDeclaration, includ
     `
   ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
     useStructs: true
-  })}overrides?: Overrides): EthCallParam {
-    let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16)
-    if (overrides?.blockTag) {
-      blockTagWithOverride = typeof(overrides.blockTag) == 'string'? overrides.blockTag: "0x" + overrides.blockTag.toString(16)
-    }
-    
+  })}overrides?: Overrides): EthCallParam {   
     return this.view.encodeCall.${declName}(${
       fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-    }{chainId: this.context.chainId.toString(), address: this.context.address, blockTag: blockTagWithOverride})
+    }{chainId: this.context.chainId.toString(), address: this.context.address, blockTag: this.context.getBlockTag(overrides)})
   }
   `
   ]

package/src/eth/context.ts

@@ -1,7 +1,7 @@
-import { BaseContract } from 'ethers'
+import { BaseContract, Overrides } from 'ethers'
 import { LogParams, BlockParams, TransactionReceiptParams, TransactionResponseParams } from 'ethers/providers'
 
-import { PreparedData, RecordMetaData } from '@sentio/protos'
+import { EthCallContext, PreparedData, RecordMetaData } from '@sentio/protos'
 import { Trace } from './eth.js'
 import { Labels, normalizeLabels } from '../core/index.js'
 import { BaseContext } from '../core/base-context.js'
@@ -115,6 +115,23 @@ export abstract class EthContext extends BaseContext {
     }
     throw new Error("Invaid ctx argument can't happen")
   }
+
+  getBlockTag(overrides?: Overrides) {
+    let blockTagWithOverride = '0x' + this.blockNumber.toString(16)
+    if (overrides?.blockTag) {
+      blockTagWithOverride =
+        typeof overrides.blockTag == 'string' ? overrides.blockTag : '0x' + overrides.blockTag.toString(16)
+    }
+    return blockTagWithOverride
+  }
+
+  getEthCallContext(): EthCallContext {
+    return {
+      chainId: this.chainId,
+      blockTag: '0x' + this.blockNumber.toString(16),
+      address: this.address
+    }
+  }
 }
 
 export class AccountContext extends EthContext {

package/src/eth/eth.ts

@@ -11,10 +11,11 @@ import {
   object,
   formatData
 } from 'ethers/providers'
-import { CallExceptionError, LogDescription, Result, DeferredTopicFilter, BlockParams } from 'ethers'
+import { CallExceptionError, LogDescription, Result, DeferredTopicFilter, BlockParams, Interface } from 'ethers'
 import { ContractContext } from './context.js'
 import { getAddress } from 'ethers/address'
 import { getBigInt, getNumber, hexlify } from 'ethers/utils'
+import { EthCallContext, EthCallParam } from '@sentio/protos'
 
 export interface IResult {
   /**
@@ -265,3 +266,22 @@ export function validateAndNormalizeAddress(address: string): string {
   const normalizedAddress = getAddress(address)
   return normalizedAddress.toLowerCase()
 }
+
+export function encodeCallData(
+  context: EthCallContext,
+  name: string,
+  funcABI: string,
+  values?: ReadonlyArray<any>
+): EthCallParam {
+  try {
+    const iface = new Interface([funcABI])
+    const calldata = iface.encodeFunctionData(name, values)
+    return {
+      context,
+      calldata
+    }
+  } catch (e) {
+    const stack = new Error().stack
+    throw transformEtherError(e, undefined, stack)
+  }
+}

package/src/move/shared-network-codegen.ts

@@ -121,16 +121,13 @@ onEvent${struct.name}(func: (event: ${moduleName}.${normalizeToJSName(struct.nam
   }
 
   generateImports() {
-    return (
-      super.generateImports() +
-      `
+    return `
     import { CallFilter, MoveFetchConfig } from "@sentio/sdk/move"
     import {
       ${this.PREFIX}BindOptions, ${this.PREFIX}BaseProcessor,
       ${this.PREFIX}Network, TypedFunctionPayload,
       ${this.PREFIX}Context } from "@sentio/sdk/${this.PREFIX.toLowerCase()}"
 `
-    )
   }
 
   generateLoadAll(isSystem: boolean): string {