input-output-hk · iccicci · Jun 12, 2024 · May 29, 2024 · May 29, 2024 · Jun 3, 2024
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -54,7 +54,7 @@ module.exports = {
       'error',
       {
         paths: ['lodash'],
-        patterns: ['@cardano-sdk/*/src/*']
+        patterns: ['@cardano-sdk/*/src/*', 'lodash/*', '!lodash/*.js']
       }
     ],
     'no-shadow': 'off',

diff --git a/.github/workflows/continuous-integration-e2e.yaml b/.github/workflows/continuous-integration-e2e.yaml
@@ -51,7 +51,7 @@ jobs:
       - name: 🔨 Build
         run: |
           yarn install --immutable --inline-builds --mode=skip-build
-          yarn build
+          yarn build:cjs
           docker build --no-cache .
         env:
           NODE_OPTIONS: '--max_old_space_size=8192'

diff --git a/Dockerfile b/Dockerfile
@@ -55,7 +55,7 @@ RUN yarn --immutable --inline-builds --mode=skip-build
 COPY packages packages
 RUN \
   echo "export const unused = 'unused';" > packages/e2e/src/index.ts &&\
-  NODE_OPTIONS=--max_old_space_size=10240 yarn build
+  NODE_OPTIONS=--max_old_space_size=10240 yarn build:cjs
 
 FROM nodejs-builder as cardano-services-production-deps
 RUN yarn workspaces focus --all --production

diff --git a/flake.lock b/flake.lock
diff --git a/nix/cardano-services/deployments/asset.nix b/nix/cardano-services/deployments/asset.nix
@@ -21,7 +21,6 @@
     };
 
     env = {
-      BUILD_INFO = values.cardano-services.buildInfo;
       ALLOWED_ORIGINS = values.backend.allowedOrigins;
 
       NETWORK = config.network;
@@ -68,8 +67,6 @@
     port = 3000;
 
     env = {
-      BUILD_INFO = values.cardano-services.buildInfo;
-
       NETWORK = config.network;
       LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
       OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;

diff --git a/nix/cardano-services/deployments/backend-ingress.nix b/nix/cardano-services/deployments/backend-ingress.nix
@@ -52,6 +52,16 @@
                 };
               }
             ])
+            ++ (lib.optionals config.providers.handle-provider.enabled [
+              {
+                pathType = "Prefix";
+                path = "/v${lib.last (lib.sort lib.versionOlder values.cardano-services.versions.handle)}/handle";
+                backend.service = {
+                  name = "${chart.name}-handle-provider";
+                  port.name = "http";
+                };
+              }
+            ])
             ++ [
               {
                 pathType = "Prefix";
@@ -83,16 +93,6 @@
                 };
               }
             ]
-            ++ lib.optionals config.providers.handle-provider.enabled [
-              {
-                pathType = "Prefix";
-                path = "/v${lib.last (lib.sort lib.versionOlder values.cardano-services.versions.handle)}/handle";
-                backend.service = {
-                  name = "${chart.name}-handle-provider";
-                  port.name = "http";
-                };
-              }
-            ]
             ++ values.cardano-services.additionalRoutes;
         })
         values.backend.hostnames;

diff --git a/nix/cardano-services/deployments/blockfrost-worker-deployment.nix b/nix/cardano-services/deployments/blockfrost-worker-deployment.nix
@@ -49,7 +49,6 @@
               env = utils.mkPodEnv {
                 NETWORK = config.network;
                 LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
-                BUILD_INFO = values.cardano-services.buildInfo;
 
                 BLOCKFROST_API_KEY = {
                   valueFrom.secretKeyRef = {

diff --git a/nix/cardano-services/deployments/default.nix b/nix/cardano-services/deployments/default.nix
@@ -422,13 +422,13 @@ in
               env.OVERRIDE_FUZZY_OPTIONS = "true";
             };
             handle-provider.enabled = true;
-          # asset-provider.enabled = true;
+            # asset-provider.enabled = true;
           };
 
           projectors = {
             handle.enabled = true;
             stake-pool.enabled = true;
-          # asset.enabled = true;
+            # asset.enabled = true;
           };
 
           values = {
@@ -459,7 +459,7 @@ in
               env.OVERRIDE_FUZZY_OPTIONS = "true";
               env.NODE_ENV = "production";
             };
-            # handle-provider.enabled = true;
+            handle-provider.enabled = true;
             # asset-provider = {
             #   enabled = true;
             #   env.NODE_ENV = "production";
@@ -530,7 +530,7 @@ in
               env.OVERRIDE_FUZZY_OPTIONS = "true";
               env.NODE_ENV = "production";
             };
