Merge pull request #1525 from sora-xor/release/1.40.0

Release 1.40.0

env.json

@@ -10,11 +10,12 @@
   },
   "FEATURE_FLAGS": {
     "moonpay": true,
-    "charts": true,
     "soraCard": false,
     "orderBook": true,
     "kensetsu": true,
-    "assetOwner": false
+    "assetOwner": false,
+    "alt": false,
+    "debug": false
   },
   "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-prod",
   "SUBSQUID_ENDPOINT": "",
@@ -49,6 +50,7 @@
   "CHAIN_GENESIS_HASH": "0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5",
   "SUB_NETWORKS": {
     "Kusama": true,
+    "KusamaCurio": true,
     "KusamaSora": true,
     "Polkadot": true,
     "PolkadotSora": true,

package.json

@@ -28,7 +28,7 @@
   "dependencies": {
     "@cedelabs/widgets-universal": "^1.3.1",
     "@metamask/detect-provider": "^2.0.0",
-    "@soramitsu/soraneo-wallet-web": "1.39.12",
+    "@soramitsu/soraneo-wallet-web": "1.40.0",
     "@walletconnect/ethereum-provider": "^2.13.3",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.37.1",

public/env.json

@@ -10,11 +10,12 @@
   },
   "FEATURE_FLAGS": {
     "moonpay": true,
-    "charts": true,
     "soraCard": false,
     "orderBook": true,
     "kensetsu": true,
-    "assetOwner": false
+    "assetOwner": false,
+    "alt": true,
+    "debug": true
   },
   "FAUCET_URL": "https://faucet.dev.sora2.tachi.soramitsu.co.jp/",
   "TG_BOT_URL": "https://t.me/PolkaswapDevBot",
@@ -37,9 +38,9 @@
       "address": "wss://ws.framenode-3.r0.dev.sora2.soramitsu.co.jp"
     },
     {
-      "chain": "SORA-dev Liberland",
+      "chain": "SORA-predev",
       "name": "SORA",
-      "address": "wss://ws.framenode-1.lib1.dev.sora2.soramitsu.co.jp"
+      "address": "wss://ws.framenode-1.v1.predev.sora2.soramitsu.co.jp"
     }
   ],
   "SUBQUERY_ENDPOINT": "https://api.subquery.network/sq/sora-xor/sora-dev",

src/App.vue

@@ -78,9 +78,9 @@ import { tmaSdkService } from '@/utils/telegram';
 
 import type { FeatureFlags } from './store/settings/types';
 import type { EthBridgeSettings, SubNetworkApps } from './store/web3/types';
-import type { History, HistoryItem } from '@sora-substrate/util';
-import type { WhitelistArrayItem } from '@sora-substrate/util/build/assets/types';
-import type { EvmNetwork } from '@sora-substrate/util/build/bridgeProxy/evm/types';
+import type { History, HistoryItem } from '@sora-substrate/sdk';
+import type { WhitelistArrayItem } from '@sora-substrate/sdk/build/assets/types';
+import type { EvmNetwork } from '@sora-substrate/sdk/build/bridgeProxy/evm/types';
 import type DesignSystem from '@soramitsu-ui/ui-vue2/lib/types/DesignSystem';
 import type Theme from '@soramitsu-ui/ui-vue2/lib/types/Theme';
 
