@subwallet/extension-base 1.0.4-1 → 1.0.5-1

package/koni/api/dotsama/transfer.js

@@ -94,7 +94,6 @@ export const createTransferExtrinsic = async ({
   transferAll,
   value
 }) => {
-  var _transfer;
   const api = substrateApi.api;
 
   // @ts-ignore
@@ -142,8 +141,5 @@ export const createTransferExtrinsic = async ({
       transfer = api.tx.balances.transfer(to, new BN(value));
     }
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  console.log('transfer extrinsic: ', (_transfer = transfer) === null || _transfer === void 0 ? void 0 : _transfer.toHex());
   return [transfer, transferAmount || value];
 };

package/koni/api/nft/acala_nft/index.js

@@ -113,7 +113,7 @@ export class AcalaNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch acala nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/bit.country/index.js

@@ -111,7 +111,7 @@ export class BitCountryNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch bit.country nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/evm_nft/index.js

@@ -106,7 +106,6 @@ export class EvmNftApi extends BaseNftApi {
               const resp = await fetch(detailUrl);
               const itemDetail = resp && resp.ok && (await resp.json());
               if (!itemDetail) {
-                console.warn((resp === null || resp === void 0 ? void 0 : resp.statusText) || `Cannot fetch NFT id [${nftId}] from Web3.`);
                 return;
               }
               const parsedItem = this.parseMetadata(itemDetail);
@@ -123,13 +122,13 @@ export class EvmNftApi extends BaseNftApi {
                 ownItem = true;
               }
             } catch (e) {
-              console.error(`error parsing item for ${this.chain} nft`, e);
+              console.error(`${this.chain}`, e);
             }
           }
         }));
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('EVM NFT error', e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (ownItem) {

package/koni/api/nft/index.js

@@ -118,10 +118,9 @@ export class NftHandler {
           }
         });
         this.needSetupApi = false;
-        // console.log(`${this.handlers.length} nft handlers connected`, this.handlers);
       }
     } catch (e) {
-      console.error('error setting up nft handlers', e);
+      console.error(e);
     }
   }
   async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {

package/koni/api/nft/karura_nft/index.js

@@ -118,7 +118,7 @@ export class KaruraNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch karura nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/quartz_nft/index.js

@@ -181,7 +181,7 @@ export default class QuartzNftApi extends BaseNftApi {
         }
       }));
     } catch (e) {
-      console.error('Failed to fetch quartz nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/rmrk_nft/index.js

@@ -193,7 +193,6 @@ export class RmrkNftApi extends BaseNftApi {
             return {};
           }
         } catch (e) {
-          console.error('error fetching collection info', url);
           return {};
         }
       }));
@@ -220,7 +219,7 @@ export class RmrkNftApi extends BaseNftApi {
             };
           }
         } catch (e) {
-          console.error('error parsing JSON for RMRK ', item.url, e);
+          console.error(item.url, e);
         }
       }));
       allCollections.forEach(item => {
@@ -245,7 +244,7 @@ export class RmrkNftApi extends BaseNftApi {
       const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
       params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch rmrk nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/statemine_nft/index.js

@@ -119,7 +119,7 @@ export default class StatemineNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch statemine nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/transfer.js

@@ -12,7 +12,7 @@ export function acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress,
     const collectionId = params.collectionId;
     return substrateApi.api.tx.nft.transfer(recipientAddress, [collectionId, itemId]);
   } catch (e) {
-    console.error('error handling acala transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -25,7 +25,7 @@ export function rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress,
     const parsedRemark = remark.concat(recipientAddress.replace(/\\s/g, ''));
     return substrateApi.api.tx.system.remark(parsedRemark);
   } catch (e) {
-    console.error('error handling rmrk transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -37,7 +37,7 @@ export function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling unique transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -49,7 +49,7 @@ export function quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling quartz transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -59,7 +59,7 @@ export function statemineGetExtrinsic(substrateApi, senderAddress, recipientAddr
     const collectionId = params.collectionId;
     return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
   } catch (e) {
-    console.error('error handling statemine transfer nft', e);
+    console.error(e);
     return null;
   }
 }

package/koni/api/nft/unique_nft/index.js

@@ -175,7 +175,7 @@ export default class UniqueNftApi extends BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch unique nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/koni/api/nft/unique_nft/uniqueNftV2.js

@@ -46,7 +46,6 @@ export class UniqueNftApiV2 extends BaseNftApi {
         const nfts = await this.getNftByAccount(address);
         allNfts = allNfts.concat(nfts);
       }));
-      console.log('allNfts', allNfts);
     } catch (e) {
       console.error(`Failed to fetch ${this.chain} nft`, e);
     }

