Merge pull request #13 from RoboVault/feat/custom-chain

Feat/custom chain

Author: SmoothBot

.github/workflows/format.yml

@@ -9,12 +9,8 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - uses: denoland/setup-deno@v1.1.1
+      - uses: denoland/setup-deno@v1.1.2
         with:
           deno-version: v1.x
+      - run: deno --version
       - run: deno fmt
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: Apply formatting changes
-          branch: ${{ github.head_ref }}

cli/start/mod.ts

@@ -1,13 +1,14 @@
 import {
   ArkiveConsoleLogHandler,
+  ArkiveManifest,
   Arkiver,
   buildSchemaFromEntities,
   defaultArkiveData,
 } from '../../mod.ts'
 import { $, createYoga, delay, join, log, logLevel, serve } from '../deps.ts'
 import { ArkiverMetadata } from '../../src/arkiver/arkive-metadata.ts'
 import { createManifestHandlers } from './logger.ts'
-import { colors } from '../../src/deps.ts'
+import { colors, SchemaComposer } from '../../src/deps.ts'
 
 
 export const action = async (
@@ -67,7 +68,8 @@ export const action = async (
 
   const manifestImport = await import(dir)
 
-  const manifest = manifestImport.default ?? manifestImport.manifest
+  const manifest: ArkiveManifest | undefined = manifestImport.default ??
+    manifestImport.manifest
 
   if (!manifest) {
     throw new Error(
@@ -129,10 +131,19 @@ export const action = async (
     return
   }
 
-  const schema = buildSchemaFromEntities(
+  const schemaComposer = new SchemaComposer()
+
+  buildSchemaFromEntities(
+    schemaComposer,
     [...manifest.entities, { model: ArkiverMetadata, list: true }],
   )
 
+  if (manifest.schemaComposerCustomizer) {
+    manifest.schemaComposerCustomizer(schemaComposer)
+  }
+
+  const schema = schemaComposer.buildSchema()
+
   const yoga = createYoga({
     schema,
     fetchAPI: {

mod.ts

@@ -1,20 +1,20 @@
 export type {
-	ArkiveManifest,
-	BlockHandler,
-	EventHandlerFor,
+  ArkiveManifest,
+  BlockHandler,
+  EventHandlerFor,
 } from './src/arkiver/types.ts'
-export { Manifest } from './src/arkiver/manifest-builder.ts'
+export { Manifest } from './src/arkiver/manifest-builder/mod.ts'
 export { ArkiveConsoleLogHandler } from './src/logger.ts'
 export { Store } from './src/arkiver/store.ts'
 export { Arkiver } from './src/arkiver/arkiver.ts'
 export { createEntity } from './src/graphql/entity.ts'
-export { Types } from './src/deps.ts'
+export { GraphQLError, Types } from './src/deps.ts'
 export { buildSchemaFromEntities } from './src/graphql/builder.ts'
 export { supportedChains } from './src/chains.ts'
 export {
-	defaultArkiveData,
-	JSONBigIntReplacer,
-	JSONBigIntReviver,
+  defaultArkiveData,
+  JSONBigIntReplacer,
+  JSONBigIntReviver,
 } from './src/utils.ts'
 export { parseArkiveManifest } from './src/arkiver/manifest-validator.ts'
 export { ArkiveLib, type SourceInfo } from './src/lib/ArkiveLib.ts'

src/arkiver/arkiver.ts

@@ -1,7 +1,7 @@
 import { Arkive, ArkiveManifest } from './types.ts'
 import { DataSource } from './data-source.ts'
 import { mongoose } from '../deps.ts'
-import { assertChain, defaultArkiveData } from '../utils.ts'
+import { defaultArkiveData } from '../utils.ts'
 import { logger } from '../logger.ts'
 
 export class Arkiver extends EventTarget {
@@ -41,6 +41,10 @@ export class Arkiver extends EventTarget {
         logger('arkiver').debug(`Connected to database`)
       }
       await this.initSources()
+      console.log(
+        `Arkive manifest: `,
+        this.manifest,
+      )
     } catch (e) {
       logger('arkiver').error(`Error running arkiver: ${e}`)
     }
@@ -50,19 +54,21 @@ export class Arkiver extends EventTarget {
     logger('arkiver').debug(`Initializing data sources...`)
     const { dataSources } = this.manifest
     for (const [chain, source] of Object.entries(dataSources)) {
-      try {
-        assertChain(chain)
-      } catch (_e) {
-        logger('arkiver').error(
-          `Invalid chain ${chain} in manifest, ignoring...`,
-        )
+      if (source === undefined) {
+        // this should never happen but just in case
+        logger('arkiver').error(`No data source found for chain ${chain}`)
         continue
       }
+      // priority for rpcUrl is (highest to lowest):
+      // 1. rpcUrl passed into Arkiver constructor (cli args in local mode)
+      // 2. rpcUrl passed specified while building manifest
+      // 3. default rpcUrl for chain from viem's chain configs
       const rpcUrl = this.rpcUrls[chain] ?? source.options.rpcUrl
       if (rpcUrl === undefined) {
         logger('arkiver').error(`No RPC URL found for chain ${chain}`)
         continue
       }
+      source.options.rpcUrl = rpcUrl
       const dataSource = new DataSource({
         arkiveId: this.arkiveData.id,
         arkiveVersion: this.arkiveData.deployment.major_version,

src/arkiver/data-source.ts

@@ -30,7 +30,7 @@ import {
 } from '../utils.ts'
 import { Store } from './store.ts'
 import { MongoStatusProvider } from './providers/mongodb.ts'
-import { supportedChains } from '../chains.ts'
+import { Chains } from './manifest-builder/manifest.ts'
 
 interface NormalizedContracts {
   contracts: {
@@ -41,7 +41,7 @@ interface NormalizedContracts {
 }
 
 export class DataSource extends EventTarget {
-  private readonly chain: keyof typeof supportedChains
+  private readonly chain: Chains
   private readonly rpcUrl: string
   private readonly client: PublicClient<HttpTransport>
   private readonly blockRange: bigint
@@ -115,7 +115,7 @@ export class DataSource extends EventTarget {
   constructor(
     params: {
       contracts: Contract[]
-      chain: keyof typeof supportedChains
+      chain: Chains
       rpcUrl: string
       blockRange: bigint
       arkiveId: number