@@ -441,21 +441,6 @@ ul ul {
 }
 
 .app {
-  .el-loading-mask {
-    background-color: var(--s-color-utility-body);
-    z-index: $app-loader-layer;
-
-    .el-loading-spinner {
-      background-image: url('~@/assets/img/pswap-loader.svg');
-      height: var(--s-size-medium);
-      width: var(--s-size-medium);
-      margin-left: calc(50% - (var(--s-size-medium) / 2));
-      > svg {
-        display: none;
-      }
-    }
-  }
-
   &-main.app-main {
     &--rewards,
     &--referral {

src/api/index.ts

@@ -1,4 +1,4 @@
-import { axiosInstance } from '@sora-substrate/util';
+import { axiosInstance } from '@sora-substrate/sdk';
 
 import type VueRouter from 'vue-router';
 

src/components/App/Alerts/AlertList.vue

@@ -55,7 +55,7 @@ import { ZeroStringValue } from '@/consts';
 import { getter, mutation, state } from '@/store/decorators';
 import { calcPriceChange, showMostFittingValue, toPrecision } from '@/utils';
 
-import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset } from '@sora-substrate/sdk/build/assets/types';
 import type { Alert, WhitelistIdsBySymbol } from '@soramitsu/soraneo-wallet-web/lib/types/common';
 
 @Component({

src/components/App/Alerts/Alerts.vue

@@ -27,7 +27,7 @@ import { Components, NumberedAlert } from '@/consts';
 import { lazyComponent } from '@/router';
 import { mutation, state } from '@/store/decorators';
 
-import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 enum AlertPages {
   AlertList,

src/components/App/Alerts/CreateAlert.vue

@@ -78,7 +78,7 @@ import { getter, mutation, state } from '@/store/decorators';
 import { AlertFrequencyTabs, AlertTypeTabs } from '@/types/tabs';
 import { calcPriceChange, showMostFittingValue } from '@/utils';
 
-import type { AccountAsset, WhitelistIdsBySymbol } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset, WhitelistIdsBySymbol } from '@sora-substrate/sdk/build/assets/types';
 import type { Alert } from '@soramitsu/soraneo-wallet-web/lib/types/common';
 
 @Component({

src/components/App/Footer/AppFooter.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script lang="ts">
-import { FPNumber } from '@sora-substrate/util';
+import { FPNumber } from '@sora-substrate/sdk';
 import { getExplorerLinks, WALLET_CONSTS, WALLET_TYPES } from '@soramitsu/soraneo-wallet-web';
 import { Status } from '@soramitsu-ui/ui-vue2/lib/types';
 import { Component, Mixins } from 'vue-property-decorator';

src/components/App/Header/AppHeader.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script lang="ts">
-import { XOR, ETH } from '@sora-substrate/util/build/assets/consts';
+import { XOR, ETH } from '@sora-substrate/sdk/build/assets/consts';
 import { components, WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 

src/components/App/Settings/Node/SelectNodeDialog.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script lang="ts">
-import { SubNetworkId } from '@sora-substrate/util/build/bridgeProxy/sub/consts';
+import { SubNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/sub/consts';
 import { components, mixins } from '@soramitsu/soraneo-wallet-web';
 import pick from 'lodash/fp/pick';
 import { Component, Mixins, Prop } from 'vue-property-decorator';

src/components/mixins/AssetsSearchMixin.ts

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

src/components/mixins/BaseTokenPairMixin.ts

@@ -1,12 +1,12 @@
-import { FPNumber, CodecString, Operation, NetworkFeesObject } from '@sora-substrate/util';
-import { XOR } from '@sora-substrate/util/build/assets/consts';
+import { FPNumber, CodecString, Operation, NetworkFeesObject } from '@sora-substrate/sdk';
+import { XOR } from '@sora-substrate/sdk/build/assets/consts';
 import { mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
 import TranslationMixin from '@/components/mixins/TranslationMixin';
 import { state, getter } from '@/store/decorators';
 
-import type { AccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 @Component
 export default class BaseTokenPairMixin extends Mixins(TranslationMixin, mixins.FormattedAmountMixin) {

src/components/mixins/BridgeHistoryMixin.ts

@@ -1,4 +1,4 @@
-import { Operation, NetworkFeesObject } from '@sora-substrate/util';
+import { NetworkFeesObject } from '@sora-substrate/sdk';
 import { mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
@@ -7,7 +7,7 @@ import router from '@/router';
 import { state, mutation, action, getter } from '@/store/decorators';
 import { isOutgoingTransaction } from '@/utils/bridge/common/utils';
 
-import type { IBridgeTransaction } from '@sora-substrate/util';
+import type { IBridgeTransaction } from '@sora-substrate/sdk';
 
 @Component
 export default class BridgeHistoryMixin<T extends IBridgeTransaction> extends Mixins(mixins.LoadingMixin) {

src/components/mixins/BridgeMixin.ts

@@ -1,4 +1,4 @@
-import { FPNumber } from '@sora-substrate/util';
+import { FPNumber } from '@sora-substrate/sdk';
 import { mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
@@ -7,8 +7,8 @@ import { PageNames } from '@/consts';
 import router from '@/router';
 import { getter, state } from '@/store/decorators';
 
-import type { CodecString } from '@sora-substrate/util';
-import type { RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { CodecString } from '@sora-substrate/sdk';
+import type { RegisteredAccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 @Component
 export default class BridgeMixin extends Mixins(mixins.LoadingMixin, WalletConnectMixin) {
@@ -58,11 +58,10 @@ export default class BridgeMixin extends Mixins(mixins.LoadingMixin, WalletConne
 
   get outgoingMinAmount(): FPNumber | null {
     if (!this.outgoingMinLimit) return null;
-    // this fee is spend from transfer amount, so we add it to outgoing min limit
     // [TODO: Bridge] remove when limit will be defined on backend
-    const transferFee = this.isNativeTokenSelected ? this.externalTransferFeeFP : FPNumber.ZERO;
+    // this fee is spend from transfer amount, so we add it to outgoing min limit
     // minimum amount = existential deposit + xcm fee
-    return this.outgoingMinLimit.add(transferFee);
+    return this.outgoingMinLimit.add(this.externalTransferFeeFP);
   }
 
   get incomingMaxAmount(): FPNumber | null {

src/components/mixins/BridgeTransactionMixin.ts

@@ -1,12 +1,12 @@
-import { BridgeNetworkType } from '@sora-substrate/util/build/bridgeProxy/consts';
+import { BridgeNetworkType } from '@sora-substrate/sdk/build/bridgeProxy/consts';
 import { WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
 import NetworkFormatterMixin from '@/components/mixins/NetworkFormatterMixin';
 import { soraExplorerLinks } from '@/utils';
 
-import type { IBridgeTransaction } from '@sora-substrate/util';
-import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/types';
+import type { IBridgeTransaction } from '@sora-substrate/sdk';
+import type { BridgeNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/types';
 
 @Component
 export default class BridgeTransactionMixin extends Mixins(NetworkFormatterMixin) {

src/components/mixins/ExplorePageMixin.ts

@@ -1,4 +1,4 @@
-import { KnownAssets } from '@sora-substrate/util/build/assets/consts';
+import { KnownAssets } from '@sora-substrate/sdk/build/assets/consts';
 import { SortDirection } from '@soramitsu-ui/ui-vue2/lib/components/Table/consts';
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator';
 
@@ -7,7 +7,7 @@ import { getter } from '@/store/decorators';
 import ScrollableTableMixin from './ScrollableTableMixin';
 import TranslationMixin from './TranslationMixin';
 
-import type { Asset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { Asset, RegisteredAccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 @Component
 export default class ExplorePageMixin extends Mixins(ScrollableTableMixin, TranslationMixin) {

src/components/mixins/NetworkFormatterMixin.ts

@@ -1,6 +1,6 @@
-import { BridgeNetworkType, BridgeTxStatus } from '@sora-substrate/util/build/bridgeProxy/consts';
-import { EvmNetworkId } from '@sora-substrate/util/build/bridgeProxy/evm/consts';
-import { SubNetworkId } from '@sora-substrate/util/build/bridgeProxy/sub/consts';
+import { BridgeNetworkType, BridgeTxStatus } from '@sora-substrate/sdk/build/bridgeProxy/consts';
+import { EvmNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/evm/consts';
+import { SubNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/sub/consts';
 import { WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
@@ -15,8 +15,8 @@ import { isUnsignedToPart } from '@/utils/bridge/eth/utils';
 
 import TranslationMixin from './TranslationMixin';
 
-import type { IBridgeTransaction } from '@sora-substrate/util';
-import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/types';
+import type { IBridgeTransaction } from '@sora-substrate/sdk';
+import type { BridgeNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/types';
 
 const { ETH_BRIDGE_STATES } = WALLET_CONSTS;
 
@@ -149,6 +149,8 @@ export default class NetworkFormatterMixin extends Mixins(TranslationMixin) {
         return 'moonbeam';
       case SubNetworkId.Kusama:
         return 'kusama';
+      case SubNetworkId.KusamaCurio:
+        return 'curio';
       case SubNetworkId.KusamaShiden:
         return 'shiden';
       case SubNetworkId.Rococo:

src/components/mixins/SelectAssetMixin.ts

@@ -6,7 +6,7 @@ import AssetsSearchMixin from '@/components/mixins/AssetsSearchMixin';
 import { getter } from '@/store/decorators';
 import { sortAssets } from '@/utils';
 
-import type { Asset, AccountAsset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { Asset, AccountAsset, RegisteredAccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 const isEmpty = (a): boolean => isNil(a.balance) || !+a.balance.transferable;
 

src/components/mixins/SelectedTokensRouteMixin.ts

@@ -1,11 +1,11 @@
-import { XSTUSD, XOR } from '@sora-substrate/util/build/assets/consts';
+import { XSTUSD, XOR } from '@sora-substrate/sdk/build/assets/consts';
 import { WALLET_TYPES, api } from '@soramitsu/soraneo-wallet-web';
 import { Component, Vue } from 'vue-property-decorator';
 
 import { PageNames } from '@/consts';
 import { getter } from '@/store/decorators';
 
-import type { AccountAsset, Asset, Whitelist } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset, Asset, Whitelist } from '@sora-substrate/sdk/build/assets/types';
 import type { NavigationGuardNext, Route } from 'vue-router';
 
 const MAX_SYMBOL_LENGTH = 7;

src/components/mixins/WalletConnectMixin.ts

@@ -5,8 +5,8 @@ import router from '@/router';
 import { action, getter, mutation, state } from '@/store/decorators';
 import { Provider, installExtensionKey, handleRpcProviderError } from '@/utils/ethers-util';
 
-import type { BridgeNetworkType } from '@sora-substrate/util/build/bridgeProxy/consts';
-import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/types';
+import type { BridgeNetworkType } from '@sora-substrate/sdk/build/bridgeProxy/consts';
+import type { BridgeNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/types';
 
 @Component
 export default class WalletConnectMixin extends Mixins(InternalConnectMixin) {

src/components/pages/AddLiquidity/Confirm.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script lang="ts">
-import { AccountAsset } from '@sora-substrate/util/build/assets/types';
+import { AccountAsset } from '@sora-substrate/sdk/build/assets/types';
 import { components, mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 

src/components/pages/AddLiquidity/TransactionDetails.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script lang="ts">
-import { FPNumber, CodecString } from '@sora-substrate/util';
+import { FPNumber, CodecString } from '@sora-substrate/sdk';
 import { components } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 
@@ -54,7 +54,7 @@ import { Components } from '@/consts';
 import { lazyComponent } from '@/router';
 import { getter } from '@/store/decorators';
 
-import type { AccountLiquidity } from '@sora-substrate/util/build/poolXyk/types';
+import type { AccountLiquidity } from '@sora-substrate/sdk/build/poolXyk/types';
 
 @Component({
   components: {

src/components/pages/Bridge/SelectAsset.vue

@@ -37,7 +37,7 @@ import type { BridgeRegisteredAsset } from '@/store/assets/types';
 import { state, getter } from '@/store/decorators';
 import type { NetworkData } from '@/types/bridge';
 
-import type { AccountAsset, RegisteredAccountAsset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset, RegisteredAccountAsset } from '@sora-substrate/sdk/build/assets/types';
 
 @Component({
   components: {

src/components/pages/Bridge/SelectNetwork.vue

@@ -25,16 +25,16 @@
 </template>
 
 <script lang="ts">
-import { BridgeNetworkType } from '@sora-substrate/util/build/bridgeProxy/consts';
+import { BridgeNetworkType } from '@sora-substrate/sdk/build/bridgeProxy/consts';
 import { components } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 
 import NetworkFormatterMixin from '@/components/mixins/NetworkFormatterMixin';
 import { action, mutation, state } from '@/store/decorators';
 import type { AvailableNetwork } from '@/store/web3/types';
 
-import type { SubNetwork } from '@sora-substrate/util/build/bridgeProxy/sub/types';
-import type { BridgeNetworkId } from '@sora-substrate/util/build/bridgeProxy/types';
+import type { SubNetwork } from '@sora-substrate/sdk/build/bridgeProxy/sub/types';
+import type { BridgeNetworkId } from '@sora-substrate/sdk/build/bridgeProxy/types';
 
 type NetworkItem = {
   id: BridgeNetworkId;