package/koni/api/nft/wasm_nft/index.js

@@ -216,7 +216,6 @@ export class WasmNftApi extends BaseNftApi {
         }
       }
       if (!itemDetail) {
-        console.warn(`Cannot fetch NFT metadata [${tokenId}] from PSP-34 contract.`);
         return nftItem;
       }
       nftItem.name = itemDetail.name;
@@ -298,7 +297,7 @@ export class WasmNftApi extends BaseNftApi {
 
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error(`error parsing item for ${this.chain} nft`, e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (isFeatured) {

package/koni/api/staking/bonding/astar.d.ts

@@ -1,5 +1,5 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { ChainStakingMetadata, NominatorMetadata, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { ChainStakingMetadata, NominatorMetadata, UnstakingInfo, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare function getAstarStakingMetadata(chain: string, substrateApi: _SubstrateApi): Promise<ChainStakingMetadata>;
 export declare function getAstarNominatorMetadata(chainInfo: _ChainInfo, address: string, substrateApi: _SubstrateApi): Promise<NominatorMetadata | undefined>;
@@ -8,3 +8,4 @@ export declare function getAstarBondingExtrinsic(substrateApi: _SubstrateApi, am
 export declare function getAstarUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarWithdrawalExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarClaimRewardExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
+export declare function getAstarWithdrawable(nominatorMetadata: NominatorMetadata): UnstakingInfo;

package/koni/api/staking/bonding/astar.js

@@ -96,17 +96,17 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
 
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
-    const nearestUnstaking = unlockingChunks[0]; // only handle 1 unstaking request at a time, might need to change
-
-    const isClaimable = nearestUnstaking.unlockEra - parseInt(currentEra) <= 0;
-    const remainingEra = nearestUnstaking.unlockEra - (parseInt(currentEra) + 1);
-    const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
-    unstakingList.push({
-      chain,
-      status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstaking.amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
-    });
+    for (const unlockingChunk of unlockingChunks) {
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
+      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const waitingTime = remainingEra * _STAKING_ERA_LENGTH_MAP[chain];
+      unstakingList.push({
+        chain,
+        status: isClaimable ? UnstakingStatus.CLAIMABLE : UnstakingStatus.UNLOCKING,
+        claimable: unlockingChunk.amount.toString(),
+        waitingTime: waitingTime > 0 ? waitingTime : 0
+      });
+    }
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return {
@@ -247,6 +247,21 @@ export async function getAstarClaimRewardExtrinsic(substrateApi, address) {
       transactions.push(tx);
     }
   }
-  console.log('no of astar claim reward tx: ', transactions.length);
   return apiPromise.api.tx.utility.batch(transactions);
+}
+export function getAstarWithdrawable(nominatorMetadata) {
+  const unstakingInfo = {
+    chain: nominatorMetadata.chain,
+    status: UnstakingStatus.CLAIMABLE,
+    claimable: '0',
+    waitingTime: 0
+  };
+  let bnWithdrawable = BN_ZERO;
+  for (const unstaking of nominatorMetadata.unstakings) {
+    if (unstaking.status === UnstakingStatus.CLAIMABLE) {
+      bnWithdrawable = bnWithdrawable.add(new BN(unstaking.claimable));
+    }
+  }
+  unstakingInfo.claimable = bnWithdrawable.toString();
+  return unstakingInfo;
 }

package/koni/api/staking/bonding/utils.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
+import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
@@ -211,6 +212,9 @@ export function isActionFromValidator(stakingType, chain) {
 export function getWithdrawalInfo(nominatorMetadata) {
   const unstakings = nominatorMetadata.unstakings;
   let result;
+  if (_STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain)) {
+    return getAstarWithdrawable(nominatorMetadata);
+  }
   for (const unstaking of unstakings) {
     if (unstaking.status === UnstakingStatus.CLAIMABLE) {
       result = unstaking; // only get the first withdrawal

package/koni/api/staking/relayChain.js

@@ -154,7 +154,6 @@ export async function getNominationPoolReward(addresses, chainInfoMap, substrate
       }));
     }));
   } catch (e) {
-    console.error('Error fetching unclaimed reward for nomination pool', e);
     return rewardList;
   }
   return rewardList;

package/koni/api/staking/subsquidStaking.js

@@ -76,7 +76,6 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
     }));
     return result;
   } catch (e) {
-    console.error(`error getting ${chain} staking reward from subsquid`, e);
     return [];
   }
 };
@@ -94,7 +93,6 @@ export const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
       rewardList = rewardList.concat(rewardItems);
     }));
   } catch (e) {
-    console.error('Error fetching staking reward from SubSquid', e);
     return rewardList;
   }
   return rewardList;

package/koni/api/tokens/wasm/index.js

