Skip to content

Commit a876875

Browse files
committed
Merge remote-tracking branch 'origin/master' into conway-era
2 parents 7dd6402 + 10f3f72 commit a876875

File tree

428 files changed

+5585
-3735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

428 files changed

+5585
-3735
lines changed

.dockerignore

+22-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,22 @@
1-
*.env
1+
packages/**/coverage
2+
packages/**/dist
3+
packages/**/node_modules
4+
packages/**/test
5+
6+
packages/e2e/src
7+
packages/e2e/local-network
8+
packages/e2e/logs
9+
10+
**/*.md
11+
**/*.yml
12+
13+
**/.env*
14+
**/.*ignore
15+
16+
**/LICENSE
17+
**/NOTICE
18+
**/jest.config.js
19+
20+
!.yarnrc.yml
21+
!app/packages/**/node_modules
22+
!packages/e2e/src/tsconfig.json

.eslintrc.js

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
const maxLineLength = 120;
2+
13
module.exports = {
24
env: {
35
jest: true
@@ -26,12 +28,23 @@ module.exports = {
2628
'import/no-extraneous-dependencies': ['error', { devDependencies: ['**/test/**/*.ts'] }],
2729
// eslint compains about TS enums hence disable here and enable @typescript-eslint/no-shadow
2830
'import/no-unresolved': 0,
31+
'jsdoc/multiline-blocks': ['error', { minimumLengthForMultiline: maxLineLength, noMultilineBlocks: true }],
2932
'jsdoc/require-jsdoc': 0,
3033
'jsdoc/require-param': 0,
3134
'jsdoc/require-param-type': 0,
3235
'jsdoc/require-returns': 0,
3336
'jsdoc/require-returns-type': 0,
3437
'linebreak-style': [2, 'unix'],
38+
'max-len': [
39+
'warn',
40+
{
41+
code: maxLineLength, // Keep the existing max line length of maxLineLength
42+
ignoreComments: true,
43+
ignoreStrings: true,
44+
ignoreTemplateLiterals: true,
45+
ignoreUrls: true
46+
}
47+
],
3548
'new-cap': 0,
3649
'no-magic-numbers': 0,
3750
'no-restricted-imports': [
@@ -49,16 +62,6 @@ module.exports = {
4962
quotes: ['error', 'single', { avoidEscape: true }],
5063
'sort-imports': ['warn', { ignoreDeclarationSort: true }],
5164
'sort-imports-es6-autofix/sort-imports-es6': 'warn',
52-
'max-len': [
53-
'warn',
54-
{
55-
code: 120, // Keep the existing max line length of 120
56-
ignoreComments: true,
57-
ignoreUrls: true,
58-
ignoreStrings: true,
59-
ignoreTemplateLiterals: true
60-
}
61-
],
6265
'sort-keys-fix/sort-keys-fix': ['warn', 'asc', { natural: true }],
6366
'template-tag-spacing': 0,
6467
'unicorn/filename-case': 0,

.github/workflows/std.yml

+2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ on:
66
pull_request:
77
branches:
88
- master
9+
- conway-era
910
push:
1011
branches:
1112
- master
13+
- conway-era
1214
env:
1315
AWS_REGION: us-east-1
1416
AWS_ROLE_ARN: arn:aws:iam::926093910549:role/lace-ci

Dockerfile

+43-25
Original file line numberDiff line numberDiff line change
@@ -3,48 +3,66 @@ ARG UBUNTU_VERSION=20.04
33
FROM ubuntu:${UBUNTU_VERSION} as ubuntu-nodejs
44
ARG NODEJS_MAJOR_VERSION=18
55
ENV DEBIAN_FRONTEND=nonintercative
6-
RUN apt-get update && apt-get install curl -y
7-
RUN curl --proto '=https' --tlsv1.2 -sSf -L https://deb.nodesource.com/setup_${NODEJS_MAJOR_VERSION}.x | bash -
8-
RUN curl --proto '=https' --tlsv1.2 -sSf -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
9-
echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list
10-
RUN apt-get update
11-
RUN apt-get install nodejs -y
12-
RUN apt-get install -y --no-install-recommends ca-certificates jq postgresql-client
6+
7+
RUN \
8+
apt-get update &&\
9+
apt-get install ca-certificates curl gnupg lsb-release -y &&\
10+
mkdir -p /etc/apt/keyrings &&\
11+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg &&\
12+
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODEJS_MAJOR_VERSION.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list &&\
13+
curl --proto '=https' --tlsv1.2 -sSf -L https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - &&\
14+
echo "deb http://apt.postgresql.org/pub/repos/apt/ `lsb_release -cs`-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list &&\
15+
apt-get update &&\
16+
apt-get install nodejs -y &&\
17+
apt-get install -y --no-install-recommends ca-certificates jq postgresql-client
1318

1419
FROM ubuntu-nodejs as nodejs-builder
15-
RUN curl --proto '=https' --tlsv1.2 -sSf -L https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - &&\
20+
RUN \
21+
curl --proto '=https' --tlsv1.2 -sSf -L https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - &&\
1622
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list &&\
17-
apt-get update && apt-get install pkg-config libusb-1.0 libudev-dev gcc g++ make gnupg2 yarn -y
18-
RUN yarn global add [email protected]
19-
RUN mkdir -p /app/packages
23+
apt-get update && apt-get install pkg-config libusb-1.0 libudev-dev gcc g++ make gnupg2 yarn -y &&\
24+
yarn global add [email protected]
2025
WORKDIR /app
2126
COPY build build
22-
COPY packages packages
27+
COPY packages/cardano-services/package.json packages/cardano-services/package.json
28+
COPY packages/cardano-services-client/package.json packages/cardano-services-client/package.json
29+
COPY packages/core/package.json packages/core/package.json
30+
COPY packages/crypto/package.json packages/crypto/package.json
31+
COPY packages/dapp-connector/package.json packages/dapp-connector/package.json
32+
COPY packages/e2e/package.json packages/e2e/package.json
33+
COPY packages/golden-test-generator/package.json packages/golden-test-generator/package.json
34+
COPY packages/governance/package.json packages/governance/package.json
35+
COPY packages/hardware-ledger/package.json packages/hardware-ledger/package.json
36+
COPY packages/hardware-trezor/package.json packages/hardware-trezor/package.json
37+
COPY packages/input-selection/package.json packages/input-selection/package.json
38+
COPY packages/key-management/package.json packages/key-management/package.json
39+
COPY packages/ogmios/package.json packages/ogmios/package.json
40+
COPY packages/projection/package.json packages/projection/package.json
41+
COPY packages/projection-typeorm/package.json packages/projection-typeorm/package.json
42+
COPY packages/tx-construction/package.json packages/tx-construction/package.json
43+
COPY packages/util/package.json packages/util/package.json
44+
COPY packages/util-dev/package.json packages/util-dev/package.json
45+
COPY packages/util-rxjs/package.json packages/util-rxjs/package.json
46+
COPY packages/wallet/package.json packages/wallet/package.json
47+
COPY packages/web-extension/package.json packages/web-extension/package.json
2348
COPY scripts scripts
2449
COPY .yarn .yarn
25-
COPY \
26-
.eslintrc.js \
27-
.prettierrc \
28-
.yarnrc.yml \
29-
complete.eslintrc.js \
30-
eslint.tsconfig.json \
31-
package.json \
32-
tsconfig.json \
33-
yarn.lock \
34-
yarn-project.nix \
35-
/app/
50+
COPY .eslintrc.js .prettierrc .yarnrc.yml complete.eslintrc.js eslint.tsconfig.json package.json tsconfig.json yarn.lock yarn-project.nix ./
3651

3752
FROM nodejs-builder as cardano-services-builder
3853
RUN yarn --immutable --inline-builds
39-
RUN NODE_OPTIONS=--max_old_space_size=10240 yarn build
54+
COPY packages packages
55+
RUN \
56+
echo "export const unused = 'unused';" > packages/e2e/src/index.ts &&\
57+
NODE_OPTIONS=--max_old_space_size=10240 yarn build
4058

4159
FROM nodejs-builder as cardano-services-production-deps
4260
RUN yarn workspaces focus --all --production
4361

4462
FROM ubuntu-nodejs as cardano-services
4563
COPY --from=cardano-services-production-deps /app/node_modules /app/node_modules
4664
COPY --from=cardano-services-production-deps /app/packages/cardano-services/node_modules /app/packages/cardano-services/node_modules
47-
COPY --from=cardano-services-production-deps /app/packages/projection-typeorm/node_modules /app/packages/projection-typeorm/node_modules
65+
COPY --from=cardano-services-production-deps /app/packages/core/node_modules /app/packages/core/node_modules
4866
COPY --from=cardano-services-builder /app/scripts /app/scripts
4967
COPY --from=cardano-services-builder /app/packages/cardano-services/dist /app/packages/cardano-services/dist
5068
COPY --from=cardano-services-builder /app/packages/cardano-services/package.json /app/packages/cardano-services/package.json

compose/common.yml

+41
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ x-with-postgres: &with-postgres
4040
- postgres_password
4141
- postgres_user
4242
- postgres_db
43+
- postgres_db_asset
4344
- postgres_db_db_sync
4445
- postgres_db_handle
4546
- postgres_db_stake_pool
@@ -69,6 +70,7 @@ x-provider-server-environment: &provider-server-environment
6970
x-sdk-environment: &sdk-environment
7071
LOGGER_MIN_SEVERITY: ${LOGGER_MIN_SEVERITY:-info}
7172
OGMIOS_URL: ws://cardano-node-ogmios:1337
73+
POSTGRES_DB_FILE_ASSET: /run/secrets/postgres_db_handle
7274
POSTGRES_DB_FILE_DB_SYNC: /run/secrets/postgres_db_db_sync
7375
POSTGRES_DB_FILE_HANDLE: /run/secrets/postgres_db_handle
7476
POSTGRES_DB_FILE_STAKE_POOL: /run/secrets/postgres_db_stake_pool
@@ -78,12 +80,14 @@ x-sdk-environment: &sdk-environment
7880
POSTGRES_POOL_MAX_DB_SYNC: ${POSTGRES_POOL_MAX:-10}
7981
POSTGRES_POOL_MAX_HANDLE: ${POSTGRES_POOL_MAX:-10}
8082
POSTGRES_POOL_MAX_STAKE_POOL: ${POSTGRES_POOL_MAX:-10}
83+
POSTGRES_PASSWORD_FILE_ASSET: /run/secrets/postgres_password
8184
POSTGRES_PASSWORD_FILE_DB_SYNC: /run/secrets/postgres_password
8285
POSTGRES_PASSWORD_FILE_HANDLE: /run/secrets/postgres_password
8386
POSTGRES_PASSWORD_FILE_STAKE_POOL: /run/secrets/postgres_password
8487
POSTGRES_PORT_DB_SYNC: 5432
8588
POSTGRES_PORT_HANDLE: 5432
8689
POSTGRES_PORT_STAKE_POOL: 5432
90+
POSTGRES_USER_FILE_ASSET: /run/secrets/postgres_user
8791
POSTGRES_USER_FILE_DB_SYNC: /run/secrets/postgres_user
8892
POSTGRES_USER_FILE_HANDLE: /run/secrets/postgres_user
8993
POSTGRES_USER_FILE_STAKE_POOL: /run/secrets/postgres_user
@@ -192,6 +196,27 @@ services:
192196
- postgres_user
193197
shm_size: '2gb'
194198

199+
asset-projector:
200+
<<:
201+
- *from-sdk
202+
- *logging
203+
- *projector
204+
- *with-postgres
205+
environment:
206+
<<:
207+
- *projector-environment
208+
- *sdk-environment
209+
POSTGRES_DB_FILE: /run/secrets/postgres_db_asset
210+
PROJECTION_NAMES: asset
211+
healthcheck:
212+
test:
213+
[
214+
'CMD-SHELL',
215+
'test `curl -fs http://localhost:3000/v1.0.0/health | jq -r ".services[0].projectedTip.blockNo"` -gt 1'
216+
]
217+
ports:
218+
- ${ASSET_PROJECTOR_PORT:-4006}:3000
219+
195220
handle-projector:
196221
<<:
197222
- *from-sdk
@@ -262,6 +287,20 @@ services:
262287
ports:
263288
- ${STAKE_POOL_API_PORT:-4010}:3000
264289

290+
asset-provider-server:
291+
<<:
292+
- *from-sdk
293+
- *logging
294+
- *provider-server
295+
- *with-postgres
296+
environment:
297+
<<:
298+
- *sdk-environment
299+
- *provider-server-environment
300+
SERVICE_NAMES: asset
301+
ports:
302+
- ${HANDLE_API_PORT:-4014}:3000
303+
265304
handle-provider-server:
266305
<<:
267306
- *from-sdk
@@ -321,6 +360,8 @@ secrets:
321360
# See https://github.com/input-output-hk/cardano-db-sync/blob/aed18d1be192bd58d054cdba23758b579dae9f4e/nix/docker.nix#L116
322361
postgres_db:
323362
file: ../../compose/placeholder-secrets/postgres_db_db_sync
363+
postgres_db_asset:
364+
file: ../../compose/placeholder-secrets/postgres_db_asset
324365
postgres_db_db_sync:
325366
file: ../../compose/placeholder-secrets/postgres_db_db_sync
326367
postgres_db_handle:

compose/dev.yml

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
version: '3.9'
22

33
services:
4+
asset-projector:
5+
volumes:
6+
- ../..:/app
7+
8+
asset-provider-server:
9+
volumes:
10+
- ../..:/app
11+
412
pg-boss-worker:
513
volumes:
614
- ../..:/app
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
asset

packages/cardano-services-client/CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [0.14.4](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2023-10-19)
7+
8+
**Note:** Version bump only for package @cardano-sdk/cardano-services-client
9+
10+
## [0.14.3](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2023-10-12)
11+
12+
**Note:** Version bump only for package @cardano-sdk/cardano-services-client
13+
14+
## [0.14.2](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2023-10-09)
15+
16+
**Note:** Version bump only for package @cardano-sdk/cardano-services-client
17+
18+
## [0.14.1](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2023-09-29)
19+
20+
**Note:** Version bump only for package @cardano-sdk/cardano-services-client
21+
622
## [0.14.0](https://github.com/input-output-hk/cardano-js-sdk/compare/@cardano-sdk/[email protected]...@cardano-sdk/[email protected]) (2023-09-20)
723

824
### ⚠ BREAKING CHANGES

packages/cardano-services-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-sdk/cardano-services-client",
3-
"version": "0.14.0",
3+
"version": "0.14.4",
44
"description": "Cardano Services Client",
55
"engines": {
66
"node": ">=16.20.2"

packages/cardano-services-client/src/AssetInfoProvider/assetInfoHttpProvider.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { AssetProvider, HttpProviderConfigPaths } from '@cardano-sdk/core';
22
import { CreateHttpProviderConfig, createHttpProvider } from '../HttpProvider';
33
import { apiVersion } from '../version';
44

5-
/**
6-
* The AssetProvider endpoint paths.
7-
*/
5+
/** The AssetProvider endpoint paths. */
86
const paths: HttpProviderConfigPaths<AssetProvider> = {
97
getAsset: '/get-asset',
108
getAssets: '/get-assets',

packages/cardano-services-client/src/ChainHistoryProvider/chainHistoryHttpProvider.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import { ChainHistoryProvider, HttpProviderConfigPaths, ProviderError, ProviderF
22
import { CreateHttpProviderConfig, createHttpProvider } from '../HttpProvider';
33
import { apiVersion } from '../version';
44

5-
/**
6-
* The ChainHistoryProvider endpoint paths.
7-
*/
5+
/** The ChainHistoryProvider endpoint paths. */
86
const paths: HttpProviderConfigPaths<ChainHistoryProvider> = {
97
blocksByHashes: '/blocks/by-hashes',
108
healthCheck: '/health',

packages/cardano-services-client/src/HandleProvider/KoraLabsHandleProvider.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ import {
1313
import { IHandle } from '@koralabs/handles-public-api-interfaces';
1414
import axios, { AxiosAdapter, AxiosInstance } from 'axios';
1515

16-
/**
17-
* The KoraLabsHandleProvider endpoint paths.
18-
*/
16+
/** The KoraLabsHandleProvider endpoint paths. */
1917
const paths = {
2018
handles: '/handles',
2119
healthCheck: '/health'

0 commit comments

Comments
 (0)