From b7fe36a2f8346d8df646d219e05b8912905d8100 Mon Sep 17 00:00:00 2001 From: Fuxing Loh <4266087+fuxingloh@users.noreply.github.com> Date: Fri, 22 Oct 2021 18:32:21 +0800 Subject: [PATCH] bump jellyfish dependencies use peer resolution technique (#481) * updated package.json for same deps resolution * added defichain deps * fixed whale-api-wallet deps --- .github/dependabot.yml | 2 +- package-lock.json | 79 ++++++++++++++------------ package.json | 31 +++++----- packages/whale-api-client/package.json | 18 +----- packages/whale-api-wallet/package.json | 20 +------ 5 files changed, 64 insertions(+), 86 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c2db37565..177d94ee8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,7 +8,7 @@ updates: labels: - "kind/dependencies" ignore: - - dependency-name: "@defichain/*" + - dependency-name: "@defichain/whale-*" versioning-strategy: 'increase' - package-ecosystem: "github-actions" diff --git a/package-lock.json b/package-lock.json index 76317069d..ef520d8ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,13 +11,16 @@ "./packages/*" ], "dependencies": { - "@defichain/jellyfish-address": "0.47.1", - "@defichain/jellyfish-api-core": "0.47.1", - "@defichain/jellyfish-api-jsonrpc": "0.47.1", - "@defichain/jellyfish-json": "0.47.1", - "@defichain/jellyfish-network": "0.47.1", - "@defichain/jellyfish-testing": "0.47.1", - "@defichain/jellyfish-transaction": "0.47.1", + "@defichain/jellyfish-address": "^0.47.1", + "@defichain/jellyfish-api-core": "^0.47.1", + "@defichain/jellyfish-api-jsonrpc": "^0.47.1", + "@defichain/jellyfish-crypto": "^0.47.1", + "@defichain/jellyfish-json": "^0.47.1", + "@defichain/jellyfish-network": "^0.47.1", + "@defichain/jellyfish-testing": "^0.47.1", + "@defichain/jellyfish-transaction": "^0.47.1", + "@defichain/testcontainers": "^0.47.1", + "@defichain/testing": "^0.47.1", "@nestjs/common": "^8.1.1", "@nestjs/config": "^1.0.2", "@nestjs/core": "^8.1.1", @@ -29,37 +32,35 @@ "cache-manager": "^3.4.4", "class-transformer": "^0.4.0", "class-validator": "^0.13.1", + "defichain": "^0.0.1", "level": "^7.0.1", "lexicographic-integer-encoding": "^1.0.1", - "memdown": "^6.0.0", + "memdown": "^6.1.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.3.0", "subleveldown": "^6.0.1" }, "devDependencies": { - "@defichain/jellyfish-crypto": "0.47.1", - "@defichain/testcontainers": "0.47.1", - "@defichain/testing": "0.47.1", "@nestjs/cli": "^8.1.4", "@nestjs/schematics": "^8.0.4", "@nestjs/testing": "^8.1.1", "@types/cache-manager": "^3.4.2", "@types/cron": "^1.7.3", "@types/dockerode": "^3.2.7", - "@types/jest": "^27.0.0", + "@types/jest": "^27.0.2", "@types/level": "^6.0.0", "@types/lossless-json": "^1.0.1", "@types/memdown": "^3.0.0", "@types/node": "^14.14.36", "@types/subleveldown": "^4.1.1", - "husky": "^7.0.1", + "husky": "^7.0.4", "jest": "^27.0.6", "lerna": "^4.0.0", "lint-staged": "^11.2.3", "ts-jest": "^27.0.7", - "ts-loader": "^9.2.5", - "ts-node": "^10.3.0", + "ts-loader": "^9.2.6", + "ts-node": "^10.3.1", "ts-standard": "^10.0.0", "tsconfig-paths": "^3.10.1", "typescript": ">=4.2.0", @@ -964,7 +965,6 @@ "version": "0.47.1", "resolved": "https://registry.npmjs.org/@defichain/testing/-/testing-0.47.1.tgz", "integrity": "sha512-171rUPJkpJNtml3TxRdAnkVRIjUw6e59s21UwhJPP/soS76ejkiMiyG9y3hhZLoEBahCuUtWICabtDNlnziw5A==", - "dev": true, "dependencies": { "@defichain/jellyfish-api-core": "0.47.1", "@defichain/jellyfish-crypto": "0.47.1", @@ -5775,6 +5775,11 @@ "node": ">=10" } }, + "node_modules/defichain": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/defichain/-/defichain-0.0.1.tgz", + "integrity": "sha512-MJlF96SJMwBfCECe3Y8qC2oEeNQCLsMOOOCwSitB3pjUTb25chPwevrXcCnhL3h1ldQ2uZlRDRYblYKk9eF4mw==" + }, "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -8526,9 +8531,9 @@ } }, "node_modules/husky": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", - "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", + "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", "dev": true, "bin": { "husky": "lib/bin.js" @@ -14816,9 +14821,9 @@ } }, "node_modules/ts-node": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.3.0.tgz", - "integrity": "sha512-RYIy3i8IgpFH45AX4fQHExrT8BxDeKTdC83QFJkNzkvt8uFB6QJ8XMyhynYiKMLxt9a7yuXaDBZNOYS3XjDcYw==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.3.1.tgz", + "integrity": "sha512-Yw3W2mYzhHfCHOICGNJqa0i+rbL0rAyg7ZIHxU+K4pgY8gd2Lh1j+XbHCusJMykbj6RZMJVOY0MlHVd+GOivcw==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "0.7.0", @@ -15840,7 +15845,7 @@ "version": "0.0.0", "license": "MIT", "dependencies": { - "@defichain/jellyfish-api-core": "0.47.1", + "@defichain/jellyfish-api-core": "^0.47.1", "abort-controller": "^3.0.0", "cross-fetch": "^3.1.2", "url-search-params-polyfill": "8.1.1" @@ -15851,8 +15856,8 @@ "version": "0.0.0", "license": "MIT", "dependencies": { - "@defichain/jellyfish-transaction-builder": "0.47.1", - "@defichain/jellyfish-wallet": "0.47.1", + "@defichain/jellyfish-transaction-builder": "^0.47.1", + "@defichain/jellyfish-wallet": "^0.47.1", "@defichain/whale-api-client": "0.0.0" } } @@ -16563,7 +16568,6 @@ "version": "0.47.1", "resolved": "https://registry.npmjs.org/@defichain/testing/-/testing-0.47.1.tgz", "integrity": "sha512-171rUPJkpJNtml3TxRdAnkVRIjUw6e59s21UwhJPP/soS76ejkiMiyG9y3hhZLoEBahCuUtWICabtDNlnziw5A==", - "dev": true, "requires": { "@defichain/jellyfish-api-core": "0.47.1", "@defichain/jellyfish-crypto": "0.47.1", @@ -16574,7 +16578,7 @@ "@defichain/whale-api-client": { "version": "file:packages/whale-api-client", "requires": { - "@defichain/jellyfish-api-core": "0.47.1", + "@defichain/jellyfish-api-core": "^0.47.1", "abort-controller": "^3.0.0", "cross-fetch": "^3.1.2", "url-search-params-polyfill": "8.1.1" @@ -16583,8 +16587,8 @@ "@defichain/whale-api-wallet": { "version": "file:packages/whale-api-wallet", "requires": { - "@defichain/jellyfish-transaction-builder": "0.47.1", - "@defichain/jellyfish-wallet": "0.47.1", + "@defichain/jellyfish-transaction-builder": "^0.47.1", + "@defichain/jellyfish-wallet": "^0.47.1", "@defichain/whale-api-client": "0.0.0" } }, @@ -20414,6 +20418,11 @@ "inherits": "^2.0.3" } }, + "defichain": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/defichain/-/defichain-0.0.1.tgz", + "integrity": "sha512-MJlF96SJMwBfCECe3Y8qC2oEeNQCLsMOOOCwSitB3pjUTb25chPwevrXcCnhL3h1ldQ2uZlRDRYblYKk9eF4mw==" + }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -22496,9 +22505,9 @@ } }, "husky": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", - "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.4.tgz", + "integrity": "sha512-vbaCKN2QLtP/vD4yvs6iz6hBEo6wkSzs8HpRah1Z6aGmF2KW5PdYuAd7uX5a+OyBZHBhd+TFLqgjUgytQr4RvQ==", "dev": true }, "iconv-lite": { @@ -27281,9 +27290,9 @@ } }, "ts-node": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.3.0.tgz", - "integrity": "sha512-RYIy3i8IgpFH45AX4fQHExrT8BxDeKTdC83QFJkNzkvt8uFB6QJ8XMyhynYiKMLxt9a7yuXaDBZNOYS3XjDcYw==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.3.1.tgz", + "integrity": "sha512-Yw3W2mYzhHfCHOICGNJqa0i+rbL0rAyg7ZIHxU+K4pgY8gd2Lh1j+XbHCusJMykbj6RZMJVOY0MlHVd+GOivcw==", "dev": true, "requires": { "@cspotcode/source-map-support": "0.7.0", diff --git a/package.json b/package.json index e3f2181cc..4d4cf7c04 100644 --- a/package.json +++ b/package.json @@ -26,13 +26,16 @@ "packages:publish:latest": "lerna exec --no-private -- npm publish --tag latest --access public" }, "dependencies": { - "@defichain/jellyfish-address": "0.47.1", - "@defichain/jellyfish-api-core": "0.47.1", - "@defichain/jellyfish-api-jsonrpc": "0.47.1", - "@defichain/jellyfish-json": "0.47.1", - "@defichain/jellyfish-network": "0.47.1", - "@defichain/jellyfish-testing": "0.47.1", - "@defichain/jellyfish-transaction": "0.47.1", + "@defichain/jellyfish-address": "^0.47.1", + "@defichain/jellyfish-api-core": "^0.47.1", + "@defichain/jellyfish-api-jsonrpc": "^0.47.1", + "@defichain/jellyfish-crypto": "^0.47.1", + "@defichain/jellyfish-json": "^0.47.1", + "@defichain/jellyfish-network": "^0.47.1", + "@defichain/jellyfish-testing": "^0.47.1", + "@defichain/jellyfish-transaction": "^0.47.1", + "@defichain/testcontainers": "^0.47.1", + "@defichain/testing": "^0.47.1", "@nestjs/common": "^8.1.1", "@nestjs/config": "^1.0.2", "@nestjs/core": "^8.1.1", @@ -44,37 +47,35 @@ "cache-manager": "^3.4.4", "class-transformer": "^0.4.0", "class-validator": "^0.13.1", + "defichain": "^0.0.1", "level": "^7.0.1", "lexicographic-integer-encoding": "^1.0.1", - "memdown": "^6.0.0", + "memdown": "^6.1.1", "reflect-metadata": "^0.1.13", "rimraf": "^3.0.2", "rxjs": "^7.3.0", "subleveldown": "^6.0.1" }, "devDependencies": { - "@defichain/jellyfish-crypto": "0.47.1", - "@defichain/testcontainers": "0.47.1", - "@defichain/testing": "0.47.1", "@nestjs/cli": "^8.1.4", "@nestjs/schematics": "^8.0.4", "@nestjs/testing": "^8.1.1", "@types/cache-manager": "^3.4.2", "@types/cron": "^1.7.3", "@types/dockerode": "^3.2.7", - "@types/jest": "^27.0.0", + "@types/jest": "^27.0.2", "@types/level": "^6.0.0", "@types/lossless-json": "^1.0.1", "@types/memdown": "^3.0.0", "@types/node": "^14.14.36", "@types/subleveldown": "^4.1.1", - "husky": "^7.0.1", + "husky": "^7.0.4", "jest": "^27.0.6", "lerna": "^4.0.0", "lint-staged": "^11.2.3", "ts-jest": "^27.0.7", - "ts-loader": "^9.2.5", - "ts-node": "^10.3.0", + "ts-loader": "^9.2.6", + "ts-node": "^10.3.1", "ts-standard": "^10.0.0", "tsconfig-paths": "^3.10.1", "typescript": ">=4.2.0", diff --git a/packages/whale-api-client/package.json b/packages/whale-api-client/package.json index b62c14a88..b0a7cda40 100644 --- a/packages/whale-api-client/package.json +++ b/packages/whale-api-client/package.json @@ -15,22 +15,6 @@ "repository": "DeFiCh/whale", "bugs": "https://github.com/DeFiCh/whale/issues", "license": "MIT", - "contributors": [ - { - "name": "DeFiChain Foundation", - "email": "engineering@defichain.com", - "url": "https://defichain.com/" - }, - { - "name": "DeFi Blockchain Contributors" - }, - { - "name": "DeFi Jellyfish Contributors" - }, - { - "name": "DeFi Whale Contributors" - } - ], "main": "dist/index.js", "types": "dist/index.d.ts", "files": [ @@ -41,7 +25,7 @@ "version.ts": "node -p \"'export default \\'v' + require('./package.json').version.replace(/\\.\\d+$/, '') + '\\''\" > src/version.ts" }, "dependencies": { - "@defichain/jellyfish-api-core": "0.47.1", + "@defichain/jellyfish-api-core": "^0.47.1", "abort-controller": "^3.0.0", "cross-fetch": "^3.1.2", "url-search-params-polyfill": "8.1.1" diff --git a/packages/whale-api-wallet/package.json b/packages/whale-api-wallet/package.json index 5c840b58d..6370e358b 100644 --- a/packages/whale-api-wallet/package.json +++ b/packages/whale-api-wallet/package.json @@ -15,22 +15,6 @@ "repository": "DeFiCh/whale", "bugs": "https://github.com/DeFiCh/whale/issues", "license": "MIT", - "contributors": [ - { - "name": "DeFiChain Foundation", - "email": "engineering@defichain.com", - "url": "https://defichain.com/" - }, - { - "name": "DeFi Blockchain Contributors" - }, - { - "name": "DeFi Jellyfish Contributors" - }, - { - "name": "DeFi Whale Contributors" - } - ], "main": "dist/index.js", "types": "dist/index.d.ts", "files": [ @@ -40,8 +24,8 @@ "build": "tsc" }, "dependencies": { - "@defichain/jellyfish-transaction-builder": "0.47.1", - "@defichain/jellyfish-wallet": "0.47.1", + "@defichain/jellyfish-transaction-builder": "^0.47.1", + "@defichain/jellyfish-wallet": "^0.47.1", "@defichain/whale-api-client": "0.0.0" } }