input-output-hk · iccicci · Apr 12, 2024 · Mar 25, 2024 · Mar 25, 2024 · Mar 27, 2024
diff --git a/compose/aarch64.yml b/compose/aarch64.yml
@@ -0,0 +1,11 @@
+# Overrides for AArch64 processors, until we get official images:
+
+services:
+  cardano-db-sync:
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-db-sync:${CARDANO_DB_SYNC_VERSION:-13.1.0.0}
+  cardano-node:
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-node:${CARDANO_NODE_VERSION:-1.35.5}
+  ogmios:
+    image: ghcr.io/input-output-hk/ogmios-tracker/ogmios:v${OGMIOS_VERSION:-5.6.0}
+  cardano-submit-api:
+    image: ghcr.io/input-output-hk/ogmios-tracker/cardano-submit-api:${CARDANO_NODE_VERSION:-1.35.5}
diff --git a/compose/arm64.yml b/compose/arm64.yml
@@ -0,0 +1 @@
+aarch64.yml
diff --git a/compose/x86_64.yml b/compose/x86_64.yml
@@ -0,0 +1,3 @@
+# Nothing to override – for x86_64 processors we use the official `amd64` images.
+
+{}
diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix
@@ -113,12 +113,14 @@ in
           resources.limits = mkPodResources "300Mi" "500m";
           resources.requests = mkPodResources "150Mi" "100m";
         };
-
         pg-boss-worker = {
-          enabled = false;
-          metadata-fetch-mode = "direct";
-          resources.limits = mkPodResources "300Mi" "300m";
-          resources.requests = mkPodResources "150Mi" "200m";
+           enabled = false;
+           metadata-fetch-mode = "smash";
+           smash-url = if values.network == "mainnet"
+                         then "https://smash.cardano-mainnet.iohk.io/api/v1"
+                         else "https://${values.network}-smash.world.dev.cardano.org/api/v1";
+           resources.limits = mkPodResources "300Mi" "300m";
+           resources.requests = mkPodResources "150Mi" "200m";
         };
 
         backend = {
@@ -210,7 +212,6 @@ in
 
           blockfrost-worker.enabled = true;
           pg-boss-worker.enabled = true;
-          pg-boss-worker.metadata-fetch-mode = "smash";
         };
       };
 
@@ -329,7 +330,6 @@ in
 
           blockfrost-worker.enabled = true;
           pg-boss-worker.enabled = true;
-          pg-boss-worker.metadata-fetch-mode = "smash";
         };
       };
 
@@ -348,6 +348,7 @@ in
           network = "preprod";
           region = "us-east-1";
 
+
           backend.hostnames = ["${final.namespace}.${baseUrl}"];
           backend.passHandleDBArgs = false;
           backend.routes = [
@@ -401,8 +402,9 @@ in
           backend.allowedOrigins = lib.concatStringsSep "," allowedOriginsDev;
           backend.hostnames = ["${final.namespace}.${baseUrl}"];
 
-          blockfrost-worker.enabled = true;
           pg-boss-worker.enabled = true;
+
+          blockfrost-worker.enabled = true;
           cardano-services = {
             ingresOrder = 98;
           };
@@ -492,6 +494,7 @@ in
         providers = {
           backend = {
             enabled = true;
+            env.NODE_ENV = "production";
           };
         };
 
@@ -515,14 +518,54 @@ in
             "/v2.0.0/tx-submit"
             "/v2.0.0/utxo"
           ];
-          blockfrost-worker.enabled = true;
+          # blockfrost-worker.enabled = true;
           cardano-services = {
             ingresOrder = 99;
             image = "926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:s8j5nx9x2naar194pr58kpmlr5s4xn7b";
           };
         };
       };
 
