Save sub bridge transaction fees in runtime tx processing

package.json

@@ -1,6 +1,6 @@
 {
   "name": "polkaswap-exchange-web",
-  "version": "1.17.0",
+  "version": "1.18.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/sora-xor/polkaswap-exchange-web.git"
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.17.18",
+    "@soramitsu/soraneo-wallet-web": "1.18.1",
     "@walletconnect/web3-provider": "^1.8.0",
     "base-64": "^1.0.0",
     "core-js": "^3.26.0",

public/env.json

@@ -38,7 +38,6 @@
   "EVM_NETWORKS_IDS": [97, 1001],
   "SUB_NETWORKS": {
     "Rococo": "wss://ws.relaychain-node-1.r1.dev.sora2.soramitsu.co.jp",
-    "RococoKarura": "wss://ws.karura-node-1.c2.dev.sora2.soramitsu.co.jp",
     "RococoSora": "wss://ws.parachain-collator-1.c1.dev.sora2.soramitsu.co.jp"
   },
   "ETH_BRIDGE": {

src/components/mixins/AssetsSearchMixin.ts

@@ -2,8 +2,7 @@ import { Component, Mixins } from 'vue-property-decorator';
 
 import SearchInputMixin from '@/components/mixins/SearchInputMixin';
 
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
-import type { Asset, AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { Asset, AccountAsset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component
 export default class AssetsSearchMixin extends Mixins(SearchInputMixin) {

src/components/mixins/BridgeMixin.ts

@@ -4,12 +4,14 @@ import { Component, Mixins } from 'vue-property-decorator';
 import WalletConnectMixin from '@/components/mixins/WalletConnectMixin';
 import { getter, mutation, state } from '@/store/decorators';
 
-import type { CodecString, RegisteredAccountAsset } from '@sora-substrate/util';
+import type { CodecString } from '@sora-substrate/util';
+import type { RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component
 export default class BridgeMixin extends Mixins(mixins.LoadingMixin, WalletConnectMixin) {
   @state.bridge.externalNativeBalance externalNativeBalance!: CodecString;
   @state.bridge.externalBlockNumber externalBlockNumber!: number;
+  @state.bridge.assetLockedBalance assetLockedBalance!: Nullable<CodecString>;
 
   @getter.web3.isValidNetwork isValidNetwork!: boolean;
   @getter.bridge.sender sender!: string;

src/components/mixins/ExplorePageMixin.ts

@@ -6,7 +6,7 @@ import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator';
 
 import { getter } from '@/store/decorators';
 
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
+import type { RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component
 export default class ExplorePageMixin extends Mixins(

src/components/mixins/NetworkFormatterMixin.ts

@@ -77,7 +77,7 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
         return 'kusama';
       case SubNetwork.Rococo:
         return 'rococo';
-      case SubNetwork.RococoKarura:
+      case SubNetwork.KusamaKarura:
         return 'karura';
       default:
         return 'ethereum';

src/components/mixins/SelectAssetMixin.ts

@@ -5,8 +5,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator';
 import AssetsSearchMixin from '@/components/mixins/AssetsSearchMixin';
 import { getter } from '@/store/decorators';
 
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
-import type { Asset, AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { Asset, AccountAsset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component
 export default class SelectAsset extends Mixins(mixins.DialogMixin, AssetsSearchMixin) {

src/components/pages/Bridge/SelectAsset.vue

@@ -33,12 +33,11 @@ import SelectAssetMixin from '@/components/mixins/SelectAssetMixin';
 import TranslationMixin from '@/components/mixins/TranslationMixin';
 import { Components, ObjectInit } from '@/consts';
 import { lazyComponent } from '@/router';
-import type { BridgeAccountAsset } from '@/store/assets/types';
+import type { BridgeRegisteredAsset } from '@/store/assets/types';
 import { state, getter } from '@/store/decorators';
 import type { NetworkData } from '@/types/bridge';
 
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
-import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component({
   components: {
@@ -51,7 +50,7 @@ export default class BridgeSelectAsset extends Mixins(TranslationMixin, SelectAs
   @Prop({ default: ObjectInit, type: Object }) readonly asset!: AccountAsset;
 
   @getter.web3.selectedNetwork private selectedNetwork!: Nullable<NetworkData>;
-  @state.assets.registeredAssets private registeredAssets!: Record<string, BridgeAccountAsset>;
+  @state.assets.registeredAssets private registeredAssets!: Record<string, BridgeRegisteredAsset>;
   @state.bridge.isSoraToEvm isSoraToEvm!: boolean;
   @state.wallet.settings.shouldBalanceBeHidden shouldBalanceBeHidden!: boolean;
 

src/components/pages/Bridge/TransferNotification.vue

@@ -27,8 +27,8 @@ import { getter, state, mutation } from '@/store/decorators';
 import { isOutgoingTransaction } from '@/utils/bridge/common/utils';
 import ethersUtil from '@/utils/ethers-util';
 
-import type { IBridgeTransaction, RegisteredAccountAsset } from '@sora-substrate/util';
-import type { Whitelist } from '@sora-substrate/util/build/assets/types';
+import type { IBridgeTransaction } from '@sora-substrate/util';
+import type { Whitelist, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 @Component({
   components: {

src/components/pages/Moonpay/BridgeInitMixin.ts

@@ -5,7 +5,7 @@ import { Component, Mixins } from 'vue-property-decorator';
 import BridgeHistoryMixin from '@/components/mixins/BridgeHistoryMixin';
 import WalletConnectMixin from '@/components/mixins/WalletConnectMixin';
 import { MoonpayNotifications } from '@/components/pages/Moonpay/consts';
-import type { RegisteredAccountAssetObject, BridgeAccountAsset } from '@/store/assets/types';
+import type { BridgeRegisteredAsset } from '@/store/assets/types';
 import { state, action, mutation, getter } from '@/store/decorators';
 import type { BridgeTxData } from '@/store/moonpay/types';
 import { getMaxValue, hasInsufficientEvmNativeTokenForFee } from '@/utils';
@@ -14,6 +14,7 @@ import type { MoonpayTransaction } from '@/utils/moonpay';
 import { MoonpayEVMTransferAssetData, MoonpayApi } from '@/utils/moonpay';
 
 import type { CodecString, BridgeHistory } from '@sora-substrate/util';
+import type { Asset, AccountBalance } from '@sora-substrate/util/build/assets/types';
 import type { EvmNetwork } from '@sora-substrate/util/build/bridgeProxy/evm/types';
 import type { WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';
 
@@ -29,10 +30,10 @@ export default class MoonpayBridgeInitMixin extends Mixins(BridgeHistoryMixin, W
   @state.moonpay.bridgeTransactionData bridgeTransactionData!: Nullable<BridgeHistory>;
   @state.web3.ethBridgeEvmNetwork ethBridgeEvmNetwork!: EvmNetwork;
   @state.wallet.settings.soraNetwork soraNetwork!: Nullable<WALLET_CONSTS.SoraNetwork>;
-  @state.assets.registeredAssets private registeredAssets!: Record<string, BridgeAccountAsset>;
+  @state.assets.registeredAssets private registeredAssets!: Record<string, BridgeRegisteredAsset>;
 
   @getter.settings.moonpayApiKey moonpayApiKey!: string;
-  @getter.assets.assetsDataTable assetsDataTable!: RegisteredAccountAssetObject;
+  @getter.assets.assetsDataTable assetsDataTable!: Record<string, Asset>;
 
   @mutation.moonpay.setConfirmationVisibility setConfirmationVisibility!: (flag: boolean) => void;
   @mutation.moonpay.setNotificationVisibility setNotificationVisibility!: (flag: boolean) => void;
@@ -123,31 +124,40 @@ export default class MoonpayBridgeInitMixin extends Mixins(BridgeHistoryMixin, W
         );
       }
 
-      const [soraAddress] =
+      const [soraAddress, registeredAsset] =
         Object.entries(this.registeredAssets).find(([soraAddress, registeredAsset]) =>
           ethersUtil.addressesAreEqual(registeredAsset.address, ethTransferData.address)
         ) ?? [];
 
-      if (!soraAddress) {
+      if (!(soraAddress && registeredAsset)) {
         throw createError(
           `Asset is not registered: ethereum address ${ethTransferData.address}`,
           MoonpayNotifications.SupportError
         );
       }
 
-      const asset = this.assetsDataTable[soraAddress];
-
-      const externalBalance = (await ethersUtil.getAccountAssetBalance(ethTransferData.to, asset.externalAddress))
+      const externalBalance = (await ethersUtil.getAccountAssetBalance(ethTransferData.to, registeredAsset.address))
         .value;
-      const evmNetworkFee: CodecString = await ethersUtil.getEvmNetworkFee(soraAddress, false);
+      const evmNetworkFee: CodecString = await ethersUtil.getEvmNetworkFee(
+        registeredAsset.address,
+        registeredAsset.kind,
+        false
+      );
       const evmNativeBalance = await ethersUtil.getAccountBalance(ethTransferData.to);
       const hasEthForFee = !hasInsufficientEvmNativeTokenForFee(evmNativeBalance, evmNetworkFee);
 
       if (!hasEthForFee) {
         throw createError('Insufficient ETH for fee', MoonpayNotifications.FeeError);
       }
 
-      const maxAmount = getMaxValue({ ...asset, externalBalance }, evmNetworkFee, true); // max balance (minus fee if eth asset)
+      const accountAsset = {
+        ...this.assetsDataTable[soraAddress],
+        balance: {} as AccountBalance,
+        externalBalance,
+        externalAddress: registeredAsset.address,
+        externalDecimals: registeredAsset.decimals,
+      };
+      const maxAmount = getMaxValue(accountAsset, evmNetworkFee, true); // max balance (minus fee if eth asset)
       const amount = Math.min(Number(maxAmount), Number(ethTransferData.amount));
 
       if (amount <= 0) {
@@ -157,8 +167,8 @@ export default class MoonpayBridgeInitMixin extends Mixins(BridgeHistoryMixin, W
       return {
         type: Operation.EthBridgeIncoming,
         amount: String(amount),
-        symbol: asset.symbol,
-        assetAddress: asset.address,
+        symbol: accountAsset.symbol,
+        assetAddress: accountAsset.address,
         soraNetworkFee: this.networkFees[Operation.EthBridgeIncoming],
         externalNetworkFee: evmNetworkFee,
         externalNetwork: this.ethBridgeEvmNetwork,

src/consts/sub.ts

@@ -39,8 +39,8 @@ export const SUB_NETWORKS: Partial<Record<SubNetwork, NetworkData>> = {
     blockExplorerUrls: [],
     shortName: 'Rococo',
   },
-  [SubNetwork.RococoKarura]: {
-    id: SubNetwork.RococoKarura,
+  [SubNetwork.KusamaKarura]: {
+    id: SubNetwork.KusamaKarura,
     name: 'Karura',
     nativeCurrency: {
       name: 'KAR',

src/store/addLiquidity/getters.ts

@@ -6,7 +6,7 @@ import { ZeroStringValue } from '@/consts';
 import { addLiquidityGetterContext } from '@/store/addLiquidity';
 
 import type { AddLiquidityState } from './types';
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
+import type { RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 import type { AccountLiquidity } from '@sora-substrate/util/build/poolXyk/types';
 
 const getters = defineGetters<AddLiquidityState>()({

src/store/assets/actions.ts

@@ -1,86 +1,82 @@
 import { BridgeNetworkType } from '@sora-substrate/util/build/bridgeProxy/consts';
-import { SubNetwork } from '@sora-substrate/util/build/bridgeProxy/sub/consts';
 import { defineActions } from 'direct-vuex';
 
-import { ZeroStringValue } from '@/consts';
 import { assetsActionContext } from '@/store/assets';
-import type { BridgeAccountAsset } from '@/store/assets/types';
+import type { BridgeRegisteredAsset } from '@/store/assets/types';
 import { ethBridgeApi } from '@/utils/bridge/eth/api';
 import { evmBridgeApi } from '@/utils/bridge/evm/api';
 import { subBridgeApi } from '@/utils/bridge/sub/api';
 import ethersUtil from '@/utils/ethers-util';
 
+import type { EvmNetwork } from '@sora-substrate/util/build/bridgeProxy/evm/types';
+import type { SubNetwork } from '@sora-substrate/util/build/bridgeProxy/sub/consts';
 import type { ActionContext } from 'vuex';
 
-async function getEthRegisteredAssets(context: ActionContext<any, any>): Promise<Record<string, BridgeAccountAsset>[]> {
+async function getEthRegisteredAssets(
+  context: ActionContext<any, any>
+): Promise<Record<string, BridgeRegisteredAsset>[]> {
   const { rootDispatch } = assetsActionContext(context);
 
   const networkAssets = await ethBridgeApi.getRegisteredAssets();
-  const registeredAssets: Record<string, BridgeAccountAsset>[] = [];
-
-  for (const asset of networkAssets) {
-    const soraAddress = asset.address;
-    const address = asset.externalAddress || (await rootDispatch.web3.getEvmTokenAddressByAssetId(soraAddress));
-    // [TODO] fix js-lib: externalDecimals = 0 by default, what could be with nft
-    const decimals = +asset.externalDecimals || (await ethersUtil.getAssetDecimals(address));
-
-    registeredAssets.push({
-      [soraAddress]: {
-        address,
-        balance: ZeroStringValue,
-        decimals,
-      },
-    });
-  }
+  const registeredAssets = await Promise.all(
+    Object.entries(networkAssets).map(async ([soraAddress, assetData]) => {
+      const address = assetData.address || (await rootDispatch.web3.getEvmTokenAddressByAssetId(soraAddress));
+      const decimals = assetData.decimals ?? (await ethersUtil.getAssetDecimals(address));
+
+      return {
+        [soraAddress]: {
+          address,
+          decimals,
+          kind: assetData.assetKind,
+        },
+      };
+    })
+  );
 
   return registeredAssets;
 }
 
-async function getEvmRegisteredAssets(context: ActionContext<any, any>): Promise<Record<string, BridgeAccountAsset>[]> {
+async function getEvmRegisteredAssets(
+  context: ActionContext<any, any>
+): Promise<Record<string, BridgeRegisteredAsset>[]> {
   const { rootState } = assetsActionContext(context);
 
-  const evmNetworkId = rootState.web3.networkSelected;
-  const networkAssets = await evmBridgeApi.getRegisteredAssets(evmNetworkId as number);
-
+  const evmNetwork = rootState.web3.networkSelected;
+  const networkAssets = await evmBridgeApi.getRegisteredAssets(evmNetwork as EvmNetwork);
   const registeredAssets = Object.entries(networkAssets).map(([soraAddress, assetData]) => {
-    const accountAsset = {
-      address: assetData.address as string,
-      balance: ZeroStringValue,
-      contract: '', // map with appKinds
-      decimals: assetData.decimals,
-    };
-
     return {
-      [soraAddress]: accountAsset,
+      [soraAddress]: {
+        address: assetData.address,
+        decimals: assetData.decimals,
+        kind: assetData.appKind,
+      },
     };
   });
 
   return registeredAssets;
 }
 
-async function getSubRegisteredAssets(context: ActionContext<any, any>): Promise<Record<string, BridgeAccountAsset>[]> {
+async function getSubRegisteredAssets(
+  context: ActionContext<any, any>
+): Promise<Record<string, BridgeRegisteredAsset>[]> {
   const { rootState } = assetsActionContext(context);
 
   const subNetwork = rootState.web3.networkSelected;
-
   const networkAssets = await subBridgeApi.getRegisteredAssets(subNetwork as SubNetwork);
-
   const registeredAssets = Object.entries(networkAssets).map(([soraAddress, assetData]) => {
-    const accountAsset = {
-      address: '',
-      balance: ZeroStringValue,
-      decimals: assetData.decimals,
-    };
-
     return {
-      [soraAddress]: accountAsset,
+      [soraAddress]: {
+        address: '',
+        decimals: assetData.decimals,
+        kind: assetData.assetKind,
+      },
     };
   });
 
   return registeredAssets;
 }
 
-async function getRegisteredAssets(context: ActionContext<any, any>): Promise<Record<string, BridgeAccountAsset>[]> {
+async function getRegisteredAssets(context: ActionContext<any, any>): Promise<Record<string, BridgeRegisteredAsset>[]> {
   const { rootState } = assetsActionContext(context);
 
   switch (rootState.web3.networkType) {
@@ -93,6 +89,8 @@ async function getRegisteredAssets(context: ActionContext<any, any>): Promise<Re
     case BridgeNetworkType.Sub: {
       return await getSubRegisteredAssets(context);
     }
+    default:
+      return [];
   }
 }
 

src/store/assets/getters.ts

@@ -2,11 +2,11 @@ import { XOR } from '@sora-substrate/util/build/assets/consts';
 import { api } from '@soramitsu/soraneo-wallet-web';
 import { defineGetters } from 'direct-vuex';
 
+import { ZeroStringValue } from '@/consts';
 import { assetsGetterContext } from '@/store/assets';
 
 import type { AssetsState } from './types';
-import type { RegisteredAccountAsset } from '@sora-substrate/util';
-import type { Asset } from '@sora-substrate/util/build/assets/types';
+import type { Asset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
 
 const getters = defineGetters<AssetsState>()({
   whitelistAssets(...args): Array<Asset> {
@@ -35,19 +35,15 @@ const getters = defineGetters<AssetsState>()({
 
       if (!asset) return null;
 
-      const {
-        address: externalAddress,
-        balance: externalBalance,
-        decimals: externalDecimals,
-      } = state.registeredAssets[asset.address] || {};
+      const { address: externalAddress, decimals: externalDecimals } = state.registeredAssets[asset.address] || {};
 
       const { balance } = rootGetters.wallet.account.accountAssetsAddressTable[asset.address] || {};
 
       return {
         ...asset,
         balance,
         externalAddress,
-        externalBalance,
+        externalBalance: ZeroStringValue, // remove externalBalance
         externalDecimals,
       };
     };