Implement queries for multiple return type eth_calls (#12)

* Implement multiple return type for ConditionalStarRelease eth_call

* Generate ConditionalStarRelease watcher from codegen handling multiple return type

* Generate azimuth watcher from codegen handling multiple return type

* Upgrade watcher-ts package versions

packages/conditional-star-release-watcher/README.md

@@ -1,11 +1,5 @@
 # conditional-star-release-watcher
 
-## Currently unsupported queries
-
-The watcher was generated in `eth_call` mode and does not support the following queries in its current state:
-
-* `getConditionsState() returns (bytes32[] conds, uint256[] lives, uint256[] deads, uint256[] times)`
-
 ## Setup
 
 * Run the following command to install required packages:

packages/conditional-star-release-watcher/package.json

@@ -39,10 +39,10 @@
   "dependencies": {
     "@apollo/client": "^3.3.19",
     "@ethersproject/providers": "^5.4.4",
-    "@cerc-io/cli": "^0.2.39",
-    "@cerc-io/ipld-eth-client": "^0.2.39",
-    "@cerc-io/solidity-mapper": "^0.2.39",
-    "@cerc-io/util": "^0.2.39",
+    "@cerc-io/cli": "^0.2.40",
+    "@cerc-io/ipld-eth-client": "^0.2.40",
+    "@cerc-io/solidity-mapper": "^0.2.40",
+    "@cerc-io/util": "^0.2.40",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",
     "ethers": "^5.4.4",

packages/conditional-star-release-watcher/src/client.ts

@@ -26,6 +26,15 @@ export class Client {
     return isActive;
   }
 
+  async getGetKeys (blockHash: string, contractAddress: string, _point: bigint): Promise<any> {
+    const { getKeys } = await this._client.query(
+      gql(queries.getKeys),
+      { blockHash, contractAddress, _point }
+    );
+
+    return getKeys;
+  }
+
   async getGetKeyRevisionNumber (blockHash: string, contractAddress: string, _point: bigint): Promise<any> {
     const { getKeyRevisionNumber } = await this._client.query(
       gql(queries.getKeyRevisionNumber),

packages/conditional-star-release-watcher/src/database.ts

@@ -21,6 +21,7 @@ import { StateSyncStatus } from './entity/StateSyncStatus';
 import { BlockProgress } from './entity/BlockProgress';
 import { State } from './entity/State';
 import { IsActive } from './entity/IsActive';
+import { GetKeys } from './entity/GetKeys';
 import { GetKeyRevisionNumber } from './entity/GetKeyRevisionNumber';
 import { HasBeenLinked } from './entity/HasBeenLinked';
 import { IsLive } from './entity/IsLive';
@@ -80,7 +81,7 @@ import { GetBatch } from './entity/GetBatch';
 import { GetWithdrawnFromBatch } from './entity/GetWithdrawnFromBatch';
 import { HasForfeitedBatch } from './entity/HasForfeitedBatch';
 
-export const ENTITIES = [IsActive, GetKeyRevisionNumber, HasBeenLinked, IsLive, GetContinuityNumber, GetSpawnCount, HasSponsor, GetSponsor, IsSponsor, GetSponsoringCount, IsEscaping, GetEscapeRequest, IsRequestingEscapeTo, GetEscapeRequestsCount, GetOwner, IsOwner, GetOwnedPointCount, GetOwnedPointAtIndex, GetManagementProxy, IsManagementProxy, CanManage, GetManagerForCount, GetSpawnProxy, IsSpawnProxy, CanSpawnAs, GetSpawningForCount, GetVotingProxy, IsVotingProxy, CanVoteAs, GetVotingForCount, GetTransferProxy, IsTransferProxy, CanTransfer, GetTransferringForCount, IsOperator, GetUpgradeProposalCount, GetDocumentProposalCount, HasVotedOnUpgradePoll, HasVotedOnDocumentPoll, FindClaim, SupportsInterface, BalanceOf, OwnerOf, Exists, GetApproved, IsApprovedForAll, TotalSupply, TokenOfOwnerByIndex, TokenByIndex, Name, Symbol, TokenURI, GetSpawnLimit, CanEscapeTo, WithdrawLimit, VerifyBalance, GetBatch, GetWithdrawnFromBatch, HasForfeitedBatch];
+export const ENTITIES = [IsActive, GetKeys, GetKeyRevisionNumber, HasBeenLinked, IsLive, GetContinuityNumber, GetSpawnCount, HasSponsor, GetSponsor, IsSponsor, GetSponsoringCount, IsEscaping, GetEscapeRequest, IsRequestingEscapeTo, GetEscapeRequestsCount, GetOwner, IsOwner, GetOwnedPointCount, GetOwnedPointAtIndex, GetManagementProxy, IsManagementProxy, CanManage, GetManagerForCount, GetSpawnProxy, IsSpawnProxy, CanSpawnAs, GetSpawningForCount, GetVotingProxy, IsVotingProxy, CanVoteAs, GetVotingForCount, GetTransferProxy, IsTransferProxy, CanTransfer, GetTransferringForCount, IsOperator, GetUpgradeProposalCount, GetDocumentProposalCount, HasVotedOnUpgradePoll, HasVotedOnDocumentPoll, FindClaim, SupportsInterface, BalanceOf, OwnerOf, Exists, GetApproved, IsApprovedForAll, TotalSupply, TokenOfOwnerByIndex, TokenByIndex, Name, Symbol, TokenURI, GetSpawnLimit, CanEscapeTo, WithdrawLimit, VerifyBalance, GetBatch, GetWithdrawnFromBatch, HasForfeitedBatch];
 
 export class Database implements DatabaseInterface {
   _config: ConnectionOptions;
@@ -122,6 +123,15 @@ export class Database implements DatabaseInterface {
       });
   }
 
+  async getGetKeys ({ blockHash, contractAddress, _point }: { blockHash: string, contractAddress: string, _point: bigint }): Promise<GetKeys | undefined> {
+    return this._conn.getRepository(GetKeys)
+      .findOne({
+        blockHash,
+        contractAddress,
+        _point
+      });
+  }
+
   async getGetKeyRevisionNumber ({ blockHash, contractAddress, _point }: { blockHash: string, contractAddress: string, _point: bigint }): Promise<GetKeyRevisionNumber | undefined> {
     return this._conn.getRepository(GetKeyRevisionNumber)
       .findOne({
@@ -671,6 +681,12 @@ export class Database implements DatabaseInterface {
     return repo.save(entity);
   }
 
+  async saveGetKeys ({ blockHash, blockNumber, contractAddress, _point, value, proof }: DeepPartial<GetKeys>): Promise<GetKeys> {
+    const repo = this._conn.getRepository(GetKeys);
+    const entity = repo.create({ blockHash, blockNumber, contractAddress, _point, value, proof });
+    return repo.save(entity);
+  }
+
   async saveGetKeyRevisionNumber ({ blockHash, blockNumber, contractAddress, _point, value, proof }: DeepPartial<GetKeyRevisionNumber>): Promise<GetKeyRevisionNumber> {
     const repo = this._conn.getRepository(GetKeyRevisionNumber);
     const entity = repo.create({ blockHash, blockNumber, contractAddress, _point, value, proof });
@@ -1226,6 +1242,7 @@ export class Database implements DatabaseInterface {
 
   _setPropColMaps (): void {
     this._propColMaps.IsActive = this._getPropertyColumnMapForEntity('IsActive');
+    this._propColMaps.GetKeys = this._getPropertyColumnMapForEntity('GetKeys');
     this._propColMaps.GetKeyRevisionNumber = this._getPropertyColumnMapForEntity('GetKeyRevisionNumber');
     this._propColMaps.HasBeenLinked = this._getPropertyColumnMapForEntity('HasBeenLinked');
     this._propColMaps.IsLive = this._getPropertyColumnMapForEntity('IsLive');

packages/conditional-star-release-watcher/src/entity/GetKeys.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2021 Vulcanize, Inc.
+//
+
+import { Entity, PrimaryGeneratedColumn, Column, Index } from 'typeorm';
+import { bigintTransformer } from '@cerc-io/util';
+
+@Entity()
+@Index(['blockHash', 'contractAddress', '_point'], { unique: true })
+export class GetKeys {
+  @PrimaryGeneratedColumn()
+    id!: number;
+
+  @Column('varchar', { length: 66 })
+    blockHash!: string;
+
+  @Column('integer')
+    blockNumber!: number;
+
+  @Column('varchar', { length: 42 })
+    contractAddress!: string;
+
+  @Column('numeric', { transformer: bigintTransformer })
+    _point!: bigint;
+
+  @Column('varchar')
+    value!: string;
+
+  @Column('text', { nullable: true })
+    proof!: string;
+}

packages/conditional-star-release-watcher/src/gql/queries/getConditionsState.gql

@@ -0,0 +1,13 @@
+query getConditionsState($blockHash: String!, $contractAddress: String!){
+    getConditionsState(blockHash: $blockHash, contractAddress: $contractAddress){
+        value{
+            value0
+            value1
+            value2
+            value3
+        }
+        proof{
+            data
+        }
+    }
+}

packages/conditional-star-release-watcher/src/gql/queries/getKeys.gql

@@ -0,0 +1,13 @@
+query getKeys($blockHash: String!, $contractAddress: String!, $_point: BigInt!){
+    getKeys(blockHash: $blockHash, contractAddress: $contractAddress, _point: $_point){
+        value{
+            value0
+            value1
+            value2
+            value3
+        }
+        proof{
+            data
+        }
+    }
+}

packages/conditional-star-release-watcher/src/gql/queries/index.ts

@@ -4,6 +4,7 @@ import path from 'path';
 export const events = fs.readFileSync(path.join(__dirname, 'events.gql'), 'utf8');
 export const eventsInRange = fs.readFileSync(path.join(__dirname, 'eventsInRange.gql'), 'utf8');
 export const isActive = fs.readFileSync(path.join(__dirname, 'isActive.gql'), 'utf8');
+export const getKeys = fs.readFileSync(path.join(__dirname, 'getKeys.gql'), 'utf8');
 export const getKeyRevisionNumber = fs.readFileSync(path.join(__dirname, 'getKeyRevisionNumber.gql'), 'utf8');
 export const hasBeenLinked = fs.readFileSync(path.join(__dirname, 'hasBeenLinked.gql'), 'utf8');
 export const isLive = fs.readFileSync(path.join(__dirname, 'isLive.gql'), 'utf8');
@@ -77,6 +78,7 @@ export const getWithdrawnFromBatch = fs.readFileSync(path.join(__dirname, 'getWi
 export const getForfeited = fs.readFileSync(path.join(__dirname, 'getForfeited.gql'), 'utf8');
 export const hasForfeitedBatch = fs.readFileSync(path.join(__dirname, 'hasForfeitedBatch.gql'), 'utf8');
 export const getRemainingStars = fs.readFileSync(path.join(__dirname, 'getRemainingStars.gql'), 'utf8');
+export const getConditionsState = fs.readFileSync(path.join(__dirname, 'getConditionsState.gql'), 'utf8');
 export const getSyncStatus = fs.readFileSync(path.join(__dirname, 'getSyncStatus.gql'), 'utf8');
 export const getStateByCID = fs.readFileSync(path.join(__dirname, 'getStateByCID.gql'), 'utf8');
 export const getState = fs.readFileSync(path.join(__dirname, 'getState.gql'), 'utf8');

packages/conditional-star-release-watcher/src/indexer.ts

@@ -113,8 +113,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isActive(_point, { blockTag: blockHash });
+    const contractResult = await contract.isActive(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsActive({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -122,6 +123,27 @@ export class Indexer implements IndexerInterface {
     return result;
   }
 
+  async getKeys (blockHash: string, contractAddress: string, _point: bigint): Promise<ValueResult> {
+    log('getKeys: db miss, fetching from upstream server');
+
+    const abi = this._abiMap.get(KIND_CONDITIONALSTARRELEASE);
+    assert(abi);
+
+    const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
+    const contractResult = await contract.getKeys(_point, { blockTag: blockHash });
+
+    const value = {
+      value0: contractResult[0],
+      value1: contractResult[1],
+      value2: ethers.BigNumber.from(contractResult[2]).toBigInt(),
+      value3: ethers.BigNumber.from(contractResult[3]).toBigInt()
+    };
+
+    const result: ValueResult = { value };
+
+    return result;
+  }
+
   async getKeyRevisionNumber (blockHash: string, contractAddress: string, _point: bigint): Promise<ValueResult> {
     const entity = await this._db.getGetKeyRevisionNumber({ blockHash, contractAddress, _point });
     if (entity) {
@@ -142,9 +164,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getKeyRevisionNumber(_point, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getKeyRevisionNumber(_point, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -173,8 +195,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.hasBeenLinked(_point, { blockTag: blockHash });
+    const contractResult = await contract.hasBeenLinked(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveHasBeenLinked({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -202,8 +225,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isLive(_point, { blockTag: blockHash });
+    const contractResult = await contract.isLive(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsLive({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -231,9 +255,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getContinuityNumber(_point, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getContinuityNumber(_point, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -262,9 +286,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSpawnCount(_point, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getSpawnCount(_point, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -280,9 +304,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSpawned(_point, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getSpawned(_point, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -308,8 +332,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.hasSponsor(_point, { blockTag: blockHash });
+    const contractResult = await contract.hasSponsor(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveHasSponsor({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -337,9 +362,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSponsor(_point, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getSponsor(_point, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -368,8 +393,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isSponsor(_point, _sponsor, { blockTag: blockHash });
+    const contractResult = await contract.isSponsor(_point, _sponsor, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsSponsor({ blockHash, blockNumber, contractAddress, _point, _sponsor, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -397,9 +423,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSponsoringCount(_sponsor, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getSponsoringCount(_sponsor, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -415,9 +441,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSponsoring(_sponsor, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getSponsoring(_sponsor, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -443,8 +469,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isEscaping(_point, { blockTag: blockHash });
+    const contractResult = await contract.isEscaping(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsEscaping({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -472,9 +499,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getEscapeRequest(_point, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getEscapeRequest(_point, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -503,8 +530,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isRequestingEscapeTo(_point, _sponsor, { blockTag: blockHash });
+    const contractResult = await contract.isRequestingEscapeTo(_point, _sponsor, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsRequestingEscapeTo({ blockHash, blockNumber, contractAddress, _point, _sponsor, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -532,9 +560,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getEscapeRequestsCount(_sponsor, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getEscapeRequestsCount(_sponsor, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -550,9 +578,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getEscapeRequests(_sponsor, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getEscapeRequests(_sponsor, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -578,8 +606,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getOwner(_point, { blockTag: blockHash });
+    const contractResult = await contract.getOwner(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetOwner({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -607,8 +636,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isOwner(_point, _address, { blockTag: blockHash });
+    const contractResult = await contract.isOwner(_point, _address, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsOwner({ blockHash, blockNumber, contractAddress, _point, _address, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -636,9 +666,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getOwnedPointCount(_whose, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getOwnedPointCount(_whose, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -654,9 +684,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getOwnedPoints(_whose, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getOwnedPoints(_whose, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -682,9 +712,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getOwnedPointAtIndex(_whose, _index, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getOwnedPointAtIndex(_whose, _index, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -713,8 +743,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getManagementProxy(_point, { blockTag: blockHash });
+    const contractResult = await contract.getManagementProxy(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetManagementProxy({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -742,8 +773,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isManagementProxy(_point, _proxy, { blockTag: blockHash });
+    const contractResult = await contract.isManagementProxy(_point, _proxy, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsManagementProxy({ blockHash, blockNumber, contractAddress, _point, _proxy, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -771,8 +803,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.canManage(_point, _who, { blockTag: blockHash });
+    const contractResult = await contract.canManage(_point, _who, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveCanManage({ blockHash, blockNumber, contractAddress, _point, _who, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -800,9 +833,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getManagerForCount(_proxy, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getManagerForCount(_proxy, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -818,9 +851,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getManagerFor(_proxy, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getManagerFor(_proxy, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -846,8 +879,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getSpawnProxy(_point, { blockTag: blockHash });
+    const contractResult = await contract.getSpawnProxy(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetSpawnProxy({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -875,8 +909,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isSpawnProxy(_point, _proxy, { blockTag: blockHash });
+    const contractResult = await contract.isSpawnProxy(_point, _proxy, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsSpawnProxy({ blockHash, blockNumber, contractAddress, _point, _proxy, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -904,8 +939,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.canSpawnAs(_point, _who, { blockTag: blockHash });
+    const contractResult = await contract.canSpawnAs(_point, _who, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveCanSpawnAs({ blockHash, blockNumber, contractAddress, _point, _who, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -933,9 +969,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSpawningForCount(_proxy, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getSpawningForCount(_proxy, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -951,9 +987,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSpawningFor(_proxy, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getSpawningFor(_proxy, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -979,8 +1015,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getVotingProxy(_point, { blockTag: blockHash });
+    const contractResult = await contract.getVotingProxy(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetVotingProxy({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1008,8 +1045,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isVotingProxy(_point, _proxy, { blockTag: blockHash });
+    const contractResult = await contract.isVotingProxy(_point, _proxy, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsVotingProxy({ blockHash, blockNumber, contractAddress, _point, _proxy, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1037,8 +1075,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.canVoteAs(_point, _who, { blockTag: blockHash });
+    const contractResult = await contract.canVoteAs(_point, _who, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveCanVoteAs({ blockHash, blockNumber, contractAddress, _point, _who, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1066,9 +1105,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getVotingForCount(_proxy, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getVotingForCount(_proxy, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1084,9 +1123,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getVotingFor(_proxy, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getVotingFor(_proxy, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -1112,8 +1151,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getTransferProxy(_point, { blockTag: blockHash });
+    const contractResult = await contract.getTransferProxy(_point, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetTransferProxy({ blockHash, blockNumber, contractAddress, _point, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1141,8 +1181,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isTransferProxy(_point, _proxy, { blockTag: blockHash });
+    const contractResult = await contract.isTransferProxy(_point, _proxy, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsTransferProxy({ blockHash, blockNumber, contractAddress, _point, _proxy, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1170,8 +1211,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.canTransfer(_point, _who, { blockTag: blockHash });
+    const contractResult = await contract.canTransfer(_point, _who, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveCanTransfer({ blockHash, blockNumber, contractAddress, _point, _who, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1199,9 +1241,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getTransferringForCount(_proxy, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getTransferringForCount(_proxy, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1217,9 +1259,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getTransferringFor(_proxy, { blockTag: blockHash });
-    value = value.map((val: ethers.BigNumber) => ethers.BigNumber.from(val).toBigInt());
+    const contractResult = await contract.getTransferringFor(_proxy, { blockTag: blockHash });
 
+    const value = contractResult.map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt());
     const result: ValueResult = { value };
 
     return result;
@@ -1245,8 +1287,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isOperator(_owner, _operator, { blockTag: blockHash });
+    const contractResult = await contract.isOperator(_owner, _operator, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsOperator({ blockHash, blockNumber, contractAddress, _owner, _operator, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1261,8 +1304,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getUpgradeProposals({ blockTag: blockHash });
+    const contractResult = await contract.getUpgradeProposals({ blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -1288,9 +1332,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getUpgradeProposalCount({ blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getUpgradeProposalCount({ blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1306,8 +1350,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getDocumentProposals({ blockTag: blockHash });
+    const contractResult = await contract.getDocumentProposals({ blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -1333,9 +1378,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getDocumentProposalCount({ blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getDocumentProposalCount({ blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1351,8 +1396,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getDocumentMajorities({ blockTag: blockHash });
+    const contractResult = await contract.getDocumentMajorities({ blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -1378,8 +1424,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.hasVotedOnUpgradePoll(_galaxy, _proposal, { blockTag: blockHash });
+    const contractResult = await contract.hasVotedOnUpgradePoll(_galaxy, _proposal, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveHasVotedOnUpgradePoll({ blockHash, blockNumber, contractAddress, _galaxy, _proposal, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1407,8 +1454,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.hasVotedOnDocumentPoll(_galaxy, _proposal, { blockTag: blockHash });
+    const contractResult = await contract.hasVotedOnDocumentPoll(_galaxy, _proposal, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveHasVotedOnDocumentPoll({ blockHash, blockNumber, contractAddress, _galaxy, _proposal, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1436,8 +1484,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.findClaim(_whose, _protocol, _claim, { blockTag: blockHash });
+    const contractResult = await contract.findClaim(_whose, _protocol, _claim, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveFindClaim({ blockHash, blockNumber, contractAddress, _whose, _protocol, _claim, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1465,8 +1514,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.supportsInterface(_interfaceId, { blockTag: blockHash });
+    const contractResult = await contract.supportsInterface(_interfaceId, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveSupportsInterface({ blockHash, blockNumber, contractAddress, _interfaceId, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1494,9 +1544,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.balanceOf(_owner, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.balanceOf(_owner, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1525,8 +1575,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.ownerOf(_tokenId, { blockTag: blockHash });
+    const contractResult = await contract.ownerOf(_tokenId, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveOwnerOf({ blockHash, blockNumber, contractAddress, _tokenId, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1554,8 +1605,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.exists(_tokenId, { blockTag: blockHash });
+    const contractResult = await contract.exists(_tokenId, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveExists({ blockHash, blockNumber, contractAddress, _tokenId, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1583,8 +1635,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getApproved(_tokenId, { blockTag: blockHash });
+    const contractResult = await contract.getApproved(_tokenId, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetApproved({ blockHash, blockNumber, contractAddress, _tokenId, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1612,8 +1665,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.isApprovedForAll(_owner, _operator, { blockTag: blockHash });
+    const contractResult = await contract.isApprovedForAll(_owner, _operator, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveIsApprovedForAll({ blockHash, blockNumber, contractAddress, _owner, _operator, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1641,9 +1695,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.totalSupply({ blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.totalSupply({ blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1672,9 +1726,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.tokenOfOwnerByIndex(_owner, _index, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.tokenOfOwnerByIndex(_owner, _index, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1703,9 +1757,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.tokenByIndex(_index, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.tokenByIndex(_index, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1734,8 +1788,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.name({ blockTag: blockHash });
+    const contractResult = await contract.name({ blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveName({ blockHash, blockNumber, contractAddress, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1763,8 +1818,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.symbol({ blockTag: blockHash });
+    const contractResult = await contract.symbol({ blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveSymbol({ blockHash, blockNumber, contractAddress, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1792,8 +1848,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.tokenURI(_tokenId, { blockTag: blockHash });
+    const contractResult = await contract.tokenURI(_tokenId, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveTokenURI({ blockHash, blockNumber, contractAddress, _tokenId, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1821,9 +1878,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    let value = await contract.getSpawnLimit(_point, _time, { blockTag: blockHash });
-    value = value.toString();
-    value = BigInt(value);
+    const contractResult = await contract.getSpawnLimit(_point, _time, { blockTag: blockHash });
+
+    const value = ethers.BigNumber.from(contractResult).toBigInt();
 
     const result: ValueResult = { value };
 
@@ -1852,8 +1909,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.canEscapeTo(_point, _sponsor, { blockTag: blockHash });
+    const contractResult = await contract.canEscapeTo(_point, _sponsor, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveCanEscapeTo({ blockHash, blockNumber, contractAddress, _point, _sponsor, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1881,8 +1939,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.withdrawLimit(_participant, _batch, { blockTag: blockHash });
+    const contractResult = await contract.withdrawLimit(_participant, _batch, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveWithdrawLimit({ blockHash, blockNumber, contractAddress, _participant, _batch, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1910,8 +1969,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.verifyBalance(_participant, { blockTag: blockHash });
+    const contractResult = await contract.verifyBalance(_participant, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveVerifyBalance({ blockHash, blockNumber, contractAddress, _participant, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1926,8 +1986,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getBatches(_participant, { blockTag: blockHash });
+    const contractResult = await contract.getBatches(_participant, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -1953,8 +2014,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getBatch(_participant, _batch, { blockTag: blockHash });
+    const contractResult = await contract.getBatch(_participant, _batch, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetBatch({ blockHash, blockNumber, contractAddress, _participant, _batch, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -1969,8 +2031,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getWithdrawn(_participant, { blockTag: blockHash });
+    const contractResult = await contract.getWithdrawn(_participant, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -1996,8 +2059,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getWithdrawnFromBatch(_participant, _batch, { blockTag: blockHash });
+    const contractResult = await contract.getWithdrawnFromBatch(_participant, _batch, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveGetWithdrawnFromBatch({ blockHash, blockNumber, contractAddress, _participant, _batch, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -2012,8 +2076,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getForfeited(_participant, { blockTag: blockHash });
+    const contractResult = await contract.getForfeited(_participant, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     return result;
@@ -2039,8 +2104,9 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.hasForfeitedBatch(_participant, _batch, { blockTag: blockHash });
+    const contractResult = await contract.hasForfeitedBatch(_participant, _batch, { blockTag: blockHash });
 
+    const value = contractResult;
     const result: ValueResult = { value };
 
     await this._db.saveHasForfeitedBatch({ blockHash, blockNumber, contractAddress, _participant, _batch, value: result.value, proof: JSONbigNative.stringify(result.proof) });
@@ -2055,7 +2121,29 @@ export class Indexer implements IndexerInterface {
     assert(abi);
 
     const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
-    const value = await contract.getRemainingStars(_participant, { blockTag: blockHash });
+    const contractResult = await contract.getRemainingStars(_participant, { blockTag: blockHash });
+
+    const value = contractResult;
+    const result: ValueResult = { value };
+
+    return result;
+  }
+
+  async getConditionsState (blockHash: string, contractAddress: string): Promise<ValueResult> {
+    log('getConditionsState: db miss, fetching from upstream server');
+
+    const abi = this._abiMap.get(KIND_CONDITIONALSTARRELEASE);
+    assert(abi);
+
+    const contract = new ethers.Contract(contractAddress, abi, this._ethProvider);
+    const contractResult = await contract.getConditionsState({ blockTag: blockHash });
+
+    const value = {
+      value0: contractResult[0],
+      value1: contractResult[1].map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt()),
+      value2: contractResult[2].map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt()),
+      value3: contractResult[3].map((val: ethers.BigNumber | number) => ethers.BigNumber.from(val).toBigInt())
+    };
 
     const result: ValueResult = { value };
 

packages/conditional-star-release-watcher/src/resolvers.ts

@@ -90,6 +90,24 @@ export const createResolvers = async (indexerArg: IndexerInterface, eventWatcher
         return indexer.isActive(blockHash, contractAddress, _point);
       },
 
+      getKeys: (
+        _: any,
+        { blockHash, contractAddress, _point }: { blockHash: string, contractAddress: string, _point: bigint },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        __: any,
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        info: GraphQLResolveInfo
+      ): Promise<ValueResult> => {
+        log('getKeys', blockHash, contractAddress, _point);
+        gqlTotalQueryCount.inc(1);
+        gqlQueryCount.labels('getKeys').inc(1);
+
+        // Set cache-control hints
+        // setGQLCacheHints(info, {}, gqlCacheConfig);
+
+        return indexer.getKeys(blockHash, contractAddress, _point);
+      },
+
       getKeyRevisionNumber: (
         _: any,
         { blockHash, contractAddress, _point }: { blockHash: string, contractAddress: string, _point: bigint },
@@ -1404,6 +1422,24 @@ export const createResolvers = async (indexerArg: IndexerInterface, eventWatcher
         return indexer.getRemainingStars(blockHash, contractAddress, _participant);
       },
 
+      getConditionsState: (
+        _: any,
+        { blockHash, contractAddress }: { blockHash: string, contractAddress: string },
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        __: any,
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        info: GraphQLResolveInfo
+      ): Promise<ValueResult> => {
+        log('getConditionsState', blockHash, contractAddress);
+        gqlTotalQueryCount.inc(1);
+        gqlQueryCount.labels('getConditionsState').inc(1);
+
+        // Set cache-control hints
+        // setGQLCacheHints(info, {}, gqlCacheConfig);
+
+        return indexer.getConditionsState(blockHash, contractAddress);
+      },
+
       events: async (_: any, { blockHash, contractAddress, name }: { blockHash: string, contractAddress: string, name?: string }) => {
         log('events', blockHash, contractAddress, name);
         gqlTotalQueryCount.inc(1);

packages/conditional-star-release-watcher/src/schema.gql

@@ -66,6 +66,18 @@ type ResultBoolean {
   proof: Proof
 }
 
+type ResultGetKeysType {
+  value: GetKeysType!
+  proof: Proof
+}
+
+type GetKeysType {
+  value0: String!
+  value1: String!
+  value2: BigInt!
+  value3: BigInt!
+}
+
 type ResultBigInt {
   value: BigInt!
   proof: Proof
@@ -101,6 +113,18 @@ type ResultBooleanArray {
   proof: Proof
 }
 
+type ResultGetConditionsStateType {
+  value: GetConditionsStateType!
+  proof: Proof
+}
+
+type GetConditionsStateType {
+  value0: [String!]!
+  value1: [BigInt!]!
+  value2: [BigInt!]!
+  value3: [BigInt!]!
+}
+
 type SyncStatus {
   latestIndexedBlockHash: String!
   latestIndexedBlockNumber: Int!
@@ -120,6 +144,7 @@ type Query {
   events(blockHash: String!, contractAddress: String!, name: String): [ResultEvent!]
   eventsInRange(fromBlockNumber: Int!, toBlockNumber: Int!): [ResultEvent!]
   isActive(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBoolean!
+  getKeys(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultGetKeysType!
   getKeyRevisionNumber(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBigInt!
   hasBeenLinked(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBoolean!
   isLive(blockHash: String!, contractAddress: String!, _point: BigInt!): ResultBoolean!
@@ -193,6 +218,7 @@ type Query {
   getForfeited(blockHash: String!, contractAddress: String!, _participant: String!): ResultBooleanArray!
   hasForfeitedBatch(blockHash: String!, contractAddress: String!, _participant: String!, _batch: Int!): ResultBoolean!
   getRemainingStars(blockHash: String!, contractAddress: String!, _participant: String!): ResultIntArray!
+  getConditionsState(blockHash: String!, contractAddress: String!): ResultGetConditionsStateType!
   getSyncStatus: SyncStatus
   getStateByCID(cid: String!): ResultState
   getState(blockHash: String!, contractAddress: String!, kind: String): ResultState