@subwallet/extension-base 1.0.3-0 → 1.0.4-1

package/background/KoniTypes.d.ts

@@ -1111,7 +1111,8 @@ export declare enum StakingStatus {
     EARNING_REWARD = "EARNING_REWARD",
     PARTIALLY_EARNING = "PARTIALLY_EARNING",
     NOT_EARNING = "NOT_EARNING",
-    WAITING = "WAITING"
+    WAITING = "WAITING",
+    NOT_STAKING = "NOT_STAKING"
 }
 export interface NominatorMetadata {
     chain: string;
@@ -1245,20 +1246,6 @@ export declare type RequestWithdrawStakeExternal = InternalRequestSign<StakeWith
 export declare type RequestClaimRewardExternal = InternalRequestSign<StakeClaimRewardParams>;
 export declare type RequestCreateCompoundStakeExternal = InternalRequestSign<TuringStakeCompoundParams>;
 export declare type RequestCancelCompoundStakeExternal = InternalRequestSign<TuringCancelStakeCompoundParams>;
-export interface KeyringState {
-    isReady: boolean;
-    hasMasterPassword: boolean;
-    isLocked: boolean;
-}
-export interface AddressBookState {
-    contacts: AddressJson[];
-    recent: AddressJson[];
-}
-export interface RequestChangeMasterPassword {
-    oldPassword?: string;
-    newPassword: string;
-    createNew: boolean;
-}
 export declare enum ChainEditStandard {
     EVM = "EVM",
     SUBSTRATE = "SUBSTRATE",
@@ -1284,6 +1271,20 @@ export interface ChainSpecInfo {
     existentialDeposit: string;
     decimals: number;
 }
+export interface KeyringState {
+    isReady: boolean;
+    hasMasterPassword: boolean;
+    isLocked: boolean;
+}
+export interface AddressBookState {
+    contacts: AddressJson[];
+    recent: AddressJson[];
+}
+export interface RequestChangeMasterPassword {
+    oldPassword?: string;
+    newPassword: string;
+    createNew: boolean;
+}
 export interface ResponseChangeMasterPassword {
     status: boolean;
     errors: string[];
@@ -1310,12 +1311,20 @@ export interface RequestKeyringExportMnemonic {
 export interface ResponseKeyringExportMnemonic {
     result: string;
 }
+export interface RequestResetWallet {
+    resetAll: boolean;
+}
+export interface ResponseResetWallet {
+    status: boolean;
+    errors: string[];
+}
 export interface RequestSigningApprovePasswordV2 {
     id: string;
 }
 export interface AssetSettingUpdateReq {
     tokenSlug: string;
     assetSetting: AssetSetting;
+    autoEnableNativeToken?: boolean;
 }
 export interface RequestGetTransaction {
     id: string;
@@ -1493,6 +1502,7 @@ export interface KoniRequestSignatures {
     'pri(keyring.unlock)': [RequestUnlockKeyring, ResponseUnlockKeyring];
     'pri(keyring.lock)': [null, void];
     'pri(keyring.export.mnemonic)': [RequestKeyringExportMnemonic, ResponseKeyringExportMnemonic];
+    'pri(keyring.reset)': [RequestResetWallet, ResponseResetWallet];
     'pri(signing.approve.passwordV2)': [RequestSigningApprovePasswordV2, boolean];
     'pri(derivation.validateV2)': [RequestDeriveValidateV2, ResponseDeriveValidateV2];
     'pri(derivation.getList)': [RequestGetDeriveAccounts, ResponseGetDeriveAccounts];

package/background/KoniTypes.js

@@ -211,6 +211,7 @@ export let StakingStatus;
   StakingStatus["PARTIALLY_EARNING"] = "PARTIALLY_EARNING";
   StakingStatus["NOT_EARNING"] = "NOT_EARNING";
   StakingStatus["WAITING"] = "WAITING";
+  StakingStatus["NOT_STAKING"] = "NOT_STAKING";
 })(StakingStatus || (StakingStatus = {}));
 export let ChainEditStandard;
 

package/cjs/background/KoniTypes.js

@@ -219,6 +219,7 @@ exports.StakingStatus = StakingStatus;
   StakingStatus["PARTIALLY_EARNING"] = "PARTIALLY_EARNING";
   StakingStatus["NOT_EARNING"] = "NOT_EARNING";
   StakingStatus["WAITING"] = "WAITING";
+  StakingStatus["NOT_STAKING"] = "NOT_STAKING";
 })(StakingStatus || (exports.StakingStatus = StakingStatus = {}));
 let ChainEditStandard; // ChainService
 // for custom network

package/cjs/koni/api/staking/bonding/amplitude.js

@@ -54,9 +54,16 @@ async function getAmplitudeNominatorMetadata(chainInfo, address, substrateApi) {
   const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const delegatorState = _delegatorState.toPrimitive();
   const unstakingInfo = _unstakingInfo.toPrimitive();
-  console.log('unstakingInfo ampe', unstakingInfo, !!unstakingInfo);
   if (!delegatorState && !unstakingInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.NOMINATED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let activeStake = '0';
   if (delegatorState) {

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

@@ -122,7 +122,15 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
     });
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.NOMINATED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const stakingStatus = (0, _utils.getStakingStatusByNominations)(bnTotalActiveStake, nominationList);
   return {

package/cjs/koni/api/staking/bonding/paraChain.js

@@ -58,7 +58,7 @@ function validateParaChainBondingCondition(chainInfo, amount, selectedCollators,
   const bnChainMinStake = new _util.BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new _util.BN(selectedCollator.minBond || '0');
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -146,7 +146,15 @@ async function getParaChainNominatorMetadata(chainInfo, address, substrateApi) {
   const _delegatorState = await chainApi.api.query.parachainStaking.delegatorState(address);
   const delegatorState = _delegatorState.toPrimitive();
   if (!delegatorState) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.NOMINATED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let bnTotalActiveStake = _util.BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {

package/cjs/koni/api/staking/bonding/relayChain.js

@@ -55,7 +55,7 @@ function validatePoolBondingCondition(chainInfo, amount, selectedPool, address,
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new _util.BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(_util.BN_ZERO)) {
+    if (nominatorMetadata.unstakings.length > 0) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
     }
   }
@@ -68,7 +68,7 @@ function validateRelayBondingCondition(chainInfo, amount, selectedValidators, ad
   const errors = [];
   let bnTotalStake = new _util.BN(amount);
   const bnMinStake = new _util.BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === _KoniTypes.StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new _TransactionError.TransactionError(_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -166,7 +166,15 @@ async function getRelayChainNominatorMetadata(chainInfo, address, substrateApi)
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
-    return;
+    return {
+      chain,
+      type: _KoniTypes.StakingType.NOMINATED,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      address: address,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const activeStake = ledger.active.toString();
   const nominationList = [];
@@ -246,7 +254,16 @@ async function getRelayChainPoolMemberMetadata(chainInfo, address, substrateApi)
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: _KoniTypes.StakingType.POOLED,
+      address,
+      status: _KoniTypes.StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      // can only join 1 pool at a time
+      unstakings: []
+    };
   }
   let stakingStatus = _KoniTypes.StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);

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

@@ -930,7 +930,7 @@ class KoniExtension {
   }
   async updateAssetSetting(params) {
     try {
-      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting);
+      await this.#koniState.chainService.updateAssetSetting(params.tokenSlug, params.assetSetting, params.autoEnableNativeToken);
       this.#koniState.eventService.emit('asset.updateState', params.tokenSlug);
       return true;
     } catch (e) {
@@ -2451,6 +2451,11 @@ class KoniExtension {
       chainType: _KoniTypes.ChainType.SUBSTRATE
     });
   }
+
+  /// Keyring state
+
+  // Subscribe keyring state
+
   keyringStateSubscribe(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const keyringStateSubject = this.#koniState.keyringService.keyringStateSubject;
@@ -2461,6 +2466,9 @@ class KoniExtension {
     });
     return this.#koniState.keyringService.keyringState;
   }
+
+  // Change master password
+
   keyringChangeMasterPassword(_ref56) {
     let {
       createNew,
@@ -2497,6 +2505,9 @@ class KoniExtension {
       errors: []
     };
   }
+
+  // Migrate password
+
   keyringMigrateMasterPassword(_ref57) {
     let {
       address,
@@ -2516,6 +2527,9 @@ class KoniExtension {
       errors: []
     };
   }
+
+  // Unlock wallet
+
   keyringUnlock(_ref58) {
     let {
       password
@@ -2534,11 +2548,17 @@ class KoniExtension {
       errors: []
     };
   }
+
+  // Lock wallet
+
   keyringLock() {
     _uiKeyring.keyring.lockAll();
     this.#koniState.updateKeyringState();
     clearTimeout(this.#lockTimeOut);
   }
+
+  // Export mnemonic
+
   keyringExportMnemonic(_ref59) {
     let {
       address,
@@ -2551,11 +2571,31 @@ class KoniExtension {
     };
   }
 
+  // Reset wallet
+
+  async resetWallet(_ref60) {
+    let {
+      resetAll
+    } = _ref60;
+    try {
+      await this.#koniState.resetWallet(resetAll);
+      return {
+        errors: [],
+        status: true
+      };
+    } catch (e) {
+      return {
+        errors: [e.message],
+        status: false
+      };
+    }
+  }
+
   /// Signing external request
-  signingApprovePasswordV2(_ref60) {
+  signingApprovePasswordV2(_ref61) {
     let {
       id
-    } = _ref60;
+    } = _ref61;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, 'Unable to find request');
     const {
@@ -2608,22 +2648,22 @@ class KoniExtension {
 
   /// Derive account
 
-  derivationCreateMultiple(_ref61) {
+  derivationCreateMultiple(_ref62) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref61;
+    } = _ref62;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref62 => {
+    const createChild = _ref63 => {
       let {
         name,
         suri
-      } = _ref62;
+      } = _ref63;
       const meta = {
         name: name,
         parentAddress
@@ -2669,10 +2709,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref63) {
+  derivationCreateV3(_ref64) {
     let {
       address: parentAddress
-    } = _ref63;
+    } = _ref64;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2704,11 +2744,11 @@ class KoniExtension {
     });
     return true;
   }
-  validateDerivePath(_ref64) {
+  validateDerivePath(_ref65) {
     let {
       parentAddress,
       suri
-    } = _ref64;
+    } = _ref65;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2741,12 +2781,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref65) {
+  getListDeriveAccounts(_ref66) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref65;
+    } = _ref66;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2837,10 +2877,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref66) {
+  getTransaction(_ref67) {
     let {
       id
-    } = _ref66;
+    } = _ref67;
     const {
       transaction,
       ...transactionResult
@@ -2850,8 +2890,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref67 => {
-        let [key, value] = _ref67;
+      return Object.fromEntries(Object.entries(rs).map(_ref68 => {
+        let [key, value] = _ref68;
         const {
           transaction,
           ...transactionResult
@@ -2881,10 +2921,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref68) {
+  async reloadCron(_ref69) {
     let {
       data
-    } = _ref68;
+    } = _ref69;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -3232,6 +3272,8 @@ class KoniExtension {
         return this.keyringLock();
       case 'pri(keyring.export.mnemonic)':
         return this.keyringExportMnemonic(request);
+      case 'pri(keyring.reset)':
+        return await this.resetWallet(request);
 
       /// Signing external
       case 'pri(signing.approve.passwordV2)':

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

@@ -1454,5 +1454,17 @@ class KoniState {
   async reloadStaking() {
     return await this.cron.reloadStaking();
   }
+  async resetWallet(resetAll) {
+    this.keyringService.resetWallet(resetAll);
+    this.requestService.resetWallet();
+    this.transactionService.resetWallet();
+    await this.dbService.resetWallet(resetAll);
+    this.accountRefStore.set('refList', []);
+    if (resetAll) {
+      this.settingService.resetWallet();
+    }
+    this.chainService.resetWallet(resetAll);
+    await this.chainService.init();
+  }
 }
 exports.default = KoniState;

package/cjs/packageInfo.js

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

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_ACTIVE_CHAINS = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_AUTO_CONNECT_MS = void 0;
+exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -218,4 +218,19 @@ const _XCM_TYPE = {
 };
 exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
-exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+
+// TODO: review
+exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
+const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
+exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;
+const _CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainAsset.json`;
+exports._CHAIN_ASSET_SRC = _CHAIN_ASSET_SRC;
+const _ASSET_REF_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetRef.json`;
+exports._ASSET_REF_SRC = _ASSET_REF_SRC;
+const _MULTI_CHAIN_ASSET_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/MultiChainAsset.json`;
+exports._MULTI_CHAIN_ASSET_SRC = _MULTI_CHAIN_ASSET_SRC;
+const _CHAIN_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainLogoMap.json`;
+exports._CHAIN_LOGO_MAP_SRC = _CHAIN_LOGO_MAP_SRC;
+const _ASSET_LOGO_MAP_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/AssetLogoMap.json`;
+exports._ASSET_LOGO_MAP_SRC = _ASSET_LOGO_MAP_SRC;

package/cjs/services/chain-service/handler/SubstrateChainHandler.js

@@ -119,7 +119,7 @@ class SubstrateChainHandler {
           name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
           decimals = decimalsResp.output ? new _util.BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
           symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
-          if (name === '' || symbol === '') {
+          if (!name || !symbol || typeof name === 'object' || typeof symbol === 'object') {
             contractError = true;
           }
           console.log('validate PSP22', name, symbol, decimals);