diff --git a/.pnp.cjs b/.pnp.cjs index 91b8c2c0f35..0cc898bb61d 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -2306,8 +2306,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:7.32.0"],\ ["eslint-config-airbnb-base", "virtual:12a596dc9572e25ce715d3736dc74b317c5ca5cfb3b4f67864b1e76b3a401006f84d381aaf975bb5b4da9cafac5125e6869fc78d5202f4c95780c81479112f32#npm:14.2.1"],\ ["eslint-plugin-import", "virtual:12a596dc9572e25ce715d3736dc74b317c5ca5cfb3b4f67864b1e76b3a401006f84d381aaf975bb5b4da9cafac5125e6869fc78d5202f4c95780c81479112f32#npm:2.25.3"],\ - ["lodash.clone", "npm:4.5.0"],\ - ["lodash.matches", "npm:4.6.0"],\ + ["lodash", "npm:4.17.21"],\ ["mathjs", "npm:10.4.3"],\ ["mocha", "npm:9.2.2"]\ ],\ @@ -2403,7 +2402,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["karma-mocha", "npm:2.0.1"],\ ["karma-mocha-reporter", "virtual:58fb68f2aed20e5e0f2e48520ab903ae9bb3440369bfd5e912034003cf27c5aae368649fc5620dd2acbed578131f3a0975e75b838d77d12335fb0412e24026c6#npm:2.2.5"],\ ["karma-webpack", "virtual:8f25fc90e0fb5fd89843707863857591fa8c52f9f33eadced4bf404b1871d91959f7bb86948ae0e1b53ee94d491ef8fde9c0b58b39c9490c0d0fa6c931945f97#npm:5.0.0"],\ - ["lodash.sample", "npm:4.2.1"],\ + ["lodash", "npm:4.17.21"],\ ["mocha", "npm:9.2.2"],\ ["node-inspect-extracted", "npm:1.0.8"],\ ["nyc", "npm:15.1.0"],\ @@ -2622,10 +2621,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["karma-mocha", "npm:2.0.1"],\ ["karma-mocha-reporter", "virtual:58fb68f2aed20e5e0f2e48520ab903ae9bb3440369bfd5e912034003cf27c5aae368649fc5620dd2acbed578131f3a0975e75b838d77d12335fb0412e24026c6#npm:2.2.5"],\ ["karma-webpack", "virtual:58fb68f2aed20e5e0f2e48520ab903ae9bb3440369bfd5e912034003cf27c5aae368649fc5620dd2acbed578131f3a0975e75b838d77d12335fb0412e24026c6#npm:5.0.0"],\ - ["lodash.clonedeep", "npm:4.5.0"],\ - ["lodash.clonedeepwith", "npm:4.5.0"],\ - ["lodash.get", "npm:4.4.2"],\ - ["lodash.set", "npm:4.3.2"],\ + ["lodash", "npm:4.17.21"],\ ["long", "npm:5.2.0"],\ ["mocha", "npm:9.2.2"],\ ["node-inspect-extracted", "npm:1.0.8"],\ @@ -2683,9 +2679,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["find-my-way", "npm:2.2.5"],\ ["js-merkle", "npm:0.1.5"],\ ["levelup", "npm:4.4.0"],\ - ["lodash.clonedeep", "npm:4.5.0"],\ - ["lodash.get", "npm:4.4.2"],\ - ["lodash.set", "npm:4.3.2"],\ + ["lodash", "npm:4.17.21"],\ ["long", "npm:5.2.0"],\ ["memdown", "npm:5.1.0"],\ ["mocha", "npm:9.2.2"],\ @@ -2738,7 +2732,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["eslint", "npm:7.32.0"],\ ["eslint-config-airbnb-base", "virtual:12a596dc9572e25ce715d3736dc74b317c5ca5cfb3b4f67864b1e76b3a401006f84d381aaf975bb5b4da9cafac5125e6869fc78d5202f4c95780c81479112f32#npm:14.2.1"],\ ["eslint-plugin-import", "virtual:12a596dc9572e25ce715d3736dc74b317c5ca5cfb3b4f67864b1e76b3a401006f84d381aaf975bb5b4da9cafac5125e6869fc78d5202f4c95780c81479112f32#npm:2.25.3"],\ - ["lodash.get", "npm:4.4.2"],\ + ["lodash", "npm:4.17.21"],\ ["long", "npm:5.2.0"],\ ["mocha", "npm:9.2.2"],\ ["mocha-sinon", "virtual:595d7482cc8ddf98ee6aef33fc48b46393554ab5f17f851ef62e6e39315e53666c3e66226b978689aa0bc7f1e83a03081511a21db1c381362fe67614887077f9#npm:2.1.2"],\ @@ -2987,7 +2981,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["karma-mocha", "npm:2.0.1"],\ ["karma-mocha-reporter", "virtual:58fb68f2aed20e5e0f2e48520ab903ae9bb3440369bfd5e912034003cf27c5aae368649fc5620dd2acbed578131f3a0975e75b838d77d12335fb0412e24026c6#npm:2.2.5"],\ ["karma-webpack", "virtual:e2d057e7cc143d3cb9bec864f4a2d862441b5a09f81f8e6c46e7a098cbc89e4d07017cc6e2e2142d5704bb55da853cbec2d025ebc0b30e8696c31380c00f2c7d#npm:5.0.0"],\ - ["lodash.clonedeep", "npm:4.5.0"],\ + ["lodash", "npm:4.17.21"],\ ["long", "npm:5.2.0"],\ ["mocha", "npm:9.2.2"],\ ["path-browserify", "npm:1.0.1"],\ @@ -7619,11 +7613,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { ["hasbin", "npm:1.2.3"],\ ["jayson", "npm:3.6.5"],\ ["listr2", "virtual:880cda903c2a2be387819a3f857d21494004437a03c92969b9853f7bdeebdfed08d417e68364ee9e158338603a6d78d690c457a55ab11e56398bc10f0ad232fc#npm:3.5.0"],\ - ["lodash.clonedeep", "npm:4.5.0"],\ - ["lodash.get", "npm:4.4.2"],\ - ["lodash.isequal", "npm:4.5.0"],\ - ["lodash.merge", "npm:4.6.2"],\ - ["lodash.set", "npm:4.3.2"],\ + ["lodash", "npm:4.17.21"],\ ["memory-streams", "npm:0.1.3"],\ ["node-fetch", "virtual:25a5f5382d53dbf298bf7a1191760bc2e0a523a619eeb0e667b99a8649e8ad183f9e2e0b45f6fb831b92f4078b61622aa567cf79565f6aa5af9597e3c84864f6#npm:2.6.7"],\ ["node-forge", "npm:1.3.1"],\ @@ -12091,33 +12081,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["lodash.clone", [\ - ["npm:4.5.0", {\ - "packageLocation": "./.yarn/cache/lodash.clone-npm-4.5.0-d9f712430b-5839f22acf.zip/node_modules/lodash.clone/",\ - "packageDependencies": [\ - ["lodash.clone", "npm:4.5.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["lodash.clonedeep", [\ - ["npm:4.5.0", {\ - "packageLocation": "./.yarn/cache/lodash.clonedeep-npm-4.5.0-fbc3cda4e5-92c46f094b.zip/node_modules/lodash.clonedeep/",\ - "packageDependencies": [\ - ["lodash.clonedeep", "npm:4.5.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["lodash.clonedeepwith", [\ - ["npm:4.5.0", {\ - "packageLocation": "./.yarn/cache/lodash.clonedeepwith-npm-4.5.0-67373e487a-9fbf4ebfa0.zip/node_modules/lodash.clonedeepwith/",\ - "packageDependencies": [\ - ["lodash.clonedeepwith", "npm:4.5.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["lodash.debounce", [\ ["npm:4.0.8", {\ "packageLocation": "./.yarn/cache/lodash.debounce-npm-4.0.8-f1d6e09799-a3f527d22c.zip/node_modules/lodash.debounce/",\ @@ -12172,15 +12135,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["lodash.matches", [\ - ["npm:4.6.0", {\ - "packageLocation": "./.yarn/cache/lodash.matches-npm-4.6.0-4ac5f4f696-002617abb6.zip/node_modules/lodash.matches/",\ - "packageDependencies": [\ - ["lodash.matches", "npm:4.6.0"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["lodash.merge", [\ ["npm:4.6.2", {\ "packageLocation": "./.yarn/cache/lodash.merge-npm-4.6.2-77cb4416bf-ad580b4bdb.zip/node_modules/lodash.merge/",\ @@ -12190,24 +12144,6 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) { "linkType": "HARD"\ }]\ ]],\ - ["lodash.sample", [\ - ["npm:4.2.1", {\ - "packageLocation": "./.yarn/cache/lodash.sample-npm-4.2.1-ec9e9fdf4d-8d93c1db13.zip/node_modules/lodash.sample/",\ - "packageDependencies": [\ - ["lodash.sample", "npm:4.2.1"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ - ["lodash.set", [\ - ["npm:4.3.2", {\ - "packageLocation": "./.yarn/cache/lodash.set-npm-4.3.2-7586c942c2-a9122f49ee.zip/node_modules/lodash.set/",\ - "packageDependencies": [\ - ["lodash.set", "npm:4.3.2"]\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["lodash.truncate", [\ ["npm:4.4.2", {\ "packageLocation": "./.yarn/cache/lodash.truncate-npm-4.4.2-bc50fe1663-b463d8a382.zip/node_modules/lodash.truncate/",\ diff --git a/.yarn/cache/lodash.clone-npm-4.5.0-d9f712430b-5839f22acf.zip b/.yarn/cache/lodash.clone-npm-4.5.0-d9f712430b-5839f22acf.zip deleted file mode 100644 index 2ad436e4045..00000000000 Binary files a/.yarn/cache/lodash.clone-npm-4.5.0-d9f712430b-5839f22acf.zip and /dev/null differ diff --git a/.yarn/cache/lodash.clonedeep-npm-4.5.0-fbc3cda4e5-92c46f094b.zip b/.yarn/cache/lodash.clonedeep-npm-4.5.0-fbc3cda4e5-92c46f094b.zip deleted file mode 100644 index 5765f760d7b..00000000000 Binary files a/.yarn/cache/lodash.clonedeep-npm-4.5.0-fbc3cda4e5-92c46f094b.zip and /dev/null differ diff --git a/.yarn/cache/lodash.clonedeepwith-npm-4.5.0-67373e487a-9fbf4ebfa0.zip b/.yarn/cache/lodash.clonedeepwith-npm-4.5.0-67373e487a-9fbf4ebfa0.zip deleted file mode 100644 index 1ed9b32a123..00000000000 Binary files a/.yarn/cache/lodash.clonedeepwith-npm-4.5.0-67373e487a-9fbf4ebfa0.zip and /dev/null differ diff --git a/.yarn/cache/lodash.matches-npm-4.6.0-4ac5f4f696-002617abb6.zip b/.yarn/cache/lodash.matches-npm-4.6.0-4ac5f4f696-002617abb6.zip deleted file mode 100644 index 059bc28a181..00000000000 Binary files a/.yarn/cache/lodash.matches-npm-4.6.0-4ac5f4f696-002617abb6.zip and /dev/null differ diff --git a/.yarn/cache/lodash.sample-npm-4.2.1-ec9e9fdf4d-8d93c1db13.zip b/.yarn/cache/lodash.sample-npm-4.2.1-ec9e9fdf4d-8d93c1db13.zip deleted file mode 100644 index 52c2ed81888..00000000000 Binary files a/.yarn/cache/lodash.sample-npm-4.2.1-ec9e9fdf4d-8d93c1db13.zip and /dev/null differ diff --git a/.yarn/cache/lodash.set-npm-4.3.2-7586c942c2-a9122f49ee.zip b/.yarn/cache/lodash.set-npm-4.3.2-7586c942c2-a9122f49ee.zip deleted file mode 100644 index 4055fea4f25..00000000000 Binary files a/.yarn/cache/lodash.set-npm-4.3.2-7586c942c2-a9122f49ee.zip and /dev/null differ diff --git a/packages/bench-suite/lib/client/createClientWithFundedWallet.js b/packages/bench-suite/lib/client/createClientWithFundedWallet.js index 81ccfef91d5..400cece6f2f 100644 --- a/packages/bench-suite/lib/client/createClientWithFundedWallet.js +++ b/packages/bench-suite/lib/client/createClientWithFundedWallet.js @@ -1,6 +1,6 @@ const Dash = require('dash'); -const clone = require('lodash.clone'); +const clone = require('lodash/clone'); const fundWallet = require('@dashevo/wallet-lib/src/utils/fundWallet'); diff --git a/packages/bench-suite/lib/metrics/Match.js b/packages/bench-suite/lib/metrics/Match.js index a7d75acdd18..cca1d227252 100644 --- a/packages/bench-suite/lib/metrics/Match.js +++ b/packages/bench-suite/lib/metrics/Match.js @@ -1,4 +1,4 @@ -const lodashMatches = require('lodash.matches'); +const lodashMatches = require('lodash/matches'); class Match { /** diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json index 2e5c00ba56e..a5107af2b4f 100644 --- a/packages/bench-suite/package.json +++ b/packages/bench-suite/package.json @@ -15,8 +15,7 @@ "console-table-printer": "^2.11.0", "dash": "workspace:*", "dotenv-safe": "^8.2.0", - "lodash.clone": "~4.5.0", - "lodash.matches": "^4.6.0", + "lodash": "^4.17.21", "mathjs": "^10.4.3", "mocha": "^9.1.2" }, diff --git a/packages/dapi/package.json b/packages/dapi/package.json index 22b3ee41b72..c8767b64fa2 100644 --- a/packages/dapi/package.json +++ b/packages/dapi/package.json @@ -47,7 +47,7 @@ "dotenv-safe": "^8.2.0", "google-protobuf": "^3.12.2", "jayson": "^3.3.4", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "lru-cache": "^5.1.1", "ws": "^7.5.3", "zeromq": "^5.2.8" diff --git a/packages/dashmate/configs/migrations.js b/packages/dashmate/configs/migrations.js index 17ba0c51fa2..bb8171c025a 100644 --- a/packages/dashmate/configs/migrations.js +++ b/packages/dashmate/configs/migrations.js @@ -1,6 +1,6 @@ /* eslint-disable no-param-reassign */ -const lodashSet = require('lodash.set'); -const lodashGet = require('lodash.get'); +const lodashSet = require('lodash/set'); +const lodashGet = require('lodash/get'); const systemConfigs = require('./system'); diff --git a/packages/dashmate/configs/system/local.js b/packages/dashmate/configs/system/local.js index 78976c12ebf..52719fea651 100644 --- a/packages/dashmate/configs/system/local.js +++ b/packages/dashmate/configs/system/local.js @@ -1,4 +1,4 @@ -const lodashMerge = require('lodash.merge'); +const lodashMerge = require('lodash/merge'); const { NETWORK_LOCAL, diff --git a/packages/dashmate/configs/system/mainnet.js b/packages/dashmate/configs/system/mainnet.js index 27f70f84b2d..f55924f4a6b 100644 --- a/packages/dashmate/configs/system/mainnet.js +++ b/packages/dashmate/configs/system/mainnet.js @@ -1,4 +1,4 @@ -const lodashMerge = require('lodash.merge'); +const lodashMerge = require('lodash/merge'); const { NETWORK_MAINNET, diff --git a/packages/dashmate/configs/system/testnet.js b/packages/dashmate/configs/system/testnet.js index 5ec22ebb8af..2da756d1bda 100644 --- a/packages/dashmate/configs/system/testnet.js +++ b/packages/dashmate/configs/system/testnet.js @@ -1,4 +1,4 @@ -const lodashMerge = require('lodash.merge'); +const lodashMerge = require('lodash/merge'); const path = require('path'); const { diff --git a/packages/dashmate/package.json b/packages/dashmate/package.json index 173d78934c5..113f410bfca 100644 --- a/packages/dashmate/package.json +++ b/packages/dashmate/package.json @@ -74,11 +74,7 @@ "hasbin": "^1.2.3", "jayson": "^3.3.4", "listr2": "3.5.0", - "lodash.clonedeep": "^4.5.0", - "lodash.get": "^4.4.2", - "lodash.isequal": "^4.5.0", - "lodash.merge": "^4.6.2", - "lodash.set": "^4.3.2", + "lodash": "^4.17.21", "memory-streams": "^0.1.3", "node-fetch": "^2.6.1", "node-forge": "^1.3.1", diff --git a/packages/dashmate/src/config/Config.js b/packages/dashmate/src/config/Config.js index faf79f6d009..c5765751580 100644 --- a/packages/dashmate/src/config/Config.js +++ b/packages/dashmate/src/config/Config.js @@ -2,9 +2,9 @@ const Ajv = require('ajv'); const nodePath = require('path'); -const lodashGet = require('lodash.get'); -const lodashSet = require('lodash.set'); -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashGet = require('lodash/get'); +const lodashSet = require('lodash/set'); +const lodashCloneDeep = require('lodash/cloneDeep'); const addFormats = require('ajv-formats'); const configJsonSchema = require('../../configs/schema/configJsonSchema'); diff --git a/packages/dashmate/src/core/waitForNodesToHaveTheSameSporks.js b/packages/dashmate/src/core/waitForNodesToHaveTheSameSporks.js index d0f868e84f0..33af68578fb 100644 --- a/packages/dashmate/src/core/waitForNodesToHaveTheSameSporks.js +++ b/packages/dashmate/src/core/waitForNodesToHaveTheSameSporks.js @@ -1,4 +1,4 @@ -const isEqual = require('lodash.isequal'); +const isEqual = require('lodash/isEqual'); /** * @param {CoreService[]} coreServices diff --git a/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js index bda1b8a1548..e9a6b2958a9 100644 --- a/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js +++ b/packages/dashmate/src/listr/tasks/setup/local/enableCoreQuorumsTaskFactory.js @@ -1,5 +1,5 @@ const { Listr } = require('listr2'); -const isEqual = require('lodash.isequal'); +const isEqual = require('lodash/isEqual'); const wait = require('../../../../util/wait'); diff --git a/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js b/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js index a49ea71acbc..e53a48bc637 100644 --- a/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js +++ b/packages/js-dapi-client/lib/dapiAddressProvider/ListDAPIAddressProvider.js @@ -1,4 +1,4 @@ -const sample = require('lodash.sample'); +const sample = require('lodash/sample'); const networks = require('@dashevo/dashcore-lib/lib/networks'); class ListDAPIAddressProvider { diff --git a/packages/js-dapi-client/package.json b/packages/js-dapi-client/package.json index 1dcd01bd819..b2ffb11adb5 100644 --- a/packages/js-dapi-client/package.json +++ b/packages/js-dapi-client/package.json @@ -35,7 +35,7 @@ "axios": "^0.27.2", "bs58": "^4.0.1", "cbor": "^8.0.0", - "lodash.sample": "^4.2.1", + "lodash": "^4.17.21", "node-inspect-extracted": "^1.0.8" }, "devDependencies": { diff --git a/packages/js-dpp/lib/dataContract/enrichDataContractWithBaseSchema.js b/packages/js-dpp/lib/dataContract/enrichDataContractWithBaseSchema.js index 23c62ef744b..ec7df1d90c5 100644 --- a/packages/js-dpp/lib/dataContract/enrichDataContractWithBaseSchema.js +++ b/packages/js-dpp/lib/dataContract/enrichDataContractWithBaseSchema.js @@ -1,4 +1,4 @@ -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashCloneDeep = require('lodash/cloneDeep'); const DataContract = require('./DataContract'); diff --git a/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.js b/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.js index 85d8ece44c9..dc00f2186f8 100644 --- a/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.js +++ b/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.js @@ -1,4 +1,4 @@ -const lodashClone = require('lodash.clonedeep'); +const lodashClone = require('lodash/cloneDeep'); const convertBuffersToArrays = require('../../../../../util/convertBuffersToArrays'); diff --git a/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.js b/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.js index b140d6c52ba..580bf6c0a7f 100644 --- a/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.js +++ b/packages/js-dpp/lib/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateIndicesAreBackwardCompatible.js @@ -1,4 +1,4 @@ -const lodashGet = require('lodash.get'); +const lodashGet = require('lodash/get'); const DataContractHaveNewUniqueIndexError = require('../../../../../errors/consensus/basic/dataContract/DataContractHaveNewUniqueIndexError'); const DataContractUniqueIndicesChangedError = require('../../../../../errors/consensus/basic/dataContract/DataContractUniqueIndicesChangedError'); diff --git a/packages/js-dpp/lib/dataContract/validation/validateDataContractMaxDepthFactory.js b/packages/js-dpp/lib/dataContract/validation/validateDataContractMaxDepthFactory.js index ceea4baf926..075295ff2ef 100644 --- a/packages/js-dpp/lib/dataContract/validation/validateDataContractMaxDepthFactory.js +++ b/packages/js-dpp/lib/dataContract/validation/validateDataContractMaxDepthFactory.js @@ -1,4 +1,4 @@ -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashCloneDeep = require('lodash/cloneDeep'); const ValidationResult = require('../../validation/ValidationResult'); const DataContractMaxDepthExceedError = require('../../errors/consensus/basic/dataContract/DataContractMaxDepthExceedError'); const InvalidJsonSchemaRefError = require('../../errors/consensus/basic/dataContract/InvalidJsonSchemaRefError'); diff --git a/packages/js-dpp/lib/document/Document.js b/packages/js-dpp/lib/document/Document.js index 5613abf778b..79f44f8f21f 100644 --- a/packages/js-dpp/lib/document/Document.js +++ b/packages/js-dpp/lib/document/Document.js @@ -1,6 +1,6 @@ -const lodashGet = require('lodash.get'); -const lodashSet = require('lodash.set'); -const lodashCloneDeepWith = require('lodash.clonedeepwith'); +const lodashGet = require('lodash/get'); +const lodashSet = require('lodash/set'); +const lodashCloneDeepWith = require('lodash/cloneDeepWith'); const cloneDeepWithIdentifiers = require('../util/cloneDeepWithIdentifiers'); diff --git a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDataDocumentTransition.js b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDataDocumentTransition.js index b91cf611640..15899573cd8 100644 --- a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDataDocumentTransition.js +++ b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDataDocumentTransition.js @@ -1,6 +1,6 @@ -const lodashCloneDeepWith = require('lodash.clonedeepwith'); -const lodashGet = require('lodash.get'); -const lodashSet = require('lodash.set'); +const lodashCloneDeepWith = require('lodash/cloneDeepWith'); +const lodashGet = require('lodash/get'); +const lodashSet = require('lodash/set'); const cloneDeepWithIdentifiers = require('../../../../util/cloneDeepWithIdentifiers'); diff --git a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDocumentTransition.js b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDocumentTransition.js index 29b2d67551e..557deac282a 100644 --- a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDocumentTransition.js +++ b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/documentTransition/AbstractDocumentTransition.js @@ -1,4 +1,4 @@ -const lodashGet = require('lodash.get'); +const lodashGet = require('lodash/get'); const Identifier = require('../../../../identifier/Identifier'); diff --git a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/validation/basic/validatePartialCompoundIndices.js b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/validation/basic/validatePartialCompoundIndices.js index 4b50cd03404..07adb81cddd 100644 --- a/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/validation/basic/validatePartialCompoundIndices.js +++ b/packages/js-dpp/lib/document/stateTransition/DocumentsBatchTransition/validation/basic/validatePartialCompoundIndices.js @@ -1,4 +1,4 @@ -const lodashGet = require('lodash.get'); +const lodashGet = require('lodash/get'); const ValidationResult = require('../../../../../validation/ValidationResult'); diff --git a/packages/js-dpp/lib/util/cloneDeepWithIdentifiers.js b/packages/js-dpp/lib/util/cloneDeepWithIdentifiers.js index ca742581879..b3a1fa5f646 100644 --- a/packages/js-dpp/lib/util/cloneDeepWithIdentifiers.js +++ b/packages/js-dpp/lib/util/cloneDeepWithIdentifiers.js @@ -1,4 +1,4 @@ -const lodashCloneDeepWith = require('lodash.clonedeepwith'); +const lodashCloneDeepWith = require('lodash/cloneDeepWith'); const Identifier = require('../identifier/Identifier'); /** diff --git a/packages/js-dpp/lib/util/convertBuffersToArrays.js b/packages/js-dpp/lib/util/convertBuffersToArrays.js index b17549ffab1..1b1122fbdc8 100644 --- a/packages/js-dpp/lib/util/convertBuffersToArrays.js +++ b/packages/js-dpp/lib/util/convertBuffersToArrays.js @@ -1,4 +1,4 @@ -const lodashCloneDeepWith = require('lodash.clonedeepwith'); +const lodashCloneDeepWith = require('lodash/cloneDeepWith'); /** * Clone data which contains Identifiers diff --git a/packages/js-dpp/package.json b/packages/js-dpp/package.json index 6272b245e27..132a58b3336 100644 --- a/packages/js-dpp/package.json +++ b/packages/js-dpp/package.json @@ -98,10 +98,7 @@ "fast-json-patch": "^3.1.0", "json-schema-diff-validator": "^0.4.1", "json-schema-traverse": "^1.0.0", - "lodash.clonedeep": "^4.5.0", - "lodash.clonedeepwith": "^4.5.0", - "lodash.get": "^4.4.2", - "lodash.set": "^4.3.2", + "lodash": "^4.17.21", "long": "^5.2.0" } } diff --git a/packages/js-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js b/packages/js-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js index 1bf347e6899..4afafdcacdb 100644 --- a/packages/js-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js +++ b/packages/js-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js @@ -1,4 +1,4 @@ -const lodashClone = require('lodash.clonedeep'); +const lodashClone = require('lodash/cloneDeep'); const jsonPatch = require('fast-json-patch'); const jsonSchemaDiffValidator = require('json-schema-diff-validator'); diff --git a/packages/js-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js b/packages/js-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js index 0fed5ce1991..39382146c28 100644 --- a/packages/js-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js +++ b/packages/js-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js @@ -1,5 +1,5 @@ const { getRE2Class } = require('@dashevo/wasm-re2'); -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashCloneDeep = require('lodash/cloneDeep'); const $RefParser = require('@apidevtools/json-schema-ref-parser'); diff --git a/packages/js-drive/lib/document/DocumentRepository.js b/packages/js-drive/lib/document/DocumentRepository.js index 2c97d709fca..48544025c46 100644 --- a/packages/js-drive/lib/document/DocumentRepository.js +++ b/packages/js-drive/lib/document/DocumentRepository.js @@ -1,6 +1,6 @@ const { createHash } = require('crypto'); -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashCloneDeep = require('lodash/cloneDeep'); const PreCalculatedOperation = require('@dashevo/dpp/lib/stateTransition/fee/operations/PreCalculatedOperation'); const DummyFeeResult = require('@dashevo/dpp/lib/stateTransition/fee/DummyFeeResult'); diff --git a/packages/js-drive/package.json b/packages/js-drive/package.json index 9a849ab561f..7f2b15dcb1f 100644 --- a/packages/js-drive/package.json +++ b/packages/js-drive/package.json @@ -88,9 +88,7 @@ "dotenv-safe": "^8.2.0", "find-my-way": "^2.2.2", "js-merkle": "^0.1.5", - "lodash.clonedeep": "^4.5.0", - "lodash.get": "^4.4.2", - "lodash.set": "^4.3.2", + "lodash": "^4.17.21", "long": "^5.2.0", "node-graceful": "^3.0.1", "pino": "^6.4.0", diff --git a/packages/js-grpc-common/lib/loadPackageDefinition.js b/packages/js-grpc-common/lib/loadPackageDefinition.js index c90c34b18bb..310e3e608d9 100644 --- a/packages/js-grpc-common/lib/loadPackageDefinition.js +++ b/packages/js-grpc-common/lib/loadPackageDefinition.js @@ -1,7 +1,7 @@ const grpc = require('@grpc/grpc-js'); const protoLoader = require('@grpc/proto-loader'); -const lodashGet = require('lodash.get'); +const lodashGet = require('lodash/get'); /** * Load GRPC package definition diff --git a/packages/js-grpc-common/package.json b/packages/js-grpc-common/package.json index 7bc4aed7178..1cd7d574e15 100644 --- a/packages/js-grpc-common/package.json +++ b/packages/js-grpc-common/package.json @@ -30,7 +30,7 @@ "@grpc/grpc-js": "^1.3.7", "@grpc/proto-loader": "^0.5.2", "cbor": "^8.0.0", - "lodash.get": "^4.4.2", + "lodash": "^4.17.21", "long": "^5.2.0", "semver": "^7.3.2" } diff --git a/packages/wallet-lib/package.json b/packages/wallet-lib/package.json index 59537f1483b..a9b123d0927 100644 --- a/packages/wallet-lib/package.json +++ b/packages/wallet-lib/package.json @@ -48,7 +48,7 @@ "@dashevo/grpc-common": "workspace:*", "cbor": "^8.0.0", "crypto-js": "^4.0.0", - "lodash": "^4.17.19", + "lodash": "^4.17.21", "pbkdf2": "^3.1.1", "setimmediate": "^1.0.5", "winston": "^3.2.1" diff --git a/packages/wasm-dpp/package.json b/packages/wasm-dpp/package.json index 2e8be8eaf54..4833177b65d 100644 --- a/packages/wasm-dpp/package.json +++ b/packages/wasm-dpp/package.json @@ -63,7 +63,7 @@ "karma-mocha": "^2.0.1", "karma-mocha-reporter": "^2.2.5", "karma-webpack": "^5.0.0", - "lodash.clonedeep": "^4.5.0", + "lodash": "^4.17.21", "long": "^5.2.0", "mocha": "^9.1.2", "path-browserify": "^1.0.1", diff --git a/packages/wasm-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js b/packages/wasm-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js index b8c02fef9cd..8b7d3e37383 100644 --- a/packages/wasm-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js +++ b/packages/wasm-dpp/test/integration/dataContract/stateTransition/DataContractUpdateTransition/validation/basic/validateDataContractUpdateTransitionBasicFactory.spec.js @@ -1,4 +1,4 @@ -const lodashClone = require('lodash.clonedeep'); +const lodashClone = require('lodash/cloneDeep'); const jsonPatch = require('fast-json-patch'); const jsonSchemaDiffValidator = require('json-schema-diff-validator'); diff --git a/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js b/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js index 22ff9c5dc29..225114c7186 100644 --- a/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js +++ b/packages/wasm-dpp/test/integration/dataContract/validation/validateDataContractFactory.spec.js @@ -1,5 +1,5 @@ const { getRE2Class } = require('@dashevo/wasm-re2'); -const lodashCloneDeep = require('lodash.clonedeep'); +const lodashCloneDeep = require('lodash/cloneDeep'); const $RefParser = require('@apidevtools/json-schema-ref-parser'); diff --git a/yarn.lock b/yarn.lock index 658e2084c59..610c3b0ff41 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1307,8 +1307,7 @@ __metadata: eslint: ^7.32.0 eslint-config-airbnb-base: ^14.2.1 eslint-plugin-import: ^2.24.2 - lodash.clone: ~4.5.0 - lodash.matches: ^4.6.0 + lodash: ^4.17.21 mathjs: ^10.4.3 mocha: ^9.1.2 languageName: unknown @@ -1359,7 +1358,7 @@ __metadata: karma-mocha: ^2.0.1 karma-mocha-reporter: ^2.2.5 karma-webpack: ^5.0.0 - lodash.sample: ^4.2.1 + lodash: ^4.17.21 mocha: ^9.1.2 node-inspect-extracted: ^1.0.8 nyc: ^15.1.0 @@ -1425,7 +1424,7 @@ __metadata: eslint-plugin-import: ^2.24.2 google-protobuf: ^3.12.2 jayson: ^3.3.4 - lodash: ^4.17.19 + lodash: ^4.17.21 lru-cache: ^5.1.1 mocha: ^9.1.2 mocha-sinon: ^2.1.2 @@ -1601,10 +1600,7 @@ __metadata: karma-mocha: ^2.0.1 karma-mocha-reporter: ^2.2.5 karma-webpack: ^5.0.0 - lodash.clonedeep: ^4.5.0 - lodash.clonedeepwith: ^4.5.0 - lodash.get: ^4.4.2 - lodash.set: ^4.3.2 + lodash: ^4.17.21 long: ^5.2.0 mocha: ^9.1.2 node-inspect-extracted: ^1.0.8 @@ -1660,9 +1656,7 @@ __metadata: find-my-way: ^2.2.2 js-merkle: ^0.1.5 levelup: ^4.4.0 - lodash.clonedeep: ^4.5.0 - lodash.get: ^4.4.2 - lodash.set: ^4.3.2 + lodash: ^4.17.21 long: ^5.2.0 memdown: ^5.1.0 mocha: ^9.1.2 @@ -1711,7 +1705,7 @@ __metadata: eslint: ^7.32.0 eslint-config-airbnb-base: ^14.2.1 eslint-plugin-import: ^2.24.2 - lodash.get: ^4.4.2 + lodash: ^4.17.21 long: ^5.2.0 mocha: ^9.1.2 mocha-sinon: ^2.1.2 @@ -1887,7 +1881,7 @@ __metadata: karma-mocha-reporter: ^2.2.5 karma-sourcemap-loader: ^0.3.7 karma-webpack: ^5.0.0 - lodash: ^4.17.19 + lodash: ^4.17.21 mocha: ^9.1.2 node-inspect-extracted: ^1.0.8 nyc: ^15.1.0 @@ -1944,7 +1938,7 @@ __metadata: karma-mocha: ^2.0.1 karma-mocha-reporter: ^2.2.5 karma-webpack: ^5.0.0 - lodash.clonedeep: ^4.5.0 + lodash: ^4.17.21 long: ^5.2.0 mocha: ^9.1.2 path-browserify: ^1.0.1 @@ -5688,11 +5682,7 @@ __metadata: hasbin: ^1.2.3 jayson: ^3.3.4 listr2: 3.5.0 - lodash.clonedeep: ^4.5.0 - lodash.get: ^4.4.2 - lodash.isequal: ^4.5.0 - lodash.merge: ^4.6.2 - lodash.set: ^4.3.2 + lodash: ^4.17.21 memory-streams: ^0.1.3 node-fetch: ^2.6.1 node-forge: ^1.3.1 @@ -9438,27 +9428,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"lodash.clone@npm:~4.5.0": - version: 4.5.0 - resolution: "lodash.clone@npm:4.5.0" - checksum: 5839f22acf3a43c026ac4325f7bcd378f34967415cd0b9fd7efa9bbbf38dc665900d36e040944c5afab94a51ff8a24f6cfc3781fe439705cbad5c722e9506b16 - languageName: node - linkType: hard - -"lodash.clonedeep@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.clonedeep@npm:4.5.0" - checksum: 92c46f094b064e876a23c97f57f81fbffd5d760bf2d8a1c61d85db6d1e488c66b0384c943abee4f6af7debf5ad4e4282e74ff83177c9e63d8ff081a4837c3489 - languageName: node - linkType: hard - -"lodash.clonedeepwith@npm:^4.5.0": - version: 4.5.0 - resolution: "lodash.clonedeepwith@npm:4.5.0" - checksum: 9fbf4ebfa04b381df226a2298eba680327bea3d0d5d19c5118de7ae218fd219186e30e9fd0d33b13729f34ffbc83c1cf09cb27aff265ba94cb602b8a2b1e71c9 - languageName: node - linkType: hard - "lodash.debounce@npm:^4.0.8": version: 4.0.8 resolution: "lodash.debounce@npm:4.0.8" @@ -9501,13 +9470,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"lodash.matches@npm:^4.6.0": - version: 4.6.0 - resolution: "lodash.matches@npm:4.6.0" - checksum: 002617abb63d3735d8600e5e74d499a02edbef090c33acf1198f46b3ec924752729bbac2eb4f26ec00b0ce3b382fd03fdf25d19cfff08ec735180fcb36cd3fe4 - languageName: node - linkType: hard - "lodash.merge@npm:^4.6.1, lodash.merge@npm:^4.6.2": version: 4.6.2 resolution: "lodash.merge@npm:4.6.2" @@ -9515,20 +9477,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"lodash.sample@npm:^4.2.1": - version: 4.2.1 - resolution: "lodash.sample@npm:4.2.1" - checksum: 8d93c1db133b7c7c5d6f87eb6e512c83dc97baf1de56a2013eff17fd8ddffa5a0901541e320933d9fdb6a4d90e8a597d44bb7aa1e4fa6eca4da534802941e4ab - languageName: node - linkType: hard - -"lodash.set@npm:^4.3.2": - version: 4.3.2 - resolution: "lodash.set@npm:4.3.2" - checksum: a9122f49eef9f2d0fc9061a33d87f8e5b8c6b23d46e8b9e9ce1529d3588d79741bd1145a3abdfa3b13082703e65af27ff18d8a07bfc22b9be32f3fc36f763f70 - languageName: node - linkType: hard - "lodash.truncate@npm:^4.4.2": version: 4.4.2 resolution: "lodash.truncate@npm:4.4.2"