diff --git a/chain-cli/README.md b/chain-cli/README.md index 7b280489a3..ad239f38ff 100644 --- a/chain-cli/README.md +++ b/chain-cli/README.md @@ -18,7 +18,7 @@ $ npm install -g @gala-chain/cli $ galachain COMMAND running command... $ galachain (--version) -@gala-chain/cli/1.1.10 linux-x64 node-v18.17.1 +@gala-chain/cli/1.1.10 linux-x64 node-v18.17.0 $ galachain --help [COMMAND] USAGE $ galachain COMMAND diff --git a/chain-cli/chaincode-template/Dockerfile b/chain-cli/chaincode-template/Dockerfile index 18a1226ba8..63c9740789 100644 --- a/chain-cli/chaincode-template/Dockerfile +++ b/chain-cli/chaincode-template/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16-alpine AS build +FROM node:18-alpine AS build WORKDIR /usr/src/app @@ -8,7 +8,7 @@ RUN npm ci --include=dev RUN npm run build RUN npm prune --production -FROM gcr.io/distroless/nodejs16-debian11 as production +FROM gcr.io/distroless/nodejs18-debian11 as production ARG CC_SERVER_ADDRESS=0.0.0.0 ARG CC_SERVER_PORT=7052 diff --git a/chain-cli/chaincode-template/package.json b/chain-cli/chaincode-template/package.json index 17d6db9326..c71671b22e 100644 --- a/chain-cli/chaincode-template/package.json +++ b/chain-cli/chaincode-template/package.json @@ -35,7 +35,7 @@ "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/axios": "^0.14.0", "@types/jest": "^29.5.12", - "@types/node": "^16.11.41", + "@types/node": "18.11.9", "@typescript-eslint/eslint-plugin": "^5.47.1", "@typescript-eslint/parser": "^5.47.1", "axios": "^0.27.2", diff --git a/chain-cli/package.json b/chain-cli/package.json index 5cc1c81c88..86c6985850 100644 --- a/chain-cli/package.json +++ b/chain-cli/package.json @@ -46,7 +46,6 @@ "scripts": { "clean": "tsc -b --clean", "build": "shx rm -rf lib && mkdir -p lib && cp -r network lib/ && rsync -a --exclude-from=chaincode-template/.gitignore chaincode-template lib/ && tsc -b && oclif manifest && oclif readme && rm tsconfig.tsbuildinfo", - "build-win": "shx rm -rf lib && tsc -b && oclif manifest && oclif readme && xcopy chaincode-template lib\\chaincode-template /E /I && del tsconfig.tsbuildinfo", "madge": "madge --circular --warning lib", "lint": "nx run lint", "fix": "nx run lint --fix", diff --git a/chain-cli/src/commands/deploy/index.spec.ts b/chain-cli/src/commands/deploy/index.spec.ts index 59bde7a9c2..e331ed8bf8 100644 --- a/chain-cli/src/commands/deploy/index.spec.ts +++ b/chain-cli/src/commands/deploy/index.spec.ts @@ -43,10 +43,12 @@ describe("Deploy Command", () => { jest.spyOn(ux, "prompt").mockResolvedValueOnce("Y"); - jest.mocked(deployChaincode).mockResolvedValue({ - status: "CC_DEPLOY_SCHEDULED", - chaincode: "chaincode-name", - channel: "channel-name" + jest.mocked(deployChaincode).mockImplementation(async () => { + return { + status: "CC_DEPLOY_SCHEDULED", + chaincode: "chaincode-name", + channel: "channel-name" + }; }); // When diff --git a/chaincode/package.json b/chaincode/package.json index b865da8f6f..d60632ea19 100644 --- a/chaincode/package.json +++ b/chaincode/package.json @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/elliptic": "*", - "@types/node": "^16.11.41", + "@types/node": "18.11.9", "@types/setimmediate": "^1.0.2", "dd-trace": "^4.20.0", "git-branch-is": "^4.0.0", diff --git a/licenses/licenses.csv b/licenses/licenses.csv index 607ecd0cfa..f0b31eac34 100644 --- a/licenses/licenses.csv +++ b/licenses/licenses.csv @@ -297,8 +297,8 @@ "@types/long@4.0.2","@types/long","4.0.2","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for long.js","MIT" "@types/minimatch@3.0.5","@types/minimatch","3.0.5","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for Minimatch","MIT" "@types/node@15.14.9","@types/node","15.14.9","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for Node.js","MIT" -"@types/node@16.11.7","@types/node","16.11.7","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for Node.js","MIT" -"@types/node@16.18.68","@types/node","16.18.68","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for node","MIT" +"@types/node@16.18.96","@types/node","16.18.96","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for node","MIT" +"@types/node@18.11.9","@types/node","18.11.9","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for Node.js","MIT" "@types/normalize-package-data@2.4.3","@types/normalize-package-data","2.4.3","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for normalize-package-data","MIT" "@types/parse-json@4.0.1","@types/parse-json","4.0.1","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for parse-json","MIT" "@types/responselike@1.0.2","@types/responselike","1.0.2","https://github.com/DefinitelyTyped/DefinitelyTyped","TypeScript definitions for responselike","MIT" diff --git a/package-lock.json b/package-lock.json index 9bb0edf4e3..5c19adacb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,7 +29,7 @@ "@nx/workspace": "17.2.8", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/jest": "29.5.11", - "@types/node": "16.11.7", + "@types/node": "18.11.9", "@typescript-eslint/eslint-plugin": "6.13.2", "@typescript-eslint/parser": "6.13.2", "eslint": "8.55.0", @@ -472,7 +472,7 @@ }, "devDependencies": { "@types/elliptic": "*", - "@types/node": "^16.11.41", + "@types/node": "18.11.9", "@types/setimmediate": "^1.0.2", "dd-trace": "^4.20.0", "git-branch-is": "^4.0.0", @@ -492,11 +492,6 @@ "json-stringify-deterministic": "*" } }, - "chaincode/node_modules/@types/node": { - "version": "16.18.68", - "dev": true, - "license": "MIT" - }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "dev": true, @@ -5110,8 +5105,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "16.11.7", - "license": "MIT" + "version": "18.11.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.9.tgz", + "integrity": "sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.3", @@ -10173,6 +10169,11 @@ "node": ">=10" } }, + "node_modules/fabric-shim/node_modules/@types/node": { + "version": "16.18.96", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.96.tgz", + "integrity": "sha512-84iSqGXoO+Ha16j8pRZ/L90vDMKX04QTYMTfYeE1WrjWaZXuchBehGUZEpNgx7JnmlrIHdnABmpjrQjhCnNldQ==" + }, "node_modules/fabric-shim/node_modules/cliui": { "version": "7.0.4", "license": "ISC", diff --git a/package.json b/package.json index a08ad43fff..35e119bab2 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "@nx/workspace": "17.2.8", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/jest": "29.5.11", - "@types/node": "16.11.7", + "@types/node": "18.11.9", "@typescript-eslint/eslint-plugin": "6.13.2", "@typescript-eslint/parser": "6.13.2", "eslint": "8.55.0",