Merge pull request #4 from dfx-finance/lint

lint by forge fmt
dfx-finance · Nov 6, 2023 · 4fdeebe · 4fdeebe
2 parents 4109689 + 41e3cd7
commit 4fdeebe
Show file tree

Hide file tree

Showing 34 changed files with 3,260 additions and 4,502 deletions.
diff --git a/script/Addresses.sol b/script/Addresses.sol
@@ -2,42 +2,35 @@
 pragma solidity ^0.8.10;
 
 library Polygon {
-    address public constant MULTISIG =
-        0x80D27bfb638F4Fea1e862f1bd07DEa577CB77D38;
+    address public constant MULTISIG = 0x80D27bfb638F4Fea1e862f1bd07DEa577CB77D38;
     address public constant WMATIC = 0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270;
 
     // usdc
     address public constant USDC = 0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359;
     address public constant USDCe = 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174;
     uint256 public constant USDC_DECIMALS = 6;
-    address public constant CHAINLINK_USDC_USD =
-        0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7;
+    address public constant CHAINLINK_USDC_USD = 0xfE4A8cc5b5B2366C1B58Bea3858e81843581b2F7;
     // cadc
     address public constant CADC = 0x9de41aFF9f55219D5bf4359F167d1D0c772A396D;
     uint256 public constant CADC_DECIMALS = 18;
-    address public constant CHAINLINK_CAD_USD =
-        0xACA44ABb8B04D07D883202F99FA5E3c53ed57Fb5;
+    address public constant CHAINLINK_CAD_USD = 0xACA44ABb8B04D07D883202F99FA5E3c53ed57Fb5;
 
     // XSGD
     address public constant XSGD = 0xDC3326e71D45186F113a2F448984CA0e8D201995;
     uint256 public constant XSGD_DECIMALS = 6;
-    address public constant CHAINLINK_SGD_USD =
-        0x8CE3cAc0E6635ce04783709ca3CC4F5fc5304299;
+    address public constant CHAINLINK_SGD_USD = 0x8CE3cAc0E6635ce04783709ca3CC4F5fc5304299;
     // NZDS
     address public constant NZDS = 0xeaFE31Cd9e8E01C8f0073A2C974f728Fb80e9DcE;
     uint256 public constant NZDS_DECIMALS = 6;
-    address public constant CHAINLINK_NZD_USD =
-        0xa302a0B8a499fD0f00449df0a490DedE21105955;
+    address public constant CHAINLINK_NZD_USD = 0xa302a0B8a499fD0f00449df0a490DedE21105955;
     // TRYB
     address public constant TRYB = 0x4Fb71290Ac171E1d144F7221D882BECAc7196EB5;
     uint256 public constant TRYB_DECIMALS = 6;
-    address public constant CHAINLINK_TRY_USD =
-        0xd78325DcA0F90F0FFe53cCeA1B02Bb12E1bf8FdB;
+    address public constant CHAINLINK_TRY_USD = 0xd78325DcA0F90F0FFe53cCeA1B02Bb12E1bf8FdB;
     // NGNC
     address public constant NGNC = 0xAb9aD9089f23e6779a8727900709427719f753e1;
     uint256 public constant NGNC_DECIMALS = 6;
-    address public constant CHAINLINK_NGNC_USD =
-        0x0fDf9DB0B683737d801c0014aC3Ac620a1cA8D4A;
+    address public constant CHAINLINK_NGNC_USD = 0x0fDf9DB0B683737d801c0014aC3Ac620a1cA8D4A;
 
     // Epsilon (Pool Fee)
     uint256 public constant USDCe_EPSILON = 5e14; // (0.05%)
@@ -48,54 +41,44 @@ library Polygon {
 }
 
 library Mainnet {
-    address public constant MULTISIG =
-        0x27E843260c71443b4CC8cB6bF226C3f77b9695AF;
+    address public constant MULTISIG = 0x27E843260c71443b4CC8cB6bF226C3f77b9695AF;
 
     // usdc
     address public constant USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48;
     uint256 public constant USDC_DECIMALS = 6;
-    address public constant CHAINLINK_USDC_USD =
-        0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6;
+    address public constant CHAINLINK_USDC_USD = 0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6;
     // cadc
     address public constant CADC = 0xcaDC0acd4B445166f12d2C07EAc6E2544FbE2Eef;
     uint256 public constant CADC_DECIMALS = 18;
-    address public constant CHAINLINK_CAD_USD =
-        0xa34317DB73e77d453b1B8d04550c44D10e981C8e;
+    address public constant CHAINLINK_CAD_USD = 0xa34317DB73e77d453b1B8d04550c44D10e981C8e;
     // euroc
     address public constant EUROC = 0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c;
     uint256 public constant EUROC_DECIMALS = 6;
-    address public constant CHAINLINK_EUR_USD =
-        0xb49f677943BC038e9857d61E7d053CaA2C1734C1;
+    address public constant CHAINLINK_EUR_USD = 0xb49f677943BC038e9857d61E7d053CaA2C1734C1;
     // xsgd
     address public constant XSGD = 0x70e8dE73cE538DA2bEEd35d14187F6959a8ecA96;
     uint256 public constant XSGD_DECIMALS = 6;
-    address public constant CHAINLINK_SGD_USD =
-        0xe25277fF4bbF9081C75Ab0EB13B4A13a721f3E13;
+    address public constant CHAINLINK_SGD_USD = 0xe25277fF4bbF9081C75Ab0EB13B4A13a721f3E13;
     // nzds
     address public constant NZDS = 0xDa446fAd08277B4D2591536F204E018f32B6831c;
     uint256 public constant NZDS_DECIMALS = 6;
-    address public constant CHAINLINK_NZD_USD =
-        0x3977CFc9e4f29C184D4675f4EB8e0013236e5f3e;
+    address public constant CHAINLINK_NZD_USD = 0x3977CFc9e4f29C184D4675f4EB8e0013236e5f3e;
     // tryb
     address public constant TRYB = 0x2C537E5624e4af88A7ae4060C022609376C8D0EB;
     uint256 public constant TRYB_DECIMALS = 6;
-    address public constant CHAINLINK_TRY_USD =
-        0xB09fC5fD3f11Cf9eb5E1C5Dba43114e3C9f477b5;
+    address public constant CHAINLINK_TRY_USD = 0xB09fC5fD3f11Cf9eb5E1C5Dba43114e3C9f477b5;
     // gyen
     address public constant GYEN = 0xC08512927D12348F6620a698105e1BAac6EcD911;
     uint256 public constant GYEN_DECIMALS = 6;
-    address public constant CHAINLINK_YEN_USD =
-        0xBcE206caE7f0ec07b545EddE332A47C2F75bbeb3;
+    address public constant CHAINLINK_YEN_USD = 0xBcE206caE7f0ec07b545EddE332A47C2F75bbeb3;
     // xidr
     address public constant XIDR = 0xebF2096E01455108bAdCbAF86cE30b6e5A72aa52;
     uint256 public constant XIDR_DECIMALS = 6;
-    address public constant CHAINLINK_IDR_USD =
-        0x91b99C9b75aF469a71eE1AB528e8da994A5D7030;
+    address public constant CHAINLINK_IDR_USD = 0x91b99C9b75aF469a71eE1AB528e8da994A5D7030;
     // gbpt
     address public constant GBPT = 0x86B4dBE5D203e634a12364C0e428fa242A3FbA98;
     uint256 public constant GBPT_DECIMALS = 18;
-    address public constant CHAINLINK_BPT_USD =
-        0x5c0Ab2d9b5a7ed9f470386e82BB36A3613cDd4b5;
+    address public constant CHAINLINK_BPT_USD = 0x5c0Ab2d9b5a7ed9f470386e82BB36A3613cDd4b5;
 
     // Epsilon (Pool Fee)
     uint256 public constant CADC_EPSILON = 15e14; // (0.15%)
@@ -109,27 +92,23 @@ library Mainnet {
 }
 
 library Arbitrum {
-    address public constant MULTISIG =
-        0x69eb9E932A1aBAb2a17893Fa1b0D377602D2F199;
+    address public constant MULTISIG = 0x69eb9E932A1aBAb2a17893Fa1b0D377602D2F199;
 
     address public constant WETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
 
     // usdc
     address public constant USDC = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
     address public constant USDCe = 0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8;
     uint256 public constant USDC_DECIMALS = 6;
-    address public constant CHAINLINK_USDC_USD =
-        0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3;
+    address public constant CHAINLINK_USDC_USD = 0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3;
     // cadc
     address public constant CADC = 0x2b28E826b55e399F4d4699b85f68666AC51e6f70;
     uint256 public constant CADC_DECIMALS = 18;
-    address public constant CHAINLINK_CADC_USD =
-        0xf6DA27749484843c4F02f5Ad1378ceE723dD61d4;
+    address public constant CHAINLINK_CADC_USD = 0xf6DA27749484843c4F02f5Ad1378ceE723dD61d4;
     // gyen
     address public constant GYEN = 0x589d35656641d6aB57A545F08cf473eCD9B6D5F7;
     uint256 public constant GYEN_DECIMALS = 6;
-    address public constant CHAINLINK_GYEN_USD =
-        0x3dD6e51CB9caE717d5a8778CF79A04029f9cFDF8;
+    address public constant CHAINLINK_GYEN_USD = 0x3dD6e51CB9caE717d5a8778CF79A04029f9cFDF8;
 
     // oracles
 
@@ -146,16 +125,13 @@ library Base {
     // usdc
     address public constant USDC = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913;
     uint256 public constant USDC_DECIMALS = 6;
-    address public constant CHAINLINK_USDC_USD =
-        0x7e860098F58bBFC8648a4311b374B1D669a2bc6B;
+    address public constant CHAINLINK_USDC_USD = 0x7e860098F58bBFC8648a4311b374B1D669a2bc6B;
 
     // dai
     address public constant DAI = 0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb;
     uint256 public constant DAI_DECIMALS = 18;
-    address public constant CHAINLINK_DAI_USD =
-        0x591e79239a7d679378eC8c847e5038150364C78F;
+    address public constant CHAINLINK_DAI_USD = 0x591e79239a7d679378eC8c847e5038150364C78F;
 
     // usdt
-    address public constant CHAINLINK_USDT_USD =
-        0xf19d560eB8d2ADf07BD6D13ed03e1D11215721F9;
+    address public constant CHAINLINK_USDT_USD = 0xf19d560eB8d2ADf07BD6D13ed03e1D11215721F9;
 }
diff --git a/script/PolygonDeployment.s.sol b/script/PolygonDeployment.s.sol
@@ -44,86 +44,81 @@ contract ContractScript is Script {
         IOracle sgdOracle = IOracle(Polygon.CHAINLINK_SGD_USD);
         IOracle trybOracle = IOracle(Polygon.CHAINLINK_TRY_USD);
         IOracle ngncOracle = IOracle(Polygon.CHAINLINK_NGNC_USD);
-        CurveFactoryV3.CurveInfo memory usdcUsdceCurveInfo = CurveFactoryV3
-            .CurveInfo(
-                "dfx-usdc-usdce-v3",
-                "dfx-usdc-usdce-v3",
-                Polygon.USDCe,
-                Polygon.USDC,
-                CurveParams.BASE_WEIGHT,
-                CurveParams.QUOTE_WEIGHT,
-                usdOracle,
-                usdOracle,
-                CurveParams.ALPHA,
-                CurveParams.BETA,
-                CurveParams.MAX,
-                Polygon.USDCe_EPSILON,
-                CurveParams.LAMBDA
-            );
-        CurveFactoryV3.CurveInfo memory cadcUsdcCurveInfo = CurveFactoryV3
-            .CurveInfo(
-                "dfx-cadc-usdc-v3",
-                "dfx-cadc-usdc-v3",
-                Polygon.CADC,
-                Polygon.USDC,
-                CurveParams.BASE_WEIGHT,
-                CurveParams.QUOTE_WEIGHT,
-                cadOracle,
-                usdOracle,
-                CurveParams.ALPHA,
-                CurveParams.BETA,
-                CurveParams.MAX,
-                Polygon.CADC_EPSILON,
-                CurveParams.LAMBDA
-            );
-        CurveFactoryV3.CurveInfo memory xsgdUsdcCurveInfo = CurveFactoryV3
-            .CurveInfo(
-                "dfx-xsgd-usdc-v3",
-                "dfx-xsgd-usdc-v3",
-                Polygon.XSGD,
-                Polygon.USDC,
-                CurveParams.BASE_WEIGHT,
-                CurveParams.QUOTE_WEIGHT,
-                sgdOracle,
-                usdOracle,
-                CurveParams.ALPHA,
-                CurveParams.BETA,
-                CurveParams.MAX,
-                Polygon.XSGD_EPSILON,
-                CurveParams.LAMBDA
-            );
-        CurveFactoryV3.CurveInfo memory trybUsdcCurveInfo = CurveFactoryV3
-            .CurveInfo(
-                "dfx-tryb-usdc-v3",
-                "dfx-tryb-usdc-v3",
-                Polygon.TRYB,
-                Polygon.USDC,
-                CurveParams.BASE_WEIGHT,
-                CurveParams.QUOTE_WEIGHT,
-                trybOracle,
-                usdOracle,
-                CurveParams.ALPHA,
-                CurveParams.BETA,
-                CurveParams.MAX,
-                Polygon.TRYB_EPSILON,
-                CurveParams.LAMBDA
-            );
-        CurveFactoryV3.CurveInfo memory ngncUsdcCurveInfo = CurveFactoryV3
-            .CurveInfo(
-                "dfx-ngnc-usdc-v3",
-                "dfx-ngnc-usdc-v3",
-                Polygon.NGNC,
-                Polygon.USDC,
-                CurveParams.BASE_WEIGHT,
-                CurveParams.QUOTE_WEIGHT,
-                ngncOracle,
-                usdOracle,
-                CurveParams.ALPHA,
-                CurveParams.BETA,
-                CurveParams.MAX,
-                Polygon.NGNC_EPSILON,
-                CurveParams.LAMBDA
-            );
+        CurveFactoryV3.CurveInfo memory usdcUsdceCurveInfo = CurveFactoryV3.CurveInfo(
+            "dfx-usdc-usdce-v3",
+            "dfx-usdc-usdce-v3",
+            Polygon.USDCe,
+            Polygon.USDC,
+            CurveParams.BASE_WEIGHT,
+            CurveParams.QUOTE_WEIGHT,
+            usdOracle,
+            usdOracle,
+            CurveParams.ALPHA,
+            CurveParams.BETA,
+            CurveParams.MAX,
+            Polygon.USDCe_EPSILON,
+            CurveParams.LAMBDA
+        );
+        CurveFactoryV3.CurveInfo memory cadcUsdcCurveInfo = CurveFactoryV3.CurveInfo(
+            "dfx-cadc-usdc-v3",
+            "dfx-cadc-usdc-v3",
+            Polygon.CADC,
+            Polygon.USDC,
+            CurveParams.BASE_WEIGHT,
+            CurveParams.QUOTE_WEIGHT,
+            cadOracle,
+            usdOracle,
+            CurveParams.ALPHA,
+            CurveParams.BETA,
+            CurveParams.MAX,
+            Polygon.CADC_EPSILON,
+            CurveParams.LAMBDA
+        );
+        CurveFactoryV3.CurveInfo memory xsgdUsdcCurveInfo = CurveFactoryV3.CurveInfo(
+            "dfx-xsgd-usdc-v3",
+            "dfx-xsgd-usdc-v3",
+            Polygon.XSGD,
+            Polygon.USDC,
+            CurveParams.BASE_WEIGHT,
+            CurveParams.QUOTE_WEIGHT,
+            sgdOracle,
+            usdOracle,
+            CurveParams.ALPHA,
+            CurveParams.BETA,
+            CurveParams.MAX,
+            Polygon.XSGD_EPSILON,
+            CurveParams.LAMBDA
+        );
+        CurveFactoryV3.CurveInfo memory trybUsdcCurveInfo = CurveFactoryV3.CurveInfo(
+            "dfx-tryb-usdc-v3",
+            "dfx-tryb-usdc-v3",
+            Polygon.TRYB,
+            Polygon.USDC,
+            CurveParams.BASE_WEIGHT,
+            CurveParams.QUOTE_WEIGHT,
+            trybOracle,
+            usdOracle,
+            CurveParams.ALPHA,
+            CurveParams.BETA,
+            CurveParams.MAX,
+            Polygon.TRYB_EPSILON,
+            CurveParams.LAMBDA
+        );
+        CurveFactoryV3.CurveInfo memory ngncUsdcCurveInfo = CurveFactoryV3.CurveInfo(
+            "dfx-ngnc-usdc-v3",
+            "dfx-ngnc-usdc-v3",
+            Polygon.NGNC,
+            Polygon.USDC,
+            CurveParams.BASE_WEIGHT,
+            CurveParams.QUOTE_WEIGHT,
+            ngncOracle,
+            usdOracle,
+            CurveParams.ALPHA,
+            CurveParams.BETA,
+            CurveParams.MAX,
+            Polygon.NGNC_EPSILON,
+            CurveParams.LAMBDA
+        );
         // Deploy all new Curves
         deployedCurveFactory.newCurve(usdcUsdceCurveInfo);
         deployedCurveFactory.newCurve(cadcUsdcCurveInfo);