Polkaswap update cherry (#438)

* hide ceres switcher * Merge pull request sora-xor#1606 from sora-xor/release/1.41.1 Update wallet * Bump version (sora-xor#1607) (sora-xor#1608) * Bump version * Update lp fee * Merged hiding ceres switcher Signed-off-by: Timofey Trepalin <[email protected]> --------- Signed-off-by: Timofey Trepalin <[email protected]> Co-authored-by: Nikita-Polyakov <[email protected]> Co-authored-by: Stefan Popov <[email protected]>
soramitsu · Dec 18, 2024 · 245efd2 · 245efd2
1 parent 7cbfc83
commit 245efd2
Show file tree

Hide file tree

Showing 251 changed files with 688 additions and 691 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adar",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "repository": {
     "type": "git",
     "url": "https://github.com/soramitsu/adar.git"
@@ -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.44.5",
     "@walletconnect/ethereum-provider": "^2.13.3",
     "@walletconnect/modal": "^2.6.2",
     "core-js": "^3.37.1",

diff --git a/src/App.vue b/src/App.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { Operation, TransactionStatus } from '@sora-substrate/util';
+import { Operation, TransactionStatus } from '@sora-substrate/sdk';
 import {
   api,
   connection,
@@ -83,9 +83,9 @@ import { RecipientStatus, SwapTransferBatchStatus, TransactionInfo } from './sto
 
 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';
 

diff --git a/src/api/index.ts b/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';
 

diff --git a/src/components/App/Alerts/AlertList.vue b/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({

diff --git a/src/components/App/Alerts/Alerts.vue b/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,

diff --git a/src/components/App/Alerts/CreateAlert.vue b/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({

diff --git a/src/components/App/Footer/AppFooter.vue b/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';

diff --git a/src/components/App/Footer/Indexer/SelectIndexer.vue b/src/components/App/Footer/Indexer/SelectIndexer.vue
@@ -24,15 +24,17 @@
             </div>
           </s-radio>
         </s-radio-group>
-        <s-divider />
-        <div class="statistics-dialog__group">
-          <div class="statistics-dialog__item">
-            <div class="switcher">
-              <s-switch v-model="useCeres" />
-              <span>{{ t('footer.statistics.dialog.useCeres') }}</span>
+        <template v-if="showCeresSwitcher">
+          <s-divider />
+          <div class="statistics-dialog__group">
+            <div class="statistics-dialog__item">
+              <div class="switcher">
+                <s-switch v-model="useCeres" />
+                <span>{{ t('footer.statistics.dialog.useCeres') }}</span>
+              </div>
             </div>
           </div>
-        </div>
+        </template>
       </div>
     </s-scrollbar>
   </div>
@@ -51,6 +53,9 @@ export default class SelectIndexer extends Mixins(TranslationMixin) {
 
   @ModelSync('indexer', 'update:indexer', { type: String }) readonly indexerType!: IndexerType;
   @ModelSync('ceres', 'update:ceres', { type: Boolean }) readonly useCeres!: boolean;
+
+  // [CERES] do not show switcher by default
+  public readonly showCeresSwitcher = false;
 }
 </script>
 

diff --git a/src/components/App/Header/AppHeader.vue b/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';
 

diff --git a/src/components/App/Settings/Node/SelectNodeDialog.vue b/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';

diff --git a/src/components/ConfirmSend.vue b/src/components/ConfirmSend.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script lang="ts">
-import { CodecString, Operation, NetworkFeesObject } from '@sora-substrate/util';
-import { KnownSymbols } from '@sora-substrate/util/build/assets/consts';
+import { CodecString, Operation, NetworkFeesObject } from '@sora-substrate/sdk';
+import { KnownSymbols } from '@sora-substrate/sdk/build/assets/consts';
 import { api, mixins, components } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 
@@ -41,7 +41,7 @@ import { Components } from '@/consts';
 import { lazyComponent } from '@/router';
 import { state, getter } from '@/store/decorators';
 
-import type { AccountAsset, Asset } from '@sora-substrate/util/build/assets/types';
+import type { AccountAsset, Asset } from '@sora-substrate/sdk/build/assets/types';
 
 @Component({
   components: {

diff --git a/src/components/SoraCard/SoraCardIntroPage.vue b/src/components/SoraCard/SoraCardIntroPage.vue
@@ -56,7 +56,7 @@
 
 <script lang="ts">
 import { FPNumber } from '@sora-substrate/math';
-import { XOR } from '@sora-substrate/util/build/assets/consts';
+import { XOR } from '@sora-substrate/sdk/build/assets/consts';
 import { mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins } from 'vue-property-decorator';
 

diff --git a/src/components/mixins/AssetsSearchMixin.ts b/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) {

diff --git a/src/components/mixins/BaseTokenPairMixin.ts b/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) {

diff --git a/src/components/mixins/BridgeHistoryMixin.ts b/src/components/mixins/BridgeHistoryMixin.ts
@@ -1,4 +1,4 @@
-import { Operation, NetworkFeesObject } from '@sora-substrate/util';
+import { Operation, 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) {

diff --git a/src/components/mixins/BridgeMixin.ts b/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) {

diff --git a/src/components/mixins/BridgeTransactionMixin.ts b/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) {

diff --git a/src/components/mixins/ExplorePageMixin.ts b/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) {

diff --git a/src/components/mixins/NetworkFormatterMixin.ts b/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;
 

diff --git a/src/components/mixins/SelectAssetMixin.ts b/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;
 

diff --git a/src/components/mixins/SelectedTokensRouteMixin.ts b/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;

diff --git a/src/components/mixins/WalletConnectMixin.ts b/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) {

diff --git a/src/components/pages/AddLiquidity/Confirm.vue b/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';
 

diff --git a/src/components/pages/AddLiquidity/TransactionDetails.vue b/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: {

diff --git a/src/components/pages/Bridge/SelectAsset.vue b/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: {

diff --git a/src/components/pages/Bridge/SelectNetwork.vue b/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;

diff --git a/src/components/pages/Bridge/TransactionDetails.vue b/src/components/pages/Bridge/TransactionDetails.vue
@@ -38,16 +38,16 @@
 </template>
 
 <script lang="ts">
-import { XOR } from '@sora-substrate/util/build/assets/consts';
+import { XOR } from '@sora-substrate/sdk/build/assets/consts';
 import { components, mixins } from '@soramitsu/soraneo-wallet-web';
 import { Component, Mixins, Prop } from 'vue-property-decorator';
 
 import TranslationMixin from '@/components/mixins/TranslationMixin';
 import { Components, ZeroStringValue } from '@/consts';
 import { lazyComponent } from '@/router';
 
-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({
   components: {