Update Chain handling

scripts/generateERC20Whitelist.ts

@@ -1,4 +1,4 @@
-import { Asset, assetFromString, ETHChain } from '@xchainjs/xchain-util'
+import { Asset, assetFromString } from '@xchainjs/xchain-util'
 import ansis from 'ansis'
 import axios from 'axios'
 import * as IO from 'fp-ts/IO'
@@ -15,6 +15,7 @@ import prettier from 'prettier'
 
 import { writeFile, readFile } from '../src/main/utils/file'
 import { ERC20Whitelist, erc20WhitelistIO } from '../src/renderer/services/thorchain/types'
+import { ETHChain } from '../src/shared/utils/chain'
 
 const WHITELIST_URL =
   'https://gitlab.com/thorchain/thornode/-/raw/release-1.97.2/common/tokenlist/ethtokens/eth_mainnet_V97.json'

src/main/api/ledger/address.ts

@@ -1,4 +1,7 @@
 import TransportNodeHidSingleton from '@ledgerhq/hw-transport-node-hid-singleton'
+import * as E from 'fp-ts/Either'
+
+import { IPCLedgerAdddressParams, LedgerError, LedgerErrorId } from '../../../shared/api/types'
 import {
   BCHChain,
   BNBChain,
@@ -8,10 +11,7 @@ import {
   ETHChain,
   LTCChain,
   THORChain
-} from '@xchainjs/xchain-util'
-import * as E from 'fp-ts/Either'
-
-import { IPCLedgerAdddressParams, LedgerError, LedgerErrorId } from '../../../shared/api/types'
+} from '../../../shared/utils/chain'
 import { isError, isEthHDMode } from '../../../shared/utils/guard'
 import { WalletAddress } from '../../../shared/wallet/types'
 import { getAddress as getBNBAddress, verifyAddress as verifyBNBAddress } from './binance/address'

src/main/api/ledger/binance/address.ts

@@ -2,10 +2,10 @@ import { crypto } from '@binance-chain/javascript-sdk'
 import AppBNB from '@binance-chain/javascript-sdk/lib/ledger/ledger-app'
 import type Transport from '@ledgerhq/hw-transport'
 import { getDerivePath, getPrefix } from '@xchainjs/xchain-binance'
