@sentio/sdk 2.40.1-rc.1 → 2.40.1-rc.10

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

@@ -151,6 +151,23 @@ export type TransferFromCallTrace = TypedCallTrace<
 
 const templateContract = ERC721__factory.connect("0x0", DummyProvider);
 
+const iface = new Interface([
+  "function approve(address to, uint256 tokenId) returns ()",
+  "function totalSupply() view returns (uint256)",
+  "function balanceOf(address owner) view returns (uint256 balance)",
+  "function getApproved(uint256 tokenId) view returns (address operator)",
+  "function isApprovedForAll(address owner, address operator) view returns (bool)",
+  "function name() view returns (string)",
+  "function ownerOf(uint256 tokenId) view returns (address owner)",
+  "function safeTransferFrom(address from, address to, uint256 tokenId) returns ()",
+  "function safeTransferFrom(address from, address to, uint256 tokenId, bytes data) returns ()",
+  "function setApprovalForAll(address operator, bool _approved) returns ()",
+  "function supportsInterface(bytes4 interfaceId) view returns (bool)",
+  "function symbol() view returns (string)",
+  "function tokenURI(uint256 tokenId) view returns (string)",
+  "function transferFrom(address from, address to, uint256 tokenId) returns ()",
+]);
+
 export class ERC721ContractView extends ContractView<ERC721> {
   constructor(contract: ERC721) {
     super(contract);
@@ -164,9 +181,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function totalSupply() view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("totalSupply", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -195,9 +209,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function balanceOf(address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("balanceOf", [owner]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -227,9 +238,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function getApproved(uint256) view returns (address)",
-        ]);
         const calldata = iface.encodeFunctionData("getApproved", [tokenId]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -262,9 +270,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<boolean> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function isApprovedForAll(address,address) view returns (bool)",
-        ]);
         const calldata = iface.encodeFunctionData("isApprovedForAll", [
           owner,
           operator,
@@ -297,7 +302,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function name() view returns (string)"]);
         const calldata = iface.encodeFunctionData("name", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -324,9 +328,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function ownerOf(uint256) view returns (address)",
-        ]);
         const calldata = iface.encodeFunctionData("ownerOf", [tokenId]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -356,9 +357,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<boolean> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function supportsInterface(bytes4) view returns (bool)",
-        ]);
         const calldata = iface.encodeFunctionData("supportsInterface", [
           interfaceId,
         ]);
@@ -391,9 +389,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function symbol() view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("symbol", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -420,9 +415,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function tokenURI(uint256) view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("tokenURI", [tokenId]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -456,9 +448,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function approve(address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("approve", [to, tokenId]);
           const ethCallKey = makeEthCallKey({
             context: ethCallContext,
@@ -488,9 +477,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function safeTransferFrom(address,address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("safeTransferFrom", [
             from,
             to,
@@ -527,9 +513,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function safeTransferFrom(address,address,uint256,bytes) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("safeTransferFrom", [
             from,
             to,
@@ -565,9 +548,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function setApprovalForAll(address,bool) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("setApprovalForAll", [
             operator,
             _approved,
@@ -602,9 +582,6 @@ export class ERC721ContractView extends ContractView<ERC721> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transferFrom(address,address,uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("transferFrom", [
             from,
             to,

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

@@ -108,6 +108,20 @@ export type AllowanceCallTrace = TypedCallTrace<
 
 const templateContract = WETH9__factory.connect("0x0", DummyProvider);
 
+const iface = new Interface([
+  "function name() view returns (string)",
+  "function approve(address guy, uint256 wad) returns (bool)",
+  "function totalSupply() view returns (uint256)",
+  "function transferFrom(address src, address dst, uint256 wad) returns (bool)",
+  "function withdraw(uint256 wad) returns ()",
+  "function decimals() view returns (uint8)",
+  "function balanceOf(address) view returns (uint256)",
+  "function symbol() view returns (string)",
+  "function transfer(address dst, uint256 wad) returns (bool)",
+  "function deposit() payable returns ()",
+  "function allowance(address, address) view returns (uint256)",
+]);
+
 export class WETH9ContractView extends ContractView<WETH9> {
   constructor(contract: WETH9) {
     super(contract);
@@ -121,7 +135,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function name() view returns (string)"]);
         const calldata = iface.encodeFunctionData("name", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -147,9 +160,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function totalSupply() view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("totalSupply", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -177,9 +187,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function decimals() view returns (uint8)",
-        ]);
         const calldata = iface.encodeFunctionData("decimals", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -206,9 +213,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function balanceOf(address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("balanceOf", [arg0]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -237,9 +241,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<string> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function symbol() view returns (string)",
-        ]);
         const calldata = iface.encodeFunctionData("symbol", []);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -267,9 +268,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
   ): Promise<bigint> {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface([
-          "function allowance(address,address) view returns (uint256)",
-        ]);
         const calldata = iface.encodeFunctionData("allowance", [arg0, arg1]);
         const ethCallKey = makeEthCallKey({
           context: ethCallContext,
@@ -304,9 +302,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function approve(address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("approve", [guy, wad]);
           const ethCallKey = makeEthCallKey({
             context: ethCallContext,
@@ -336,9 +331,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transferFrom(address,address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("transferFrom", [
             src,
             dst,
@@ -372,9 +364,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function withdraw(uint256) nonpayable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("withdraw", [wad]);
           const ethCallKey = makeEthCallKey({
             context: ethCallContext,
@@ -405,9 +394,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<boolean> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function transfer(address,uint256) nonpayable returns (bool)",
-          ]);
           const calldata = iface.encodeFunctionData("transfer", [dst, wad]);
           const ethCallKey = makeEthCallKey({
             context: ethCallContext,
@@ -436,9 +422,6 @@ export class WETH9ContractView extends ContractView<WETH9> {
     ): Promise<void> {
       try {
         if (preparedData?.ethCallResults && ethCallContext) {
-          const iface = new Interface([
-            "function deposit() payable returns ()",
-          ]);
           const calldata = iface.encodeFunctionData("deposit", []);
           const ethCallKey = makeEthCallKey({
             context: ethCallContext,

package/src/eth/codegen/file.ts

@@ -13,6 +13,7 @@ import {
   generateBoundFunctionCallEncoders,
   generateBoundViewFunctions,
   generateFunctionCallEncoders,
+  generateFunctionSignatures,
   generateViewFunctions
 } from './function-calls.js'
 
@@ -30,6 +31,10 @@ export function codeGenSentioFile(contract: Contract): string {
   ${Object.values(contract.functions).map(codegenCallTraceTypes).join('\n')}
 
   const templateContract = ${contract.name}__factory.connect("0x0", DummyProvider)
+  
+  const iface = new Interface([${Object.values(contract.functions)
+    .filter((f) => !reservedKeywords.has(f[0].name))
+    .flatMap((fs) => generateFunctionSignatures(fs))}])
 
   export class ${contract.name}ContractView extends ContractView<${contract.name}> {
     constructor (contract: ${contract.name}) {

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

@@ -17,6 +17,10 @@ export function generateViewFunctions(view: boolean, functions: FunctionDeclarat
   return functions.flatMap((fn) => generateViewFunction(view, fn, includeArgTypes))
 }
 
+export function generateFunctionSignatures(functions: FunctionDeclaration[]): string[] {
+  return functions.map((fn) => `"function ${getFullSignatureWithOutputForFn(fn)}"`)
+}
+
 export function generateViewFunction(view: boolean, fn: FunctionDeclaration, includeArgTypes: boolean): string[] {
   const isView = fn.stateMutability === 'view' || fn.stateMutability === 'pure'
   if (view !== isView) {
@@ -41,7 +45,6 @@ export function generateViewFunction(view: boolean, fn: FunctionDeclaration, inc
   })}overrides?: Overrides, preparedData?: PreparedData, ethCallContext?: EthCallContext): ${generateReturnTypes(fn)} {
     try {
       if (preparedData?.ethCallResults && ethCallContext) {
-        const iface = new Interface(["function ${getFullSignatureWithOutputForFn(fn)}"])
         const calldata = iface.encodeFunctionData(
           "${fn.name}",[${
             fn.inputs.length > 0 ? fn.inputs.map((input, index) => input.name || `arg${index}`).join(',') + ',' : ''

package/src/eth/codegen/types.ts

@@ -1,10 +1,11 @@
 import {
   AbiOutputParameter,
   AbiParameter,
+  ArrayType,
+  EventArgDeclaration,
   EventDeclaration,
   FunctionDeclaration,
-  getArgumentForSignature,
-  getSignatureForFn
+  TupleType
 } from 'typechain'
 import { EvmType } from 'typechain/dist/parser/parseEvmType.js'
 
@@ -48,6 +49,13 @@ export function getFullSignatureForFunction(fn: FunctionDeclaration): string {
     .join(',')})`
 }
 
+export function getFullSignatureWithOutputForFn(fn: FunctionDeclaration) {
+  return `${fn.name}(${fn.inputs.map((i) => getArgumentForSignature(i)).join(', ')}) ${fn.stateMutability != 'nonpayable' ? fn.stateMutability + ' ' : ''}returns (${fn.outputs
+    .map((i) => getOutputArgumentForSignature(i))
+    .filter((s) => s != '')
+    .join(', ')})`
+}
+
 function getOutputArgumentForSignature(argument: AbiOutputParameter) {
   if (argument.type.type == 'void') {
     return ''
@@ -55,9 +63,26 @@ function getOutputArgumentForSignature(argument: AbiOutputParameter) {
   return getArgumentForSignature(argument as AbiParameter)
 }
 
-export function getFullSignatureWithOutputForFn(fn: FunctionDeclaration) {
-  return `${getSignatureForFn(fn)} ${fn.stateMutability} returns (${fn.outputs
-    .map((i) => getOutputArgumentForSignature(i))
-    .filter((s) => s != '')
-    .join(',')})`
+function getArgumentForSignature(argument: EventArgDeclaration | AbiParameter): string {
+  if (argument.type.originalType === 'tuple') {
+    return getTypeWithName(
+      `(${(argument.type as TupleType).components.map((i) => getArgumentForSignature(i)).join(', ')})`,
+      argument.name
+    )
+  } else if (argument.type.originalType.startsWith('tuple')) {
+    const arr = argument.type as ArrayType
+    return getTypeWithName(
+      `${getArgumentForSignature({
+        name: '',
+        type: arr.itemType
+      })}[${arr.size?.toString() || ''}]`,
+      argument.name
+    )
+  } else {
+    return getTypeWithName(argument.type.originalType, argument.name)
+  }
+}
+
+function getTypeWithName(type: string, name?: string) {
+  return (name ?? '').length > 0 ? `${type} ${name}` : type
 }

package/src/store/cache.ts

@@ -1,10 +1,6 @@
 import { ID } from './types.js'
 import type { Entity as EntityStruct } from '@sentio/protos'
 
-export interface Entity {
-  id: ID
-}
-
 export class LocalCache {
   private cache: Map<string, EntityStruct> = new Map()
 

package/src/store/codegen.ts

@@ -34,6 +34,7 @@ interface Class {
   name: string
   fields: Field[]
   annotations: string[]
+  parent?: string
   interfaces: string[]
 }
 
@@ -98,7 +99,7 @@ async function codegenInternal(schema: GraphQLSchema, source: string, target: st
     },
     {
       module: '@sentio/sdk/store',
-      types: ['Entity', 'Required', 'One', 'Many', 'Column', 'ListColumn']
+      types: ['Entity', 'Required', 'One', 'Many', 'Column', 'ListColumn', 'AbstractEntity']
     },
     {
       module: '@sentio/bigdecimal',
@@ -134,44 +135,60 @@ async function codegenInternal(schema: GraphQLSchema, source: string, target: st
       })
     }
   }
+
   for (const t of Object.values(schema.getTypeMap())) {
     if (t.name.startsWith('__')) {
       continue
     }
 
     if (t instanceof GraphQLObjectType) {
-      const fields: Field[] = []
-      for (const f of Object.values(t.getFields())) {
-        const type = genType(f.type)
-        const annotations: string[] = []
-        addTypeAnnotations(f.type, annotations)
-        if (isRelationType(f.type)) {
-          fields.push({
-            name: f.name,
-            type: `Promise<${type}>`,
-            annotations
-          })
-          const isMany = type.startsWith('Array')
-          fields.push({
-            name: f.name + 'ID' + (isMany ? 's' : ''),
-            type: isMany ? `Array<ID | undefined>` : `ID`,
-            annotations: []
-          })
-        } else {
-          fields.push({
+      if (isEntity(t)) {
+        const fields: Field[] = []
+        for (const f of Object.values(t.getFields())) {
+          const type = genType(f.type)
+          const annotations: string[] = []
+          addTypeAnnotations(f.type, annotations)
+          if (isRelationType(f.type)) {
+            fields.push({
+              name: f.name,
+              type: `Promise<${type}>`,
+              annotations
+            })
+            const isMany = type.startsWith('Array')
+            fields.push({
+              name: f.name + 'ID' + (isMany ? 's' : ''),
+              type: isMany ? `Array<ID | undefined>` : `ID`,
+              annotations: []
+            })
+          } else {
+            fields.push({
+              name: f.name,
+              optional: !f.type.toString().endsWith('!'),
+              type: type.replace(' | undefined', ''),
+              annotations
+            })
+          }
+        }
+        classes.push({
+          name: t.name,
+          fields,
+          annotations: [`@Entity("${t.name}")`],
+          parent: 'AbstractEntity',
+          interfaces: t.getInterfaces().map((i) => i.name)
+        })
+      } else {
+        classes.push({
+          name: t.name,
+          fields: Object.values(t.getFields()).map((f) => ({
             name: f.name,
             optional: !f.type.toString().endsWith('!'),
-            type: type.replace(' | undefined', ''),
-            annotations
-          })
-        }
+            type: genType(f.type).replace(' | undefined', ''),
+            annotations: []
+          })),
+          annotations: [],
+          interfaces: t.getInterfaces().map((i) => i.name)
+        })
       }
-      classes.push({
-        name: t.name,
-        fields,
-        annotations: [`@Entity("${t.name}")`],
-        interfaces: t.getInterfaces().map((i) => i.name)
-      })
     }
   }
 
@@ -201,13 +218,11 @@ ${classes
   .map(
     (c) => `
 ${c.annotations.join('\n')}
-export class ${c.name} ${c.interfaces.length > 0 ? `implements ${c.interfaces.join(', ')}` : ''} {
+export class ${c.name} ${c.parent ? `extends ${c.parent}` : ''} ${c.interfaces.length > 0 ? `implements ${c.interfaces.join(', ')}` : ''} {
 ${c.fields
   .map((f) => `${f.annotations.map((a) => `\n\t${a}`).join('')}\n\t${f.name}${f.optional ? '?' : ''}: ${f.type}`)
   .join('\n')}
-
-  constructor(data: Partial<${c.name}>) {}
-
+  ${c.annotations.some((a) => a.startsWith('@Entity')) ? `constructor(data: Partial<${c.name}>) {super()}` : ''}
 }`
   )
   .join('\n')}
@@ -256,3 +271,7 @@ function isRelationType(type: GraphQLOutputType): boolean {
     return false
   }
 }
+
+function isEntity(t: GraphQLObjectType) {
+  return t.astNode?.directives?.some((d) => d.name.value == 'entity')
+}

package/src/store/store.ts

@@ -1,19 +1,19 @@
 import { StoreContext } from './context.js'
 import { DatabaseSchema } from '../core/index.js'
 import { BigDecimal } from '@sentio/bigdecimal'
-import { Bytes, Float, ID, Int, Timestamp } from './types.js'
+import { AbstractEntity as Entity, Bytes, Float, ID, Int, Timestamp } from './types.js'
 import type { DBRequest, Entity as EntityStruct, RichValue } 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 { Entity, LocalCache } from './cache.js'
+import { LocalCache } from './cache.js'
 
 export interface EntityClass<T> {
   new (data: Partial<T>): T
 }
 
-function getEntityName<T>(entity: EntityClass<T> | T | string): string {
+export function getEntityName<T>(entity: EntityClass<T> | T | string): string {
   if (entity == null) {
     throw new Error("can't figure out entityName from undefined")
   }
@@ -182,7 +182,7 @@ export class Store {
 
   async list<T extends Entity, P extends keyof T, O extends Operators<T[P]>>(
     entity: EntityClass<T>,
-    filters: ListFilter<T, P, O>[],
+    filters?: ListFilter<T, P, O>[],
     cursor?: Cursor
   ) {
     if (cursor) {
@@ -191,7 +191,7 @@ export class Store {
       return response.entityList?.entities.map((data) => this.newEntity(entity, data)) || []
     }
     // TODO Array.fromAsync when upgrade to node 22
-    return this.fromAsync(this.listIterator(entity, filters))
+    return this.fromAsync(this.listIterator(entity, filters ?? []))
   }
 
   private async fromAsync<T>(gen: AsyncIterable<T>): Promise<T[]> {

package/src/store/types.ts

@@ -1,3 +1,7 @@
+import { RichStruct, RichValue } from '@sentio/protos'
+import { BigDecimalConverter, BigIntConverter } from './convert.js'
+import { getEntityName } from './store.js'
+
 export type ID = string | Uint8Array
 export type String = string
 export type Int = number
@@ -6,3 +10,56 @@ export type Boolean = boolean
 export type Timestamp = Date
 export type Bytes = Uint8Array
 export type BigInt = bigint
+
+export abstract class AbstractEntity {
+  abstract id: ID
+  private readonly _data: RichStruct
+
+  toJSON() {
+    const obj: any = {}
+
+    for (const [field, value] of Object.entries(this._data.fields)) {
+      obj[field] = toJSValue(value)
+    }
+    return obj
+  }
+
+  toString() {
+    const obj = this.toJSON()
+    return `${getEntityName(this)} ${JSON.stringify(obj)}`
+  }
+}
+
+function toJSValue(value: RichValue): any {
+  if (value.nullValue) {
+    return null
+  }
+  if (value.bytesValue) {
+    return value.bytesValue
+  }
+  if (value.stringValue) {
+    return value.stringValue
+  }
+  if (value.bigdecimalValue) {
+    return BigDecimalConverter.to(value)
+  }
+  if (value.bigintValue) {
+    return BigIntConverter.to(value)
+  }
+  if (value.boolValue) {
+    return value.boolValue
+  }
+  if (value.timestampValue) {
+    return value.timestampValue
+  }
+  if (value.floatValue) {
+    return value.floatValue
+  }
+  if (value.intValue) {
+    return value.intValue
+  }
+  if (value.listValue) {
+    return value.listValue.values.map(toJSValue)
+  }
+  throw new Error('Unknown value type:' + JSON.stringify(value))
+}