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

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

@@ -827,54 +827,53 @@ export class WETH9BoundContractView extends BoundContractView<
     context: this.context,
 
     name(overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.name({ chainId, address, blockTag });
+      return this.view.encodeCall.name({
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     approve(
       guy: string,
       wad: BigNumberish,
       overrides?: Overrides
     ): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
       return this.view.encodeCall.approve(guy, wad, {
-        chainId,
-        address,
-        blockTag,
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
       });
     },
     totalSupply(overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.totalSupply({ chainId, address, blockTag });
+      return this.view.encodeCall.totalSupply({
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     transferFrom(
       src: string,
@@ -882,135 +881,127 @@ export class WETH9BoundContractView extends BoundContractView<
       wad: BigNumberish,
       overrides?: Overrides
     ): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
       return this.view.encodeCall.transferFrom(src, dst, wad, {
-        chainId,
-        address,
-        blockTag,
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
       });
     },
     withdraw(wad: BigNumberish, overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.withdraw(wad, { chainId, address, blockTag });
+      return this.view.encodeCall.withdraw(wad, {
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     decimals(overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.decimals({ chainId, address, blockTag });
+      return this.view.encodeCall.decimals({
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     balanceOf(arg0: string, overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
       return this.view.encodeCall.balanceOf(arg0, {
-        chainId,
-        address,
-        blockTag,
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
       });
     },
     symbol(overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.symbol({ chainId, address, blockTag });
+      return this.view.encodeCall.symbol({
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     transfer(
       dst: string,
       wad: BigNumberish,
       overrides?: Overrides
     ): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
       return this.view.encodeCall.transfer(dst, wad, {
-        chainId,
-        address,
-        blockTag,
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
       });
     },
     deposit(overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
-      return this.view.encodeCall.deposit({ chainId, address, blockTag });
+      return this.view.encodeCall.deposit({
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
+      });
     },
     allowance(arg0: string, arg1: string, overrides?: Overrides): EthCallParam {
-      const chainId =
-        overrides?.chainId?.toString() ?? this.context.chainId.toString();
-      const address = this.context.address;
-      let blockTag = "0x" + this.context.blockNumber.toString(16);
+      let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16);
       if (overrides?.blockTag) {
-        blockTag =
+        blockTagWithOverride =
           typeof overrides.blockTag == "string"
             ? overrides.blockTag
             : "0x" + overrides.blockTag.toString(16);
       }
 
       return this.view.encodeCall.allowance(arg0, arg1, {
-        chainId,
-        address,
-        blockTag,
+        chainId: this.context.chainId.toString(),
+        address: this.context.address,
+        blockTag: blockTagWithOverride,
       });
     },
   };

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

@@ -154,16 +154,14 @@ export function generateBoundFunctionCallEncoder(fn: FunctionDeclaration, includ
   ${declName ?? fn.name}(${generateInputTypes(fn.inputs, {
     useStructs: true
   })}overrides?: Overrides): EthCallParam {
-    const chainId = overrides?.chainId?.toString() ?? this.context.chainId.toString()
-    const address = this.context.address
-    let blockTag = "0x" + this.context.blockNumber.toString(16)
+    let blockTagWithOverride = "0x" + this.context.blockNumber.toString(16)
     if (overrides?.blockTag) {
-      blockTag = typeof(overrides.blockTag) == 'string'? overrides.blockTag: "0x" + overrides.blockTag.toString(16)
+      blockTagWithOverride = typeof(overrides.blockTag) == 'string'? overrides.blockTag: "0x" + overrides.blockTag.toString(16)
     }
     
     return this.view.encodeCall.${declName}(${
       fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''
-    }{chainId, address, blockTag})
+    }{chainId: this.context.chainId.toString(), address: this.context.address, blockTag: blockTagWithOverride})
   }
   `
   ]

package/src/store/store.ts

@@ -2,12 +2,12 @@ import { StoreContext } from './context.js'
 import { DatabaseSchema } from '../core/index.js'
 import { BigDecimal } from '@sentio/bigdecimal'
 import { AbstractEntity as Entity, Bytes, Float, ID, Int, Timestamp } from './types.js'
-import type { DBRequest, Entity as EntityStruct, RichValue } from '@sentio/protos'
+import type { DBRequest, Entity as EntityStruct } from '@sentio/protos'
 import { DBRequest_DBOperator, DBResponse } from '@sentio/protos'
-import { toBigInteger } from './convert.js'
 import { PluginManager } from '@sentio/runtime'
 import { Cursor } from './cursor.js'
 import { LocalCache } from './cache.js'
+import { serializeRichValue } from './util.js'
 
 export interface EntityClass<T> {
   new (data: Partial<T>): T
@@ -166,7 +166,11 @@ export class Store {
             filters?.map((f) => ({
               field: f.field as string,
               op: ops[f.op],
-              value: { values: Array.isArray(f.value) ? f.value.map((v) => serialize(v)) : [serialize(f.value)] }
+              value: {
+                values: Array.isArray(f.value)
+                  ? f.value.map((v) => serializeRichValue(v))
+                  : [serializeRichValue(f.value)]
+              }
             })) || []
         }
       },
@@ -297,56 +301,6 @@ const ops: Record<Operators<any>, DBRequest_DBOperator> = {
   'has any': DBRequest_DBOperator.HAS_ANY
 }
 
-function serialize(v: any): RichValue {
-  if (v == null) {
-    return { nullValue: 0 }
-  }
-  if (typeof v == 'boolean') {
-    return { boolValue: v }
-  }
-  if (typeof v == 'string') {
-    return { stringValue: v }
-  }
-
-  if (typeof v == 'number') {
-    return { floatValue: v }
-  }
-  if (typeof v == 'bigint') {
-    return {
-      bigintValue: toBigInteger(v)
-    }
-  }
-
-  if (v instanceof BigDecimal) {
-    return serializeBigDecimal(v)
-  }
-
-  if (v instanceof Date) {
-    return {
-      timestampValue: v
-    }
-  }
-
-  if (v instanceof Uint8Array) {
-    return { bytesValue: v }
-  }
-
-  if (Array.isArray(v)) {
-    return {
-      listValue: { values: v.map((v) => serialize(v)) }
-    }
-  }
-  return {
-    nullValue: 0
-  }
-}
-
-function serializeBigDecimal(v: BigDecimal): RichValue {
-  return {
-    bigdecimalValue: undefined
-  }
-}
-
 export function getStore() {
   const dbContext = PluginManager.INSTANCE.dbContextLocalStorage.getStore()
   if (dbContext) {

package/src/store/util.ts

@@ -0,0 +1,53 @@
+import type { RichValue } from '@sentio/protos'
+import { toBigInteger } from './convert.js'
+import { BigDecimal } from '@sentio/bigdecimal'
+
+export function serializeRichValue(v: any): RichValue {
+  if (v == null) {
+    return { nullValue: 0 }
+  }
+  if (typeof v == 'boolean') {
+    return { boolValue: v }
+  }
+  if (typeof v == 'string') {
+    return { stringValue: v }
+  }
+
+  if (typeof v == 'number') {
+    return { floatValue: v }
+  }
+  if (typeof v == 'bigint') {
+    return {
+      bigintValue: toBigInteger(v)
+    }
+  }
+
+  if (v instanceof BigDecimal) {
+    return serializeBigDecimal(v)
+  }
+
+  if (v instanceof Date) {
+    return {
+      timestampValue: v
+    }
+  }
+
+  if (v instanceof Uint8Array) {
+    return { bytesValue: v }
+  }
+
+  if (Array.isArray(v)) {
+    return {
+      listValue: { values: v.map((v) => serializeRichValue(v)) }
+    }
+  }
+  return {
+    nullValue: 0
+  }
+}
+
+function serializeBigDecimal(v: BigDecimal): RichValue {
+  return {
+    bigdecimalValue: undefined
+  }
+}