chore(project): bump and improve lib (#33)

fuxingloh · Apr 19, 2024 · ba59fdb · ba59fdb
1 parent 26859a3
commit ba59fdb
Show file tree

Hide file tree

Showing 26 changed files with 612 additions and 482 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -7,6 +7,15 @@
     "dependencyDashboardApproval": false
   },
   "rangeStrategy": "bump",
+  "regexManagers": [
+    {
+      "fileMatch": [".+Dockerfile$"],
+      "matchStrings": [
+        "datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\sENV .*?_VERSION=(?<currentValue>.*)\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
+    }
+  ],
   "packageRules": [
     {
       "matchPackageNames": ["node", "typescript", "@types/node"],

diff --git a/.idea/dictionaries/fuxing.xml b/.idea/dictionaries/fuxing.xml
diff --git a/definitions/bip122-000000000019d6689c085ae165831e93/bitcoind.unit.ts b/definitions/bip122-000000000019d6689c085ae165831e93/bitcoind.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 import waitForExpect from 'wait-for-expect';
 
 import definition from './bitcoind.json';
@@ -15,7 +15,7 @@ afterAll(async () => {
 });
 
 describe('bitcoind', () => {
-  let bitcoind: KarfiaTestContainer;
+  let bitcoind: KarfiaContainer;
 
   beforeAll(() => {
     bitcoind = testcontainers.getContainer('bitcoind');

diff --git a/definitions/bip122-0f9188f13cb7b2c71f2a335e3a4fc328/bitcoind.unit.ts b/definitions/bip122-0f9188f13cb7b2c71f2a335e3a4fc328/bitcoind.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './bitcoind.json';
 
@@ -14,7 +14,7 @@ afterAll(async () => {
 });
 
 describe('bitcoind', () => {
-  let bitcoind: KarfiaTestContainer;
+  let bitcoind: KarfiaContainer;
 
   beforeAll(() => {
     bitcoind = testcontainers.getContainer('bitcoind');

diff --git a/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid-jellyfish.json b/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid-jellyfish.json
@@ -15,7 +15,7 @@
       "encoding": "hex"
     },
     "DEFID_URL": {
-      "type": "Expansion",
+      "type": "Value",
       "value": "http://${RPC_USER}:${RPC_PASSWORD}@defid:8554"
     }
   },

diff --git a/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid-jellyfish.unit.ts b/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid-jellyfish.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './defid-jellyfish.json';
 
@@ -14,8 +14,8 @@ afterAll(async () => {
 });
 
 describe('defid + whale', () => {
-  let defid: KarfiaTestContainer;
-  let whale: KarfiaTestContainer;
+  let defid: KarfiaContainer;
+  let whale: KarfiaContainer;
 
   beforeAll(() => {
     defid = testcontainers.getContainer('defid');

diff --git a/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid.unit.ts b/definitions/bip122-279b1a87aedc7b9471d4ad4e5f12967a/defid.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './defid.json';
 
@@ -14,7 +14,7 @@ afterAll(async () => {
 });
 
 describe('defid', () => {
-  let defid: KarfiaTestContainer;
+  let defid: KarfiaContainer;
 
   beforeAll(() => {
     defid = testcontainers.getContainer('defid');

diff --git a/definitions/bip122-d744db74fb70ed42767ae028a129365f/defid-jellyfish.unit.ts b/definitions/bip122-d744db74fb70ed42767ae028a129365f/defid-jellyfish.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './defid-jellyfish.json';
 
@@ -14,8 +14,8 @@ afterAll(async () => {
 });
 
 describe('defid + whale', () => {
-  let defid: KarfiaTestContainer;
-  let whale: KarfiaTestContainer;
+  let defid: KarfiaContainer;
+  let whale: KarfiaContainer;
 
   beforeAll(() => {
     defid = testcontainers.getContainer('defid');

diff --git a/definitions/eip155-1337/ganache.unit.ts b/definitions/eip155-1337/ganache.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './ganache.json';
 
@@ -15,7 +15,7 @@ describe('testcontainers', () => {
   });
 
   describe('ganache', () => {
-    let ganache: KarfiaTestContainer;
+    let ganache: KarfiaContainer;
 
     beforeAll(() => {
       ganache = testcontainers.getContainer('ganache');

diff --git a/definitions/eip155-31337/hardhat.unit.ts b/definitions/eip155-31337/hardhat.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './hardhat.json';
 
@@ -15,7 +15,7 @@ describe('testcontainers', () => {
   });
 
   describe('hardhat', () => {
-    let hardhat: KarfiaTestContainer;
+    let hardhat: KarfiaContainer;
 
     beforeAll(() => {
       hardhat = testcontainers.getContainer('hardhat');

diff --git a/definitions/solana-00000000000000000000000000000000/solana-test-validator.unit.ts b/definitions/solana-00000000000000000000000000000000/solana-test-validator.unit.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, it } from '@jest/globals';
-import { KarfiaAgentContainer, KarfiaTestContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
+import { KarfiaAgentContainer, KarfiaContainer, KarfiaTestcontainers } from 'karfia-testcontainers';
 
 import definition from './solana-test-validator.json';
 
@@ -15,7 +15,7 @@ describe('testcontainers', () => {
   });
 
   describe('solana-test-validator', () => {
-    let validator: KarfiaTestContainer;
+    let validator: KarfiaContainer;
 
     beforeAll(() => {
       validator = testcontainers.getContainer('solana-test-validator');

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@swc/core": "^1.4.13",
+    "@swc/core": "^1.4.16",
     "@swc/jest": "^0.2.36",
     "@types/node": "^20.11.30",
     "@workspace/eslint-config": "workspace:*",

diff --git a/packages/karfia-agent/Dockerfile b/packages/karfia-agent/Dockerfile
@@ -7,15 +7,20 @@ RUN corepack enable pnpm
 
 ENV PNPM_HOME="/root/.local/share/pnpm/global" \
     PATH="$PATH:/root/.local/share/pnpm/global"
-RUN pnpm config set store-dir /root/.local/share/pnpm/global/store/v3
 
-# renovate: datasource=npm depName=turbo
-ENV TURBO_VERSION=1.12.5
-RUN pnpm add -g turbo@${TURBO_VERSION}
+COPY package.json package.json
+RUN pnpm -v
+ENV COREPACK_ENABLE_NETWORK=0
+
+RUN pnpm config set store-dir /root/.local/share/pnpm/global/store/v3
 
 # Isolate workspace by pruning non-related services.
 FROM base AS pruner
 
+# renovate: datasource=npm depName=turbo
+ENV TURBO_VERSION=1.13.2
+RUN pnpm add -g turbo@${TURBO_VERSION}
+
 COPY . .
 
 RUN pnpm turbo prune --scope=karfia-agent --docker
@@ -30,15 +35,15 @@ COPY --from=pruner /app/out/pnpm-lock.yaml ./pnpm-lock.yaml
 
 # Mount cache to copy from content-addressable store; ignore cross-device link errors due to different mount points.
 RUN --mount=type=cache,target=/root/.local/share/pnpm/global/store/v3\
-  pnpm install --frozen-lockfile\
-  | grep -v "cross-device link not permitted\|Falling back to copying packages from store"
+  pnpm install --frozen-lockfile
 
 COPY --from=pruner /app/out/full/ .
 
 # To relink dependencies with ./bin links
 RUN pnpm install --frozen-lockfile --offline
 
-RUN pnpm turbo run build --filter=karfia-agent
+RUN --mount=type=cache,id=turborepo-cache,target=node_modules/.cache/turbo\
+  pnpm turbo run build --filter=karfia-agent
 
 # Run agent
 FROM node:20-alpine AS runner

diff --git a/packages/karfia-agent/package.json b/packages/karfia-agent/package.json
@@ -32,7 +32,7 @@
     "ajv-formats": "^3.0.1",
     "karfia-definition": "workspace:^",
     "trpc-openapi": "^1.2.0",
-    "zod": "^3.22.4"
+    "zod": "^3.22.5"
   },
   "devDependencies": {
     "@workspace/jest-preset": "workspace:*",

diff --git a/packages/karfia-agent/routers/probes.ts b/packages/karfia-agent/routers/probes.ts
@@ -8,8 +8,8 @@ import {
   ContainerEndpointHttpAuthorization,
   ContainerEndpointHttpJsonRpc,
   ContainerEndpointHttpRest,
+  EnvironmentReference,
   KarfiaDefinition,
-  KarfiaEnvironmentReference,
 } from 'karfia-definition';
 import { z } from 'zod';
 
@@ -236,7 +236,7 @@ function getHttpAuthorizationHeaders(auth: ContainerEndpointHttpAuthorization):
  *
  * If the value is not a reference, it is returned as is.
  */
-function resolveValue(value: string | KarfiaEnvironmentReference): string {
+function resolveValue(value: string | EnvironmentReference): string {
   if (typeof value === 'string') {
     return value;
   }

diff --git a/packages/karfia-definition/index.json b/packages/karfia-definition/index.json
@@ -25,15 +25,15 @@
       "maxLength": 128
     },
     "environment": {
-      "$ref": "#/definitions/KarfiaEnvironment"
+      "$ref": "#/definitions/Environment"
     },
     "containers": {
       "type": "object",
       "minProperties": 1,
       "maxProperties": 6,
       "patternProperties": {
         "^(?!karfia)[a-z0-9][a-z0-9-]{0,28}[a-z0-9]$": {
-          "$ref": "#/definitions/KarfiaContainer"
+          "$ref": "#/definitions/Container"
         }
       },
       "additionalProperties": false
@@ -42,17 +42,17 @@
   "required": ["id", "caip2", "name", "containers"],
   "additionalProperties": false,
   "definitions": {
-    "KarfiaEnvironment": {
+    "Environment": {
       "type": "object",
       "maxProperties": 30,
       "patternProperties": {
         "^[a-zA-Z_]+[a-zA-Z0-9_]*$": {
-          "$ref": "#/definitions/KarfiaEnvironmentFactory"
+          "$ref": "#/definitions/EnvironmentFactory"
         }
       },
       "additionalProperties": false
     },
-    "KarfiaEnvironmentFactory": {
+    "EnvironmentFactory": {
       "oneOf": [
         {
           "type": "object",
@@ -77,7 +77,7 @@
           "type": "object",
           "properties": {
             "type": {
-              "const": "Expansion"
+              "const": "Value"
             },
             "value": {
               "type": "string"
@@ -88,7 +88,7 @@
         }
       ]
     },
-    "KarfiaEnvironmentReference": {
+    "EnvironmentReference": {
       "type": "object",
       "properties": {
         "key": {
@@ -98,7 +98,7 @@
       "required": ["key"],
       "additionalProperties": false
     },
-    "KarfiaContainer": {
+    "Container": {
       "type": "object",
       "properties": {
         "image": {
@@ -145,7 +145,7 @@
           "maxProperties": 30,
           "patternProperties": {
             "^[a-zA-Z_]+[a-zA-Z0-9_]*$": {
-              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/KarfiaEnvironmentReference" }]
+              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/EnvironmentReference" }]
             }
           },
           "additionalProperties": false
@@ -360,10 +360,10 @@
               "const": "HttpBasic"
             },
             "username": {
-              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/KarfiaEnvironmentReference" }]
+              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/EnvironmentReference" }]
             },
             "password": {
-              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/KarfiaEnvironmentReference" }]
+              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/EnvironmentReference" }]
             }
           },
           "required": ["type", "username", "password"],
@@ -376,7 +376,7 @@
               "const": "HttpBearer"
             },
             "token": {
-              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/KarfiaEnvironmentReference" }]
+              "oneOf": [{ "type": "string" }, { "$ref": "#/definitions/EnvironmentReference" }]
             }
           },
           "required": ["type", "token"],

diff --git a/packages/karfia-docker-compose/__snapshots__/synthesizer.unit.ts.snap b/packages/karfia-docker-compose/__snapshots__/synthesizer.unit.ts.snap
@@ -16,7 +16,7 @@ services:
       - '0:1194'
     environment:
       KARFIA_DEFINITION_JSON: >-
-        {"id":"eip155:1337/ganache:7.9.1","caip2":"eip155:1337","name":"Ganache","environment":{"RPC_USER":{"type":"RandomBytes","length":16,"encoding":"hex"},"RPC_PASSWORD":{"type":"RandomBytes","length":16,"encoding":"hex"},"URL":{"type":"Expansion","value":"http://$\${RPC_USER}:$\${RPC_PASSWORD}@ganache:8554"}},"containers":{"ganache":{"image":"docker.io/trufflesuite/ganache@sha256:c62c58290c28e24b427f74c6f597ff696257bd2d8e8d517ce4cf46b29b304a3f","source":"https://github.com/trufflesuite/ganache","environment":{"RPCUSER":{"key":"RPC_USER"},"RPCPASSWORD":{"key":"RPC_PASSWORD"}},"resources":{"cpu":0.25,"memory":256},"endpoints":{"p2p":{"port":8555},"rpc":{"port":8545,"protocol":"HTTP
+        {"id":"eip155:1337/ganache:7.9.1","caip2":"eip155:1337","name":"Ganache","environment":{"RPC_USER":{"type":"RandomBytes","length":16,"encoding":"hex"},"RPC_PASSWORD":{"type":"RandomBytes","length":16,"encoding":"hex"},"URL":{"type":"Value","value":"http://$\${RPC_USER}:$\${RPC_PASSWORD}@ganache:8554"}},"containers":{"ganache":{"image":"docker.io/trufflesuite/ganache@sha256:c62c58290c28e24b427f74c6f597ff696257bd2d8e8d517ce4cf46b29b304a3f","source":"https://github.com/trufflesuite/ganache","environment":{"RPCUSER":{"key":"RPC_USER"},"RPCPASSWORD":{"key":"RPC_PASSWORD"}},"resources":{"cpu":0.25,"memory":256},"endpoints":{"p2p":{"port":8555},"rpc":{"port":8545,"protocol":"HTTP
         JSON-RPC
         2.0","authorization":{"type":"HttpBasic","username":{"key":"RPC_USER"},"password":{"key":"RPC_PASSWORD"}},"probes":{"readiness":{"params":[],"method":"eth_blockNumber","match":{"result":{"type":"string"}}}}}},"volumes":{"persistent":{"paths":["/.ganache"],"size":{"initial":"1G","from":"2024-01-01","growth":"1G","rate":"yearly"}}}}}}
       KARFIA_DEPLOYMENT_ID: \${KARFIA_DEPLOYMENT_ID}