Merge branch 'master' into f/redesign

Rari-Capital · May 23, 2021 · 42b7e39 · 42b7e39
2 parents 96ffdec + 7d06b41
commit 42b7e39
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 14 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/api/tokenData.ts b/api/tokenData.ts
@@ -32,7 +32,6 @@ export default async (request: NowRequest, response: NowResponse) => {
     const name = await tokenContract.methods.name().call();
     const symbol = await tokenContract.methods.symbol().call();
 
-    // BNB
     if (
       web3.utils.toChecksumAddress(address) ===
       web3.utils.toChecksumAddress("0xB8c77482e45F1F44dE1745F52C74426C631bDD52")
@@ -47,6 +46,8 @@ export default async (request: NowRequest, response: NowResponse) => {
         logoURL:
           "https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/assets/0xB8c77482e45F1F44dE1745F52C74426C631bDD52/logo.png",
       });
+
+      return;
     } else if (
       web3.utils.toChecksumAddress(address) ===
       web3.utils.toChecksumAddress("0xcee60cFa923170e4f8204AE08B4fA6A3F5656F3a")
@@ -78,6 +79,38 @@ export default async (request: NowRequest, response: NowResponse) => {
           "https://raw.githubusercontent.com/Rari-Capital/rari-dApp/master/src/static/crvLINKGauge.png",
       });
 
+      return;
+    } else if (
+      web3.utils.toChecksumAddress(address) ===
+      web3.utils.toChecksumAddress("0x986b4AFF588a109c09B50A03f42E4110E29D353F")
+    ) {
+      // yvCurve-sETH
+      response.json({
+        name: "Curve sETH yVault",
+        symbol: "ycrvSETH",
+        decimals,
+        color: "#627EEA",
+        overlayTextColor: "#FFFFFF",
+        logoURL:
+          "https://raw.githack.com/yearn/yearn-assets/master/icons/tokens/0xA3D87FffcE63B53E0d54fAa1cc983B7eB0b74A9c/logo-128.png",
+      });
+
+      return;
+    } else if (
+      web3.utils.toChecksumAddress(address) ===
+      web3.utils.toChecksumAddress("0x96Ea6AF74Af09522fCB4c28C269C26F59a31ced6")
+    ) {
+      // yvCurve-LINK
+      response.json({
+        name: "Curve LINK/sLINK yVault",
+        symbol: "ycrvLINK",
+        decimals,
+        color: "#2A5ADA",
+        overlayTextColor: "#FFFFFF",
+        logoURL:
+          "https://raw.githack.com/yearn/yearn-assets/master/icons/tokens/0xcee60cFa923170e4f8204AE08B4fA6A3F5656F3a/logo-128.png",
+      });
+
       return;
     }
 

diff --git a/src/fuse-sdk/src/abi/FuseFeeDistributor.json b/src/fuse-sdk/src/abi/FuseFeeDistributor.json
@@ -119,5 +119,25 @@
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address[]", "name": "targets", "type": "address[]" },
+      { "internalType": "bytes[]", "name": "data", "type": "bytes[]" }
+    ],
+    "name": "_callPool",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address[]", "name": "targets", "type": "address[]" },
+      { "internalType": "bytes", "name": "data", "type": "bytes" }
+    ],
+    "name": "_callPool",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
   }
 ]
diff --git a/src/fuse-sdk/src/index.js b/src/fuse-sdk/src/index.js
@@ -24,7 +24,7 @@ export default class Fuse {
   static FUSE_POOL_DIRECTORY_CONTRACT_ADDRESS =
     "0x835482FE0532f169024d5E9410199369aAD5C77E";
   static FUSE_SAFE_LIQUIDATOR_CONTRACT_ADDRESS =
-    "0xCc29FE6A0e090D464Abb616E1AE4cEeA415c140E";
+    "0x41C7F2D48bde2397dFf43DadA367d2BD3527452F";
   static FUSE_FEE_DISTRIBUTOR_CONTRACT_ADDRESS =
     "0xa731585ab05fC9f83555cf9Bff8F58ee94e18F85";
   static FUSE_POOL_LENS_CONTRACT_ADDRESS =
@@ -45,16 +45,24 @@ export default class Fuse {
   static PUBLIC_PRICE_ORACLE_CONTRACT_ADDRESSES = {
     PreferredPriceOracle: "", // TODO: Set correct mainnet address after deployment
     ChainlinkPriceOracle: "0xe102421A85D9C0e71C0Ef1870DaC658EB43E1493",
-    UniswapView: "", // TODO: Set correct mainnet address after deployment
-    Keep3rPriceOracle: "0xb90de476d438b37a4a143bf729a9b2237e544af6",
-    Keep3rSushiSwapPriceOracle: "0x08d415f90ccfb971dfbfdd6266f9a7cb1c166fc0",
+    ChainlinkPriceOracleV2: "0xb0602af43Ca042550ca9DA3c33bA3aC375d20Df4",
+    UniswapView: "", // NOT IN USE
+    Keep3rPriceOracle_Uniswap: "0xb90de476d438b37a4a143bf729a9b2237e544af6", // NO LONGER IN USE
+    Keep3rPriceOracle_SushiSwap: "0x08d415f90ccfb971dfbfdd6266f9a7cb1c166fc0", // NO LONGER IN USE
+    Keep3rV2PriceOracle_Uniswap: "0xd6a8cac634e59c00a3d4163f839d068458e39869", // NO LONGER IN USE
+    UniswapTwapPriceOracle_Uniswap: "0xCd8f1c72Ff98bFE3B307869dDf66f5124D57D3a9",
+    UniswapTwapPriceOracle_SushiSwap: "0xfD4B4552c26CeBC54cD80B1BDABEE2AC3E7eB324",
     UniswapLpTokenPriceOracle: "", // TODO: Set correct mainnet address after deployment
     RecursivePriceOracle: "", // TODO: Set correct mainnet address after deployment
     YVaultV1PriceOracle: "", // TODO: Set correct mainnet address after deployment
     YVaultV2PriceOracle: "", // TODO: Set correct mainnet address after deployment
     AlphaHomoraV1PriceOracle: "", // TODO: Set correct mainnet address after deployment
+    AlphaHomoraV2PriceOracle: "", // TODO: Set correct mainnet address after deployment
     SynthetixPriceOracle: "", // TODO: Set correct mainnet address after deployment
+    BalancerLpTokenPriceOracle: "", // TODO: Set correct mainnet address after deployment
     MasterPriceOracle: "0x1887118E49e0F4A78Bd71B792a49dE03504A764D",
+    CurveLpTokenPriceOracle: "0x43c534203339bbf15f62b8dde91e7d14195e7a60",
+    CurveLiquidityGaugeV2PriceOracle: "0xd9eefdb09d75ca848433079ea72ef609a1c1ea21",
   };
 
   static DAI_POT = "0x197e90f9fad81970ba7976f33cbd77088e5d7cf7";