-            # handle-provider.enabled = true;
+            handle-provider.enabled = true;
             #asset-provider = {
             #  enabled = true;
             #  env.NODE_ENV = "production";
@@ -540,7 +540,7 @@ in
           projectors = {
             handle.enabled = true;
             stake-pool.enabled = true;
-            #asset.enabled = true;
+            # asset.enabled = true;
           };
 
           values = {
@@ -600,7 +600,7 @@ in
               env.NODE_ENV = "production";
             };
             handle-provider = {
-              enabled = false;
+              enabled = true;
               env.NODE_ENV = "production";
             };
             #asset-provider = {
@@ -614,7 +614,7 @@ in
             stake-pool = {
               enabled = true;
             };
-            #asset.enabled = true;
+            # asset.enabled = true;
           };
 
           values = {
@@ -661,7 +661,7 @@ in
               env.NODE_ENV = "production";
             };
             handle-provider = {
-              enabled = false;
+              enabled = true;
               env.NODE_ENV = "production";
             };
             #asset-provider = {
@@ -675,7 +675,7 @@ in
             stake-pool = {
               enabled = true;
             };
-            #asset.enabled = true;
+            # asset.enabled = true;
           };
 
           values = {
@@ -761,7 +761,7 @@ in
               env.NODE_ENV = "production";
             };
             handle-provider = {
-              enabled = false;
+              enabled = true;
               env.NODE_ENV = "production";
             };
             #asset-provider = {
@@ -775,7 +775,7 @@ in
             stake-pool = {
               enabled = true;
             };
-            #asset.enabled = true;
+            # asset.enabled = true;
           };
 
           values = {
@@ -861,7 +861,7 @@ in
               env.NODE_ENV = "production";
             };
             handle-provider = {
-              enabled = false;
+              enabled = true;
               env.NODE_ENV = "production";
             };
             # asset-provider = {
@@ -1097,4 +1097,10 @@ in
         #  context = "eks-admin";
         #};
       });
+
+    targetGroups = targets: {
+      DEV = lib.filterAttrs (name: _: lib.hasPrefix "dev-" name) targets;
+      LIVE = lib.filterAttrs (name: _: lib.hasPrefix "live-" name) targets;
+      OPS = lib.filterAttrs (name: _: lib.hasPrefix "ops-" name) targets;
+    };
   }
diff --git a/nix/cardano-services/deployments/handle.nix b/nix/cardano-services/deployments/handle.nix
@@ -28,7 +28,6 @@
       OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
       SERVICE_NAMES = "handle";
 
-      BUILD_INFO = values.cardano-services.buildInfo;
       ALLOWED_ORIGINS = values.backend.allowedOrigins;
 
       POSTGRES_POOL_MAX_HANDLE = "10";
@@ -72,8 +71,6 @@
       PROJECTION_NAMES = "handle";
       HANDLE_POLICY_IDS = "f0ff48bbb7bbe9d59a40f1ce90e9e9d0ff5002ec48f232b49ca0fb9a";
 
-      BUILD_INFO = values.cardano-services.buildInfo;
-
       POSTGRES_POOL_MAX = "2";
       POSTGRES_HOST = values.postgresName;
       POSTGRES_PORT = "5432";

diff --git a/nix/cardano-services/deployments/pg-boss-worker-deployment.nix b/nix/cardano-services/deployments/pg-boss-worker-deployment.nix
@@ -57,7 +57,6 @@
                   NETWORK = config.network;
                   LOGGER_MIN_SEVERITY = values.cardano-services.loggingLevel;
                   QUEUES = values.pg-boss-worker.queues;
-                  BUILD_INFO = values.cardano-services.buildInfo;
 
                   METADATA_FETCH_MODE = values.pg-boss-worker.metadata-fetch-mode;
 

