From e70396b9ebbc35f492367896737e7fd32b26df91 Mon Sep 17 00:00:00 2001 From: aeolian <94939382+aeolianeth@users.noreply.github.com> Date: Sun, 26 May 2024 15:24:00 +1000 Subject: [PATCH] chore: remove JB deprecated contracts --- package.json | 1 - .../V2V3ProjectContractsDashboard.tsx | 2 - src/hooks/JBPrices/loadJBPrices.ts | 6 +- .../useProjectControllerAddress.ts | 9 +- .../v2v3/contractReader/useProjectSplits.ts | 6 +- .../contractReader/useProjectTerminals.ts | 6 +- src/models/v2v3/contracts.ts | 3 - src/utils/v2v3/contractLoaders/JuiceboxV2.ts | 12 -- yarn.lock | 163 +----------------- 9 files changed, 12 insertions(+), 196 deletions(-) diff --git a/package.json b/package.json index 0578af1692..d75f257b2b 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,6 @@ "@headlessui/react": "^1.7.18", "@heroicons/react": "^2.0.17", "@jbx-protocol/contracts-v1": "2.0.0", - "@jbx-protocol/contracts-v2-4.0.0": "npm:@jbx-protocol/contracts-v2@4.0.0", "@jbx-protocol/contracts-v2-latest": "npm:@jbx-protocol/contracts-v2@8.0.4", "@jbx-protocol/juice-721-delegate-v3": "npm:@jbx-protocol/juice-721-delegate@3.0.0", "@jbx-protocol/juice-721-delegate-v3-1": "npm:@jbx-protocol/juice-721-delegate@5.0.2", diff --git a/src/components/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx b/src/components/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx index a5f0f3eeaf..56d3e0b92f 100644 --- a/src/components/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx +++ b/src/components/v2v3/V2V3Project/V2V3ProjectContractsDashboard/V2V3ProjectContractsDashboard.tsx @@ -24,8 +24,6 @@ import { V2V3ProjectHeaderActions } from '../V2V3ProjectHeaderActions/V2V3Projec * Typically this list consists of contracts that are project-specific (e.g. PaymentTerminal, Controller etc.) */ const CONTRACT_EXCLUSIONS = [ - V2V3ContractName.DeprecatedJBDirectory, - V2V3ContractName.DeprecatedJBSplitsStore, V2V3ContractName.JBSingleTokenPaymentTerminalStore, V2V3ContractName.JBFundAccessConstraintsStore, ...SUPPORTED_CONTROLLERS, diff --git a/src/hooks/JBPrices/loadJBPrices.ts b/src/hooks/JBPrices/loadJBPrices.ts index 47c5d49295..8ab34094be 100644 --- a/src/hooks/JBPrices/loadJBPrices.ts +++ b/src/hooks/JBPrices/loadJBPrices.ts @@ -31,11 +31,7 @@ export async function loadJBPrices({ } if (cv === CV_V3) { - if (readNetwork.name === NetworkName.goerli) { - contractJson = await import( - '@jbx-protocol/juice-contracts-v3/deployments/goerli/JBPrices.json' - ) - } else if (readNetwork.name === NetworkName.sepolia) { + if (readNetwork.name === NetworkName.sepolia) { contractJson = await import( '@jbx-protocol/juice-contracts-v3/deployments/sepolia/JBPrices.json' ) diff --git a/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts b/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts index 1932bfe4e5..827da8f4de 100644 --- a/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts +++ b/src/hooks/v2v3/contractReader/useProjectControllerAddress.ts @@ -5,19 +5,12 @@ import useV2ContractReader from './useV2ContractReader' export default function useProjectControllerAddress({ projectId, contract, - useDeprecatedContract, }: { projectId?: number contract?: ContractConfig | undefined - useDeprecatedContract?: boolean }) { - if (!contract) { - contract = useDeprecatedContract - ? V2V3ContractName.DeprecatedJBDirectory - : V2V3ContractName.JBDirectory - } return useV2ContractReader({ - contract, + contract: contract ?? V2V3ContractName.JBDirectory, functionName: 'controllerOf', args: projectId ? [projectId] : null, }) diff --git a/src/hooks/v2v3/contractReader/useProjectSplits.ts b/src/hooks/v2v3/contractReader/useProjectSplits.ts index 1cb2248cf0..92e335b800 100644 --- a/src/hooks/v2v3/contractReader/useProjectSplits.ts +++ b/src/hooks/v2v3/contractReader/useProjectSplits.ts @@ -33,17 +33,13 @@ export default function useProjectSplits({ projectId, splitGroup, domain, - useDeprecatedContract, }: { projectId: number | undefined splitGroup: SplitGroup domain: string | undefined - useDeprecatedContract?: boolean }) { return useV2ContractReader({ - contract: useDeprecatedContract - ? V2V3ContractName.DeprecatedJBSplitsStore - : V2V3ContractName.JBSplitsStore, + contract: V2V3ContractName.JBSplitsStore, functionName: 'splitsOf', args: projectId && domain ? [projectId, domain, splitGroup] : null, formatter: useCallback((value: unknown): Split[] => { diff --git a/src/hooks/v2v3/contractReader/useProjectTerminals.ts b/src/hooks/v2v3/contractReader/useProjectTerminals.ts index cc8df10798..2dd4905d83 100644 --- a/src/hooks/v2v3/contractReader/useProjectTerminals.ts +++ b/src/hooks/v2v3/contractReader/useProjectTerminals.ts @@ -4,15 +4,11 @@ import useV2ContractReader from './useV2ContractReader' export default function useProjectTerminals({ projectId, - useDeprecatedContract, }: { projectId?: number - useDeprecatedContract?: boolean }) { return useV2ContractReader({ - contract: useDeprecatedContract - ? V2V3ContractName.DeprecatedJBDirectory - : V2V3ContractName.JBDirectory, + contract: V2V3ContractName.JBDirectory, functionName: 'terminalsOf', args: projectId ? [projectId] : null, }) diff --git a/src/models/v2v3/contracts.ts b/src/models/v2v3/contracts.ts index f64382eb6e..1412219a24 100644 --- a/src/models/v2v3/contracts.ts +++ b/src/models/v2v3/contracts.ts @@ -22,9 +22,6 @@ export enum V2V3ContractName { JBETHPaymentTerminal3_1 = 'JBETHPaymentTerminal3_1', JBETHPaymentTerminal3_1_1 = 'JBETHPaymentTerminal3_1_1', JBETHPaymentTerminal3_1_2 = 'JBETHPaymentTerminal3_1_2', - - DeprecatedJBSplitsStore = 'DeprecatedJBSplitsStore', - DeprecatedJBDirectory = 'DeprecatedJBDirectory', } export type V2V3Contracts = Record diff --git a/src/utils/v2v3/contractLoaders/JuiceboxV2.ts b/src/utils/v2v3/contractLoaders/JuiceboxV2.ts index 1cb547d3c1..df01b4040e 100644 --- a/src/utils/v2v3/contractLoaders/JuiceboxV2.ts +++ b/src/utils/v2v3/contractLoaders/JuiceboxV2.ts @@ -96,18 +96,6 @@ export const loadJuiceboxV2Contract = async ( try { let contractJson: ContractJson | undefined switch (contractName) { - case V2V3ContractName.DeprecatedJBDirectory: { - contractJson = (await import( - `@jbx-protocol/contracts-v2-4.0.0/deployments/mainnet/JBDirectory.json` - )) as ContractJson - break - } - case V2V3ContractName.DeprecatedJBSplitsStore: { - contractJson = (await import( - `@jbx-protocol/contracts-v2-4.0.0/deployments/mainnet/JBSplitsStore.json` - )) as ContractJson - break - } case V2V3ContractName.JBController: { contractJson = (await import( `@jbx-protocol/contracts-v2-latest/deployments/mainnet/JBController.json` diff --git a/yarn.lock b/yarn.lock index aad852b8e5..1891a76040 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2182,7 +2182,7 @@ "@ethersproject/properties" "^5.5.0" "@ethersproject/strings" "^5.5.0" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.12", "@ethersproject/abi@^5.1.2", "@ethersproject/abi@^5.4.0", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.12", "@ethersproject/abi@^5.4.0", "@ethersproject/abi@^5.5.0", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -3538,24 +3538,6 @@ resolved "https://registry.yarnpkg.com/@jbx-protocol/contracts-v1/-/contracts-v1-2.0.0.tgz#616dd2adb8603dd1067d29fa613e704737adc243" integrity sha512-70BvKKor6iM8eBTa4klH7iOA5+/oa0J5gMpazK5nECrn8U0xeKTB19v+jXmTu+26JYruZHzCKZVdV5aH+c8qnA== -"@jbx-protocol/contracts-v2-4.0.0@npm:@jbx-protocol/contracts-v2@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@jbx-protocol/contracts-v2/-/contracts-v2-4.0.0.tgz#0e1758c3be932993c7dbfa6b23addd10cc1855ea" - integrity sha512-8B3UBPZYS4HCvRY25M8ROZi7mQdDrUMfq7dT3ucPVlE1KQLC8nBMwV2PiihgUamKpbQES9vhs7T4UIZbAv79rg== - dependencies: - "@chainlink/contracts" "^0.1.6" - "@nomiclabs/hardhat-etherscan" "^2.1.4" - "@openzeppelin/contracts" "^4.5.0-rc.0" - "@paulrberg/contracts" "^3.4.0" - dotenv "^10.0.0" - esm "^3.2.25" - glob "^7.2.0" - hardhat-deploy-ethers "^0.3.0-beta.10" - prettier "^2.4.0" - prettier-plugin-solidity "^1.0.0-beta.19" - solhint "^3.3.6" - solhint-plugin-prettier "^0.0.5" - "@jbx-protocol/contracts-v2-latest@npm:@jbx-protocol/contracts-v2@8.0.4": version "8.0.4" resolved "https://registry.yarnpkg.com/@jbx-protocol/contracts-v2/-/contracts-v2-8.0.4.tgz#ceb72c01f56d528691d048d488fef2566961bb88" @@ -4554,19 +4536,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@nomiclabs/hardhat-etherscan@^2.1.4": - version "2.1.8" - resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-2.1.8.tgz#e206275e96962cd15e5ba9148b44388bc922d8c2" - integrity sha512-0+rj0SsZotVOcTLyDOxnOc3Gulo8upo0rsw/h+gBPcmtj91YqYJNhdARHoBxOhhE8z+5IUQPx+Dii04lXT14PA== - dependencies: - "@ethersproject/abi" "^5.1.2" - "@ethersproject/address" "^5.0.2" - cbor "^5.0.2" - debug "^4.1.1" - fs-extra "^7.0.1" - node-fetch "^2.6.0" - semver "^6.3.0" - "@openzeppelin/contracts@3.4.1-solc-0.7-2": version "3.4.1-solc-0.7-2" resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-3.4.1-solc-0.7-2.tgz#371c67ebffe50f551c3146a9eec5fe6ffe862e92" @@ -4945,13 +4914,6 @@ rpc-websockets "^7.5.1" superstruct "^0.14.2" -"@solidity-parser/parser@^0.16.0": - version "0.16.0" - resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.16.0.tgz#1fb418c816ca1fc3a1e94b08bcfe623ec4e1add4" - integrity sha512-ESipEcHyRHg4Np4SqBCfcXwyxxna1DgFVz69bgpLV8vzl/NP1DtcKsJ4dJZXWQhY/Z4J2LeKBiOkOVZn9ct33Q== - dependencies: - antlr4ts "^0.5.0-alpha.4" - "@stablelib/aead@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@stablelib/aead/-/aead-1.0.1.tgz#c4b1106df9c23d1b867eb9b276d8f42d5fc4c0c3" @@ -6941,7 +6903,7 @@ ajv-keywords@^5.1.0: dependencies: fast-deep-equal "^3.1.3" -ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.6: +ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -6951,7 +6913,7 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.6: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.0.1, ajv@^8.9.0: +ajv@^8.0.0, ajv@^8.9.0: version "8.12.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== @@ -7071,16 +7033,6 @@ antd@^4.24.0: rc-util "^5.22.5" scroll-into-view-if-needed "^2.2.25" -antlr4@^4.11.0: - version "4.13.0" - resolved "https://registry.yarnpkg.com/antlr4/-/antlr4-4.13.0.tgz#25c0b17f0d9216de114303d38bafd6f181d5447f" - integrity sha512-zooUbt+UscjnWyOrsuY/tVFL4rwrAGwOivpQmvmUDE22hy/lUA467Rc1rcixyRwcRUIXFYBwv7+dClDSHdmmew== - -antlr4ts@^0.5.0-alpha.4: - version "0.5.0-alpha.4" - resolved "https://registry.yarnpkg.com/antlr4ts/-/antlr4ts-0.5.0-alpha.4.tgz#71702865a87478ed0b40c0709f422cf14d51652a" - integrity sha512-WPQDt1B74OfPv/IMS2ekXAKkTZIHl88uMetg6q3OTqgFxZ/dxDXI0EWLyZid/1Pe6hTftyg5N7gel5wNAGxXyQ== - anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: version "3.1.3" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e" @@ -7232,11 +7184,6 @@ assert@^2.0.0: object-is "^1.0.1" util "^0.12.0" -ast-parents@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/ast-parents/-/ast-parents-0.0.1.tgz#508fd0f05d0c48775d9eccda2e174423261e8dd3" - integrity sha512-XHusKxKz3zoYk1ic8Un640joHbFMhbqneyoZfoKnEGtf2ey9Uh/IdpcQplODdO/kENaMIWsD0nJm4+wX3UNLHA== - ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" @@ -8111,7 +8058,7 @@ cbor-sync@^1.0.4: resolved "https://registry.yarnpkg.com/cbor-sync/-/cbor-sync-1.0.4.tgz#5a11a1ab75c2a14d1af1b237fd84aa8c1593662f" integrity sha512-GWlXN4wiz0vdWWXBU71Dvc1q3aBo0HytqwAZnXF1wOwjqNnDWA1vZ1gDMFLlqohak31VQzmhiYfiCX5QSSfagA== -cbor@^5.0.2, cbor@^5.2.0: +cbor@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c" integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A== @@ -9565,11 +9512,6 @@ dot-case@^3.0.4: no-case "^3.0.4" tslib "^2.0.3" -dotenv@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" - integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== - dotenv@^16.0.0, dotenv@^16.0.1: version "16.0.3" resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" @@ -10192,11 +10134,6 @@ eslint@^8.19.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -esm@^3.2.25: - version "3.2.25" - resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10" - integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA== - espree@^9.5.2: version "9.5.2" resolved "https://registry.yarnpkg.com/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" @@ -10925,11 +10862,6 @@ fast-diff@1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.1.2.tgz#4b62c42b8e03de3f848460b639079920695d0154" integrity sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig== -fast-diff@^1.1.2, fast-diff@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0" - integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw== - fast-equals@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-5.0.1.tgz#a4eefe3c5d1c0d021aeed0bc10ba5e0c12ee405d" @@ -11288,7 +11220,7 @@ fs-extra@^4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^7.0.0, fs-extra@^7.0.1: +fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -11449,7 +11381,7 @@ glob@7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.2.0: +glob@^7.1.1, glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -11652,11 +11584,6 @@ har-validator@~5.1.3: ajv "^6.12.3" har-schema "^2.0.0" -hardhat-deploy-ethers@^0.3.0-beta.10: - version "0.3.0-beta.13" - resolved "https://registry.yarnpkg.com/hardhat-deploy-ethers/-/hardhat-deploy-ethers-0.3.0-beta.13.tgz#b96086ff768ddf69928984d5eb0a8d78cfca9366" - integrity sha512-PdWVcKB9coqWV1L7JTpfXRCI91Cgwsm7KLmBcwZ8f0COSm1xtABHZTyz3fvF6p42cTnz1VM0QnfDvMFlIRkSNw== - has-bigints@^1.0.1, has-bigints@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" @@ -12130,7 +12057,7 @@ ieee754@^1.1.13, ieee754@^1.2.1: resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== -ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.2.0: version "5.2.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== @@ -13981,11 +13908,6 @@ lodash.sortby@^4.7.0: resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== - lodash.uniqby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" @@ -16236,11 +16158,6 @@ pkg-up@^3.1.0: dependencies: find-up "^3.0.0" -pluralize@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" - integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== - pngjs@^3.3.0: version "3.4.0" resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" @@ -16417,33 +16334,17 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== -prettier-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - prettier-plugin-organize-imports@^3.1.0: version "3.2.2" resolved "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-3.2.2.tgz#91993365e017daa5d0d28d8183179834224d8dd1" integrity sha512-e97lE6odGSiHonHJMTYC0q0iLXQyw0u5z/PJpvP/3vRy6/Zi9kLBwFAbEGjDzIowpjQv8b+J04PDamoUSQbzGA== -prettier-plugin-solidity@^1.0.0-beta.19: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prettier-plugin-solidity/-/prettier-plugin-solidity-1.1.3.tgz#9a35124f578404caf617634a8cab80862d726cba" - integrity sha512-fQ9yucPi2sBbA2U2Xjh6m4isUTJ7S7QLc/XDDsktqqxYfTwdYKJ0EnnywXHwCGAaYbQNK+HIYPL1OemxuMsgeg== - dependencies: - "@solidity-parser/parser" "^0.16.0" - semver "^7.3.8" - solidity-comments-extractor "^0.0.7" - prettier-plugin-tailwindcss@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.1.13.tgz#ca1071361dc7e2ed5d95a2ee36825ce45f814942" integrity sha512-/EKQURUrxLu66CMUg4+1LwGdxnz8of7IDvrSLqEtDqhLH61SAlNNUSr90UTvZaemujgl3OH/VHg+fyGltrNixw== -prettier@^2.3.1, prettier@^2.4.0, prettier@^2.7.1, prettier@^2.8.3: +prettier@^2.3.1, prettier@^2.7.1: version "2.8.8" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== @@ -18465,43 +18366,6 @@ solc@^0.4.20: semver "^5.3.0" yargs "^4.7.1" -solhint-plugin-prettier@^0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/solhint-plugin-prettier/-/solhint-plugin-prettier-0.0.5.tgz#e3b22800ba435cd640a9eca805a7f8bc3e3e6a6b" - integrity sha512-7jmWcnVshIrO2FFinIvDQmhQpfpS2rRRn3RejiYgnjIE68xO2bvrYvjqVNfrio4xH9ghOqn83tKuTzLjEbmGIA== - dependencies: - prettier-linter-helpers "^1.0.0" - -solhint@^3.3.6: - version "3.4.1" - resolved "https://registry.yarnpkg.com/solhint/-/solhint-3.4.1.tgz#8ea15b21c13d1be0b53fd46d605a24d0b36a0c46" - integrity sha512-pzZn2RlZhws1XwvLPVSsxfHrwsteFf5eySOhpAytzXwKQYbTCJV6z8EevYDiSVKMpWrvbKpEtJ055CuEmzp4Xg== - dependencies: - "@solidity-parser/parser" "^0.16.0" - ajv "^6.12.6" - antlr4 "^4.11.0" - ast-parents "^0.0.1" - chalk "^4.1.2" - commander "^10.0.0" - cosmiconfig "^8.0.0" - fast-diff "^1.2.0" - glob "^8.0.3" - ignore "^5.2.4" - js-yaml "^4.1.0" - lodash "^4.17.21" - pluralize "^8.0.0" - semver "^6.3.0" - strip-ansi "^6.0.1" - table "^6.8.1" - text-table "^0.2.0" - optionalDependencies: - prettier "^2.8.3" - -solidity-comments-extractor@^0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/solidity-comments-extractor/-/solidity-comments-extractor-0.0.7.tgz#99d8f1361438f84019795d928b931f4e5c39ca19" - integrity sha512-wciNMLg/Irp8OKGrh3S2tfvZiZ0NEyILfcRCXCD4mp7SgK/i9gzLfhY2hY7VMCQJ3kH9UB9BzNdibIVMchzyYw== - sonic-boom@^2.2.1: version "2.8.0" resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611" @@ -19069,17 +18933,6 @@ table-layout@^1.0.2: typical "^5.2.0" wordwrapjs "^4.0.0" -table@^6.8.1: - version "6.8.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" - integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== - dependencies: - ajv "^8.0.1" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - tailwind-merge@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.3.0.tgz#27d2134fd00a1f77eca22bcaafdd67055917d286"