updated ogmios to v6 & updated config files for new ogmios node

cardano-foundation · Feb 29, 2024 · e64758b · e64758b
1 parent b95d7f7
commit e64758b
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 10,449 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "config"]
 	path = config
-	url = https://github.com/input-output-hk/cardano-configurations.git
-[submodule "ogmios"]
-	path = ogmios
-	url = https://github.com/CardanoSolutions/ogmios.git
+	url = https://github.com/input-output-hk/cardano-configurations.git
diff --git a/config b/config
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -38,10 +38,10 @@ services:
     volumes:
       - ./node-db:/db
       - ./node-ipc:/ipc
-#      - ./config/network/${NETWORK:-mainnet}:/config
+      - ./config/network/${NETWORK:-mainnet}:/config
 
   cardano-db-sync:
-    image: inputoutput/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.1.0.2}
+    image: ghcr.io/intersectmbo/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.2.0.1}
     command: [
       "--config", "/config/cardano-db-sync/config.json",
       "--socket-path", "/node-ipc/node.socket"

diff --git a/packages/api-cardano-db-hasura/package.json b/packages/api-cardano-db-hasura/package.json
@@ -35,7 +35,7 @@
   ],
   "dependencies": {
     "@cardano-graphql/util": "8.0.0",
-    "@cardano-ogmios/client": "6.1.0",
+    "@cardano-ogmios/client": "^6.0.0",
     "@cardanosolutions/json-bigint": "^1.0.0",
     "@emurgo/cip14-js": "^2.0.0",
     "@graphql-tools/delegate": "^6.2.4",

diff --git a/packages/api-cardano-db-hasura/src/CardanoNodeClient.ts b/packages/api-cardano-db-hasura/src/CardanoNodeClient.ts
@@ -3,25 +3,21 @@ import pRetry from 'p-retry'
 import util, { DataFetcher, errors, ModuleState } from '@cardano-graphql/util'
 import {
   ConnectionConfig,
-  createConnectionObject,
-  createStateQueryClient,
-  createTxSubmissionClient,
-  getServerHealth,
-  ServerHealth,
-  // Schema,
-  StateQuery,
-  TxSubmission
+  createConnectionObject, createLedgerStateQueryClient, createTransactionSubmissionClient, getServerHealth,
+  ServerHealth
 } from '@cardano-ogmios/client'
 import { dummyLogger, Logger } from 'ts-log'
 import { createInteractionContextWithLogger } from './util'
+import {TransactionSubmissionClient} from "@cardano-ogmios/client/dist/TransactionSubmission";
+import {LedgerStateQueryClient} from "@cardano-ogmios/client/dist/LedgerStateQuery";
 
 const MODULE_NAME = 'CardanoNodeClient'
 
 export class CardanoNodeClient {
   readonly networkParams: string[]
   public adaCirculatingSupply: AssetSupply['circulating']
-  private stateQueryClient: StateQuery.StateQueryClient
-  private txSubmissionClient: TxSubmission.TxSubmissionClient
+  private stateQueryClient: LedgerStateQueryClient
+  private txSubmissionClient: TransactionSubmissionClient
   private state: ModuleState
   private serverHealthFetcher: DataFetcher<ServerHealth>
 
@@ -75,8 +71,8 @@ export class CardanoNodeClient {
         await this.shutdown()
         await this.initialize(ogmiosConnectionConfig)
       })
-      this.stateQueryClient = await createStateQueryClient(interactionContext)
-      this.txSubmissionClient = await createTxSubmissionClient(interactionContext)
+      this.stateQueryClient = await createLedgerStateQueryClient(interactionContext)
+      this.txSubmissionClient = await createTransactionSubmissionClient(interactionContext)
     }, {
       factor: 1.2,
       retries: 100,
@@ -110,7 +106,7 @@ export class CardanoNodeClient {
     if (this.serverHealthFetcher.value.networkSynchronization < 0.95) {
       throw new errors.OperationRequiresSyncedNode('submitTransaction')
     }
-    const hash = await this.txSubmissionClient.submitTx(transaction)
+    const hash = await this.txSubmissionClient.submitTransaction(transaction)
     this.logger.info({ module: MODULE_NAME, hash }, 'submitTransaction')
     return hash
   }

diff --git a/packages/api-cardano-db-hasura/src/ChainFollower.ts b/packages/api-cardano-db-hasura/src/ChainFollower.ts
@@ -1,18 +1,14 @@
 import  {
   ChainSynchronization,
     createChainSynchronizationClient,
-
-  // isAlonzoBlock,
-  // isBabbageBlock,
-  // isMaryBlock,
 } from '@cardano-ogmios/client'
 import pRetry from 'p-retry'
 import { Config } from './Config'
 import util, { assetFingerprint, errors, RunnableModuleState } from '@cardano-graphql/util'
 import PgBoss from 'pg-boss'
 import { dummyLogger, Logger } from 'ts-log'
 import { createInteractionContextWithLogger } from './util'
-import { PointOrOrigin } from '@cardano-ogmios/schema'
+import { PointOrOrigin, BlockPraos } from '@cardano-ogmios/schema'
 import { HasuraBackgroundClient } from './HasuraBackgroundClient'
 import { DbConfig } from './typeAliases'
 
@@ -63,17 +59,18 @@ export class ChainFollower {
             requestNext()
           },
           rollForward: async ({ block }, requestNext) => {
+            let b = block as BlockPraos;
 
             if (b !== undefined) {
-              for (const tx of b.body) {
-                for (const entry of Object.entries(tx.body.mint.assets)) {
+              for (const tx of b.transactions) {
+                for (const entry of Object.entries(tx.mint.assets)) {
                   const [policyId, assetName] = entry[0].split('.')
                   const assetId = `${policyId}${assetName !== undefined ? assetName : ''}`
                   if (!(await this.hasuraClient.hasAsset(assetId))) {
                     const asset = {
                       assetId,
                       assetName,
-                      firstAppearedInSlot: b.header.slot,
+                      firstAppearedInSlot: b.slot,
                       fingerprint: assetFingerprint(policyId, assetName),
                       policyId
                     }

diff --git a/packages/api-cardano-db-hasura/src/HasuraBackgroundClient.ts b/packages/api-cardano-db-hasura/src/HasuraBackgroundClient.ts
@@ -187,9 +187,10 @@ export class HasuraBackgroundClient {
           throw new Error('cardano-db-sync is lagging behind the asset sync operation.')
         }
         const { hash, slotNo } = result.assets[0].firstAppearedInBlock
-        point = {
-          hash: hash.substring(2),
-          slot: Number(slotNo)
+        // @ts-ignore
+          point = {
+          slot: Number(slotNo),
+          id: hash.substring(2)
         }
       } else {
         point = null

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -25,7 +25,7 @@
   "homepage": "https://github.com/input-output-hk/cardano-graphql/blob/master/packages/server/README.md",
   "dependencies": {
     "@cardano-graphql/api-cardano-db-hasura": "8.0.0",
-    "@cardano-ogmios/schema": "5.5.7",
+    "@cardano-ogmios/schema": "^6.0.0",
     "@graphql-tools/merge": "^6.2.17",
     "apollo-metrics": "^1.0.1",
     "apollo-server-core": "^2.25.3",