@sentio/sdk 2.40.1-rc.3 → 2.40.1-rc.5

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

@@ -194,10 +194,10 @@ const templateContract = EACAggregatorProxy__factory.connect(
 );
 
 const iface = new Interface([
-  "function acceptOwnership() nonpayable returns ()",
+  "function acceptOwnership() returns ()",
   "function accessController() view returns (address)",
   "function aggregator() view returns (address)",
-  "function confirmAggregator(address _aggregator) nonpayable returns ()",
+  "function confirmAggregator(address _aggregator) returns ()",
   "function decimals() view returns (uint8)",
   "function description() view returns (string)",
   "function getAnswer(uint256 _roundId) view returns (int256)",
@@ -210,12 +210,12 @@ const iface = new Interface([
   "function owner() view returns (address)",
   "function phaseAggregators(uint16) view returns (address)",
   "function phaseId() view returns (uint16)",
-  "function proposeAggregator(address _aggregator) nonpayable returns ()",
+  "function proposeAggregator(address _aggregator) returns ()",
   "function proposedAggregator() view returns (address)",
   "function proposedGetRoundData(uint80 _roundId) view returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)",
   "function proposedLatestRoundData() view returns (uint80 roundId, int256 answer, uint256 startedAt, uint256 updatedAt, uint80 answeredInRound)",
-  "function setController(address _accessController) nonpayable returns ()",
-  "function transferOwnership(address _to) nonpayable returns ()",
+  "function setController(address _accessController) returns ()",
+  "function transferOwnership(address _to) returns ()",
   "function version() view returns (uint256)",
 ]);
 

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

@@ -125,9 +125,9 @@ const iface = new Interface([
   "function balanceOf(address account, uint256 id) view returns (uint256)",
   "function balanceOfBatch(address[] accounts, uint256[] ids) view returns (uint256[])",
   "function isApprovedForAll(address account, address operator) view returns (bool)",
-  "function safeBatchTransferFrom(address from, address to, uint256[] ids, uint256[] amounts, bytes data) nonpayable returns ()",
-  "function safeTransferFrom(address from, address to, uint256 id, uint256 amount, bytes data) nonpayable returns ()",
-  "function setApprovalForAll(address operator, bool approved) nonpayable returns ()",
+  "function safeBatchTransferFrom(address from, address to, uint256[] ids, uint256[] amounts, bytes data) returns ()",
+  "function safeTransferFrom(address from, address to, uint256 id, uint256 amount, bytes data) returns ()",
+  "function setApprovalForAll(address operator, bool approved) returns ()",
   "function supportsInterface(bytes4 interfaceId) view returns (bool)",
   "function uri(uint256 id) view returns (string)",
 ]);

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

@@ -169,23 +169,23 @@ const templateContract = ERC20__factory.connect("0x0", DummyProvider);
 
 const iface = new Interface([
   "function allowance(address owner, address spender) view returns (uint256)",
-  "function approve(address spender, uint256 amount) nonpayable returns (bool)",
+  "function approve(address spender, uint256 amount) returns (bool)",
   "function balanceOf(address account) view returns (uint256)",
-  "function burn(uint256 amount) nonpayable returns ()",
-  "function burnFrom(address account, uint256 amount) nonpayable returns ()",
+  "function burn(uint256 amount) returns ()",
+  "function burnFrom(address account, uint256 amount) returns ()",
   "function decimals() view returns (uint8)",
-  "function decreaseAllowance(address spender, uint256 subtractedValue) nonpayable returns (bool)",
-  "function increaseAllowance(address spender, uint256 addedValue) nonpayable returns (bool)",
+  "function decreaseAllowance(address spender, uint256 subtractedValue) returns (bool)",
+  "function increaseAllowance(address spender, uint256 addedValue) returns (bool)",
   "function locker() view returns (address)",
   "function name() view returns (string)",
   "function owner() view returns (address)",
-  "function renounceOwnership() nonpayable returns ()",
-  "function setLocker(address _locker) nonpayable returns ()",
+  "function renounceOwnership() returns ()",
+  "function setLocker(address _locker) returns ()",
   "function symbol() view returns (string)",
   "function totalSupply() view returns (uint256)",
-  "function transfer(address recipient, uint256 amount) nonpayable returns (bool)",
-  "function transferFrom(address sender, address recipient, uint256 amount) nonpayable returns (bool)",
-  "function transferOwnership(address newOwner) nonpayable returns ()",
+  "function transfer(address recipient, uint256 amount) returns (bool)",
+  "function transferFrom(address sender, address recipient, uint256 amount) returns (bool)",
+  "function transferOwnership(address newOwner) returns ()",
 ]);
 
 export class ERC20ContractView extends ContractView<ERC20> {

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

@@ -101,13 +101,13 @@ const templateContract = ERC20Bytes__factory.connect("0x0", DummyProvider);
 
 const iface = new Interface([
   "function name() view returns (bytes32)",
-  "function approve(address spender, uint256 value) nonpayable returns (bool)",
+  "function approve(address spender, uint256 value) returns (bool)",
   "function totalSupply() view returns (uint256)",
-  "function transferFrom(address from, address to, uint256 value) nonpayable returns (bool)",
+  "function transferFrom(address from, address to, uint256 value) returns (bool)",
   "function decimals() view returns (uint8)",
   "function balanceOf(address who) view returns (uint256)",
   "function symbol() view returns (bytes32)",
-  "function transfer(address to, uint256 value) nonpayable returns (bool)",
+  "function transfer(address to, uint256 value) returns (bool)",
   "function allowance(address owner, address spender) view returns (uint256)",
 ]);
 

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

@@ -152,20 +152,20 @@ export type TransferFromCallTrace = TypedCallTrace<
 const templateContract = ERC721__factory.connect("0x0", DummyProvider);
 
 const iface = new Interface([
-  "function approve(address to, uint256 tokenId) nonpayable returns ()",
+  "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) nonpayable returns ()",
-  "function safeTransferFrom(address from, address to, uint256 tokenId, bytes data) nonpayable returns ()",
-  "function setApprovalForAll(address operator, bool _approved) nonpayable returns ()",
+  "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) nonpayable returns ()",
+  "function transferFrom(address from, address to, uint256 tokenId) returns ()",
 ]);
 
 export class ERC721ContractView extends ContractView<ERC721> {

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

@@ -110,14 +110,14 @@ const templateContract = WETH9__factory.connect("0x0", DummyProvider);
 
 const iface = new Interface([
   "function name() view returns (string)",
-  "function approve(address guy, uint256 wad) nonpayable returns (bool)",
+  "function approve(address guy, uint256 wad) returns (bool)",
   "function totalSupply() view returns (uint256)",
-  "function transferFrom(address src, address dst, uint256 wad) nonpayable returns (bool)",
-  "function withdraw(uint256 wad) nonpayable returns ()",
+  "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) nonpayable returns (bool)",
+  "function transfer(address dst, uint256 wad) returns (bool)",
   "function deposit() payable returns ()",
   "function allowance(address, address) view returns (uint256)",
 ]);

package/src/eth/codegen/types.ts

@@ -50,7 +50,7 @@ export function getFullSignatureForFunction(fn: FunctionDeclaration): string {
 }
 
 export function getFullSignatureWithOutputForFn(fn: FunctionDeclaration) {
-  return `${fn.name}(${fn.inputs.map((i) => getArgumentForSignature(i)).join(', ')}) ${fn.stateMutability} returns (${fn.outputs
+  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(', ')})`

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))
+}