Merge branch 'main' into main

AngleProtocol · Oct 31, 2024 · 90db124 · 90db124
2 parents 40d0be1 + 5082243
commit 90db124
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 28 deletions.
diff --git a/ERC20_LIST.json b/ERC20_LIST.json
@@ -723,7 +723,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/angle-icon-colorback-black500.png",
         "name": "Steakhouse USDC",
         "symbol": "steakUSDC",
-        "underlyingTokens": ["0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"],
+        "underlyingTokens": [
+          "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0x125D41A6e5dbf455cD9Df8F80BCC6fd172D52Cc6": {
@@ -734,7 +736,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/angle-icon-colorback-black500.png",
         "name": "Gauntlet USDA Core",
         "symbol": "gtUSDAcore",
-        "underlyingTokens": ["0x0000206329b97DB379d5E1Bf586BbDB969C63274"],
+        "underlyingTokens": [
+          "0x0000206329b97DB379d5E1Bf586BbDB969C63274"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0x89D80f5e9BC88d8021b352064ae73F0eAf79EBd8": {
@@ -745,7 +749,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/angle-icon-colorback-black500.png",
         "name": "Re7 USDA",
         "symbol": "Re7USDA",
-        "underlyingTokens": ["0x0000206329b97DB379d5E1Bf586BbDB969C63274"],
+        "underlyingTokens": [
+          "0x0000206329b97DB379d5E1Bf586BbDB969C63274"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0x2371e134e3455e0593363cBF89d3b6cf53740618": {
@@ -755,7 +761,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/WETH.svg",
         "name": "Gauntlet WETH Prime",
         "symbol": "gtWETH",
-        "underlyingTokens": ["0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"],
+        "underlyingTokens": [
+          "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0xdd0f28e19C1780eb6396170735D45153D261490d": {
@@ -765,7 +773,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDC.svg",
         "name": "Gauntlet USDC Prime",
         "symbol": "gtUSDC",
-        "underlyingTokens": ["0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"],
+        "underlyingTokens": [
+          "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0": {
@@ -775,7 +785,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/WETH.svg",
         "name": "Re7 WETH",
         "symbol": "Re7WETH",
-        "underlyingTokens": ["0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"],
+        "underlyingTokens": [
+          "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0x95EeF579155cd2C5510F312c8fA39208c3Be01a8": {
@@ -785,7 +797,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDT.svg",
         "name": "Re7 USDT",
         "symbol": "Re7USDT",
-        "underlyingTokens": ["0xdAC17F958D2ee523a2206206994597C13D831ec7 "],
+        "underlyingTokens": [
+          "0xdAC17F958D2ee523a2206206994597C13D831ec7 "
+        ],
         "wrappingMethod": "ERC4626"
       },
       "0xcB84d72e61e383767C4DFEb2d8ff7f4FB89abc6e": {
@@ -878,7 +892,10 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/crvFRAXUSDC.png",
         "name": "Curve.fi FRAX/USDC",
         "symbol": "crvFRAXUSDC",
-        "underlyingTokens": ["0x853d955aCEf822Db058eb8505911ED77F175b99e", "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"],
+        "underlyingTokens": [
+          "0x853d955aCEf822Db058eb8505911ED77F175b99e",
+          "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+        ],
         "useInSwap": false
       },
       "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490": {
@@ -904,7 +921,10 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/LUSD3CRV.png",
         "name": "Curve.fi Factory USD Metapool: Liquity",
         "symbol": "LUSD3CRV",
-        "underlyingTokens": ["0x5f98805A4E8be255a32880FDeC7F6728C6568bA0", "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
+        "underlyingTokens": [
+          "0x5f98805A4E8be255a32880FDeC7F6728C6568bA0",
+          "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
+        ],
         "useInSwap": false
       },
       "0xa9d2Eea75C80fF9669cc998c276Ff26D741Dcb26": {
@@ -915,7 +935,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-crvFRAXUSDC.png",
         "name": "Angle Curve.fi FRAX/USDC Stake DAO Staker",
         "symbol": "sd-crvFRAXUSDC",
-        "underlyingTokens": ["0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"],
+        "underlyingTokens": [
+          "0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -927,7 +949,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-3CRV.svg",
         "name": "Angle Curve.fi DAI/USDC/USDT Stake DAO Staker",
         "symbol": "sd-3CRV",
-        "underlyingTokens": ["0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
+        "underlyingTokens": [
+          "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -939,7 +963,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-crvLUSD3CRV.png",
         "name": "Angle Curve.fi Factory USD Metapool: Liquity Stake DAO Staker",
         "symbol": "sd-crvLUSD3CRV",
-        "underlyingTokens": ["0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"],
+        "underlyingTokens": [
+          "0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -951,7 +977,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-crvFRAXUSDC.svg",
         "name": "Angle Curve.fi FRAX/USDC Convex Staker",
         "symbol": "cvx-crvFRAXUSDC",
-        "underlyingTokens": ["0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"],
+        "underlyingTokens": [
+          "0x3175Df0976dFA876431C2E9eE6Bc45b65d3473CC"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -963,7 +991,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-3CRV.svg",
         "name": "Angle Curve.fi DAI/USDC/USDT Convex Staker",
         "symbol": "cvx-3CRV",
-        "underlyingTokens": ["0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"],
+        "underlyingTokens": [
+          "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -984,7 +1014,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-crvLUSD3CRV.svg",
         "name": "Angle Curve.fi Factory USD Metapool: Liquity Convex Staker",
         "symbol": "cvx-crvLUSD3CRV",
-        "underlyingTokens": ["0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"],
+        "underlyingTokens": [
+          "0xEd279fDD11cA84bEef15AF5D39BB4d4bEE23F0cA"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -1171,7 +1203,9 @@
       },
       "0xc69Ad9baB1dEE23F4605a82b3354F8E40d1E5966": {
         "address": "0xc69Ad9baB1dEE23F4605a82b3354F8E40d1E5966",
-        "underlyingTokens": ["0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"],
+        "underlyingTokens": [
+          "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"
+        ],
         "name": "PT ether.fi weETH 27JUN2024",
         "decimals": 18,
         "symbol": "PT-weETH-27JUN2024",
@@ -1181,7 +1215,9 @@
       },
       "0x6ee2b5E19ECBa773a352E5B21415Dc419A700d1d": {
         "address": "0x6ee2b5E19ECBa773a352E5B21415Dc419A700d1d",
-        "underlyingTokens": ["0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"],
+        "underlyingTokens": [
+          "0xCd5fE23C85820F7B72D0926FC9b05b43E359b7ee"
+        ],
         "name": "PT ether.fi weETH 26DEC2024",
         "decimals": 18,
         "symbol": "PT-weETH-26DEC2024",
@@ -1191,7 +1227,9 @@
       },
       "0xf7906F274c174A52d444175729E3fa98f9bde285": {
         "address": "0xf7906F274c174A52d444175729E3fa98f9bde285",
-        "underlyingTokens": ["0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"],
+        "underlyingTokens": [
+          "0xbf5495Efe5DB9ce00f80364C8B423567e58d2110"
+        ],
         "name": "PT ether.fi ezETH 26DEC2024",
         "decimals": 18,
         "symbol": "PT-ezETH-26DEC2024",
@@ -1201,7 +1239,9 @@
       },
       "0xa0021EF8970104c2d008F38D92f115ad56a9B8e1": {
         "address": "0xa0021EF8970104c2d008F38D92f115ad56a9B8e1",
-        "underlyingTokens": ["0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"],
+        "underlyingTokens": [
+          "0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"
+        ],
         "name": "PT Ethena USDe 25JUL2024",
         "decimals": 18,
         "symbol": "PT-USDe-25JUL2024",
@@ -2211,7 +2251,9 @@
         "decimals": 18,
         "symbol": "amDAI",
         "wrappingMethod": "Aave Matic Market",
-        "underlyingTokens": ["0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"],
+        "underlyingTokens": [
+          "0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063"
+        ],
         "hasPermit": false,
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/DAI.svg"
       },
@@ -2229,7 +2271,9 @@
         "decimals": 6,
         "symbol": "amUSDC",
         "wrappingMethod": "Aave Matic Market",
-        "underlyingTokens": ["0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"],
+        "underlyingTokens": [
+          "0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174"
+        ],
         "hasPermit": false,
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDC.svg"
       },
@@ -2263,7 +2307,9 @@
         "decimals": 6,
         "symbol": "amUSDT",
         "wrappingMethod": "Aave Matic Market",
-        "underlyingTokens": ["0xc2132D05D31c914a87C6611C10748AEb04B58e8F"],
+        "underlyingTokens": [
+          "0xc2132D05D31c914a87C6611C10748AEb04B58e8F"
+        ],
         "hasPermit": false,
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDT.svg"
       },
@@ -2283,7 +2329,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvxam3CRV.svg",
         "name": "Angle Curve.fi amDAI/amUSDC/amUSDT Staker",
         "symbol": "agstk-am3CRV",
-        "underlyingTokens": ["0xE7a24EF0C5e95Ffb0f6684b813A78F2a3AD7D171"],
+        "underlyingTokens": [
+          "0xE7a24EF0C5e95Ffb0f6684b813A78F2a3AD7D171"
+        ],
         "useInSwap": false
       },
       "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359": {
@@ -3584,7 +3632,9 @@
         "useInSwap": false,
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/USDC.svg",
         "wrappingMethod": "ERC4626",
-        "underlyingTokens": ["0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"]
+        "underlyingTokens": [
+          "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
+        ]
       },
       "0x5dC25aA049837B696d1dc0F966aC8DF1491f819B": {
         "address": "0x5dC25aA049837B696d1dc0F966aC8DF1491f819B",
@@ -4161,7 +4211,10 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/2CRV.svg",
         "name": "Curve.fi USDC/USDT",
         "symbol": "2CRV",
-        "underlyingTokens": ["0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8", "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9"],
+        "underlyingTokens": [
+          "0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8",
+          "0xFd086bC7CD5C481DCC9C85ebE478A1C0b69FCbb9"
+        ],
         "useInSwap": false
       },
       "0xc8711B1206cD3e89799Ec32973f583e696Cb553C": {
@@ -4172,7 +4225,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/sd-2CRV.svg",
         "name": "Angle Curve.fi USDC/USDT Stake DAO Staker",
         "symbol": "sd-crvUSDCUSDT",
-        "underlyingTokens": ["0x7f90122BF0700F9E7e1F688fe926940E8839F353"],
+        "underlyingTokens": [
+          "0x7f90122BF0700F9E7e1F688fe926940E8839F353"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -4184,7 +4239,9 @@
         "logoURI": "https://raw.githubusercontent.com/AngleProtocol/angle-token-list/main/src/assets/tokens/cvx-2CRV.svg",
         "name": "Angle Curve.fi USDC/USDT Convex Staker",
         "symbol": "cvx-crvUSDCUSDT",
-        "underlyingTokens": ["0x7f90122BF0700F9E7e1F688fe926940E8839F353"],
+        "underlyingTokens": [
+          "0x7f90122BF0700F9E7e1F688fe926940E8839F353"
+        ],
         "useInSwap": false,
         "wrappingMethod": "BorrowStaker"
       },
@@ -5545,4 +5602,4 @@
       }
     }
   }
-]
+]
diff --git a/src/assets/tokens/FNX.svg b/src/assets/tokens/FNX.svg