[release] Kintsugi 2.34.0

api/market_data.py

@@ -8,25 +8,81 @@
 
 api_key = os.environ.get("CG_API_KEY")
 
+tickers = {
+  "Tether USD": "tether",
+}
 
 @app.after_request
 def add_header(response):
     response.cache_control.max_age = 0
     response.cache_control.s_maxage = 300
     return response
 
-
-@app.route("/marketdata/price", methods=["GET"])
-def get_price():
-    args = request.args
-
+def coingecko(args):
     headers_dict = {
         "content-type": "application/json",
         "accept": "application/json",
     }
     url = "https://api.coingecko.com/api/v3/simple/price"
     resp = requests.get(url, params=args, headers=headers_dict)
     data = resp.json()
+    return data
+
+def dia(asset):
+    headers_dict = {
+        "content-type": "application/json",
+        "accept": "application/json",
+        "x-cg-pro-api-key": api_key,
+    }
+    url = "https://api.diadata.org/v1/assetQuotation"
+    if asset == "bitcoin":
+      url += "/Bitcoin/0x0000000000000000000000000000000000000000"
+    elif asset == "interlay":
+      url += "/Interlay/0x0000000000000000000000000000000000000000"
+    elif asset == "liquid-staking-dot":
+      return { "liquid-staking-dot": None }
+    elif asset == "polkadot":
+      url += "/Polkadot/0x0000000000000000000000000000000000000000/"
+    elif asset == "tether":
+      url += "/Ethereum/0xdAC17F958D2ee523a2206206994597C13D831ec7"
+
+    resp = requests.get(url, headers=headers_dict)
+    data = resp.json()
+
+    # optionally rename the ticker
+    ticker = tickers.get(data["Name"], data["Name"]).lower()
+
+    return {
+      ticker: {
+        "usd": data["Price"],
+      }
+    }
+
+
+@app.route("/marketdata/price", methods=["GET"])
+def get_price():
+    args = request.args
+
+    price_source = args.get('price-source')
+
+    data = {}
+
+    def _dia():
+      ticker_ids = args["ids"].split(",")
+      for ticker_id in ticker_ids:
+        data.update(dia(ticker_id))
+
+    if price_source == "dia":
+       _dia()
+    elif price_source == "coingecko":
+       data = coingecko(args)
+    else:
+      try:
+        _dia()
+      except Exception as e:
+        print("Error", e)
+        data = coingecko(args)
+
     return jsonify(data)
 
 

package.json

