Merge branch 'master' into update-network-registry

package.json

@@ -47,7 +47,7 @@
     "@galacticcouncil/math-xyk": "^1.0.0",
     "@galacticcouncil/sdk": "^5.0.1",
     "@galacticcouncil/ui": "^5.2.3",
-    "@galacticcouncil/xcm-cfg": "^5.5.1",
+    "@galacticcouncil/xcm-cfg": "^5.6.0",
     "@galacticcouncil/xcm-core": "^5.4.0",
     "@galacticcouncil/xcm-sdk": "^7.0.0",
     "@hookform/resolvers": "^3.3.4",

src/api/payments.ts

@@ -32,23 +32,46 @@ export const getAcceptedCurrency = (api: ApiPromise) => async () => {
 }
 
 export const useAcceptedCurrencies = (ids: string[]) => {
-  const { api, isLoaded } = useRpcProvider()
+  const { api, isLoaded, tradeRouter } = useRpcProvider()
   const { native } = useAssets()
 
-  return useQuery(QUERY_KEYS.acceptedCurrencies, getAcceptedCurrency(api), {
-    enabled: isLoaded && ids.length > 0,
-    select: (assets) => {
+  return useQuery(
+    QUERY_KEYS.acceptedCurrencies(ids),
+    async () => {
+      const [pools, acceptedCurrency] = await Promise.all([
+        tradeRouter.getPools(),
+        getAcceptedCurrency(api)(),
+      ])
+
       return ids.map((id) => {
-        const response = assets.find((asset) => asset.id === id)
+        const currency = acceptedCurrency.find((currency) => currency.id === id)
+
+        if (currency) {
+          return currency
+        }
+
+        if (id === native.id) {
+          return { id, accepted: true, data: undefined }
+        }
+
+        const hasPoolWithDOT = !!pools.find((pool) => {
+          return (
+            pool.tokens.find((token) => token.id === id) &&
+            pool.tokens.find((token) => token.id === "5")
+          )
+        })
 
-        return response
-          ? response
-          : id === native.id
-            ? { id, accepted: true, data: undefined }
-            : { id, accepted: false, data: undefined }
+        if (hasPoolWithDOT) {
+          return { id, accepted: true, data: undefined }
+        }
+
+        return { id, accepted: false, data: undefined }
       })
     },
-  })
+    {
+      enabled: isLoaded && ids.length > 0,
+    },
+  )
 }
 
 export const useSetAsFeePayment = () => {

src/i18n/locales/en/translations.json

@@ -844,7 +844,7 @@
   "staking.dashboard.rewards.legend.current": "Current rewards",
   "staking.dashboard.rewards.legend.future": "Rewards after voting",
   "staking.dashboard.rewards.legend.tooltip": "You have to vote max conviction with whole staking position",
-  "staking.dashboard.graph.axisY": "Paylable Percentage",
+  "staking.dashboard.graph.axisY": "Payable Percentage",
   "staking.dashboard.graph.axisX": "Days",
   "staking.dashboard.rewards.button": "Claim",
   "staking.dashboard.stats.chart.label": "Staked HDX",

src/sections/assets/AssetsModal.utils.tsx

@@ -18,6 +18,7 @@ interface useAssetsModalProps {
   allAssets?: boolean
   confirmRequired?: boolean
   defaultSelectedAsssetId?: string
+  withExternal?: boolean
 }
 
 export const useAssetsModal = ({
@@ -28,6 +29,7 @@ export const useAssetsModal = ({
   allAssets,
   confirmRequired,
   defaultSelectedAsssetId,
+  withExternal,
 }: useAssetsModalProps) => {
   const { t } = useTranslation()
   const [isOpen, setIsOpen] = useState(false)
@@ -61,6 +63,7 @@ export const useAssetsModal = ({
         allAssets={allAssets}
         confirmRequired={confirmRequired}
         defaultSelectedAsssetId={defaultSelectedAsssetId}
+        withExternal={withExternal}
       />
     </Modal>
   ) : null

src/sections/pools/modals/AddLiquidity/AddLiquidityInfoCard.tsx

@@ -13,7 +13,10 @@ export const PoolAddLiquidityInformationCard = () => {
         <Text fs={13} lh={16}>
           {t("liquidity.add.modal.information.text")}
         </Text>
-        <SLink href={`${DOC_LINK}/omnipool_impermanent_loss`} target="_blank">
+        <SLink
+          href={`${DOC_LINK}/products/trading/pools/learn_amm#impermanent-loss`}
+          target="_blank"
+        >
           {t("liquidity.add.modal.information.linkText")}
         </SLink>
       </div>

src/sections/staking/StakingPage.utils.ts

@@ -543,9 +543,9 @@ export const useClaimReward = () => {
         stakePosition.accumulatedSlashPoints.toString(),
       )
 
-      const extraPaylablePercentage = wasm.sigmoid(extraPoints, a, b)
+      const extraPayablePercentage = wasm.sigmoid(extraPoints, a, b)
 
-      extraPayablePercentageHuman = scaleHuman(extraPaylablePercentage, "q")
+      extraPayablePercentageHuman = scaleHuman(extraPayablePercentage, "q")
         .multipliedBy(100)
         .toString()
     }
@@ -571,7 +571,7 @@ export const useClaimReward = () => {
         BN(payablePercentageHuman).gte(chartPoints.y) &&
         (arr[i + 1] ? BN(payablePercentageHuman).lt(arr[i + 1].y) : true)
 
-      //calculate paylable percentage if vote ongoing referendas
+      // calculate payable percentage if vote ongoing referendas
       const currentSecondary = extraPayablePercentageHuman
         ? BN(extraPayablePercentageHuman).gte(chartPoints.y) &&
           (arr[i + 1] ? BN(extraPayablePercentageHuman).lt(arr[i + 1].y) : true)

src/sections/transaction/ReviewTransactionForm.utils.tsx

@@ -266,6 +266,7 @@ export const useEditFeePaymentAsset = (
     defaultSelectedAsssetId: feePaymentAssetId,
     allowedAssets: acceptedFeePaymentAssets,
     onSelect: (asset) => feeAsPayment.mutate(asset.id),
+    withExternal: true,
   })
 
   return {

src/sections/wallet/assets/table/actions/WalletAssetsTableActions.tsx

@@ -91,7 +91,7 @@ export const WalletAssetsTableActions = (props: Props) => {
       icon: <PlusIcon />,
       label: t("wallet.assets.table.actions.deposit"),
       onSelect: () => navigate({ to: LINKS.cross_chain }),
-      disabled: account?.isExternalWalletConnected,
+      disabled: account?.isExternalWalletConnected || props.asset.meta.isErc20,
     },
   ]
 
@@ -176,8 +176,10 @@ export const WalletAssetsTableActions = (props: Props) => {
             account?.isExternalWalletConnected
               ? []
               : [
-                  ...buttons.filter((button) =>
-                    hiddenElementsKeys.includes(button.key),
+                  ...buttons.filter(
+                    (button) =>
+                      hiddenElementsKeys.includes(button.key) &&
+                      !button.disabled,
                   ),
                   ...actionItems,
                 ]

src/sections/wallet/assets/table/actions/WalletAssetsTableActionsMob.tsx

@@ -195,7 +195,9 @@ export const WalletAssetsTableActionsMob = ({
                   <Button
                     sx={{ width: "100%" }}
                     size="small"
-                    disabled={account?.isExternalWalletConnected}
+                    disabled={
+                      account?.isExternalWalletConnected || row.meta.isErc20
+                    }
                   >
                     <PlusIcon />
                     {t("wallet.assets.table.actions.deposit")}

src/sections/wallet/transfer/onchain/WalletTransferSectionOnchain.tsx

@@ -120,10 +120,10 @@ export function WalletTransferSectionOnchain({
     return await createTransaction(
       {
         tx:
-          asset.toString() === native.id
+          asset.toString() === native.id || assetMeta.isErc20
             ? api.tx.currencies.transfer(
                 normalizedDest,
-                native.id,
+                asset.toString(),
                 amount.toFixed(),
               )
             : api.tx.tokens.transfer(normalizedDest, asset, amount.toFixed()),

src/sections/web3-connect/signer/EthereumSigner.ts

@@ -133,21 +133,19 @@ export class EthereumSigner {
       let gasLimit = BigNumber(0)
       if (tx.gasLimit) {
         gasLimit = BigNumber(tx.gasLimit.toString())
-          .multipliedBy(12)
-          .dividedBy(10)
-          .decimalPlaces(0)
       } else {
-        /* const gas = await this.getGasValues(tx)
-        gasLimit = BigNumber(gas[0].toString()) */
-        // Use hardcoded gas limit for now, because the estimator is not working correctly
-        gasLimit = BigNumber(4000000)
+        const { gas } = await this.getGasValues(tx)
+        gasLimit = BigNumber(gas.toString())
       }
 
       const createPermitMessageData = () => {
         const message: PermitMessage = {
           ...tx,
           value: 0,
-          gaslimit: gasLimit.toNumber(),
+          gaslimit: gasLimit
+            .multipliedBy(1.2) // add 20%
+            .decimalPlaces(0)
+            .toNumber(),
           nonce: nonce.toNumber(),
           deadline: Math.floor(Date.now() / 1000 + 3600),
         }

src/utils/queryKeys.ts

@@ -189,7 +189,7 @@ export const QUERY_KEYS = {
   math: ["@galacticcouncil/math"],
   existentialDeposit: [QUERY_KEY_PREFIX, "existentialDeposit"],
   metadataVersion: ["metadataVersion"],
-  acceptedCurrencies: ["acceptedCurrencies"],
+  acceptedCurrencies: (ids: string[]) => ["acceptedCurrencies", ids.join(",")],
   accountCurrency: (address: Maybe<AccountId32 | string>) => [
     "accountCurrency",
     address,

yarn.lock

@@ -2294,10 +2294,10 @@
     lit "^3.1.4"
     ts-debounce "^4.0.0"
 
-"@galacticcouncil/xcm-cfg@^5.5.1":
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/@galacticcouncil/xcm-cfg/-/xcm-cfg-5.5.1.tgz#6d0e518cbab0a66bf3246dc574d025f8bf273de4"
-  integrity sha512-S4dFcdhY/K+hYTyFBqpRksKgAQXbqXL2DVtk92dPMGvQfFu6C0AQyYySaUnnW7CBpbjxY9imNeSJZtsfW/s0HQ==
+"@galacticcouncil/xcm-cfg@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@galacticcouncil/xcm-cfg/-/xcm-cfg-5.6.0.tgz#c58f1a6931d374b34c0ad6012b3eb1dc3392c964"
+  integrity sha512-y42O/L2rkYAkio+lxMpRLwDVCAKD43IJ5NrnIGy4i2lvGyH6PcuKGaB7szHxM6QGUPyL4IMXGaNdxoe9IfeStA==
   dependencies:
     "@galacticcouncil/xcm-core" "^5.4.0"