diff --git a/nix/cardano-services/deployments/stake-pool.nix b/nix/cardano-services/deployments/stake-pool.nix
@@ -31,7 +31,6 @@
       USE_TYPEORM_STAKE_POOL_PROVIDER = "true";
       TOKEN_METADATA_SERVER_URL = values.cardano-services.tokenMetadataServerUrl;
 
-      BUILD_INFO = values.cardano-services.buildInfo;
       ALLOWED_ORIGINS = values.backend.allowedOrigins;
 
       POSTGRES_POOL_MAX_STAKE_POOL = "10";
@@ -74,8 +73,6 @@
       OGMIOS_SRV_SERVICE_NAME = values.backend.ogmiosSrvServiceName;
       PROJECTION_NAMES = "stake-pool,stake-pool-metadata-job,stake-pool-metrics-job,stake-pool-rewards-job";
 
-      BUILD_INFO = values.cardano-services.buildInfo;
-
       POSTGRES_POOL_MAX = "2";
       POSTGRES_HOST = values.postgresName;
       POSTGRES_PORT = "5432";

diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
   ],
   "scripts": {
     "build": "yarn workspaces foreach -v run build",
+    "build:cjs": "yarn workspaces foreach -v run build:cjs",
     "circular-deps:check": "yarn workspaces foreach -v run circular-deps:check",
     "cleanup-build": "yarn workspaces foreach -v run cleanup && yarn install && yarn workspaces foreach -v run build",
     "reinstall": "yarn workspaces foreach -v run cleanup:nm && yarn install",
@@ -84,6 +85,7 @@
     "ts-jest": "^28.0.7",
     "ts-node": "^10.0.0",
     "ts-node-dev": "^1.1.8",
+    "tsc-alias": "^1.8.10",
     "typedoc": "^0.23.24",
     "typedoc-plugin-missing-exports": "^1.0.0",
     "typescript": "^4.7.4"

diff --git a/packages/cardano-services-client/CHANGELOG.md b/packages/cardano-services-client/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.19.5](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-06-05)
+
+**Note:** Version bump only for package @cardano-sdk/cardano-services-client
+
 ## [0.19.4](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-05-20)
 
 **Note:** Version bump only for package @cardano-sdk/cardano-services-client

