From 214922363e6d27fdb816e4db1a5220b113e253ed Mon Sep 17 00:00:00 2001 From: iorveth Date: Fri, 23 Aug 2024 14:31:27 +0000 Subject: [PATCH 1/3] Add avida-ts multi arch support & node >=20.0.0 requirement to package.json --- avida-ts/docker/docker-compose.local.yaml | 8 ++++---- avida-ts/package.json | 7 +++++-- .../src/contracts/RestaurantContract.types.ts | 5 ----- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/avida-ts/docker/docker-compose.local.yaml b/avida-ts/docker/docker-compose.local.yaml index 9468e26..e7ff94c 100644 --- a/avida-ts/docker/docker-compose.local.yaml +++ b/avida-ts/docker/docker-compose.local.yaml @@ -2,7 +2,7 @@ version: "3" services: cheqd-node: - image: ghcr.io/nymlab/cheqd-node:v2.0.1-arm64 + image: ghcr.io/nymlab/cheqd-node-multiarch:v2.0.1 ports: - target: 9090 published: 9090 # grpc @@ -17,7 +17,7 @@ services: - ../env/local.env cheqd-resource-uploader: - image: ghcr.io/nymlab/cheqd-node:v2.0.1-arm64 + image: ghcr.io/nymlab/cheqd-node-multiarch:v2.0.1 volumes: - ./scripts/:/tmp/scripts/ - ./cheqd-resource-artifacts/:/tmp/cheqd-resource-artifacts @@ -28,7 +28,7 @@ services: - NODE=http://cheqd-node:26657 neutron-node: - image: ghcr.io/nymlab/neutron-standalone:v3.0.5-arm64 + image: ghcr.io/nymlab/neutron-standalone-multiarch:v3.0.5 ports: - target: 9090 published: 9080 # grpc @@ -44,7 +44,7 @@ services: # deployer: neutron demo_2 # salt: ascii avida-local neutron-deployer: - image: ghcr.io/nymlab/neutron-standalone:v3.0.5-arm64 + image: ghcr.io/nymlab/neutron-standalone-multiarch:v3.0.5 volumes: - ./../../artifacts/:/tmp/artifacts/ - ../:/tmp/app/ diff --git a/avida-ts/package.json b/avida-ts/package.json index f0e7a27..d432803 100644 --- a/avida-ts/package.json +++ b/avida-ts/package.json @@ -9,7 +9,7 @@ "setup": "pnpm run reset && pnpm install", "reset": "pnpm dlx rimraf --glob ./**/node_modules", "build": "NODE_ENV=production pnpm run build:txutils && pnpm run build:types", - "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", + "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", "build:txutils": "tsc -p ./packages/avida-tx-utils && tsc-alias -p ./packages/avida-tx-utils/tsconfig.json", "build:types": "node ./scripts/gen-contract-types.mjs && tsc -p ./packages/avida-common-types && tsc-alias -p ./packages/avida-common-types/tsconfig.json", "scripts-type-check": "tsc --pretty --noEmit --project tsconfig.base.json", @@ -55,5 +55,8 @@ }, "keywords": [], "author": "", - "license": "ISC" + "license": "ISC", + "engines" : { + "node" : ">=20.0.0" + } } diff --git a/avida-ts/packages/avida-common-types/src/contracts/RestaurantContract.types.ts b/avida-ts/packages/avida-common-types/src/contracts/RestaurantContract.types.ts index 5f39688..7f10c66 100644 --- a/avida-ts/packages/avida-common-types/src/contracts/RestaurantContract.types.ts +++ b/avida-ts/packages/avida-common-types/src/contracts/RestaurantContract.types.ts @@ -57,11 +57,6 @@ export type QueryMsg1 = { get_verifier_address: { [k: string]: unknown; }; -} | { - get_route_requirements: { - route_id: number; - [k: string]: unknown; - }; }; export interface GetVerifierResponse { verifier: string; From a32c0304f0fe5a0387f9c7cff8f751d4f2ae79dc Mon Sep 17 00:00:00 2001 From: iorveth Date: Sun, 25 Aug 2024 08:14:45 +0000 Subject: [PATCH 2/3] chore: whitespace issue --- avida-ts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avida-ts/package.json b/avida-ts/package.json index d432803..5365c3f 100644 --- a/avida-ts/package.json +++ b/avida-ts/package.json @@ -9,7 +9,7 @@ "setup": "pnpm run reset && pnpm install", "reset": "pnpm dlx rimraf --glob ./**/node_modules", "build": "NODE_ENV=production pnpm run build:txutils && pnpm run build:types", - "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", + "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", "build:txutils": "tsc -p ./packages/avida-tx-utils && tsc-alias -p ./packages/avida-tx-utils/tsconfig.json", "build:types": "node ./scripts/gen-contract-types.mjs && tsc -p ./packages/avida-common-types && tsc-alias -p ./packages/avida-common-types/tsconfig.json", "scripts-type-check": "tsc --pretty --noEmit --project tsconfig.base.json", From b3f2d1eb1ba5babba80709390ce964900cc1a473 Mon Sep 17 00:00:00 2001 From: iorveth Date: Sun, 25 Aug 2024 08:15:36 +0000 Subject: [PATCH 3/3] chore: whitespace issue --- avida-ts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avida-ts/package.json b/avida-ts/package.json index 5365c3f..c95c031 100644 --- a/avida-ts/package.json +++ b/avida-ts/package.json @@ -9,7 +9,7 @@ "setup": "pnpm run reset && pnpm install", "reset": "pnpm dlx rimraf --glob ./**/node_modules", "build": "NODE_ENV=production pnpm run build:txutils && pnpm run build:types", - "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", + "local-demo": "node --env-file=./env/local.contract ./scripts/local-e2e-demo.mjs", "build:txutils": "tsc -p ./packages/avida-tx-utils && tsc-alias -p ./packages/avida-tx-utils/tsconfig.json", "build:types": "node ./scripts/gen-contract-types.mjs && tsc -p ./packages/avida-common-types && tsc-alias -p ./packages/avida-common-types/tsconfig.json", "scripts-type-check": "tsc --pretty --noEmit --project tsconfig.base.json",