From 387f3608cd55d1dafc93d52d9ce15a966f374eca Mon Sep 17 00:00:00 2001
From: Mohan <mohandast52@gmail.com>
Date: Fri, 30 Aug 2024 00:31:21 +0530
Subject: [PATCH] (registry) fix: multisig fix in service details (#89)

* fix: update ipfs constant in NFT image list

* feat: add ethers v5

* feat: use ethersv5

* chore: add resolver for gnosis.pm - ethersv5

* refactor: update dependencies and improve transaction handling for ethersV5

* refactor: update eslint configuration to allow only console.warn and console.error

* chore: update CODEOWNERS

* test: works with gnosis-safe, yaygit status

* feat: remove all logs and update comment
---
 .eslintrc.json                                |  6 ++
 CODEOWNERS                                    |  4 +-
 .../List/IpfsHashGenerationModal/index.jsx    |  2 +-
 .../common-util/functions/index.ts            | 17 +++-
 .../3rdStepFinishedRegistration/index.jsx     |  6 +-
 .../3rdStepFinishedRegistration/utils.jsx     | 61 ++++++++-----
 .../ListServices/ServiceState/utils.jsx       | 90 ++++++-------------
 .../src/lib/rewards.ts                        |  2 +-
 .../src/lib/sendTransaction/index.ts          |  3 +-
 package.json                                  |  4 +
 yarn.lock                                     | 35 ++------
 11 files changed, 100 insertions(+), 130 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 56e8f245..88a2bbcb 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -23,6 +23,12 @@
               }
             ]
           }
+        ],
+        "no-console": [
+          "warn",
+          {
+            "allow": ["warn", "error"]
+          }
         ]
       }
     },
diff --git a/CODEOWNERS b/CODEOWNERS
index e8e603bd..0267eaef 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1,4 +1,4 @@
 # more info here - https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-apps/ @mohandast52 @oaksprout