+      "live-preprod@us-east-2@v2" = final: {
+        name = "${final.namespace}-cardanojs-v2";
+        namespace = "live-preprod";
+        context = "eks-admin";
+
+        providers = {
+          backend = {
+            enabled = true;
+            env.NODE_ENV = "production";
+          };
+          stake-pool-provider = {
+            enabled = true;
+            env.OVERRIDE_FUZZY_OPTIONS = "true";
+            env.NODE_ENV = "production";
+          };
+          handle-provider = {
+            enabled = true;
+            env.NODE_ENV = "production";
+          };
+        };
+
+        projectors = {
+          handle.enabled = true;
+          stake-pool.enabled = true;
+        };
+
+        values = {
+          network = "preprod";
+          region = "us-east-2";
+
+          backend.hostnames = ["backend.${final.namespace}.eks.${baseUrl}" "${final.namespace}.${baseUrl}"];
+          blockfrost-worker.enabled = true;
+          pg-boss-worker.enabled = true;
+          cardano-services = {
+            ingresOrder = 98;
+          };
+        };
+      };
+
+
       "live-preview@us-east-2@v1" = final: {
         name = "${final.namespace}-cardanojs-v1";
         namespace = "live-preview";
@@ -531,6 +574,7 @@ in
         providers = {
           backend = {
             enabled = true;
+            env.NODE_ENV = "production";
           };
         };
 
@@ -554,14 +598,53 @@ in
             "/v2.0.0/tx-submit"
             "/v2.0.0/utxo"
           ];
-          blockfrost-worker.enabled = true;
+          # blockfrost-worker.enabled = true;
           cardano-services = {
             ingresOrder = 99;
             image = "926093910549.dkr.ecr.us-east-1.amazonaws.com/cardano-services:s8j5nx9x2naar194pr58kpmlr5s4xn7b";
           };
         };
       };
 
+      "live-preview@us-east-2@v2" = final: {
+        name = "${final.namespace}-cardanojs-v2";
+        namespace = "live-preview";
+        context = "eks-admin";
+
+        providers = {
+          backend = {
+            enabled = true;
+            env.NODE_ENV = "production";
+          };
+          stake-pool-provider = {
+            enabled = true;
+            env.OVERRIDE_FUZZY_OPTIONS = "true";
+            env.NODE_ENV = "production";
+          };
+          handle-provider = {
+            enabled = true;
+            env.NODE_ENV = "production";
+          };
+        };
+
+        projectors = {
+          handle.enabled = true;
+          stake-pool.enabled = true;
+        };
+
+        values = {
+          network = "preview";
+          region = "us-east-2";
+
+          backend.hostnames = ["backend.${final.namespace}.eks.${baseUrl}" "${final.namespace}.${baseUrl}"];
+          blockfrost-worker.enabled = true;
+          pg-boss-worker.enabled = true;
+          cardano-services = {
+            ingresOrder = 98;
+          };
+        };
+      };
+
       "ops-preview-1@us-east-1" = final: {
         namespace = "ops-preview-1";
 
@@ -610,6 +693,7 @@ in
             env.USE_SUBMIT_API = "true";
             env.USE_BLOCKFROST = lib.mkForce "false";
             env.SUBMIT_API_URL = "http://${final.namespace}-cardano-stack.${final.namespace}.svc.cluster.local:8090";
+            env.NODE_ENV = "production";
           };
           stake-pool-provider.enabled = true;
         };

diff --git a/nix/cardano-services/deployments/pg-boss-worker-deployment.nix b/nix/cardano-services/deployments/pg-boss-worker-deployment.nix
@@ -101,7 +101,7 @@
                 }
                 // lib.optionalAttrs (values.pg-boss-worker ? env) values.pg-boss-worker.env
                 // lib.optionalAttrs (values.pg-boss-worker.metadata-fetch-mode == "smash") {