@@ -23,7 +23,6 @@ export async function getPSP34TransferExtrinsic(networkKey, substrateApi, sender
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
-    console.error('Error getting WASM NFT transfer extrinsic', e);
     return null;
   }
 }

package/koni/api/tokens/wasm/utils.js

@@ -9,7 +9,6 @@ const toContractAbiMessage = (contractPromise, message) => {
   if (!value) {
     const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
     const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
     return {
       ok: false,
       error

package/koni/api/xcm/index.js

@@ -25,6 +25,5 @@ export const createXcmExtrinsic = async ({
   } else {
     extrinsic = getExtrinsicByXtokensPallet(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  console.log('XCM extrinsic: ', extrinsic.toHex());
   return extrinsic;
 };

package/koni/background/cron.js

@@ -93,7 +93,6 @@ export class KoniCron {
       if (!commonReload && !chainUpdated && !stakingSubmitted) {
         return;
       }
-      this.logger.log('ServiceInfo updated, Cron restarting...', eventTypes);
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
       if (!address) {
         return;
@@ -133,7 +132,6 @@ export class KoniCron {
     if (!(currentAccountInfo !== null && currentAccountInfo !== void 0 && currentAccountInfo.address)) {
       return;
     }
-    this.logger.log('Starting cron jobs');
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.address);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
@@ -162,48 +160,12 @@ export class KoniCron {
       this.serviceSubscription.unsubscribe();
       this.serviceSubscription = undefined;
     }
-    this.logger.log('Stopping cron jobs');
     this.removeAllCrons();
     this.status = 'stopped';
   };
   updateApiMapStatus = () => {
     this.state.chainService.updateApiMapStatus().catch(console.error);
-    // const apiMap = this.state.getApiMap();
-    // const networkMap = this.state.getChainStateMap();
-    //
-    // for (const [key, substrateApi] of Object.entries(apiMap.substrate)) {
-    //   let status: _ChainConnectionStatus = _ChainConnectionStatus.CONNECTING;
-    //
-    //   if (substrateApi.isApiConnected) {
-    //     status = _ChainConnectionStatus.CONNECTED;
-    //   }
-    //
-    //   if (!networkMap[key].connectionStatus) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== status) {
-    //     this.state.updateChainConnectionStatus(key, status);
-    //   }
-    // }
-    //
-    // for (const [key, evmApi] of Object.entries(apiMap.evm)) {
-    //   evmApi.api.eth.net.isListening()
-    //     .then(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTED) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTED);
-    //       }
-    //     })
-    //     .catch(() => {
-    //       if (!networkMap[key].connectionStatus) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       } else if (networkMap[key].connectionStatus && networkMap[key].connectionStatus !== _ChainConnectionStatus.CONNECTING) {
-    //         this.state.updateChainConnectionStatus(key, _ChainConnectionStatus.CONNECTING);
-    //       }
-    //     });
-    // }
   };
-
   recoverApiMap = () => {
     var _this$subscriptions;
     const apiMap = this.state.getApiMap();
@@ -224,7 +186,6 @@ export class KoniCron {
   };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
-      console.debug('Refresh NFT state');
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
     };
   };
@@ -236,13 +197,11 @@ export class KoniCron {
   };
   refreshStakingReward = address => {
     return () => {
-      console.debug('Refresh staking reward state');
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
     };
   };
   refreshStakingRewardFastInterval = address => {
     return () => {
-      console.debug('Refresh staking reward data with fast interval');
       this.subscriptions.subscribeStakingRewardFastInterval(address).catch(this.logger.error);
     };
   };
@@ -254,20 +213,17 @@ export class KoniCron {
   };
   updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching chain staking metadata');
       this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
     };
   };
   updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
     return () => {
-      console.debug('Fetching nominator data for', address);
       this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
     };
   };
   async reloadNft() {
     const address = this.state.keyringService.currentAccount.address;
     const serviceInfo = this.state.getServiceInfo();
-    console.debug('Hard refresh NFT for', address);
     this.resetNft(address);
     this.removeCron('refreshNft');
     this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
@@ -276,7 +232,6 @@ export class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    console.debug('Hard refresh staking meta for', address);
     this.resetStakingReward();
     this.removeCron('refreshStakingReward');
     this.removeCron('refreshPoolingStakingReward');

package/koni/background/handlers/Extension.d.ts

@@ -73,7 +73,9 @@ export default class KoniExtension {
     private saveTheme;
     private setCamera;
     private saveBrowserConfirmationType;
+    private setAutoLockTime;
     private subscribeSettings;
+    private setEnableChainPatrol;
     private subscribeAuthUrls;
     private _saveCurrentAccountAddress;
     private updateCurrentAccountAddress;