-libs/ @mohandast52 @oaksprout
+apps/ @mohandast52 @oaksprout @Tanya-atatakai @truemiller
+libs/ @mohandast52 @oaksprout @Tanya-atatakai @truemiller
diff --git a/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx b/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx
index 98525f91..3ffe4899 100644
--- a/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx
+++ b/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx
@@ -228,7 +228,7 @@ export const IpfsHashGenerationModal = ({
               <span>
                 {/* TODO: fetch from middleware constant */}
                 <ul style={{ margin: 0 }}>
-                  <li>{'ipfs://{IPFS_HASH}'}</li>
+                  <li>ipfs://*</li>
                   <li>https://gateway.autonolas.tech/ipfs/*</li>
                   <li>https://gateway.pinata.cloud/ipfs/*</li>
                   <li>https://*.arweave.net/</li>
diff --git a/apps/autonolas-registry/common-util/functions/index.ts b/apps/autonolas-registry/common-util/functions/index.ts
index 8a2a1a34..b57a2d75 100644
--- a/apps/autonolas-registry/common-util/functions/index.ts
+++ b/apps/autonolas-registry/common-util/functions/index.ts
@@ -2,6 +2,7 @@ import { PublicKey } from '@solana/web3.js';
 import { RuleObject } from 'antd/es/form';
 import { StoreValue } from 'antd/es/form/interface';
 import { Contract, FallbackProvider, JsonRpcProvider, ethers } from 'ethers';
+import { Contract as ContractV5 } from 'ethers-v5';
 import { isString } from 'lodash';
 import { Address } from 'viem';
 
@@ -11,6 +12,7 @@ import {
   isValidAddress,
   notifyError,
   notifyWarning,
+  sendTransaction as sendTransactionLegacyFn,
 } from '@autonolas/frontend-library';
 
 import { sendTransaction as sendTransactionFn } from 'libs/util-functions/src';
@@ -144,11 +146,11 @@ const isMethodsBuilderInstance = (
  *
  */
 export const sendTransaction = (
-  method: Contract,
+  method: Contract | ContractV5,
   account: Address,
-  extra?: { vmType: string; registryAddress: Address },
+  extra?: { vmType: string; registryAddress: Address; isLegacy?: boolean },
 ) => {
-  const { vmType, registryAddress } = extra || {};
+  const { vmType, registryAddress, isLegacy } = extra || {};
   if (vmType === VM_TYPE.SVM && registryAddress) {
     // Check if something resembling an SVM method is being passed
     if (!isMethodsBuilderInstance(method, registryAddress)) {
@@ -158,7 +160,14 @@ export const sendTransaction = (
     return method.rpc();
   }
 
-  return sendTransactionFn(method, account, {
+  if (isLegacy) {
+    return sendTransactionLegacyFn(method as ContractV5, account, {
+      supportedChains: SUPPORTED_CHAINS,
+      rpcUrls: RPC_URLS as RpcUrl,
+    });
+  }
+
+  return sendTransactionFn(method as Contract, account, {
     supportedChains: SUPPORTED_CHAINS,
     rpcUrls: RPC_URLS as RpcUrl,
   });
diff --git a/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx b/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx
index 759c4eee..3b6dcf3d 100644
--- a/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx
+++ b/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx
@@ -19,7 +19,7 @@ import { SVM_EMPTY_ADDRESS } from 'util/constants';
 import { RadioLabel } from '../styles';
 import { useFinishRegistration } from '../useSvmServiceStateManagement';
 import { getServiceAgentInstances, onStep3Deploy } from '../utils';
-import { handleMultisigSubmit } from './utils';
+import { onMultisigSubmit } from './utils';
 
 const STEP = 3;
 const OPTION_1 = 'Creates a new service multisig with currently registered agent instances';
@@ -363,7 +363,7 @@ export const FinishedRegistration = ({
               onClick={async () => {
                 try {
                   setIsSubmitting(true);
-                  await handleMultisigSubmit({
+                  await onMultisigSubmit({
                     multisig,
                     threshold,
                     agentInstances,
@@ -375,9 +375,9 @@ export const FinishedRegistration = ({
                   });
                 } catch (error) {
                   console.error(error);
+                  notifyError('Error occurred while updating multisig. Please try again.');
                 } finally {
                   setIsSubmitting(false);
-                  notifyError('Error occurred while updating multisig. Please try again.');
                 }
               }}
               {...getOtherBtnProps(STEP, {
diff --git a/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/utils.jsx b/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/utils.jsx
index e9dbcad5..b19a5d80 100644
--- a/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/utils.jsx
+++ b/apps/autonolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/utils.jsx
@@ -1,10 +1,31 @@
-/* eslint-disable no-underscore-dangle */
-import { ethers } from 'ethers';
+/**
+ * NOTE: Legacy code, needs to be refactored once gnosis.pm/safe-contracts updates ethers.js to v6
+ *
+ * How to test `onMultisigSubmit` function (step 3 in service)
+ * - First, you’ll need two accounts; let's call them `account1` and `account2`.
+ * - Create a service with account1 as the owner, using one 1 as an example.
+ * - Navigate to the newly created service.
+ * - Start with the first step and click the "Activate Registration" button.
+ * - In the second step, switch to `account2` and add `account1` as the "Agent instance address".
+ * - In the third step, switch back to `account1` and select 1st radio button (creates new multisig) and click the "Submit" button.
+ * - In the fourth step, use `account1` to "Terminate" the service.
+ * - In the fifth step, switch to `account2` and "Unbond" the service.
+ * NOW, start from the 1st step to test the multisig update functionality.
+ * - In the first step, switch to `account1` click "Activate Registration" button.
+ * - In the second step, switch to `account2` and add any valid address as the "Agent instance address" (fetch from the explorer of the same chain).
+ * - In the third step, switch back `account1` and select 2nd radio button and click "Submit" button - this will trigger the `onMultisigSubmit` function.
+ *
+ * NOTE: It's the same steps for gnosis-safe and metamask-like wallets.
+ */
+import { ethers } from 'ethers-v5';
+
+import { getEthersProvider as getEthersV5Provider } from '@autonolas/frontend-library';
 
 import { GNOSIS_SAFE_CONTRACT, MULTI_SEND_CONTRACT } from 'common-util/AbiAndAddresses';
 import { RPC_URLS, getServiceOwnerMultisigContract } from 'common-util/Contracts';
 import { safeMultiSend } from 'common-util/Contracts/addresses';
-import { checkIfGnosisSafe, getEthersProvider } from 'common-util/functions';
+import { SUPPORTED_CHAINS } from 'common-util/Login';
+import { checkIfGnosisSafe } from 'common-util/functions';
 
 import { isHashApproved } from './helpers';
 
@@ -28,7 +49,7 @@ const EIP712_SAFE_TX_TYPE = {
   ],
 };
 
-export const handleMultisigSubmit = async ({
+export const onMultisigSubmit = async ({
   multisig,
   threshold,
   agentInstances,
@@ -43,7 +64,6 @@ export const handleMultisigSubmit = async ({
     GNOSIS_SAFE_CONTRACT.abi,
     ethers.getDefaultProvider(RPC_URLS[chainId]),
   );
-
   const nonce = await multisigContract.nonce();
 
   const callData = [];
@@ -84,12 +104,10 @@ export const handleMultisigSubmit = async ({
   );
 
   const safeTx = safeContracts.buildMultiSendSafeTx(multiSendContract, txs, nonce);
-
-  const provider = getEthersProvider();
+  const provider = getEthersV5Provider(SUPPORTED_CHAINS, RPC_URLS);
   const isSafe = await checkIfGnosisSafe(account, provider);
 
   try {
-    // TODO: check if we are dealing with safe in future!
     // logic to deal with gnosis-safe
     if (isSafe) {
       // Create a message hash from the multisend transaction
@@ -105,7 +123,6 @@ export const handleMultisigSubmit = async ({
         safeTx.refundReceiver,
         nonce,
       );
-
       const multisigContractServiceOwner = getServiceOwnerMultisigContract(multisig);
       const startingBlock = await provider.getBlockNumber();
 
@@ -126,7 +143,7 @@ export const handleMultisigSubmit = async ({
       ]);
 
       // Redeploy the service updating the multisig with new owners and threshold
-      const packedData = ethers.solidityPacked(['address', 'bytes'], [multisig, safeExecData]);
+      const packedData = ethers.utils.solidityPack(['address', 'bytes'], [multisig, safeExecData]);
 
       // Check if the hash was already approved
       const filterOption = { approvedHash: messageHash, owner: account };
@@ -137,10 +154,10 @@ export const handleMultisigSubmit = async ({
           fromBlock: 0,
           toBlock: 'latest',
         },
-        (_error, events) => {
+        async (_error, events) => {
           // if hash was already approved, call the deploy function right away.
           if (events.length > 0) {
-            handleStep3Deploy(radioValue, packedData);
+            await handleStep3Deploy(radioValue, packedData);
           } else {
             // else wait until the hash is approved and then call deploy function
             multisigContractServiceOwner.methods
@@ -149,20 +166,18 @@ export const handleMultisigSubmit = async ({
               .on('transactionHash', async (hash) => {
                 window.console.log('safeTx', hash);
 
-                // TODO: use websocket based subscription to fetch real-time event
-                // await until the hash is approved & then deploy
                 await isHashApproved(multisigContractServiceOwner, startingBlock, filterOption);
-                handleStep3Deploy(radioValue, packedData);
+                await handleStep3Deploy(radioValue, packedData);
               })
               .then((information) => window.console.log(information))
-              .catch((e) => {
-                console.error(e);
-              });
+              .catch((e) => console.error(e));
           }
         },
       );
-    } else {
-      // logic to deal with metamask
+    }
+
+    // logic to deal with metamask like wallets
+    else {
       const signer = provider.getSigner();
 
       const getSignatureBytes = async () => {
@@ -196,7 +211,6 @@ export const handleMultisigSubmit = async ({
       };
 
       const signatureBytes = await getSignatureBytes();
-
       const safeExecData = multisigContract.interface.encodeFunctionData('execTransaction', [
         safeTx.to,
         safeTx.value,
@@ -209,10 +223,9 @@ export const handleMultisigSubmit = async ({
         safeTx.refundReceiver,
         signatureBytes,
       ]);
+      const packedData = ethers.utils.solidityPack(['address', 'bytes'], [multisig, safeExecData]);
 
-      const packedData = ethers.solidityPacked(['address', 'bytes'], [multisig, safeExecData]);
-
-      handleStep3Deploy(radioValue, packedData);
+      await handleStep3Deploy(radioValue, packedData);
     }
   } catch (error) {
     window.console.log('Error in signing:');
diff --git a/apps/autonolas-registry/components/ListServices/ServiceState/utils.jsx b/apps/autonolas-registry/components/ListServices/ServiceState/utils.jsx
index 295f64b0..92802077 100644
--- a/apps/autonolas-registry/components/ListServices/ServiceState/utils.jsx
+++ b/apps/autonolas-registry/components/ListServices/ServiceState/utils.jsx
@@ -1,7 +1,7 @@
 import { ethers } from 'ethers';
+
 import { notifyError } from '@autonolas/frontend-library';
 
-import { DEFAULT_SERVICE_CREATION_ETH_TOKEN_ZEROS } from 'util/constants';
 import {
   getGenericErc20Contract,
   getServiceContract,
@@ -9,12 +9,11 @@ import {
   getServiceRegistryTokenUtilityContract,
 } from 'common-util/Contracts';
 import { ADDRESSES } from 'common-util/Contracts/addresses';
-import { sendTransaction } from 'common-util/functions';
 import { getTokenDetailsRequest } from 'common-util/Details/utils';
-import {
-  transformDatasourceForServiceTable,
-  transformSlotsAndBonds,
-} from '../helpers/functions';
+import { sendTransaction } from 'common-util/functions';
+import { DEFAULT_SERVICE_CREATION_ETH_TOKEN_ZEROS } from 'util/constants';
+
+import { transformDatasourceForServiceTable, transformSlotsAndBonds } from '../helpers/functions';
 
 /* ----- helper functions ----- */
 
@@ -44,11 +43,7 @@ export const getBonds = async (id, tableDataSource) => {
     bondsArray.push(bond);
   }
 
-  const transformedSlotsAndBonds = transformSlotsAndBonds(
-    slotsArray,
-    bondsArray,
-    tableDataSource,
-  );
+  const transformedSlotsAndBonds = transformSlotsAndBonds(slotsArray, bondsArray, tableDataSource);
   return transformedSlotsAndBonds;
 };
 
@@ -68,12 +63,7 @@ export const getServiceOwner = async (id) => {
   return response;
 };
 
-const hasSufficientTokenRequest = async ({
-  account,
-  chainId,
-  serviceId,
-  amountToApprove,
-}) => {
+const hasSufficientTokenRequest = async ({ account, chainId, serviceId, amountToApprove }) => {
   /**
    * - fetch the token address from the serviceId
    * - fetch the allowance of the token using the token address
@@ -89,12 +79,7 @@ const hasSufficientTokenRequest = async ({
 /**
  * Approves token
  */
-const approveToken = async ({
-  account,
-  chainId,
-  serviceId,
-  amountToApprove,
-}) => {
+const approveToken = async ({ account, chainId, serviceId, amountToApprove }) => {
   const { token } = await getTokenDetailsRequest(serviceId);
   const contract = getGenericErc20Contract(token);
   const fn = contract.methods
@@ -105,12 +90,7 @@ const approveToken = async ({
   return response;
 };
 
-export const checkAndApproveToken = async ({
-  account,
-  chainId,
-  serviceId,
-  amountToApprove,
-}) => {
+export const checkAndApproveToken = async ({ account, chainId, serviceId, amountToApprove }) => {
   const hasTokenBalance = await hasSufficientTokenRequest({
     account,
     chainId,
@@ -141,9 +121,7 @@ export const checkIfEth = async (id) => {
 export const mintTokenRequest = async ({ account, serviceId }) => {
   const { token } = await getTokenDetailsRequest(serviceId);
   const contract = getGenericErc20Contract(token);
-  const fn = contract.methods
-    .mint(account, ethers.parseEther('1000'))
-    .send({ from: account });
+  const fn = contract.methods.mint(account, ethers.parseEther('1000')).send({ from: account });
   await sendTransaction(fn, account);
   return null;
 };
@@ -200,9 +178,7 @@ export const getServiceTableDataSource = async (id, agentIds) => {
    */
   const numAgentInstancesArray = await Promise.all(
     agentIds.map(async (agentId) => {
-      const info = await contract.methods
-        .getInstancesForAgentId(id, agentId)
-        .call();
+      const info = await contract.methods.getInstancesForAgentId(id, agentId).call();
       return info.numAgentInstances;
     }),
   );
@@ -216,34 +192,26 @@ export const getServiceTableDataSource = async (id, agentIds) => {
   return dateSource;
 };
 
-export const checkIfAgentInstancesAreValid = async ({
-  account,
-  agentInstances,
-}) => {
+export const checkIfAgentInstancesAreValid = async ({ account, agentInstances }) => {
   const contract = getServiceContract();
 
   // check if the operator is registered as an agent instance already
-  const operator = await contract.methods
-    .mapAgentInstanceOperators(account)
-    .call();
+  const operator = await contract.methods.mapAgentInstanceOperators(account).call();
   if (operator !== DEFAULT_SERVICE_CREATION_ETH_TOKEN_ZEROS) {
     notifyError('The operator is registered as an agent instance already.');
     return false;
   }
 
   // check if the agent instances are valid
-  const agentInstanceAddressesPromises = agentInstances.map(
-    async (agentInstance) => {
-      const eachAgentInstance = await contract.methods
-        .mapAgentInstanceOperators(agentInstance)
-        .call();
-      return eachAgentInstance;
-    },
-  );
+  const agentInstanceAddressesPromises = agentInstances.map(async (agentInstance) => {
+    const eachAgentInstance = await contract.methods
+      .mapAgentInstanceOperators(agentInstance)
+      .call();
+    return eachAgentInstance;
+  });
 
   const ifValidArray = (await Promise.all(agentInstanceAddressesPromises)).some(
-    (eachAgentInstance) =>
-      eachAgentInstance === DEFAULT_SERVICE_CREATION_ETH_TOKEN_ZEROS,
+    (eachAgentInstance) => eachAgentInstance === DEFAULT_SERVICE_CREATION_ETH_TOKEN_ZEROS,
   );
 
   if (!ifValidArray) {
@@ -287,17 +255,11 @@ export const getServiceAgentInstances = async (id) => {
   return response?.agentInstances;
 };
 
-export const onStep3Deploy = async (
-  account,
-  id,
-  radioValue,
-  payload = '0x',
-) => {
+export const onStep3Deploy = async (account, id, radioValue, payload = '0x') => {
   const contract = getServiceManagerContract();
-  const fn = contract.methods
-    .deploy(id, radioValue, payload)
-    .send({ from: account });
-  const response = sendTransaction(fn, account);
+
+  const fn = contract.methods.deploy(id, radioValue, payload).send({ from: account });
+  const response = await sendTransaction(fn, account, { isLegacy: true });
   return response;
 };
 
@@ -307,9 +269,7 @@ export const getAgentInstanceAndOperator = async (id) => {
   const response = await contract.methods.getAgentInstances(id).call();
   const data = await Promise.all(
     (response?.agentInstances || []).map(async (key, index) => {
-      const operatorAddress = await contract.methods
-        .mapAgentInstanceOperators(key)
-        .call();
+      const operatorAddress = await contract.methods.mapAgentInstanceOperators(key).call();
       return {
         id: `agent-instance-row-${index + 1}`,
         operatorAddress,
diff --git a/libs/common-contract-functions/src/lib/rewards.ts b/libs/common-contract-functions/src/lib/rewards.ts
index ea691f2e..cf6eacb9 100644
--- a/libs/common-contract-functions/src/lib/rewards.ts
+++ b/libs/common-contract-functions/src/lib/rewards.ts
@@ -97,4 +97,4 @@ export const getPendingIncentives = async ({
     pendingReward: rewardsFormatter(pendingReward, 4),
     pendingTopUp: rewardsFormatter(pendingTopUp, 2),
   };
-};
\ No newline at end of file
+};
diff --git a/libs/util-functions/src/lib/sendTransaction/index.ts b/libs/util-functions/src/lib/sendTransaction/index.ts
index f087f72f..249bd736 100644
--- a/libs/util-functions/src/lib/sendTransaction/index.ts
+++ b/libs/util-functions/src/lib/sendTransaction/index.ts
@@ -18,9 +18,10 @@ export const SAFE_API_POLYGON =
 /**
  * returns the gnosis-safe API url based on the chainId.
  * Here is the ist of available gnosis safe transaction service
- * https://docs.safe.global/safe-core-api/available-services
+ * @see https://docs.safe.global/core-api/transaction-service-supported-networks
  */
 export const getUrl = (hash: string, chainId: number) => {
+  // TODO: update the URL for supported chains
   switch (chainId) {
     case 5:
       return `${process.env['NEXT_PUBLIC_GNOSIS_SAFE_API_GOERLI'] || SAFE_API_GOERLI}/${hash}`;
diff --git a/package.json b/package.json
index 53768a47..65426961 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "cors": "^2.8.5",
     "decimal.js": "^10.4.3",
     "ethers": "^6.11.1",
+    "ethers-v5": "npm:ethers@5.7.2",
     "express": "^4.18.2",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",
@@ -133,5 +134,8 @@
     "util": "^0.12.5",
     "vite": "^5.0.0",
     "vitest": "^1.0.4"
+  },
+  "resolutions": {
+    "@gnosis.pm/safe-contracts/ethers": "^5.7.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 805dc3d5..dcda672c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14062,7 +14062,7 @@ ethereumjs-util@^7.0.10, ethereumjs-util@^7.1.0, ethereumjs-util@^7.1.5:
     ethereum-cryptography "^0.1.3"
     rlp "^2.2.4"
 
-ethers@^5.7.2:
+"ethers-v5@npm:ethers@5.7.2", ethers@^5.7.0, ethers@^5.7.2:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e"
   integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg==
@@ -23838,7 +23838,8 @@ string-length@^5.0.1:
     char-regex "^2.0.0"
     strip-ansi "^7.0.1"
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -23856,15 +23857,6 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
@@ -23955,7 +23947,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -23976,13 +23968,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -26425,7 +26410,8 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -26452,15 +26438,6 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"