From 84b66fb67ba629a58222db8465e19fbb05a447a8 Mon Sep 17 00:00:00 2001 From: Francisco Silva Date: Fri, 7 Feb 2025 10:24:45 +0100 Subject: [PATCH] Creating client-api type definitions for the omni executor (#3251) --- .../{identity => }/client-api/.editorconfig | 0 .../{identity => }/client-api/.gitignore | 0 .../{identity => }/client-api/.prettierrc | 0 .../{identity => }/client-api/README.md | 0 tee-worker/client-api/package.json | 13 +++ .../client-api/parachain-api/.gitignore | 0 .../client-api/parachain-api/CHANGELOG.md | 0 .../client-api/parachain-api/README.md | 0 .../client-api/parachain-api/package.json | 0 .../prepare-build/interfaces/definitions.ts | 1 + .../interfaces/identity/definitions.ts | 0 .../interfaces/omniAccount/definitions.ts | 4 +- .../interfaces/omniExecutor/definitions.ts | 96 +++++++++++++++++++ .../interfaces/sidechain/definitions.ts | 0 .../trusted_operations/definitions.ts | 0 .../interfaces/vc/definitions.ts | 0 .../client-api/parachain-api/src/index.ts | 0 .../client-api/parachain-api/tsconfig.json | 0 .../{identity => }/client-api/pnpm-lock.yaml | 0 tee-worker/client-api/pnpm-workspace.yaml | 1 + .../client-api/sidechain-api/.gitignore | 0 .../client-api/sidechain-api/CHANGELOG.md | 0 .../client-api/sidechain-api/README.md | 0 .../client-api/sidechain-api/package.json | 2 +- .../prepare-build/interfaces/definitions.ts | 0 .../interfaces/dummynocustom/definitions.ts | 0 .../client-api/sidechain-api/src/index.ts | 0 .../client-api/sidechain-api/tsconfig.json | 0 tee-worker/identity/client-api/package.json | 13 --- .../identity/client-api/pnpm-workspace.yaml | 1 - .../lit-di-identity-multiworker-test.yml | 4 +- .../identity/docker/lit-di-identity-test.yml | 4 +- .../docker/lit-dr-vc-multiworker-test.yml | 4 +- tee-worker/identity/docker/lit-dr-vc-test.yml | 4 +- ...lit-native-request-vc-multiworker-test.yml | 4 +- .../docker/lit-native-request-vc-test.yml | 4 +- .../lit-omni-account-multiworker-test.yml | 4 +- .../identity/docker/lit-omni-account-test.yml | 4 +- .../identity/docker/lit-resume-worker.yml | 4 +- .../docker/lit-test-stress-script.yml | 4 +- .../docker/lit-ts-api-package-build.yml | 6 +- .../docker/lit-vc-correctness-test.yml | 4 +- .../ts-tests/integration-tests/package.json | 4 +- tee-worker/identity/ts-tests/pnpm-lock.yaml | 16 ++-- 44 files changed, 150 insertions(+), 51 deletions(-) rename tee-worker/{identity => }/client-api/.editorconfig (100%) rename tee-worker/{identity => }/client-api/.gitignore (100%) rename tee-worker/{identity => }/client-api/.prettierrc (100%) rename tee-worker/{identity => }/client-api/README.md (100%) create mode 100644 tee-worker/client-api/package.json rename tee-worker/{identity => }/client-api/parachain-api/.gitignore (100%) rename tee-worker/{identity => }/client-api/parachain-api/CHANGELOG.md (100%) rename tee-worker/{identity => }/client-api/parachain-api/README.md (100%) rename tee-worker/{identity => }/client-api/parachain-api/package.json (100%) rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/definitions.ts (82%) rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/identity/definitions.ts (100%) rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts (86%) create mode 100644 tee-worker/client-api/parachain-api/prepare-build/interfaces/omniExecutor/definitions.ts rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts (100%) rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts (100%) rename tee-worker/{identity => }/client-api/parachain-api/prepare-build/interfaces/vc/definitions.ts (100%) rename tee-worker/{identity => }/client-api/parachain-api/src/index.ts (100%) rename tee-worker/{identity => }/client-api/parachain-api/tsconfig.json (100%) rename tee-worker/{identity => }/client-api/pnpm-lock.yaml (100%) create mode 100644 tee-worker/client-api/pnpm-workspace.yaml rename tee-worker/{identity => }/client-api/sidechain-api/.gitignore (100%) rename tee-worker/{identity => }/client-api/sidechain-api/CHANGELOG.md (100%) rename tee-worker/{identity => }/client-api/sidechain-api/README.md (100%) rename tee-worker/{identity => }/client-api/sidechain-api/package.json (94%) rename tee-worker/{identity => }/client-api/sidechain-api/prepare-build/interfaces/definitions.ts (100%) rename tee-worker/{identity => }/client-api/sidechain-api/prepare-build/interfaces/dummynocustom/definitions.ts (100%) rename tee-worker/{identity => }/client-api/sidechain-api/src/index.ts (100%) rename tee-worker/{identity => }/client-api/sidechain-api/tsconfig.json (100%) delete mode 100644 tee-worker/identity/client-api/package.json delete mode 100644 tee-worker/identity/client-api/pnpm-workspace.yaml diff --git a/tee-worker/identity/client-api/.editorconfig b/tee-worker/client-api/.editorconfig similarity index 100% rename from tee-worker/identity/client-api/.editorconfig rename to tee-worker/client-api/.editorconfig diff --git a/tee-worker/identity/client-api/.gitignore b/tee-worker/client-api/.gitignore similarity index 100% rename from tee-worker/identity/client-api/.gitignore rename to tee-worker/client-api/.gitignore diff --git a/tee-worker/identity/client-api/.prettierrc b/tee-worker/client-api/.prettierrc similarity index 100% rename from tee-worker/identity/client-api/.prettierrc rename to tee-worker/client-api/.prettierrc diff --git a/tee-worker/identity/client-api/README.md b/tee-worker/client-api/README.md similarity index 100% rename from tee-worker/identity/client-api/README.md rename to tee-worker/client-api/README.md diff --git a/tee-worker/client-api/package.json b/tee-worker/client-api/package.json new file mode 100644 index 0000000000..538369ed14 --- /dev/null +++ b/tee-worker/client-api/package.json @@ -0,0 +1,13 @@ +{ + "type": "module", + "license": "ISC", + "scripts": { + "update": "pnpm --filter parachain-api run update-metadata && pnpm --filter sidechain-api run update-metadata", + "build": "pnpm --filter parachain-api run build && pnpm --filter sidechain-api run build", + "update-build": "pnpm run update && pnpm run build", + "format": "pnpm run --recursive format", + "check-format": "pnpm run --recursive check-format", + "clean": "pnpm --filter parachain-api run clean && pnpm --filter sidechain-api run clean" + }, + "packageManager": "pnpm@8.7.6" +} diff --git a/tee-worker/identity/client-api/parachain-api/.gitignore b/tee-worker/client-api/parachain-api/.gitignore similarity index 100% rename from tee-worker/identity/client-api/parachain-api/.gitignore rename to tee-worker/client-api/parachain-api/.gitignore diff --git a/tee-worker/identity/client-api/parachain-api/CHANGELOG.md b/tee-worker/client-api/parachain-api/CHANGELOG.md similarity index 100% rename from tee-worker/identity/client-api/parachain-api/CHANGELOG.md rename to tee-worker/client-api/parachain-api/CHANGELOG.md diff --git a/tee-worker/identity/client-api/parachain-api/README.md b/tee-worker/client-api/parachain-api/README.md similarity index 100% rename from tee-worker/identity/client-api/parachain-api/README.md rename to tee-worker/client-api/parachain-api/README.md diff --git a/tee-worker/identity/client-api/parachain-api/package.json b/tee-worker/client-api/parachain-api/package.json similarity index 100% rename from tee-worker/identity/client-api/parachain-api/package.json rename to tee-worker/client-api/parachain-api/package.json diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/definitions.ts similarity index 82% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/definitions.ts index bb7bb66c2f..13d6a3766b 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/definitions.ts +++ b/tee-worker/client-api/parachain-api/prepare-build/interfaces/definitions.ts @@ -3,3 +3,4 @@ export { default as vc } from "./vc/definitions"; export { default as omniAccount } from "./omniAccount/definitions"; export { default as trusted_operations } from "./trusted_operations/definitions"; export { default as sidechain } from "./sidechain/definitions"; +export { default as omniExecutor } from "./omniExecutor/definitions"; diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/identity/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/identity/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/identity/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/identity/definitions.ts diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts similarity index 86% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts index 9988d28ed0..80909ff7e0 100644 --- a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts +++ b/tee-worker/client-api/parachain-api/prepare-build/interfaces/omniAccount/definitions.ts @@ -36,7 +36,9 @@ export default { Private: "(Bytes,H256)", }, }, - + OmniAccountPermission: { + _enum: ["All", "AccountManagement", "RequestNativeIntent", "RequestEthereumIntent", "RequestSolanaIntent"], + }, AuthOptions: { expires_at: "u32", }, diff --git a/tee-worker/client-api/parachain-api/prepare-build/interfaces/omniExecutor/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/omniExecutor/definitions.ts new file mode 100644 index 0000000000..2f889272fe --- /dev/null +++ b/tee-worker/client-api/parachain-api/prepare-build/interfaces/omniExecutor/definitions.ts @@ -0,0 +1,96 @@ +export default { + types: { + OmniAesRequest: { + mrenclave: "MrEnclave", + key: "Vec", + payload: "AesOutput", + }, + PlainRequest: { + mrenclave: "MrEnclave", + payload: "Vec", + }, + MrEnclave: "H256", + NativeCall: { + _enum: { + request_intent: "(LitentryIdentity, Intent)", + create_account_store: "(LitentryIdentity)", + add_account: "(LitentryIdentity, LitentryIdentity, LitentryValidationData, bool, Option>)", + remove_accounts: "(LitentryIdentity, Vec)", + publicize_account: "(LitentryIdentity, LitentryIdentity)", + set_permissions: "(LitentryIdentity, LitentryIdentity, Vec)", + }, + }, + NativeCallAuthenticated: { + call: "NativeCall", + nonce: "Index", + authentication: "Authentication", + }, + Authentication: { + _enum: { + Web3: "(LitentryMultiSignature)", + Email: "(Text)", + AuthToken: "(Text)", + OAuth2: "(OAuth2Data)", + }, + }, + OAuth2Data: { + provider: "OAuth2Provider", + code: "Text", + state: "Text", + redirect_uri: "Text", + }, + OAuth2Provider: { + _enum: ["Google"], + }, + NativeCallResponse: "Result", + NativeCallOk: { + _enum: { + AuthToken: "(Text)", + ExtrinsicReport: "(XtReport)", + }, + }, + XtReport: { + // Hash of the extrinsic. + extrinsic_hash: "H256", + // Block hash of the block the extrinsic was included in. + // Only available if watched until at least `InBlock`. + block_hash: "Option", + // Last known Transaction Status. + status: "TxStatus", + }, + TxStatus: { + // Transaction is part of the future queue. + Future: "Null", + // Transaction is part of the ready queue. + Ready: "Null", + // The transaction has been broadcast to the given peers. + Broadcast: "Vec", + // Transaction has been included in block with given hash. + InBlock: "H256", + // The block this transaction was included in has been retracted. + Retracted: "H256", + // Maximum number of finality watchers has been reached, + // old watchers are being removed. + FinalityTimeout: "H256", + // Transaction has been finalized by a finality-gadget, e.g GRANDPA + Finalized: "H256", + // Transaction has been replaced in the pool, by another transaction + // that provides the same tags. (e.g. same (sender, nonce)). + Usurped: "H256", + // Transaction has been dropped from the pool because of the limit. + Dropped: "Null", + // Transaction is no longer valid in the current state. + Invalid: "Null", + }, + NativeCallError: { + _enum: { + UnexpectedCall: "(Text)", + UnauthorizedSender: "Null", + AuthTokenCreationFailed: "Null", + InternalError: "Null", + IInvalidMemberIdentity: "Null", + ValidationDataVerificationFailed: "Null", + }, + }, + }, +}; diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/sidechain/definitions.ts diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/trusted_operations/definitions.ts diff --git a/tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/vc/definitions.ts b/tee-worker/client-api/parachain-api/prepare-build/interfaces/vc/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/prepare-build/interfaces/vc/definitions.ts rename to tee-worker/client-api/parachain-api/prepare-build/interfaces/vc/definitions.ts diff --git a/tee-worker/identity/client-api/parachain-api/src/index.ts b/tee-worker/client-api/parachain-api/src/index.ts similarity index 100% rename from tee-worker/identity/client-api/parachain-api/src/index.ts rename to tee-worker/client-api/parachain-api/src/index.ts diff --git a/tee-worker/identity/client-api/parachain-api/tsconfig.json b/tee-worker/client-api/parachain-api/tsconfig.json similarity index 100% rename from tee-worker/identity/client-api/parachain-api/tsconfig.json rename to tee-worker/client-api/parachain-api/tsconfig.json diff --git a/tee-worker/identity/client-api/pnpm-lock.yaml b/tee-worker/client-api/pnpm-lock.yaml similarity index 100% rename from tee-worker/identity/client-api/pnpm-lock.yaml rename to tee-worker/client-api/pnpm-lock.yaml diff --git a/tee-worker/client-api/pnpm-workspace.yaml b/tee-worker/client-api/pnpm-workspace.yaml new file mode 100644 index 0000000000..0257df1072 --- /dev/null +++ b/tee-worker/client-api/pnpm-workspace.yaml @@ -0,0 +1 @@ +packages: ["parachain-api", "sidechain-api"] diff --git a/tee-worker/identity/client-api/sidechain-api/.gitignore b/tee-worker/client-api/sidechain-api/.gitignore similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/.gitignore rename to tee-worker/client-api/sidechain-api/.gitignore diff --git a/tee-worker/identity/client-api/sidechain-api/CHANGELOG.md b/tee-worker/client-api/sidechain-api/CHANGELOG.md similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/CHANGELOG.md rename to tee-worker/client-api/sidechain-api/CHANGELOG.md diff --git a/tee-worker/identity/client-api/sidechain-api/README.md b/tee-worker/client-api/sidechain-api/README.md similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/README.md rename to tee-worker/client-api/sidechain-api/README.md diff --git a/tee-worker/identity/client-api/sidechain-api/package.json b/tee-worker/client-api/sidechain-api/package.json similarity index 94% rename from tee-worker/identity/client-api/sidechain-api/package.json rename to tee-worker/client-api/sidechain-api/package.json index dd1c861952..852bd5c61a 100644 --- a/tee-worker/identity/client-api/sidechain-api/package.json +++ b/tee-worker/client-api/sidechain-api/package.json @@ -8,7 +8,7 @@ "version": "0.9.21-next.0", "scripts": { "clean": "rm -rf dist build node_modules", - "update-metadata": "../../bin/litentry-cli print-sgx-metadata-raw > prepare-build/litentry-sidechain-metadata.json", + "update-metadata": "../../identity/bin/litentry-cli print-sgx-metadata-raw > prepare-build/litentry-sidechain-metadata.json", "prepare-dir": "mkdir -p build && cp -rf prepare-build/* build", "generate-from-defs": "pnpm exec node --experimental-specifier-resolution=node --loader ts-node/esm node_modules/@polkadot/typegen/scripts/polkadot-types-from-defs.mjs --package sidechain-api/interfaces --input build/interfaces --endpoint build/litentry-sidechain-metadata.json", "generate-from-chain": "pnpm exec node --experimental-specifier-resolution=node --loader ts-node/esm node_modules/@polkadot/typegen/scripts/polkadot-types-from-chain.mjs --package sidechain-api/interfaces --output build/interfaces --endpoint build/litentry-sidechain-metadata.json --strict", diff --git a/tee-worker/identity/client-api/sidechain-api/prepare-build/interfaces/definitions.ts b/tee-worker/client-api/sidechain-api/prepare-build/interfaces/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/prepare-build/interfaces/definitions.ts rename to tee-worker/client-api/sidechain-api/prepare-build/interfaces/definitions.ts diff --git a/tee-worker/identity/client-api/sidechain-api/prepare-build/interfaces/dummynocustom/definitions.ts b/tee-worker/client-api/sidechain-api/prepare-build/interfaces/dummynocustom/definitions.ts similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/prepare-build/interfaces/dummynocustom/definitions.ts rename to tee-worker/client-api/sidechain-api/prepare-build/interfaces/dummynocustom/definitions.ts diff --git a/tee-worker/identity/client-api/sidechain-api/src/index.ts b/tee-worker/client-api/sidechain-api/src/index.ts similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/src/index.ts rename to tee-worker/client-api/sidechain-api/src/index.ts diff --git a/tee-worker/identity/client-api/sidechain-api/tsconfig.json b/tee-worker/client-api/sidechain-api/tsconfig.json similarity index 100% rename from tee-worker/identity/client-api/sidechain-api/tsconfig.json rename to tee-worker/client-api/sidechain-api/tsconfig.json diff --git a/tee-worker/identity/client-api/package.json b/tee-worker/identity/client-api/package.json deleted file mode 100644 index 437192a9f2..0000000000 --- a/tee-worker/identity/client-api/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "module", - "license": "ISC", - "scripts": { - "update": "pnpm --filter parachain-api run update-metadata && pnpm --filter sidechain-api run update-metadata", - "build": "pnpm --filter parachain-api run build && pnpm --filter sidechain-api run build", - "update-build": "pnpm run update && pnpm run build", - "format": "pnpm run --recursive format", - "check-format": "pnpm run --recursive check-format", - "clean": "pnpm --filter parachain-api run clean && pnpm --filter sidechain-api run clean" - }, - "packageManager": "pnpm@8.7.6" -} diff --git a/tee-worker/identity/client-api/pnpm-workspace.yaml b/tee-worker/identity/client-api/pnpm-workspace.yaml deleted file mode 100644 index 28fde15bef..0000000000 --- a/tee-worker/identity/client-api/pnpm-workspace.yaml +++ /dev/null @@ -1 +0,0 @@ -packages: ['parachain-api', 'sidechain-api'] diff --git a/tee-worker/identity/docker/lit-di-identity-multiworker-test.yml b/tee-worker/identity/docker/lit-di-identity-multiworker-test.yml index 5eb974a6c3..4a8821435a 100644 --- a/tee-worker/identity/docker/lit-di-identity-multiworker-test.yml +++ b/tee-worker/identity/docker/lit-di-identity-multiworker-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-di-identity-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-di-identity-test.yml b/tee-worker/identity/docker/lit-di-identity-test.yml index 87f8c9e09b..c032f85d15 100644 --- a/tee-worker/identity/docker/lit-di-identity-test.yml +++ b/tee-worker/identity/docker/lit-di-identity-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-di-identity-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../../ dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-dr-vc-multiworker-test.yml b/tee-worker/identity/docker/lit-dr-vc-multiworker-test.yml index 8ce3a1d96c..5241782c22 100644 --- a/tee-worker/identity/docker/lit-dr-vc-multiworker-test.yml +++ b/tee-worker/identity/docker/lit-dr-vc-multiworker-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-dr-vc-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-dr-vc-test.yml b/tee-worker/identity/docker/lit-dr-vc-test.yml index 8bb0a6cf56..bd4dd10cb1 100644 --- a/tee-worker/identity/docker/lit-dr-vc-test.yml +++ b/tee-worker/identity/docker/lit-dr-vc-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-dr-vc-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-native-request-vc-multiworker-test.yml b/tee-worker/identity/docker/lit-native-request-vc-multiworker-test.yml index a5e1e5a6f9..4dad26d204 100644 --- a/tee-worker/identity/docker/lit-native-request-vc-multiworker-test.yml +++ b/tee-worker/identity/docker/lit-native-request-vc-multiworker-test.yml @@ -4,10 +4,10 @@ services: container_name: lit-native-request-vc-multiworker-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-native-request-vc-test.yml b/tee-worker/identity/docker/lit-native-request-vc-test.yml index 241abab7ce..412df8a041 100644 --- a/tee-worker/identity/docker/lit-native-request-vc-test.yml +++ b/tee-worker/identity/docker/lit-native-request-vc-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-native-request-vc-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-omni-account-multiworker-test.yml b/tee-worker/identity/docker/lit-omni-account-multiworker-test.yml index c1291249cd..3e42e6dd5a 100644 --- a/tee-worker/identity/docker/lit-omni-account-multiworker-test.yml +++ b/tee-worker/identity/docker/lit-omni-account-multiworker-test.yml @@ -4,10 +4,10 @@ services: container_name: lit-omni-account-multiworker-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-omni-account-test.yml b/tee-worker/identity/docker/lit-omni-account-test.yml index 59432c5ead..8b0f2dbb15 100644 --- a/tee-worker/identity/docker/lit-omni-account-test.yml +++ b/tee-worker/identity/docker/lit-omni-account-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-omni-account-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-resume-worker.yml b/tee-worker/identity/docker/lit-resume-worker.yml index 0152ca9ad0..4906233cb1 100644 --- a/tee-worker/identity/docker/lit-resume-worker.yml +++ b/tee-worker/identity/docker/lit-resume-worker.yml @@ -4,10 +4,10 @@ services: container_name: litentry-worker volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-worker depends_on: diff --git a/tee-worker/identity/docker/lit-test-stress-script.yml b/tee-worker/identity/docker/lit-test-stress-script.yml index e188433f01..0d12a7a464 100644 --- a/tee-worker/identity/docker/lit-test-stress-script.yml +++ b/tee-worker/identity/docker/lit-test-stress-script.yml @@ -4,10 +4,10 @@ services: container_name: litentry-test-stress-script volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/docker/lit-ts-api-package-build.yml b/tee-worker/identity/docker/lit-ts-api-package-build.yml index 882e06eaec..14f32f6334 100644 --- a/tee-worker/identity/docker/lit-ts-api-package-build.yml +++ b/tee-worker/identity/docker/lit-ts-api-package-build.yml @@ -3,10 +3,10 @@ services: image: litentry/identity-cli:latest container_name: litentry-lit-ts-api-package-build volumes: - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: @@ -17,7 +17,7 @@ services: condition: service_started networks: - litentry-test-network - entrypoint: + entrypoint: "/usr/local/worker-cli/lit_ts_api_package_build.sh -p 9944 -u ws://litentry-node -W http://litentry-node -V ws://litentry-worker-1 -A 2011 -C /usr/local/bin/litentry-cli 2>&1" restart: "no" networks: diff --git a/tee-worker/identity/docker/lit-vc-correctness-test.yml b/tee-worker/identity/docker/lit-vc-correctness-test.yml index 8e3dbb91a0..edafa2acaa 100644 --- a/tee-worker/identity/docker/lit-vc-correctness-test.yml +++ b/tee-worker/identity/docker/lit-vc-correctness-test.yml @@ -4,10 +4,10 @@ services: container_name: litentry-vc-correctness-test volumes: - ../ts-tests:/ts-tests - - ../client-api:/client-api + - ../../client-api:/client-api - ../cli:/usr/local/worker-cli build: - context: .. + context: ../.. dockerfile: build.Dockerfile target: deployed-client depends_on: diff --git a/tee-worker/identity/ts-tests/integration-tests/package.json b/tee-worker/identity/ts-tests/integration-tests/package.json index 137f47277f..01ccaa060d 100644 --- a/tee-worker/identity/ts-tests/integration-tests/package.json +++ b/tee-worker/identity/ts-tests/integration-tests/package.json @@ -37,9 +37,9 @@ "micro-base58": "^0.5.1", "mocha": "^10.6.0", "mocha-steps": "^1.3.0", - "parachain-api": "file:../../client-api/parachain-api", + "parachain-api": "file:../../../client-api/parachain-api", "scale-ts": "^0.2.11", - "sidechain-api": "file:../../client-api/sidechain-api", + "sidechain-api": "file:../../../client-api/sidechain-api", "tiny-secp256k1": "^2.2.3", "tweetnacl": "^1.0.3", "websocket-as-promised": "^2.0.1", diff --git a/tee-worker/identity/ts-tests/pnpm-lock.yaml b/tee-worker/identity/ts-tests/pnpm-lock.yaml index 3addf6f174..ebcaeaa7b7 100644 --- a/tee-worker/identity/ts-tests/pnpm-lock.yaml +++ b/tee-worker/identity/ts-tests/pnpm-lock.yaml @@ -95,14 +95,14 @@ importers: specifier: ^1.3.0 version: 1.3.0 parachain-api: - specifier: file:../../client-api/parachain-api - version: file:../client-api/parachain-api + specifier: file:../../../client-api/parachain-api + version: file:../../client-api/parachain-api scale-ts: specifier: ^0.2.11 version: 0.2.12 sidechain-api: - specifier: file:../../client-api/sidechain-api - version: file:../client-api/sidechain-api + specifier: file:../../../client-api/sidechain-api + version: file:../../client-api/sidechain-api tiny-secp256k1: specifier: ^2.2.3 version: 2.2.3 @@ -5067,8 +5067,8 @@ packages: yaml: 2.6.1 dev: false - file:../client-api/parachain-api: - resolution: {directory: ../client-api/parachain-api, type: directory} + file:../../client-api/parachain-api: + resolution: {directory: ../../client-api/parachain-api, type: directory} name: '@litentry/parachain-api' dependencies: '@polkadot/api': 15.0.2 @@ -5091,8 +5091,8 @@ packages: - utf-8-validate dev: false - file:../client-api/sidechain-api: - resolution: {directory: ../client-api/sidechain-api, type: directory} + file:../../client-api/sidechain-api: + resolution: {directory: ../../client-api/sidechain-api, type: directory} name: '@litentry/sidechain-api' dependencies: '@polkadot/api': 15.0.2