Merge pull request #45 from mars-protocol/v1.7.1

v1.7.1

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mars",
   "homepage": "./",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": false,
   "license": "SEE LICENSE IN LICENSE FILE",
   "scripts": {

src/components/common/index.ts

@@ -27,6 +27,7 @@ export { InputSection } from './InputSection/InputSection'
 export { InputSlider } from './InputSlider/InputSlider'
 export { Layout } from './Layout/Layout'
 export { Loading } from './Loading/Loading'
+export { MigrationBanner } from './MigrationBanner/MigrationBanner'
 export { MigrationInProgress } from './MigrationInProgress/MigrationInProgress'
 export { MobileNav } from './MobileNav/MobileNav'
 export { Notification } from './Notification/Notification'

src/components/redbank/RedbankColumns.module.scss

@@ -24,7 +24,7 @@
   }
 
   &.axlusdc,
-  &.nusdc {
+  &.usdc {
     background-image: $colorGradientAxlUSDC;
   }
 

src/configs/devnet.ts

@@ -7,6 +7,7 @@ import axlweth from 'images/axlweth.svg'
 import mars from 'images/mars.svg'
 import osmo from 'images/osmo.svg'
 import statom from 'images/statom.svg'
+import usdc from 'images/usdc.svg'
 import colors from 'styles/_assets.module.scss'
 
 const ASSETS: NetworkAssets = {
@@ -79,6 +80,16 @@ const ASSETS: NetworkAssets = {
     logo: statom,
     decimals: 6,
   },
+  usdc: {
+    symbol: 'USDC',
+    name: 'USDC',
+    id: 'USDC',
+    denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
+    color: colors.usdc,
+    decimals: 6,
+    logo: usdc,
+    priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+  },
 }
 
 const OTHER_ASSETS: { [denom: string]: OtherAsset } = {
@@ -116,8 +127,9 @@ export const NETWORK_CONFIG: NetworkConfig = {
     incentives: 'osmo1nkahswfr8shg8rlxqwup0vgahp0dk4x8w6tkv3rra8rratnut36sk22vrm',
     oracle: 'osmo1mhznfr60vjdp2gejhyv2gax9nvyyzhd3z0qcwseyetkfustjauzqycsy2g',
     creditManager: 'osmo1f2m24wktq0sw3c0lexlg7fv4kngwyttvzws3a3r3al9ld2s2pvds87jqvf',
-    params: 'osmo1aye5qcer5n52crrkaf35jprsad2807q6kg3eeeu7k79h4slxfausfqhc9y',
     accountNft: 'osmo1450hrg6dv2l58c0rvdwx8ec2a0r6dd50hn4frk370tpvqjhy8khqw7sw09',
+    pyth: 'osmo13ge29x4e2s63a8ytz2px8gurtyznmue4a69n5275692v3qn3ks8q7cwck7',
+    params: 'osmo1aye5qcer5n52crrkaf35jprsad2807q6kg3eeeu7k79h4slxfausfqhc9y',
   },
   assets: {
     base: ASSETS.osmo,
@@ -129,10 +141,13 @@ export const NETWORK_CONFIG: NetworkConfig = {
       ASSETS.axlwbtc,
       ASSETS.axlweth,
       ASSETS.statom,
+      ASSETS.usdc,
     ],
     other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
     currencies: [
       OTHER_ASSETS.usd,
+      ASSETS.usdc,
+      ASSETS.axlusdc,
       ASSETS.osmo,
       ASSETS.atom,
       ASSETS.axl,

src/configs/osmosis-1.ts

@@ -7,6 +7,7 @@ import axlweth from 'images/axlweth.svg'
 import mars from 'images/mars.svg'
 import osmo from 'images/osmo.svg'
 import statom from 'images/statom.svg'
+import usdc from 'images/usdc.svg'
 import colors from 'styles/_assets.module.scss'
 
 const ASSETS: NetworkAssets = {
@@ -79,6 +80,16 @@ const ASSETS: NetworkAssets = {
     logo: statom,
     decimals: 6,
   },
+  usdc: {
+    symbol: 'USDC',
+    name: 'Noble',
+    id: 'USDC',
+    denom: 'ibc/498A0751C798A0D9A389AA3691123DADA57DAA4FE165D5C75894505B876BA6E4',
+    color: colors.usdc,
+    decimals: 6,
+    logo: usdc,
+    priceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+  },
 }
 
 const OTHER_ASSETS: { [denom: string]: OtherAsset } = {
@@ -132,10 +143,13 @@ export const NETWORK_CONFIG: NetworkConfig = {
       ASSETS.axlwbtc,
       ASSETS.axlweth,
       ASSETS.statom,
+      ASSETS.usdc,
     ],
     other: [OTHER_ASSETS.usd, OTHER_ASSETS.mars],
     currencies: [
       OTHER_ASSETS.usd,
+      ASSETS.usdc,
+      ASSETS.axlusdc,
       ASSETS.osmo,
       ASSETS.atom,
       ASSETS.axl,

src/hooks/queries/useDepositAndDebt.tsx

@@ -19,8 +19,8 @@ export interface DepositAndDebtData {
     JUNODebt: string
     axlUSDCDeposits: string
     axlUSDCDebt: string
-    nUSDCDeposits: string
-    nUSDCDebt: string
+    USDCDeposits: string
+    USDCDebt: string
     axlWBTCDeposits: string
     axlWBTCDebt: string
     axlWETHDeposits: string

src/mocks/redBankData.ts

@@ -133,6 +133,39 @@ export const redBankData: RedBankData = {
         },
       ],
     },
+    USDCMarket: {
+      denom: 'ibc/D189335C6E4A68B513C10AB227BF1C1D38C746766278BA3EEB4FB14124F1D858',
+      max_loan_to_value: '0.74',
+      liquidation_threshold: '0.75',
+      liquidation_bonus: '0.1',
+      reserve_factor: '0.2',
+      interest_rate_model: {
+        optimal_utilization_rate: '0.8',
+        base: '0',
+        slope_1: '0.2',
+        slope_2: '2',
+      },
+      borrow_index: '1.010875731969102527',
+      liquidity_index: '1.00525118991986623',
+      borrow_rate: '0.193514001505802393',
+      liquidity_rate: '0.11983254009212061',
+      indexes_last_updated: 1678369620,
+      collateral_total_scaled: '1494717184985439254',
+      debt_total_scaled: '1158255523619905561',
+      deposit_enabled: true,
+      borrow_enabled: true,
+      deposit_cap: '1500000000000',
+      incentives: [
+        {
+          denom: 'ibc/2E7368A14AC9AB7870F32CFEA687551C5064FA861868EDF7437BC877358A81F9',
+          emission_per_second: '48225',
+          start_time: 1675793700,
+          duration: 2592000,
+          index: '0.000000143742920378',
+          last_updated: 1678369620,
+        },
+      ],
+    },
     unclaimedRewards: '4679062',
   },
 }

src/types/interfaces/asset.d.ts

@@ -10,15 +10,15 @@ interface Asset {
     | 'AXL'
     | 'JUNO'
     | 'USDC.axl'
-    | 'USDC.n'
+    | 'USDC'
     | 'stATOM'
     | 'WBTC.axl'
     | 'WETH.axl'
   id:
     | 'OSMO'
     | 'NTRN'
     | 'axlUSDC'
-    | 'nUSDC'
+    | 'USDC'
     | 'axlWBTC'
     | 'axlWETH'
     | 'ATOM'

src/types/interfaces/redbank.d.ts

@@ -21,8 +21,8 @@ interface RedBankData {
     axlWETHMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
     stATOMMarket: Market
     stATOMMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
-    nUSDCMarket: Market
-    nUSDCMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
+    USDCMarket: Market
+    USDCMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
     NTRNMarket: Market
     NTRNMarketIncentive: MarketIncentive | MultiAssetMarketIncentive[]
     collateral: UserCollateral[]