-import { BNBChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { BNBChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/bitcoin/address.ts

@@ -1,9 +1,9 @@
 import AppBTC from '@ledgerhq/hw-app-btc'
 import type Transport from '@ledgerhq/hw-transport'
-import { BTCChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { BTCChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/bitcoincash/address.ts

@@ -1,9 +1,9 @@
 import AppBTC from '@ledgerhq/hw-app-btc'
 import type Transport from '@ledgerhq/hw-transport'
-import { BCHChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { BCHChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/cosmos/address.ts

@@ -1,9 +1,9 @@
 import CosmosApp from '@ledgerhq/hw-app-cosmos'
 import type Transport from '@ledgerhq/hw-transport'
-import { CosmosChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId } from '../../../../shared/api/types'
+import { CosmosChain } from '../../../../shared/utils/chain'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'
 import { getDerivationPath } from './common'

src/main/api/ledger/doge/address.ts

@@ -1,9 +1,9 @@
 import AppBTC from '@ledgerhq/hw-app-btc'
 import type Transport from '@ledgerhq/hw-transport'
-import { DOGEChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { DOGEChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/ethereum/address.ts

@@ -1,11 +1,11 @@
 import EthApp from '@ledgerhq/hw-app-eth'
 import type Transport from '@ledgerhq/hw-transport'
-import { ETHChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId } from '../../../../shared/api/types'
 import { getDerivationPath } from '../../../../shared/ethereum/ledger'
 import { EthHDMode } from '../../../../shared/ethereum/types'
+import { ETHChain } from '../../../../shared/utils/chain'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'
 

src/main/api/ledger/litecoin/address.ts

@@ -1,9 +1,9 @@
 import AppBTC from '@ledgerhq/hw-app-btc'
 import type Transport from '@ledgerhq/hw-transport'
-import { LTCChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { LTCChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/thorchain/address.ts

@@ -1,10 +1,10 @@
 import type Transport from '@ledgerhq/hw-transport'
 import THORChainApp, { LedgerErrorType } from '@thorchain/ledger-thorchain'
 import { getPrefix } from '@xchainjs/xchain-thorchain'
-import { THORChain } from '@xchainjs/xchain-util'
 import * as E from 'fp-ts/Either'
 
 import { LedgerError, LedgerErrorId, Network } from '../../../../shared/api/types'
+import { THORChain } from '../../../../shared/utils/chain'
 import { toClientNetwork } from '../../../../shared/utils/client'
 import { isError } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'

src/main/api/ledger/transaction.ts

@@ -1,5 +1,9 @@
 import TransportNodeHidSingleton from '@ledgerhq/hw-transport-node-hid-singleton'
 import { TxHash } from '@xchainjs/xchain-client'
+import * as E from 'fp-ts/Either'
+
+import { IPCLedgerDepositTxParams, IPCLedgerSendTxParams } from '../../../shared/api/io'
+import { LedgerError, LedgerErrorId } from '../../../shared/api/types'
 import {
   BCHChain,
   BNBChain,
@@ -10,11 +14,7 @@ import {
   ETHChain,
   LTCChain,
   THORChain
-} from '@xchainjs/xchain-util'
-import * as E from 'fp-ts/Either'
-
-import { IPCLedgerDepositTxParams, IPCLedgerSendTxParams } from '../../../shared/api/io'
-import { LedgerError, LedgerErrorId } from '../../../shared/api/types'
+} from '../../../shared/utils/chain'
 import { isError, isEthHDMode } from '../../../shared/utils/guard'
 import * as BNB from './binance/transaction'
 import * as BTC from './bitcoin/transaction'

src/renderer/components/Bonds/table/helpers.tsx

@@ -1,11 +1,12 @@
 import React from 'react'
 
 import { StopOutlined } from '@ant-design/icons'
-import { Address, AssetRuneNative, baseToAsset, formatAssetAmountCurrency, THORChain } from '@xchainjs/xchain-util'
+import { Address, AssetRuneNative, baseToAsset, formatAssetAmountCurrency } from '@xchainjs/xchain-util'
 import { Col } from 'antd'
 import { useIntl } from 'react-intl'
 
 import { Network } from '../../../../shared/api/types'
+import { THORChain } from '../../../../shared/utils/chain'
 import { NodeInfo } from '../../../services/thorchain/types'
 import { NodeStatusEnum } from '../../../types/generated/thornode'
 import * as Styled from './BondsTable.styles'

src/renderer/components/PoolShares/PoolShares.tsx

@@ -5,7 +5,6 @@ import {
   AssetRuneNative,
   baseAmount,
   baseToAsset,
-  Chain,
   formatAssetAmountCurrency,
   formatBN
 } from '@xchainjs/xchain-util'
@@ -15,6 +14,7 @@ import * as FP from 'fp-ts/lib/function'
 import { useIntl } from 'react-intl'
 
 import { Network } from '../../../shared/api/types'
+import { Chain } from '../../../shared/utils/chain'
 import * as PoolHelpers from '../../helpers/poolHelper'
 import { MimirHalt } from '../../services/thorchain/types'
 import { AssetLabel } from '../uielements/assets/assetLabel'

src/renderer/components/deposit/Deposit.tsx

@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react'
 
 import * as RD from '@devexperts/remote-data-ts'
-import { Chain } from '@xchainjs/xchain-util'
 import { Grid } from 'antd'
 import * as FP from 'fp-ts/function'
 import * as O from 'fp-ts/Option'
 import { useIntl } from 'react-intl'
 
+import { Chain } from '../../../shared/utils/chain'
 import { WalletAddress } from '../../../shared/wallet/types'
 import { eqAddress, eqOAddress } from '../../helpers/fp/eq'
 import { PoolDetailRD, PoolShareRD, PoolSharesRD } from '../../services/midgard/types'

src/renderer/components/deposit/add/Deposit.helper.ts

@@ -1,12 +1,13 @@
 import * as RD from '@devexperts/remote-data-ts'
 import { PoolData } from '@thorchain/asgardex-util'
-import { Asset, baseAmount, BaseAmount, Chain } from '@xchainjs/xchain-util'
+import { Asset, baseAmount, BaseAmount } from '@xchainjs/xchain-util'
 import BigNumber from 'bignumber.js'
 import * as E from 'fp-ts/Either'
 import * as FP from 'fp-ts/function'
 import * as A from 'fp-ts/lib/Array'
 import * as O from 'fp-ts/Option'
 
+import { Chain } from '../../../../shared/utils/chain'
 import { SUPPORTED_LEDGER_APPS, ZERO_BASE_AMOUNT } from '../../../const'
 import {
   convertBaseAmountDecimal,

src/renderer/components/deposit/add/SymDeposit.tsx

@@ -11,10 +11,8 @@ import {
   baseAmount,
   BaseAmount,
   baseToAsset,
-  chainToString,
   formatAssetAmountCurrency,
-  isAssetRuneNative,
-  THORChain
+  isAssetRuneNative
 } from '@xchainjs/xchain-util'
 import BigNumber from 'bignumber.js'
 import * as A from 'fp-ts/lib/Array'
@@ -27,6 +25,7 @@ import { useIntl } from 'react-intl'
 import * as RxOp from 'rxjs/operators'
 
 import { Network } from '../../../../shared/api/types'
+import { chainToString, THORChain } from '../../../../shared/utils/chain'
 import { isLedgerWallet } from '../../../../shared/utils/guard'
 import { WalletType } from '../../../../shared/wallet/types'
 import { ZERO_ASSET_AMOUNT, ZERO_BASE_AMOUNT } from '../../../const'

src/renderer/components/deposit/withdraw/Withdraw.stories.tsx

@@ -9,15 +9,15 @@ import {
   assetToBase,
   assetToString,
   baseAmount,
-  bn,
-  BNBChain
+  bn
 } from '@xchainjs/xchain-util'
 import * as O from 'fp-ts/lib/Option'
 import * as Rx from 'rxjs'
 import * as RxOp from 'rxjs/operators'
 
 import { BNB_ADDRESS_TESTNET } from '../../../../shared/mock/address'
 import { mockValidatePassword$ } from '../../../../shared/mock/wallet'
+import { BNBChain } from '../../../../shared/utils/chain'
 import { BNB_DECIMAL, THORCHAIN_DECIMAL } from '../../../helpers/assetHelper'
 import { mockWalletAddress } from '../../../helpers/test/testWalletHelper'
 import { INITIAL_WITHDRAW_STATE } from '../../../services/chain/const'

src/renderer/components/deposit/withdraw/Withdraw.tsx

@@ -9,9 +9,7 @@ import {
   BaseAmount,
   baseToAsset,
   formatAssetAmount,
-  Chain,
-  formatAssetAmountCurrency,
-  THORChain
+  formatAssetAmountCurrency
 } from '@xchainjs/xchain-util'
 import { Col } from 'antd'
 import BigNumber from 'bignumber.js'
@@ -21,6 +19,7 @@ import { useObservableState } from 'observable-hooks'
 import { useIntl } from 'react-intl'
 
 import { Network } from '../../../../shared/api/types'
+import { Chain, THORChain } from '../../../../shared/utils/chain'
 import { isLedgerWallet } from '../../../../shared/utils/guard'
 import { WalletAddress } from '../../../../shared/wallet/types'
 import { ZERO_BASE_AMOUNT } from '../../../const'

src/renderer/components/modal/confirmation/LedgerConfirmationModal.stories.tsx

@@ -1,7 +1,7 @@
 import { ComponentMeta } from '@storybook/react'
-import { Chain } from '@xchainjs/xchain-util'
 import * as O from 'fp-ts/lib/Option'
 
+import { Chain } from '../../../../shared/utils/chain'
 import { LedgerConfirmationModal } from './'
 
 type Args = {

src/renderer/components/modal/confirmation/LedgerConfirmationModal.tsx

@@ -1,12 +1,13 @@
 import { useCallback, useState } from 'react'
 
 import { isCashAddress, toCashAddress, toLegacyAddress } from '@xchainjs/xchain-bitcoincash'
-import { Address, Chain, chainToString } from '@xchainjs/xchain-util'
+import { Address } from '@xchainjs/xchain-util'
 import * as FP from 'fp-ts/function'
 import * as O from 'fp-ts/lib/Option'
 import { useIntl } from 'react-intl'
 
 import { Network } from '../../../../shared/api/types'
+import { Chain, chainToString } from '../../../../shared/utils/chain'
 import { getChainAsset, isBchChain } from '../../../helpers/chainHelper'
 import { AttentionIcon } from '../../icons'
 import { AddressEllipsis } from '../../uielements/addressEllipsis'

src/renderer/components/modal/confirmation/WalletPasswordConfirmation.stories.tsx

@@ -1,9 +1,9 @@
 import * as RD from '@devexperts/remote-data-ts'
 import { ComponentMeta } from '@storybook/react'
-import { Chain } from '@xchainjs/xchain-util'
 import * as Rx from 'rxjs'
 
 import { mockValidatePassword$ } from '../../../../shared/mock/wallet'
+import { Chain } from '../../../../shared/utils/chain'
 import { WalletPasswordConfirmationModal } from './WalletPasswordConfirmationModal'
 
 type ValidatePasswordVariant = 'initial' | 'pending' | 'failure' | 'success' | 'all'

src/renderer/components/settings/WalletSettings.tsx

@@ -2,22 +2,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { SearchOutlined } from '@ant-design/icons'
 import * as RD from '@devexperts/remote-data-ts'
-import {
-  Asset,
-  BNBChain,
-  THORChain,
-  ETHChain,
-  BCHChain,
-  BTCChain,
-  LTCChain,
-  CosmosChain,
-  Chain,
-  DOGEChain,
-  TerraChain,
-  chainToString,
-  AVAXChain,
-  Address
-} from '@xchainjs/xchain-util'
+import { Asset, Address } from '@xchainjs/xchain-util'
 import { List, Collapse, RadioChangeEvent } from 'antd'
 import * as FP from 'fp-ts/function'
 import * as A from 'fp-ts/lib/Array'
@@ -28,6 +13,19 @@ import { useNavigate } from 'react-router-dom'
 import { KeystoreId, Network } from '../../../shared/api/types'
 import { getDerivationPath as getEthDerivationPath } from '../../../shared/ethereum/ledger'
 import { EthHDMode } from '../../../shared/ethereum/types'
+import {
+  AvalancheChain,
+  BCHChain,
+  BNBChain,
+  BTCChain,
+  Chain,
+  chainToString,
+  CosmosChain,
+  DOGEChain,
+  ETHChain,
+  LTCChain,
+  THORChain
+} from '../../../shared/utils/chain'
 import { isError } from '../../../shared/utils/guard'
 import { HDMode, WalletAddress } from '../../../shared/wallet/types'
 import { ReactComponent as UnlockOutlined } from '../../assets/svg/icon-unlock-warning.svg'
@@ -166,9 +164,8 @@ export const WalletSettings: React.FC<Props> = (props): JSX.Element => {
     [THORChain]: 0,
     [ETHChain]: 0,
     [CosmosChain]: 0,
-    [AVAXChain]: 0, // not supported in ASGDX yet, but part of xchain-util
-    [DOGEChain]: 0,
-    [TerraChain]: 0 // not supported in ASGDX anymore, but part of xchain-util
+    [AvalancheChain]: 0, // not supported in ASGDX yet, but part of xchain-util
+    [DOGEChain]: 0
   })
 
   const {

src/renderer/components/swap/Swap.stories.tsx

@@ -10,14 +10,14 @@ import {
   assetToBase,
   assetToString,
   baseAmount,
-  bn,
-  BNBChain
+  bn
 } from '@xchainjs/xchain-util'
 import * as O from 'fp-ts/lib/Option'
 import * as Rx from 'rxjs'
 import * as RxOp from 'rxjs/operators'
 
 import { mockValidatePassword$ } from '../../../shared/mock/wallet'
+import { BNBChain } from '../../../shared/utils/chain'
 import { ONE_BN } from '../../const'
 import { THORCHAIN_DECIMAL } from '../../helpers/assetHelper'
 import { RUNE_PRICE_POOL } from '../../helpers/poolHelper'

src/renderer/components/swap/Swap.tsx

@@ -19,7 +19,6 @@ import {
   delay,
   assetToBase,
   assetAmount,
-  chainToString,
   Address
 } from '@xchainjs/xchain-util'
 import BigNumber from 'bignumber.js'
@@ -32,6 +31,7 @@ import { useIntl } from 'react-intl'
 import * as RxOp from 'rxjs/operators'
 
 import { Network } from '../../../shared/api/types'
+import { chainToString } from '../../../shared/utils/chain'
 import { isLedgerWallet } from '../../../shared/utils/guard'
 import { WalletType } from '../../../shared/wallet/types'
 import { ZERO_BASE_AMOUNT } from '../../const'