From a6e1a52269d595c5c7a124d4b5e17f9d55ceed17 Mon Sep 17 00:00:00 2001 From: Sandpiper Date: Tue, 5 Mar 2024 13:19:35 -0500 Subject: [PATCH] Is different value decorator fix (#80) * update decorator to fix erroneous error throws * update all versions * restore manifest --- chain-api/package.json | 2 +- chain-api/src/validators/decorators.ts | 7 +++++-- chain-cli/README.md | 2 +- chain-cli/chaincode-template/package.json | 12 ++++++------ chain-cli/oclif.manifest.json | 2 +- chain-cli/package.json | 4 ++-- chain-client/package.json | 4 ++-- chain-test/package.json | 6 +++--- chaincode/package.json | 4 ++-- licenses/licenses.csv | 12 ++++++------ package-lock.json | 24 +++++++++++------------ package.json | 2 +- 12 files changed, 42 insertions(+), 39 deletions(-) diff --git a/chain-api/package.json b/chain-api/package.json index 2f9e717582..d7c99b6332 100644 --- a/chain-api/package.json +++ b/chain-api/package.json @@ -1,6 +1,6 @@ { "name": "@gala-chain/api", - "version": "1.0.17", + "version": "1.0.18", "description": "Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.", "license": "Apache-2.0", "dependencies": { diff --git a/chain-api/src/validators/decorators.ts b/chain-api/src/validators/decorators.ts index 61da75635a..93941cc872 100644 --- a/chain-api/src/validators/decorators.ts +++ b/chain-api/src/validators/decorators.ts @@ -50,8 +50,11 @@ export function IsDifferentValue(property: string, validationOptions?: Validatio validate(value: Record, args: ValidationArguments) { const [relatedPropertyName] = args.constraints; const relatedValue = args.object[relatedPropertyName]; - if (typeof value !== "object" || typeof relatedValue !== "object") { - throw new NotImplementedError("IsDifferentValue only works with plain objects"); + if ( + (typeof value !== "string" && value !== undefined) || + (typeof relatedValue !== "string" && relatedValue !== undefined) + ) { + throw new NotImplementedError("IsDifferentValue only works with string or undefined"); } return value !== relatedValue; } diff --git a/chain-cli/README.md b/chain-cli/README.md index 636d99ec9a..daef4414fb 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.0.17 linux-x64 node-v16.16.0 +@gala-chain/cli/1.0.18 linux-x64 node-v16.16.0 $ galachain --help [COMMAND] USAGE $ galachain COMMAND diff --git a/chain-cli/chaincode-template/package.json b/chain-cli/chaincode-template/package.json index 6a7ee9164f..43311b79fc 100644 --- a/chain-cli/chaincode-template/package.json +++ b/chain-cli/chaincode-template/package.json @@ -1,6 +1,6 @@ { "name": "@galachain/product", - "version": "1.0.17", + "version": "1.0.18", "description": "Product Chaincode", "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -22,16 +22,16 @@ "update-snapshot": "jest --updateSnapshot" }, "dependencies": { - "@gala-chain/api": "1.0.17", - "@gala-chain/chaincode": "1.0.17", + "@gala-chain/api": "1.0.18", + "@gala-chain/chaincode": "1.0.18", "dotenv": "^16.0.1", "fabric-contract-api": "2.4.2", "fabric-shim": "2.4.2" }, "devDependencies": { - "@gala-chain/cli": "1.0.17", - "@gala-chain/client": "1.0.17", - "@gala-chain/test": "1.0.17", + "@gala-chain/cli": "1.0.18", + "@gala-chain/client": "1.0.18", + "@gala-chain/test": "1.0.18", "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/axios": "^0.14.0", "@types/jest": "^29.5.12", diff --git a/chain-cli/oclif.manifest.json b/chain-cli/oclif.manifest.json index c909d3fbdd..8b2895309e 100644 --- a/chain-cli/oclif.manifest.json +++ b/chain-cli/oclif.manifest.json @@ -1,5 +1,5 @@ { - "version": "1.0.17", + "version": "1.0.18", "commands": { "connect": { "id": "connect", diff --git a/chain-cli/package.json b/chain-cli/package.json index 9cab925882..30f5cb1810 100644 --- a/chain-cli/package.json +++ b/chain-cli/package.json @@ -1,6 +1,6 @@ { "name": "@gala-chain/cli", - "version": "1.0.17", + "version": "1.0.18", "description": "CLI for GalaChain to manage and deploy chaincodes", "license": "Apache-2.0", "bin": { @@ -14,7 +14,7 @@ "/oclif.manifest.json" ], "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "@noble/secp256k1": "^1.7.1", "@oclif/core": "^2", "@oclif/plugin-help": "^2", diff --git a/chain-client/package.json b/chain-client/package.json index 863297b0dd..0337bf10ab 100644 --- a/chain-client/package.json +++ b/chain-client/package.json @@ -1,6 +1,6 @@ { "name": "@gala-chain/client", - "version": "1.0.17", + "version": "1.0.18", "description": "GalaChain client library", "license": "Apache-2.0", "scripts": { @@ -21,7 +21,7 @@ "lib" ], "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "axios": "^1.6.0", "jsonschema": "^1.4.1", "tslib": "^2.6.2", diff --git a/chain-test/package.json b/chain-test/package.json index 6639f67ea2..1962560277 100644 --- a/chain-test/package.json +++ b/chain-test/package.json @@ -1,10 +1,10 @@ { "name": "@gala-chain/test", - "version": "1.0.17", + "version": "1.0.18", "description": "Unit testing and integration testing for GalaChain", "license": "Apache-2.0", "dependencies": { - "@gala-chain/client": "1.0.17", + "@gala-chain/client": "1.0.18", "nanoid": "^3.3.6", "tslib": "^2.6.2", "path": "0.12.7", @@ -12,7 +12,7 @@ "@jest/globals": "29.7.0" }, "peerDependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "bignumber.js": "*", "class-transformer": "*", "elliptic": "*", diff --git a/chaincode/package.json b/chaincode/package.json index 2a00172c64..9a7e107b3e 100644 --- a/chaincode/package.json +++ b/chaincode/package.json @@ -1,6 +1,6 @@ { "name": "@gala-chain/chaincode", - "version": "1.0.17", + "version": "1.0.18", "description": "Framework for building chaincodes on GalaChain", "license": "Apache-2.0", "type": "commonjs", @@ -21,7 +21,7 @@ "test": "jest" }, "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "fabric-contract-api": "2.4.2", "fabric-shim": "2.4.2", "nanoid": "^3.3.6", diff --git a/licenses/licenses.csv b/licenses/licenses.csv index 1570a158bb..e8bd1b7f1e 100644 --- a/licenses/licenses.csv +++ b/licenses/licenses.csv @@ -138,12 +138,12 @@ "@eslint/js@8.55.0","@eslint/js","8.55.0","https://github.com/eslint/eslint","ESLint JavaScript language implementation","MIT" "@fidm/asn1@1.0.4","@fidm/asn1","1.0.4","https://github.com/fidm/asn1","ASN.1/DER, PEM for Node.js","MIT" "@fidm/x509@1.2.1","@fidm/x509","1.2.1","https://github.com/fidm/x509","Pure JavaScript X509 certificate tools for Node.js","MIT" -"@gala-chain/api@1.0.17","@gala-chain/api","1.0.17","","Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.","Apache-2.0" -"@gala-chain/chaincode@1.0.17","@gala-chain/chaincode","1.0.17","","Framework for building chaincodes on GalaChain","Apache-2.0" -"@gala-chain/cli@1.0.17","@gala-chain/cli","1.0.17","","CLI for GalaChain to manage and deploy chaincodes","Apache-2.0" -"@gala-chain/client@1.0.17","@gala-chain/client","1.0.17","","GalaChain client library","Apache-2.0" -"@gala-chain/sdk@1.0.17","@gala-chain/sdk","1.0.17","","Welcome to developing with GalaChain! GalaChain SDK is a set of TS tools to help you develop on GalaChain:","UNLICENSED" -"@gala-chain/test@1.0.17","@gala-chain/test","1.0.17","","Unit testing and integration testing for GalaChain","Apache-2.0" +"@gala-chain/api@1.0.18","@gala-chain/api","1.0.18","","Common types, DTOs (Data Transfer Objects), APIs, signatures, and utils for GalaChain.","Apache-2.0" +"@gala-chain/chaincode@1.0.18","@gala-chain/chaincode","1.0.18","","Framework for building chaincodes on GalaChain","Apache-2.0" +"@gala-chain/cli@1.0.18","@gala-chain/cli","1.0.18","","CLI for GalaChain to manage and deploy chaincodes","Apache-2.0" +"@gala-chain/client@1.0.18","@gala-chain/client","1.0.18","","GalaChain client library","Apache-2.0" +"@gala-chain/sdk@1.0.18","@gala-chain/sdk","1.0.18","","Welcome to developing with GalaChain! GalaChain SDK is a set of TS tools to help you develop on GalaChain:","UNLICENSED" +"@gala-chain/test@1.0.18","@gala-chain/test","1.0.18","","Unit testing and integration testing for GalaChain","Apache-2.0" "@gar/promisify@1.1.3","@gar/promisify","1.1.3","https://github.com/wraithgar/gar-promisify","Promisify an entire class or object","MIT" "@grpc/grpc-js@1.9.7","@grpc/grpc-js","1.9.7","https://github.com/grpc/grpc-node/tree/master/packages/grpc-js","gRPC Library for Node - pure JS implementation","Apache-2.0" "@grpc/proto-loader@0.6.13","@grpc/proto-loader","0.6.13","https://github.com/grpc/grpc-node","gRPC utility library for loading .proto files","Apache-2.0" diff --git a/package-lock.json b/package-lock.json index 3912c21952..3e930e2cb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@gala-chain/sdk", - "version": "1.0.17", + "version": "1.0.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@gala-chain/sdk", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "workspaces": [ "chain-cli", @@ -51,7 +51,7 @@ }, "chain-api": { "name": "@gala-chain/api", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "dependencies": { "bignumber.js": "^9.0.2", @@ -74,10 +74,10 @@ }, "chain-cli": { "name": "@gala-chain/cli", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "@noble/secp256k1": "^1.7.1", "@oclif/core": "^2", "@oclif/plugin-help": "^2", @@ -409,10 +409,10 @@ }, "chain-client": { "name": "@gala-chain/client", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "axios": "^1.6.0", "jsonschema": "^1.4.1", "process": "0.11.10", @@ -439,10 +439,10 @@ }, "chain-test": { "name": "@gala-chain/test", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "dependencies": { - "@gala-chain/client": "1.0.17", + "@gala-chain/client": "1.0.18", "@jest/globals": "29.7.0", "nanoid": "^3.3.6", "path": "0.12.7", @@ -450,7 +450,7 @@ "tslib": "^2.6.2" }, "peerDependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "bignumber.js": "*", "class-transformer": "*", "elliptic": "*", @@ -461,10 +461,10 @@ }, "chaincode": { "name": "@gala-chain/chaincode", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "dependencies": { - "@gala-chain/api": "1.0.17", + "@gala-chain/api": "1.0.18", "fabric-contract-api": "2.4.2", "fabric-shim": "2.4.2", "nanoid": "^3.3.6", diff --git a/package.json b/package.json index c94768745d..c3cf6f9526 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@gala-chain/sdk", - "version": "1.0.17", + "version": "1.0.18", "license": "Apache-2.0", "scripts": { "lint": "nx run-many -t lint",