@subwallet/extension-base 1.1.18-1 → 1.1.19-0

package/cjs/koni/api/dotsama/transfer.js

@@ -190,7 +190,7 @@ const createTransferExtrinsic = async _ref => {
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {
-      transfer = api.tx.balances.transfer(to, new _util.BN(value));
+      transfer = api.tx.balances.transferKeepAlive(to, new _util.BN(value));
     }
   }
   return [transfer, transferAmount || value];

package/cjs/koni/background/handlers/Extension.js

@@ -1625,7 +1625,7 @@ class KoniExtension {
       if (new _bignumber.default(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
         const atLeast = new _bignumber.default(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
         const atLeastStr = (0, _number.formatNumber)(atLeast, tokenInfo.decimals || 0, _number.balanceFormatter);
-        inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+        inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
           replace: {
             amount: atLeastStr,
             symbol: tokenInfo.symbol
@@ -1694,7 +1694,7 @@ class KoniExtension {
         // Check ed for receiver
         if (new _bignumber.default(value).lt(atLeast)) {
           const atLeastStr = (0, _number.formatNumber)(atLeast, destinationTokenInfo.decimals || 0, _number.balanceFormatter);
-          inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+          inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
             replace: {
               amount: atLeastStr,
               symbol: originTokenInfo.symbol
@@ -1884,7 +1884,6 @@ class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            var _paymentInfo$partialF;
             maxTransferable = maxTransferable.sub(new _util.BN(tokenInfo.minAmount || '0'));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
@@ -1894,11 +1893,16 @@ class KoniExtension {
               destinationTokenInfo,
               originTokenInfo: tokenInfo,
               recipient: recipient,
-              sendingValue: '0',
+              sendingValue: '1000000000000000000',
               substrateApi
             });
-            const paymentInfo = await mockTx.paymentInfo(address);
-            estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
+            try {
+              var _paymentInfo$partialF;
+              const paymentInfo = await mockTx.paymentInfo(address);
+              estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
+            } catch (e) {
+              estimatedFee = tokenInfo.minAmount || '0';
+            }
           }
         } else {
           const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
@@ -1922,7 +1926,7 @@ class KoniExtension {
               to: address,
               tokenInfo,
               transferAll: true,
-              value: '0'
+              value: '1000000000000000000'
             });
             const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';

package/cjs/koni/background/handlers/State.js

@@ -212,6 +212,9 @@ class KoniState {
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
+
+    // TODO: consider moving this to a separate service
+    await this.dbService.stores.crowdloan.removeEndedCrowdloans();
     await this.startSubscription();
   }
   async initMantaPay(password) {

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.18-1'
+  version: '1.1.19-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/chain-service/index.js

@@ -647,12 +647,34 @@ class ChainService {
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         if (storedSlug in latestChainInfoMap) {
           // check predefined chains first, keep setting for providers and currentProvider
-          mergedChainInfoMap[storedSlug].providers = {
-            ...storedChainInfo.providers,
+          // TODO: review merging providers
+          // Keep customer provider only
+          const providers = {
             ...mergedChainInfoMap[storedSlug].providers
-          }; // TODO: review merging providers
+          };
+          for (const [key, value] of Object.entries(storedChainInfo.providers)) {
+            if ((0, _utils._isCustomProvider)(key)) {
+              if (!Object.values(providers).includes(value)) {
+                providers[key] = value;
+              }
+            }
+          }
+          mergedChainInfoMap[storedSlug].providers = providers;
+
+          // Merge current provider
+          let currentProvider = storedChainInfo.currentProvider;
+          const providerValue = storedChainInfo.providers[currentProvider] || '';
+          if (!providers[currentProvider]) {
+            currentProvider = Object.keys(providers)[0];
+            for (const [key, value] of Object.entries(providers)) {
+              if (providerValue === value) {
+                currentProvider = key;
+                break;
+              }
+            }
+          }
           this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: storedChainInfo.currentProvider,
+            currentProvider: currentProvider,
             slug: storedSlug,
             connectionStatus: _types3._ChainConnectionStatus.DISCONNECTED,
             active: storedChainInfo.active
@@ -660,7 +682,7 @@ class ChainService {
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: storedChainInfo.active,
-            currentProvider: storedChainInfo.currentProvider
+            currentProvider: currentProvider
           });
         } else {
           var _storedChainInfo$subs, _storedChainInfo$evmI;

package/cjs/services/storage-service/db-stores/Crowdloan.js

@@ -10,6 +10,20 @@ var _BaseStoreWithAddressAndChain = _interopRequireDefault(require("@subwallet/e
 // SPDX-License-Identifier: Apache-2.0
 
 class CrowdloanStore extends _BaseStoreWithAddressAndChain.default {
+  async removeEndedCrowdloans() {
+    const now = new Date();
+    const removeList = [];
+    await this.table.each((obj, cursor) => {
+      try {
+        if (!obj.endTime || new Date(obj.endTime) < now) {
+          removeList.push(cursor.primaryKey);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    });
+    await this.table.bulkDelete(removeList);
+  }
   getCrowdloan(address) {
     return this.table.where('address').equals(address).toArray();
   }

package/koni/api/dotsama/transfer.js

@@ -181,7 +181,7 @@ export const createTransferExtrinsic = async ({
     if (transferAll) {
       transfer = api.tx.balances.transferAll(to, false);
     } else if (value) {
-      transfer = api.tx.balances.transfer(to, new BN(value));
+      transfer = api.tx.balances.transferKeepAlive(to, new BN(value));
     }
   }
   return [transfer, transferAmount || value];

package/koni/background/handlers/Extension.js

@@ -1572,7 +1572,7 @@ export default class KoniExtension {
       if (new BigN(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
         const atLeast = new BigN(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
         const atLeastStr = formatNumber(atLeast, tokenInfo.decimals || 0, balanceFormatter);
-        inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+        inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
           replace: {
             amount: atLeastStr,
             symbol: tokenInfo.symbol
@@ -1641,7 +1641,7 @@ export default class KoniExtension {
         // Check ed for receiver
         if (new BigN(value).lt(atLeast)) {
           const atLeastStr = formatNumber(atLeast, destinationTokenInfo.decimals || 0, balanceFormatter);
-          inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+          inputTransaction.errors.push(new TransactionError(TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, t('You must transfer at least {{amount}} {{symbol}} to keep the destination account alive', {
             replace: {
               amount: atLeastStr,
               symbol: originTokenInfo.symbol
@@ -1827,7 +1827,6 @@ export default class KoniExtension {
           if (!destinationTokenInfo) {
             estimatedFee = '0';
           } else {
-            var _paymentInfo$partialF;
             maxTransferable = maxTransferable.sub(new BN(tokenInfo.minAmount || '0'));
             const desChainInfo = chainInfoMap[destChain];
             const orgChainInfo = chainInfoMap[networkKey];
@@ -1837,11 +1836,16 @@ export default class KoniExtension {
               destinationTokenInfo,
               originTokenInfo: tokenInfo,
               recipient: recipient,
-              sendingValue: '0',
+              sendingValue: '1000000000000000000',
               substrateApi
             });
-            const paymentInfo = await mockTx.paymentInfo(address);
-            estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
+            try {
+              var _paymentInfo$partialF;
+              const paymentInfo = await mockTx.paymentInfo(address);
+              estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF = paymentInfo.partialFee) === null || _paymentInfo$partialF === void 0 ? void 0 : _paymentInfo$partialF.toString()) || '0';
+            } catch (e) {
+              estimatedFee = tokenInfo.minAmount || '0';
+            }
           }
         } else {
           const chainInfo = this.#koniState.chainService.getChainInfoByKey(networkKey);
@@ -1865,7 +1869,7 @@ export default class KoniExtension {
               to: address,
               tokenInfo,
               transferAll: true,
-              value: '0'
+              value: '1000000000000000000'
             });
             const paymentInfo = await (mockTx === null || mockTx === void 0 ? void 0 : mockTx.paymentInfo(address));
             estimatedFee = (paymentInfo === null || paymentInfo === void 0 ? void 0 : (_paymentInfo$partialF2 = paymentInfo.partialFee) === null || _paymentInfo$partialF2 === void 0 ? void 0 : _paymentInfo$partialF2.toString()) || '0';

package/koni/background/handlers/State.js

@@ -204,6 +204,9 @@ export default class KoniState {
     this.onReady();
     this.onAccountAdd();
     this.onAccountRemove();
+
+    // TODO: consider moving this to a separate service
+    await this.dbService.stores.crowdloan.removeEndedCrowdloans();
     await this.startSubscription();
   }
   async initMantaPay(password) {

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.18-1",
+  "version": "1.1.19-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1277,11 +1277,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.18-beta.2",
-    "@subwallet/extension-base": "^1.1.18-1",
-    "@subwallet/extension-chains": "^1.1.18-1",
-    "@subwallet/extension-dapp": "^1.1.18-1",
-    "@subwallet/extension-inject": "^1.1.18-1",
+    "@subwallet/chain-list": "0.2.18-beta.3",
+    "@subwallet/extension-base": "^1.1.19-0",
+    "@subwallet/extension-chains": "^1.1.19-0",
+    "@subwallet/extension-dapp": "^1.1.19-0",
+    "@subwallet/extension-inject": "^1.1.19-0",
     "@subwallet/keyring": "^0.1.1",
     "@subwallet/ui-keyring": "^0.1.1",
     "@walletconnect/sign-client": "^2.8.4",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.1.18-1'
+  version: '1.1.19-0'
 };

package/services/chain-service/index.js

@@ -9,7 +9,7 @@ import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-se
 import { SubstrateChainHandler } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _ChainConnectionStatus, _CUSTOM_PREFIX, _NFT_CONTRACT_STANDARDS, _SMART_CONTRACT_STANDARDS } from '@subwallet/extension-base/services/chain-service/types';
-import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
+import { _isAssetFungibleToken, _isChainEnabled, _isCustomAsset, _isCustomChain, _isCustomProvider, _isEqualContractAddress, _isEqualSmartContractAsset, _isMantaZkAsset, _isPureEvmChain, _isPureSubstrateChain, _parseAssetRefKey } from '@subwallet/extension-base/services/chain-service/utils';
 import AssetSettingStore from '@subwallet/extension-base/stores/AssetSetting';
 import { MODULE_SUPPORT } from '@subwallet/extension-base/utils';
 import { BehaviorSubject, Subject } from 'rxjs';
@@ -631,12 +631,34 @@ export class ChainService {
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
         if (storedSlug in latestChainInfoMap) {
           // check predefined chains first, keep setting for providers and currentProvider
-          mergedChainInfoMap[storedSlug].providers = {
-            ...storedChainInfo.providers,
+          // TODO: review merging providers
+          // Keep customer provider only
+          const providers = {
             ...mergedChainInfoMap[storedSlug].providers
-          }; // TODO: review merging providers
+          };
+          for (const [key, value] of Object.entries(storedChainInfo.providers)) {
+            if (_isCustomProvider(key)) {
+              if (!Object.values(providers).includes(value)) {
+                providers[key] = value;
+              }
+            }
+          }
+          mergedChainInfoMap[storedSlug].providers = providers;
+
+          // Merge current provider
+          let currentProvider = storedChainInfo.currentProvider;
+          const providerValue = storedChainInfo.providers[currentProvider] || '';
+          if (!providers[currentProvider]) {
+            currentProvider = Object.keys(providers)[0];
+            for (const [key, value] of Object.entries(providers)) {
+              if (providerValue === value) {
+                currentProvider = key;
+                break;
+              }
+            }
+          }
           this.dataMap.chainStateMap[storedSlug] = {
-            currentProvider: storedChainInfo.currentProvider,
+            currentProvider: currentProvider,
             slug: storedSlug,
             connectionStatus: _ChainConnectionStatus.DISCONNECTED,
             active: storedChainInfo.active
@@ -644,7 +666,7 @@ export class ChainService {
           newStorageData.push({
             ...mergedChainInfoMap[storedSlug],
             active: storedChainInfo.active,
-            currentProvider: storedChainInfo.currentProvider
+            currentProvider: currentProvider
           });
         } else {
           var _storedChainInfo$subs, _storedChainInfo$evmI;

package/services/storage-service/db-stores/Crowdloan.d.ts

@@ -1,6 +1,7 @@
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
 import { ICrowdloanItem } from '../databases';
 export default class CrowdloanStore extends BaseStoreWithAddressAndChain<ICrowdloanItem> {
+    removeEndedCrowdloans(): Promise<void>;
     getCrowdloan(address: string): import("dexie").PromiseExtended<ICrowdloanItem[]>;
     deleteByChainAndAddress(chain: string, address: string): import("dexie").PromiseExtended<number>;
 }

package/services/storage-service/db-stores/Crowdloan.js

@@ -3,6 +3,20 @@
 
 import BaseStoreWithAddressAndChain from '@subwallet/extension-base/services/storage-service/db-stores/BaseStoreWithAddressAndChain';
 export default class CrowdloanStore extends BaseStoreWithAddressAndChain {
+  async removeEndedCrowdloans() {
+    const now = new Date();
+    const removeList = [];
+    await this.table.each((obj, cursor) => {
+      try {
+        if (!obj.endTime || new Date(obj.endTime) < now) {
+          removeList.push(cursor.primaryKey);
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    });
+    await this.table.bulkDelete(removeList);
+  }
   getCrowdloan(address) {
     return this.table.where('address').equals(address).toArray();
   }