fix: codestyle

RedDuck-Software · Sep 30, 2024 · 893918d · 893918d
1 parent b2bb903
commit 893918d
Show file tree

Hide file tree

Showing 32 changed files with 344 additions and 295 deletions.
diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json
@@ -3557,11 +3557,7 @@
           },
           "t_enum(RequestStatus)9670": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -4048,11 +4044,7 @@
           },
           "t_enum(RequestStatus)9670": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -4571,11 +4563,7 @@
           },
           "t_enum(RequestStatus)7800": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -5050,11 +5038,7 @@
           },
           "t_enum(RequestStatus)9670": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -5549,11 +5533,7 @@
           },
           "t_enum(RequestStatus)7404": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -6072,11 +6052,7 @@
           },
           "t_enum(RequestStatus)7404": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -6229,4 +6205,4 @@
       }
     }
   }
-}
+}
diff --git a/.openzeppelin/sepolia.json b/.openzeppelin/sepolia.json
@@ -5315,11 +5315,7 @@
           },
           "t_enum(RequestStatus)10148": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -5774,11 +5770,7 @@
           },
           "t_enum(RequestStatus)10148": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -6613,11 +6605,7 @@
           },
           "t_enum(RequestStatus)10148": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -7080,11 +7068,7 @@
           },
           "t_enum(RequestStatus)7771": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -7571,11 +7555,7 @@
           },
           "t_enum(RequestStatus)7771": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -8046,11 +8026,7 @@
           },
           "t_enum(RequestStatus)10121": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -8737,11 +8713,7 @@
           },
           "t_enum(RequestStatus)9670": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -9260,11 +9232,7 @@
           },
           "t_enum(RequestStatus)9670": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {
@@ -9783,11 +9751,7 @@
           },
           "t_enum(RequestStatus)10397": {
             "label": "enum RequestStatus",
-            "members": [
-              "Pending",
-              "Processed",
-              "Canceled"
-            ],
+            "members": ["Pending", "Processed", "Canceled"],
             "numberOfBytes": "1"
           },
           "t_mapping(t_address,t_bool)": {

diff --git a/config/constants/addresses.ts b/config/constants/addresses.ts
@@ -19,26 +19,31 @@ export interface MidasAddresses {
   etfDataFeed?: string;
   eurToUsdFeed?: string;
   accessControl?: string;
-  dataFeeds?: Record<string, {
-    token?: string;
-    dataFeed?: string;
-    aggregator?: string
-  }>
+  dataFeeds?: Record<
+    string,
+    {
+      token?: string;
+      dataFeed?: string;
+      aggregator?: string;
+    }
+  >;
 }
 
-export const midasAddressesPerNetwork: ConfigPerNetwork<MidasAddresses | undefined> = {
+export const midasAddressesPerNetwork: ConfigPerNetwork<
+  MidasAddresses | undefined
+> = {
   main: {
     dataFeeds: {
       usdt: {
         aggregator: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D',
         token: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-        dataFeed: '0x7811C1Bf5db28630F303267Cc613797EB9A81188'
+        dataFeed: '0x7811C1Bf5db28630F303267Cc613797EB9A81188',
       },
       usdc: {
         aggregator: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6',
         token: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-        dataFeed: '0x3aAc6fd73fA4e16Ec683BD4aaF5Ec89bb2C0EdC2'
-      }
+        dataFeed: '0x3aAc6fd73fA4e16Ec683BD4aaF5Ec89bb2C0EdC2',
+      },
     },
     accessControl: '0x0312A9D1Ff2372DDEdCBB21e4B6389aFc919aC4B',
     // TODO: remove this data feed
@@ -51,7 +56,7 @@ export const midasAddressesPerNetwork: ConfigPerNetwork<MidasAddresses | undefin
       tokensReceiver: '0x875c06A295C41c27840b9C9dfDA7f3d819d8bC6A',
       depositVault: '0x99361435420711723aF805F08187c9E6bF796683',
       redemptionVault: '0xF6e51d24F4793Ac5e71e0502213a9BBE3A6d4517',
-      redemptionVaultBuidl: '0x569D7dccBF6923350521ecBC28A555A500c4f0Ec'
+      redemptionVaultBuidl: '0x569D7dccBF6923350521ecBC28A555A500c4f0Ec',
     },
     mBASIS: {
       dataFeed: '0x1615cBC603192ae8A9FF20E98dd0e40a405d76e4',
@@ -60,7 +65,7 @@ export const midasAddressesPerNetwork: ConfigPerNetwork<MidasAddresses | undefin
       tokensReceiver: '0xB8633297f9D9A8eaD48f1335ab04b14C189639f0',
       depositVault: '0xa8a5c4FF4c86a459EBbDC39c5BE77833B3A15d88',
       redemptionVault: '0x19AB19e61A930bc5C7B75Bf06cDd954218Ca9F0b',
-      redemptionVaultSwapper: '0x0D89C1C4799353F3805A3E6C4e1Cbbb83217D123'
+      redemptionVaultSwapper: '0x0D89C1C4799353F3805A3E6C4e1Cbbb83217D123',
     },
     eUSD: {
       tokensReceiver: '0x9d13371c8DeA0361ac78B4c109ea3CB748427CF5',
@@ -125,13 +130,13 @@ export const midasAddressesPerNetwork: ConfigPerNetwork<MidasAddresses | undefin
       usdt: {
         aggregator: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D',
         token: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-        dataFeed: '0x7811C1Bf5db28630F303267Cc613797EB9A81188'
+        dataFeed: '0x7811C1Bf5db28630F303267Cc613797EB9A81188',
       },
       usdc: {
         aggregator: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6',
         token: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-        dataFeed: '0x3aAc6fd73fA4e16Ec683BD4aaF5Ec89bb2C0EdC2'
-      }
+        dataFeed: '0x3aAc6fd73fA4e16Ec683BD4aaF5Ec89bb2C0EdC2',
+      },
     },
     accessControl: '0x0312A9D1Ff2372DDEdCBB21e4B6389aFc919aC4B',
     // TODO: remove this data feed
@@ -163,9 +168,9 @@ export const midasAddressesPerNetwork: ConfigPerNetwork<MidasAddresses | undefin
   base: {
     accessControl: '0x0312a9d1ff2372ddedcbb21e4b6389afc919ac4b',
     mTBILL: {
-      token: '0xDD629E5241CbC5919847783e6C96B2De4754e438'
-    }
-  }
+      token: '0xDD629E5241CbC5919847783e6C96B2De4754e438',
+    },
+  },
 };
 
 export const getCurrentAddresses = (hre: HardhatRuntimeEnvironment) => {

diff --git a/config/deploy/tags.ts b/config/deploy/tags.ts
@@ -36,7 +36,7 @@ export const E_USD_CONTRACT_NAME = 'eUSD';
 export const E_USD_DEPLOY_TAG = 'eUSD';
 
 export const M_TBILL_CUSTOM_AGGREGATOR_CONTRACT_NAME =
-  'MTBillCustomAggregatorFeed' as const
+  'MTBillCustomAggregatorFeed' as const;
 export const M_BASIS_CUSTOM_AGGREGATOR_CONTRACT_NAME =
   'MBasisCustomAggregatorFeed' as const;
 

diff --git a/config/networks/index.ts b/config/networks/index.ts
@@ -52,7 +52,7 @@ export const gases: ConfigPerNetwork<number | undefined> = {
   hardhat: undefined,
   etherlink: undefined,
   localhost: undefined,
-  base: undefined
+  base: undefined,
 };
 
 export const timeouts: ConfigPerNetwork<number | undefined> = {
@@ -61,8 +61,7 @@ export const timeouts: ConfigPerNetwork<number | undefined> = {
   hardhat: undefined,
   localhost: 999999,
   etherlink: undefined,
-  base: undefined
-
+  base: undefined,
 };
 
 export const blockGasLimits: ConfigPerNetwork<number | undefined> = {
@@ -71,7 +70,7 @@ export const blockGasLimits: ConfigPerNetwork<number | undefined> = {
   etherlink: undefined,
   hardhat: 300 * 10 ** 6,
   localhost: undefined,
-  base: undefined
+  base: undefined,
 };
 
 export const initialBasesFeePerGas: ConfigPerNetwork<number | undefined> = {
@@ -80,7 +79,7 @@ export const initialBasesFeePerGas: ConfigPerNetwork<number | undefined> = {
   sepolia: undefined,
   hardhat: 0,
   localhost: undefined,
-  base: undefined
+  base: undefined,
 };
 
 export const getBaseNetworkConfig = (

diff --git a/contracts/RedemptionVault.sol b/contracts/RedemptionVault.sol
@@ -428,7 +428,13 @@ contract RedemptionVault is ManageableVault, IRedemptionVault {
             tokenOutRate: tokenOutRate
         });
 
-        emit RedeemRequest(requestId, user, tokenOutCopy, amountMTokenInCopy, feeAmount);
+        emit RedeemRequest(
+            requestId,
+            user,
+            tokenOutCopy,
+            amountMTokenInCopy,
+            feeAmount
+        );
 
         return requestId;
     }

diff --git a/contracts/feeds/DataFeed.sol b/contracts/feeds/DataFeed.sol
@@ -80,7 +80,6 @@ contract DataFeed is WithMidasAccessControl, IDataFeed {
         aggregator = AggregatorV3Interface(_aggregator);
     }
 
-
     /**
      * @dev updates `healthyDiff` value
      * @param _healthyDiff new value
@@ -101,7 +100,7 @@ contract DataFeed is WithMidasAccessControl, IDataFeed {
     function setMinExpectedAnswer(int256 _minExpectedAnswer)
         external
         onlyRole(feedAdminRole(), msg.sender)
-    {   
+    {
         require(_minExpectedAnswer > 0, "DF: invalid min exp. price");
         require(
             maxExpectedAnswer > _minExpectedAnswer,

diff --git a/contracts/mBasis/MBasisCustomAggregatorFeed.sol b/contracts/mBasis/MBasisCustomAggregatorFeed.sol
@@ -10,7 +10,10 @@ import "./MBasisMidasAccessControlRoles.sol";
  * where price is submitted manually by feed admins
  * @author RedDuck Software
  */
-contract MBasisCustomAggregatorFeed is CustomAggregatorV3CompatibleFeed, MBasisMidasAccessControlRoles {
+contract MBasisCustomAggregatorFeed is
+    CustomAggregatorV3CompatibleFeed,
+    MBasisMidasAccessControlRoles
+{
     /**
      * @inheritdoc CustomAggregatorV3CompatibleFeed
      */

diff --git a/contracts/mBasis/MBasisDepositVault.sol b/contracts/mBasis/MBasisDepositVault.sol
@@ -10,7 +10,6 @@ import "./MBasisMidasAccessControlRoles.sol";
  * @author RedDuck Software
  */
 contract MBasisDepositVault is DepositVault, MBasisMidasAccessControlRoles {
-
     /**
      * @dev leaving a storage gap for futures updates
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ import "./MBasisMidasAccessControlRoles.sol"; @@
      * @author RedDuck Software
      */
     contract MBasisDepositVault is DepositVault, MBasisMidasAccessControlRoles {
         /**
          * @dev leaving a storage gap for futures updates
          */
@@ Expand Down @@