@@ -1,13 +1,13 @@
 {
   "name": "interbtc-ui",
-  "version": "2.33.0",
+  "version": "2.34.0",
   "private": true,
   "dependencies": {
     "@craco/craco": "^6.1.1",
     "@headlessui/react": "^1.1.1",
     "@heroicons/react": "^2.0.18",
-    "@interlay/bridge": "^0.3.11",
-    "@interlay/interbtc-api": "2.3.1",
+    "@interlay/bridge": "^0.3.13",
+    "@interlay/interbtc-api": "2.3.3",
     "@interlay/monetary-js": "0.7.3",
     "@polkadot/api": "9.14.2",
     "@polkadot/extension-dapp": "0.44.1",

src/components/LoanPositionsTable/ApyCell.tsx

@@ -32,7 +32,7 @@ const ApyCell = ({
 }: ApyCellProps): JSX.Element => {
   const rewardsApy = getSubsidyRewardApy(currency, rewardsPerYear, prices);
 
-  const totalApy = isBorrow ? apy.sub(rewardsApy || 0) : apy.add(rewardsApy || 0);
+  const totalApy = isBorrow ? (rewardsApy || Big(0)).sub(apy) : apy.add(rewardsApy || 0);
 
   const totalApyLabel = getApyLabel(totalApy);
 

src/pages/AMM/Pools/components/DepositForm/DepositOutputAssets.tsx

@@ -56,7 +56,7 @@ const DepositOutputAssets = ({ pool, values, prices }: DepositOutputAssetsProps)
   return (
     <Flex direction='column' gap='spacing4'>
       <P align='center' size='xs'>
-        {t('amm.pools.receivable_assets')}
+        {t('receivable_assets')}
       </P>
       <Dl direction='column' gap='spacing2'>
         <StyledDlGroup justifyContent='space-between'>

src/pages/AMM/Swap/components/SwapForm/SwapForm.tsx

@@ -4,7 +4,7 @@ import Big from 'big.js';
 import { ChangeEventHandler, Key, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useSelector } from 'react-redux';
-import { useDebounce } from 'react-use';
+import { useDebounce, useInterval } from 'react-use';
 
 import { StoreType } from '@/common/types/util.types';
 import { convertMonetaryAmountToValueInUSD, formatUSD, newSafeMonetaryAmount } from '@/common/utils/utils';
@@ -20,6 +20,7 @@ import {
 } from '@/lib/form';
 import { SlippageManager } from '@/pages/AMM/shared/components';
 import { SwapPair } from '@/types/swap';
+import { REFETCH_INTERVAL } from '@/utils/constants/api';
 import { SWAP_PRICE_IMPACT_LIMIT } from '@/utils/constants/swap';
 import { getTokenPrice } from '@/utils/helpers/prices';
 import { useGetBalances } from '@/utils/hooks/api/tokens/use-get-balances';
@@ -120,20 +121,21 @@ const SwapForm = ({
     onSuccess: onSwap
   });
 
-  useDebounce(
-    () => {
-      if (!pair.input || !pair.output || !inputAmount) {
-        return setTrade(undefined);
-      }
+  const handleChangeTrade = () => {
+    if (!pair.input || !pair.output || !inputAmount) {
+      return setTrade(undefined);
+    }
 
-      const inputMonetaryAmount = newMonetaryAmount(inputAmount, pair.input, true);
-      const trade = window.bridge.amm.getOptimalTrade(inputMonetaryAmount, pair.output, liquidityPools);
+    const inputMonetaryAmount = newMonetaryAmount(inputAmount, pair.input, true);
+    const trade = window.bridge.amm.getOptimalTrade(inputMonetaryAmount, pair.output, liquidityPools);
 
-      setTrade(trade);
-    },
-    500,
-    [inputAmount, pair]
-  );
+    setTrade(trade);
+  };
+
+  // attemp to update trade object on each new block
+  useInterval(handleChangeTrade, REFETCH_INTERVAL.BLOCK);
+
+  useDebounce(handleChangeTrade, 500, [inputAmount, pair]);
 
   const inputBalance = pair.input && getAvailableBalance(pair.input.ticker);
   const outputBalance = pair.output && getAvailableBalance(pair.output.ticker);

src/parts/Topbar/index.tsx

@@ -41,7 +41,7 @@ const Topbar = (): JSX.Element => {
   const { selectProps } = useSignMessage();
   const { list } = useNotifications();
 
-  const kintBalanceIsZero = getAvailableBalance('KINT')?.isZero();
+  const governanceTokenBalanceIsZero = getAvailableBalance(GOVERNANCE_TOKEN.ticker)?.isZero();
 
   const handleRequestFromFaucet = async (): Promise<void> => {
     if (!selectedAccount) return;
@@ -106,7 +106,7 @@ const Topbar = (): JSX.Element => {
         {isBanxaEnabled ? <FundWallet /> : <GetGovernanceTokenUI className={SMALL_SIZE_BUTTON_CLASSES} />}
         {selectedAccount !== undefined && (
           <>
-            {process.env.REACT_APP_FAUCET_URL && kintBalanceIsZero && (
+            {process.env.REACT_APP_FAUCET_URL && governanceTokenBalanceIsZero && (
               <>
                 <InterlayDenimOrKintsugiMidnightOutlinedButton
                   className={SMALL_SIZE_BUTTON_CLASSES}

src/utils/helpers/loans.ts

@@ -11,6 +11,9 @@ const MIN_DECIMAL_NUMBER = 0.01;
 
 // MEMO: returns formatted apy or better representation of a very small apy
 const getApyLabel = (apy: Big): string => {
+  if (apy.eq(0)) {
+    return formatPercentage(0);
+  }
   const isPositive = apy.gt(0);
   const isTinyApy = isPositive ? apy.lt(MIN_DECIMAL_NUMBER) : apy.gt(-MIN_DECIMAL_NUMBER);
 

yarn.lock

@@ -2099,10 +2099,10 @@
   resolved "https://registry.yarnpkg.com/@iarna/toml/-/toml-2.2.5.tgz#b32366c89b43c6f8cefbdefac778b9c828e3ba8c"
   integrity sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==
 
-"@interlay/bridge@^0.3.11":
-  version "0.3.11"
-  resolved "https://registry.yarnpkg.com/@interlay/bridge/-/bridge-0.3.11.tgz#45b2f3bb44d5e7eb1777ba82cfdf1a2f5dbf2b1d"
-  integrity sha512-HMgUlSFw5wOR7Qi+JxrDeY8TqoybRd7MWdXUqswDpiCgc0WZGTSDK+2NmuKRgDjRYoly0xIpzpkb8oek6v/JQw==
+"@interlay/bridge@^0.3.13":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@interlay/bridge/-/bridge-0.3.13.tgz#8add2a9d8a811ea3bbe73498bf3ebc19cd279ec6"
+  integrity sha512-LXXomxfI2n1h2MHeN8woRaQgh+gLKKlHfH1oTBAMyKPpSI7tTvtrE2XwIKt+Qg1TvmukRngtmwWtEXh760Dtkw==
   dependencies:
     "@acala-network/api" "4.1.8-13"
     "@acala-network/sdk" "4.1.8-13"
@@ -2120,10 +2120,10 @@
   dependencies:
     axios "^0.21.1"
 
-"@interlay/interbtc-api@2.3.1":
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/@interlay/interbtc-api/-/interbtc-api-2.3.1.tgz#99bd9058453f6125d0fe1aa7bae208acda3191ed"
-  integrity sha512-XTbFNz0W/ev9cLfO0hKOfoPa79ARUrhKItrNolA98n055DMWHS7Lu9P1HUBG9KfKvgoiB5hQBo1Gc4hG+oPKQg==
+"@interlay/interbtc-api@2.3.3":
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/@interlay/interbtc-api/-/interbtc-api-2.3.3.tgz#e75f0aa64ae6db604d4314cadf307fe09d128741"
+  integrity sha512-q5uDFejEJoy4ZC5sc2YSmksILDA14qR/A+oQonMJGIh2F8k58YHdC8Zpp+6ayYUjp13rwkeQQwoBS1kwBFFdqg==
   dependencies:
     "@interlay/esplora-btc-api" "0.4.0"
     "@interlay/interbtc-types" "1.12.0"