-                  SMASH_URL = "https://smash.cardano-mainnet.iohk.io/api/v1";
+                  SMASH_URL = values.pg-boss-worker.smash-url;
                 });
               volumeMounts = [
                 {

diff --git a/packages/cardano-services-client/package.json b/packages/cardano-services-client/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "@cardano-sdk/core": "workspace:~",
     "@cardano-sdk/util": "workspace:~",
-    "axios": "^0.27.2",
+    "axios": "^0.28.0",
     "class-validator": "^0.14.0",
     "json-bigint": "~1.0.0",
     "ts-log": "^2.2.4"

diff --git a/packages/cardano-services/CHANGELOG.md b/packages/cardano-services/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.27.1](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-04-03)
+
+**Note:** Version bump only for package @cardano-sdk/cardano-services
+
 ## [0.27.0](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-03-26)
 
 ### ⚠ BREAKING CHANGES

diff --git a/packages/cardano-services/package.json b/packages/cardano-services/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/cardano-services",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "description": "Cardano GraphQL Services",
   "engines": {
     "node": ">=16.20.2"
@@ -29,8 +29,8 @@
     "cleanup:nm": "rm -rf node_modules",
     "cleanup": "rm -rf dist node_modules",
     "cli": "ts-node --transpile-only src/cli.ts",
-    "compose:up": "docker compose --env-file environments/.env.$NETWORK -p cardano-services-$NETWORK -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/pg-agent.yml ${FILES:-} up",
-    "compose:down": "docker compose -p cardano-services-$NETWORK -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/pg-agent.yml down -t 120",
+    "compose:up": "docker compose --env-file environments/.env.$NETWORK -p cardano-services-$NETWORK -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/pg-agent.yml -f ../../compose/$(uname -m).yml ${FILES:-} up",
+    "compose:down": "docker compose -p cardano-services-$NETWORK -f docker-compose.yml -f ../../compose/common.yml -f ../../compose/pg-agent.yml -f ../../compose/$(uname -m).yml down -t 120",
     "coverage": "yarn test --coverage || true",
     "circular-deps:check": "madge --circular dist/cjs",
     "lint": "eslint -c ../../complete.eslintrc.js \"src/**/*.ts\" \"test/**/*.ts\"",
@@ -98,7 +98,7 @@
     "@cardano-sdk/util": "workspace:~",
     "@cardano-sdk/util-rxjs": "workspace:~",
     "@hapi/topo": "^6.0.2",
-    "axios": "^0.27.2",
+    "axios": "^0.28.0",
     "backoff-rxjs": "^7.0.0",
     "bignumber.js": "^9.1.0",
     "body-parser": "^1.19.2",

diff --git a/packages/cardano-services/src/Http/HttpService.ts b/packages/cardano-services/src/Http/HttpService.ts
@@ -15,7 +15,11 @@ import { versionPathFromSpec } from '../util/openApi';
 import express, { Router } from 'express';
 import path from 'path';
 
-const openApiOption = { ignoreUndocumented: true, validateRequests: true, validateResponses: true };
+const openApiOption = {
+  ignoreUndocumented: true,
+  validateRequests: true,
+  validateResponses: process.env.NODE_ENV !== 'production'
+};
 
 export abstract class HttpService extends RunnableModule {
   public router: express.Router;

diff --git a/packages/cardano-services/src/Projection/createTypeormProjection.ts b/packages/cardano-services/src/Projection/createTypeormProjection.ts
@@ -3,7 +3,7 @@
 import { Bootstrap, ProjectionEvent, logProjectionProgress, requestNext } from '@cardano-sdk/projection';
 import { Cardano, ObservableCardanoNode } from '@cardano-sdk/core';
 import { Logger } from 'ts-log';
-import { Observable, concat, defer, take, takeWhile } from 'rxjs';
+import { Observable, concat, defer, groupBy, mergeMap, take, takeWhile } from 'rxjs';
 import {
   PgConnectionConfig,
   TypeormDevOptions,
@@ -72,7 +72,7 @@ export const createTypeormProjection = ({
   logger.debug(`Creating projection with policyIds ${JSON.stringify(handlePolicyIds)}`);
   logger.debug(`Using a ${blocksBufferLength} blocks buffer`);
 
-  const { mappers, entities, stores, extensions } = prepareTypeormProjection(
+  const { mappers, entities, stores, extensions, willStore } = prepareTypeormProjection(
     {
       options: projectionOptions,
       projections
@@ -118,15 +118,23 @@ export const createTypeormProjection = ({
     defer(() =>
       projectionSource$.pipe(
         applyMappers(mappers),
-        shareRetryBackoff(
-          (evt$) =>
-            evt$.pipe(
-              withTypeormTransaction({ connection$: connect() }),
-              applyStores(stores),
-              buffer.storeBlockData(),
-              typeormTransactionCommit()
-            ),
-          { shouldRetry: isRecoverableTypeormError }
+        // if there are any relevant data to write into db
+        groupBy((evt) => willStore(evt)),
+        mergeMap((group$) =>
+          group$.key
+            ? group$.pipe(
+                shareRetryBackoff(
+                  (evt$) =>
+                    evt$.pipe(
+                      withTypeormTransaction({ connection$: connect() }),
+                      applyStores(stores),
+                      buffer.storeBlockData(),
+                      typeormTransactionCommit()
+                    ),
+                  { shouldRetry: isRecoverableTypeormError }
+                )
+              )
+            : group$
         ),
         tipTracker.trackProjectedTip(),
         requestNext(),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Nothing to override – for x86_64 processors we use the official `amd64` images.

		{}