@sentio/sdk 4.0.0-rc.1 → 4.0.0-rc.3

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

@@ -24,7 +24,13 @@ import {
   PreprocessResult,
   encodeCallData,
 } from "@sentio/sdk/eth";
-import { EthCallParam, EthCallContext, PreparedData } from "@sentio/protos";
+import {
+  EthCallParam,
+  EthCallContext,
+  EthCallContextSchema,
+  PreparedData,
+} from "@sentio/protos";
+import { create } from "@bufbuild/protobuf";
 
 import { ERC721__factory } from "./index.js";
 import {
@@ -754,57 +760,78 @@ export class ERC721BoundContractView extends BoundContractView<
       tokenId: BigNumberish,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.approve(to, tokenId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.approve(
+        to,
+        tokenId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     totalSupply(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.totalSupply({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.totalSupply(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     balanceOf(owner: string, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.balanceOf(owner, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.balanceOf(
+        owner,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     getApproved(tokenId: BigNumberish, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.getApproved(tokenId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.getApproved(
+        tokenId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     isApprovedForAll(
       owner: string,
       operator: string,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.isApprovedForAll(owner, operator, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.isApprovedForAll(
+        owner,
+        operator,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     name(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.name({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.name(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     ownerOf(tokenId: BigNumberish, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.ownerOf(tokenId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.ownerOf(
+        tokenId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     safeTransferFrom_address_address_uint256(
       from: string,
@@ -816,11 +843,11 @@ export class ERC721BoundContractView extends BoundContractView<
         from,
         to,
         tokenId,
-        {
+        create(EthCallContextSchema, {
           chainId: this.context.chainId.toString(),
           address: this.context.address,
           blockTag: this.context.getBlockTag(overrides),
-        },
+        }),
       );
     },
     safeTransferFrom_address_address_uint256_bytes(
@@ -835,11 +862,11 @@ export class ERC721BoundContractView extends BoundContractView<
         to,
         tokenId,
         data,
-        {
+        create(EthCallContextSchema, {
           chainId: this.context.chainId.toString(),
           address: this.context.address,
           blockTag: this.context.getBlockTag(overrides),
-        },
+        }),
       );
     },
     setApprovalForAll(
@@ -847,35 +874,47 @@ export class ERC721BoundContractView extends BoundContractView<
       _approved: boolean,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.setApprovalForAll(operator, _approved, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.setApprovalForAll(
+        operator,
+        _approved,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     supportsInterface(
       interfaceId: BytesLike,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.supportsInterface(interfaceId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.supportsInterface(
+        interfaceId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     symbol(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.symbol({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.symbol(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     tokenURI(tokenId: BigNumberish, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.tokenURI(tokenId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.tokenURI(
+        tokenId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     transferFrom(
       from: string,
@@ -883,11 +922,16 @@ export class ERC721BoundContractView extends BoundContractView<
       tokenId: BigNumberish,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.transferFrom(from, to, tokenId, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.transferFrom(
+        from,
+        to,
+        tokenId,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
   };
 }

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

@@ -24,7 +24,13 @@ import {
   PreprocessResult,
   encodeCallData,
 } from "@sentio/sdk/eth";
-import { EthCallParam, EthCallContext, PreparedData } from "@sentio/protos";
+import {
+  EthCallParam,
+  EthCallContext,
+  EthCallContextSchema,
+  PreparedData,
+} from "@sentio/protos";
+import { create } from "@bufbuild/protobuf";
 
 import { WETH9__factory } from "./index.js";
 import {
@@ -534,29 +540,37 @@ export class WETH9BoundContractView extends BoundContractView<
     context: this.context,
 
     name(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.name({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.name(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     approve(
       guy: string,
       wad: BigNumberish,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.approve(guy, wad, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.approve(
+        guy,
+        wad,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     totalSupply(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.totalSupply({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.totalSupply(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     transferFrom(
       src: string,
@@ -564,64 +578,89 @@ export class WETH9BoundContractView extends BoundContractView<
       wad: BigNumberish,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.transferFrom(src, dst, wad, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.transferFrom(
+        src,
+        dst,
+        wad,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     withdraw(wad: BigNumberish, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.withdraw(wad, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.withdraw(
+        wad,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     decimals(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.decimals({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.decimals(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     balanceOf(arg0: string, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.balanceOf(arg0, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.balanceOf(
+        arg0,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     symbol(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.symbol({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.symbol(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     transfer(
       dst: string,
       wad: BigNumberish,
       overrides?: Overrides,
     ): EthCallParam {
-      return this.view.encodeCall.transfer(dst, wad, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.transfer(
+        dst,
+        wad,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     deposit(overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.deposit({
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.deposit(
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
     allowance(arg0: string, arg1: string, overrides?: Overrides): EthCallParam {
-      return this.view.encodeCall.allowance(arg0, arg1, {
-        chainId: this.context.chainId.toString(),
-        address: this.context.address,
-        blockTag: this.context.getBlockTag(overrides),
-      });
+      return this.view.encodeCall.allowance(
+        arg0,
+        arg1,
+        create(EthCallContextSchema, {
+          chainId: this.context.chainId.toString(),
+          address: this.context.address,
+          blockTag: this.context.getBlockTag(overrides),
+        }),
+      );
     },
   };
 }

package/src/eth/codegen/file.ts

@@ -223,7 +223,8 @@ export class ${contract.name}ProcessorTemplate extends BaseProcessorTemplate<${c
       ],
       // '@sentio/sdk/eth': ['BaseContext'],
       // '@sentio/protos': ['EthFetchConfig'],
-      '@sentio/protos': ['EthCallParam', 'EthCallContext', 'PreparedData'],
+      '@sentio/protos': ['EthCallParam', 'EthCallContext', 'EthCallContextSchema', 'PreparedData'],
+      '@bufbuild/protobuf': ['create'],
       './common.js': ['PromiseOrValue'],
       './index.js': [`${contract.name}__factory`],
       [`./${contract.name}.js`]: [`${contract.name}`, ...eventsImports, ...uniqueStructImports]

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

@@ -123,7 +123,7 @@ export function generateBoundFunctionCallEncoder(fn: FunctionDeclaration, includ
   })}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: this.context.getBlockTag(overrides)})
+    }create(EthCallContextSchema, {chainId: this.context.chainId.toString(), address: this.context.address, blockTag: this.context.getBlockTag(overrides)}))
   }
   `
   ]

package/src/eth/context.ts

@@ -1,7 +1,21 @@
 import { BaseContract, Overrides } from 'ethers'
-import { LogParams, BlockParams, TransactionReceiptParams, TransactionResponseParams } from 'ethers/providers'
+import {
+  allowNull,
+  LogParams,
+  BlockParams,
+  TransactionReceiptParams,
+  TransactionResponseParams
+} from 'ethers/providers'
+import { getNumber } from 'ethers/utils'
 
-import { EthCallContext, PreparedData, RecordMetaData } from '@sentio/protos'
+import {
+  type EthCallContext,
+  EthCallContextSchema,
+  type PreparedData,
+  type RecordMetaData,
+  RecordMetaDataSchema
+} from '@sentio/protos'
+import { create } from '@bufbuild/protobuf'
 import { Trace } from './eth.js'
 import { Labels, normalizeLabels } from '../core/index.js'
 import { BaseContext } from '../core/base-context.js'
@@ -63,7 +77,7 @@ export abstract class EthContext extends BaseContext {
 
   getMetaDataInternal(name: string, labels: Labels): RecordMetaData {
     if (this.log) {
-      return {
+      return create(RecordMetaDataSchema, {
         address: this.address,
         contractName: this.getContractName(),
         blockNumber: BigInt(this.blockNumber),
@@ -73,23 +87,25 @@ export abstract class EthContext extends BaseContext {
         chainId: this.chainId,
         name: name,
         labels: normalizeLabels(labels)
-      }
+      })
     }
     if (this.trace) {
-      return {
+      return create(RecordMetaDataSchema, {
         address: this.address,
         contractName: this.getContractName(),
         blockNumber: BigInt(this.blockNumber),
-        transactionIndex: this.trace.transactionPosition,
+        // Traces are used as a raw `as Trace` cast (no Formatted wrapper), so transactionPosition
+        // may be a hex string from raw RPC; coerce for the int32 field (default 0 when absent).
+        transactionIndex: allowNull(getNumber, 0)(this.trace.transactionPosition),
         transactionHash: this.transactionHash || '',
         logIndex: -1,
         chainId: this.chainId.toString(),
         name: name,
         labels: normalizeLabels(labels)
-      }
+      })
     }
     if (this.transaction) {
-      return {
+      return create(RecordMetaDataSchema, {
         address: this.address,
         contractName: this.getContractName(),
         blockNumber: BigInt(this.blockNumber),
@@ -99,10 +115,10 @@ export abstract class EthContext extends BaseContext {
         chainId: this.chainId.toString(),
         name: name,
         labels: normalizeLabels(labels)
-      }
+      })
     }
     if (this.block) {
-      return {
+      return create(RecordMetaDataSchema, {
         address: this.address,
         contractName: this.getContractName(),
         blockNumber: BigInt(this.blockNumber),
@@ -112,7 +128,7 @@ export abstract class EthContext extends BaseContext {
         chainId: this.chainId.toString(),
         name: name,
         labels: normalizeLabels(labels)
-      }
+      })
     }
     throw new Error("Invaid ctx argument can't happen")
   }
@@ -127,11 +143,11 @@ export abstract class EthContext extends BaseContext {
   }
 
   getEthCallContext(): EthCallContext {
-    return {
+    return create(EthCallContextSchema, {
       chainId: this.chainId,
       blockTag: '0x' + this.blockNumber.toString(16),
       address: this.address
-    }
+    })
   }
 }