@sentio/sdk 2.11.0 → 2.11.1-rc.2

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

@@ -10,7 +10,6 @@ import {
   getProcessor,
   getProvider,
   transformEtherError,
-  Trace,
   BindOptions,
   BaseProcessor,
   BaseProcessorTemplate,
@@ -38,7 +37,7 @@ import {
 
 export interface NameCallObject {}
 
-export type NameCallTrace = TypedCallTrace<[], NameCallObject> & Trace;
+export type NameCallTrace = TypedCallTrace<[], NameCallObject>;
 
 export interface ApproveCallObject {
   guy: string;
@@ -48,13 +47,11 @@ export interface ApproveCallObject {
 export type ApproveCallTrace = TypedCallTrace<
   [string, bigint],
   ApproveCallObject
-> &
-  Trace;
+>;
 
 export interface TotalSupplyCallObject {}
 
-export type TotalSupplyCallTrace = TypedCallTrace<[], TotalSupplyCallObject> &
-  Trace;
+export type TotalSupplyCallTrace = TypedCallTrace<[], TotalSupplyCallObject>;
 
 export interface TransferFromCallObject {
   src: string;
@@ -65,28 +62,25 @@ export interface TransferFromCallObject {
 export type TransferFromCallTrace = TypedCallTrace<
   [string, string, bigint],
   TransferFromCallObject
-> &
-  Trace;
+>;
 
 export interface WithdrawCallObject {
   wad: bigint;
 }
 
-export type WithdrawCallTrace = TypedCallTrace<[bigint], WithdrawCallObject> &
-  Trace;
+export type WithdrawCallTrace = TypedCallTrace<[bigint], WithdrawCallObject>;
 
 export interface DecimalsCallObject {}
 
-export type DecimalsCallTrace = TypedCallTrace<[], DecimalsCallObject> & Trace;
+export type DecimalsCallTrace = TypedCallTrace<[], DecimalsCallObject>;
 
 export interface BalanceOfCallObject {}
 
-export type BalanceOfCallTrace = TypedCallTrace<[string], BalanceOfCallObject> &
-  Trace;
+export type BalanceOfCallTrace = TypedCallTrace<[string], BalanceOfCallObject>;
 
 export interface SymbolCallObject {}
 
-export type SymbolCallTrace = TypedCallTrace<[], SymbolCallObject> & Trace;
+export type SymbolCallTrace = TypedCallTrace<[], SymbolCallObject>;
 
 export interface TransferCallObject {
   dst: string;
@@ -96,20 +90,18 @@ export interface TransferCallObject {
 export type TransferCallTrace = TypedCallTrace<
   [string, bigint],
   TransferCallObject
-> &
-  Trace;
+>;
 
 export interface DepositCallObject {}
 
-export type DepositCallTrace = TypedCallTrace<[], DepositCallObject> & Trace;
+export type DepositCallTrace = TypedCallTrace<[], DepositCallObject>;
 
 export interface AllowanceCallObject {}
 
 export type AllowanceCallTrace = TypedCallTrace<
   [string, string],
   AllowanceCallObject
-> &
-  Trace;
+>;
 
 const templateContract = WETH9__factory.connect("0x0", DummyProvider);
 
@@ -306,77 +298,77 @@ export class WETH9Processor extends BaseProcessor<
     handler: (call: NameCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x06fdde03", handler, fetchConfig);
+    return super.onTrace("0x06fdde03", handler as any, fetchConfig);
   }
 
   onCallApprove(
     handler: (call: ApproveCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x095ea7b3", handler, fetchConfig);
+    return super.onTrace("0x095ea7b3", handler as any, fetchConfig);
   }
 
   onCallTotalSupply(
     handler: (call: TotalSupplyCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x18160ddd", handler, fetchConfig);
+    return super.onTrace("0x18160ddd", handler as any, fetchConfig);
   }
 
   onCallTransferFrom(
     handler: (call: TransferFromCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x23b872dd", handler, fetchConfig);
+    return super.onTrace("0x23b872dd", handler as any, fetchConfig);
   }
 
   onCallWithdraw(
     handler: (call: WithdrawCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x2e1a7d4d", handler, fetchConfig);
+    return super.onTrace("0x2e1a7d4d", handler as any, fetchConfig);
   }
 
   onCallDecimals(
     handler: (call: DecimalsCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x313ce567", handler, fetchConfig);
+    return super.onTrace("0x313ce567", handler as any, fetchConfig);
   }
 
   onCallBalanceOf(
     handler: (call: BalanceOfCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x70a08231", handler, fetchConfig);
+    return super.onTrace("0x70a08231", handler as any, fetchConfig);
   }
 
   onCallSymbol(
     handler: (call: SymbolCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0x95d89b41", handler, fetchConfig);
+    return super.onTrace("0x95d89b41", handler as any, fetchConfig);
   }
 
   onCallTransfer(
     handler: (call: TransferCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xa9059cbb", handler, fetchConfig);
+    return super.onTrace("0xa9059cbb", handler as any, fetchConfig);
   }
 
   onCallDeposit(
     handler: (call: DepositCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xd0e30db0", handler, fetchConfig);
+    return super.onTrace("0xd0e30db0", handler as any, fetchConfig);
   }
 
   onCallAllowance(
     handler: (call: AllowanceCallTrace, ctx: WETH9Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("0xdd62ed3e", handler, fetchConfig);
+    return super.onTrace("0xdd62ed3e", handler as any, fetchConfig);
   }
 
   public static filters = {

package/src/eth/codegen/ethers-sentio.ts

@@ -65,6 +65,7 @@ export default class EthersSentio extends Ethers.default {
   }
 
   override afterRun() {
+    const commonPath = join('internal', 'common.ts')
     const files = super.afterRun()
     for (const [idx, file] of files.entries()) {
       if (file.path.endsWith('__factory.ts')) {
@@ -72,8 +73,11 @@ export default class EthersSentio extends Ethers.default {
       } else if (file.path.endsWith('factories/index.ts')) {
         file.contents = file.contents.replaceAll("__factory'", "__factory.js'")
       } else if (file.path.endsWith('_processor.ts')) {
+      } else if (file.path.endsWith(commonPath)) {
+        file.contents = COMMON_CONTENT
       }
     }
+
     let indexContent = ''
     for (const contract of this.processedABIs) {
       const content = `
@@ -130,3 +134,35 @@ ${contract.name}Processor.bind({ address: '${contract.address}', network: ${cont
     return files
   }
 }
+
+const COMMON_CONTENT = `/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import type { DeferredTopicFilter } from "ethers";
+import { LogParams } from "ethers/providers";
+import { Result } from "ethers";
+
+export interface TypedEvent<
+    TArgsArray extends Array<any> = any,
+    TArgsObject = any
+> extends LogParams {
+  args: TArgsObject & {
+    /**
+     *  Returns the Result as a normal Array.
+     */
+    toArray(): Array<any>;
+    /**
+     *  Returns the Result as an Object with each name-value pair.
+     */
+    toObject(): Record<string, any>;
+  };
+  name: string
+}
+
+export interface TypedEventFilter<_TEvent extends TypedEvent>
+    extends DeferredTopicFilter {}
+
+export type PromiseOrValue<T> = T | Promise<T>;
+
+  `

package/src/eth/codegen/functions-handler.ts

@@ -33,7 +33,7 @@ function codegenCallTraceType(fn: FunctionDeclaration, overloadedName?: string):
   return `
   export interface ${identifier}CallObject ${objectOutput}
     
-  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject> & Trace
+  export type ${identifier}CallTrace = TypedCallTrace<${arrayOutput}, ${identifier}CallObject>
   `
 }
 
@@ -47,7 +47,7 @@ function generateCallHandler(fn: FunctionDeclaration, contractName: string, over
     handler: (call: ${upperFirst(overloadedName ?? fn.name)}CallTrace, ctx: ${contractName}Context) => void,
     fetchConfig?: Partial<EthFetchConfig>
   ): this {
-    return super.onTrace("${sighash}", handler, fetchConfig);
+    return super.onTrace("${sighash}", handler as any, fetchConfig);
   }
 `
 }

package/src/eth/trace.ts

@@ -1,8 +1,24 @@
 // https://github.com/openethereum/parity-ethereum/blob/55c90d4016505317034e3e98f699af07f5404b63/rpc/src/v1/types/trace.rs#L482
+
 import { Result } from 'ethers'
 
 export interface TypedCallTrace<TArgsArray extends Array<any> = any, TArgsObject = any> {
-  args: TArgsArray & TArgsObject
+  args: TArgsObject & {
+    /**
+     *  Returns the Result as a normal Array.
+     *
+     *  This will throw if there are any outstanding deferred
+     *  errors.
+     */
+    toArray(): Array<any>
+    /**
+     *  Returns the Result as an Object with each name-value pair.
+     *
+     *  This will throw if any value is unnamed, or if there are
+     *  any outstanding deferred errors.
+     */
+    toObject(): Record<string, any>
+  }
 }
 
 export interface Trace {