diff --git a/packages/cardano-services-client/package.json b/packages/cardano-services-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cardano-sdk/cardano-services-client",
-  "version": "0.19.4",
+  "version": "0.19.5",
   "description": "Cardano Services Client",
   "engines": {
     "node": ">=16.20.2"
@@ -20,11 +20,9 @@
   },
   "license": "Apache-2.0",
   "scripts": {
-    "build:esm": "tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020",
-    "build:cjs": "tsc --build src",
-    "build:version": "bash -c 'if node ./scripts/createVersionSource.js --check ; then node ./scripts/createVersionSource.js --create && yarn lint:fix ; fi && cp ./package.json ./dist/package.json'",
-    "build": "yarn build:version && run-s build:cjs build:esm module-fixup",
-    "module-fixup": "cp ../../build/cjs-package.json ./dist/cjs/package.json && cp ../../build/esm-package.json ./dist/esm/package.json",
+    "build": "yarn build:cjs && tsc -p src/tsconfig.json --outDir ./dist/esm --module es2020 && tsc-alias -p src/tsconfig.json --outDir ./dist/esm && cp ../../build/esm-package.json ./dist/esm/package.json",
+    "build:cjs": "yarn build:version && tsc --build src && cp ./package.json dist/ && cp ../../build/cjs-package.json ./dist/cjs/package.json",
+    "build:version": "bash -c 'if node ./scripts/createVersionSource.js --check ; then node ./scripts/createVersionSource.js --create && yarn lint:fix ; fi'",
     "tscNoEmit": "echo typescript --noEmit command not implemented yet",
     "cleanup:dist": "rm -rf dist",
     "circular-deps:check": "madge --circular dist/cjs",
@@ -50,6 +48,7 @@
     "madge": "^5.0.1",
     "npm-run-all": "^4.1.5",
     "ts-jest": "^28.0.7",
+    "tsc-alias": "^1.8.10",
     "typescript": "^4.7.4"
   },
   "dependencies": {

diff --git a/packages/cardano-services-client/src/typings.d.ts b/packages/cardano-services-client/src/typings.d.ts
@@ -1 +1,4 @@
 declare module '*.json';
+
+// exclude from build, as it has to be imported at runtime
+declare module '../package.json';
diff --git a/packages/cardano-services/CHANGELOG.md b/packages/cardano-services/CHANGELOG.md
@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.28.5](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-06-05)
+
+### Features
+
+* **cardano-services:** chain history provider now also returns reference scripts on outputs ([8b0731d](https://github.com/input-output-hk/cardano-js-sdk/commit/8b0731de9d7c1f0b7eb22528b1e3d22071931b40))
+
 ## [0.28.4](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2024-05-20)
 
 ### Features

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.28.4",
+  "version": "0.28.5",
   "description": "Cardano GraphQL Services",
   "engines": {
     "node": ">=16.20.2"
@@ -21,9 +21,8 @@
   "sideEffects": false,
   "license": "Apache-2.0",
   "scripts": {
-    "build:cjs": "tsc --build src && chmod +x ./dist/cjs/cli.js",
-    "build:copy-assets": "bash ./copy-assets.sh",
-    "build": "run-s build:cjs build:copy-assets",
+    "build": "yarn build:cjs",
+    "build:cjs": "tsc --build src && chmod +x ./dist/cjs/cli.js && bash ./copy-assets.sh",
     "build:test-db": "./test/jest-setup/rebuild-test-db.sh",
     "cleanup:dist": "rm -rf dist",
     "cleanup:nm": "rm -rf node_modules",

diff --git a/packages/cardano-services/src/Asset/CardanoTokenRegistry.ts b/packages/cardano-services/src/Asset/CardanoTokenRegistry.ts
@@ -4,7 +4,7 @@ import { Logger } from 'ts-log';
 import { TokenMetadataService } from './types';
 import { contextLogger } from '@cardano-sdk/util';
 import axios, { AxiosInstance } from 'axios';
-import pick from 'lodash/pick';
+import pick from 'lodash/pick.js';
 
 export const DEFAULT_TOKEN_METADATA_CACHE_TTL = Seconds(10 * 60);
 export const DEFAULT_TOKEN_METADATA_REQUEST_TIMEOUT = Milliseconds(3 * 1000);

diff --git a/packages/cardano-services/src/ChainHistory/DbSyncChainHistory/ChainHistoryBuilder.ts b/packages/cardano-services/src/ChainHistory/DbSyncChainHistory/ChainHistoryBuilder.ts
@@ -53,8 +53,8 @@ import {
   mapTxTokenMap,
   mapWithdrawal
 } from './mappers';
-import omit from 'lodash/omit';
-import orderBy from 'lodash/orderBy';
+import omit from 'lodash/omit.js';
+import orderBy from 'lodash/orderBy.js';
 
 const {
   CredentialType,

diff --git a/packages/cardano-services/src/ChainHistory/DbSyncChainHistory/DbSyncChainHistoryProvider.ts b/packages/cardano-services/src/ChainHistory/DbSyncChainHistory/DbSyncChainHistoryProvider.ts
@@ -18,7 +18,7 @@ import { QueryResult } from 'pg';
 import { TxMetadataService } from '../../Metadata';
 import { hexStringToBuffer } from '@cardano-sdk/util';
 import { mapBlock, mapTxAlonzo, mapTxIn, mapTxOut } from './mappers';
-import orderBy from 'lodash/orderBy';
+import orderBy from 'lodash/orderBy.js';
 
 /** Properties that are need to create DbSyncChainHistoryProvider */
 export interface ChainHistoryProviderProps {

diff --git a/...s/cardano-services/src/NetworkInfo/DbSyncNetworkInfoProvider/DbSyncNetworkInfoProvider.ts b/...s/cardano-services/src/NetworkInfo/DbSyncNetworkInfoProvider/DbSyncNetworkInfoProvider.ts
@@ -17,7 +17,7 @@ import { Logger } from 'ts-log';
 import { NetworkInfoBuilder } from './NetworkInfoBuilder';
 import { RunnableModule } from '@cardano-sdk/util';
 import { toGenesisParams, toLedgerTip, toProtocolParams, toSupply } from './mappers';
-import memoize from 'lodash/memoize';
+import memoize from 'lodash/memoize.js';
 
 /** Dependencies that are need to create DbSyncNetworkInfoProvider */
 export interface NetworkInfoProviderDependencies extends DbSyncProviderDependencies {