@subwallet/extension-base 0.4.6-0 → 0.4.8-0

package/background/KoniTypes.d.ts

@@ -1,5 +1,5 @@
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
-import { AccountAuthType, AccountJson, AuthorizeRequest, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
+import { AccountAuthType, AccountJson, AuthorizeRequest, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeCancel, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import Web3 from 'web3';
 import { RequestArguments, TransactionConfig } from 'web3-core';
@@ -75,6 +75,8 @@ export interface StakingItem {
     name: string;
     chainId: string;
     balance?: string;
+    activeBalance?: string;
+    unlockingBalance?: string;
     nativeToken: string;
     unit?: string;
     state: APIItemState;
@@ -246,6 +248,7 @@ export interface NetworkJson {
     blockExplorer?: string;
     dependencies?: string[];
     getStakingOnChain?: boolean;
+    supportBonding?: boolean;
     apiStatus?: NETWORK_STATUS;
     requestId?: string;
 }
@@ -576,6 +579,7 @@ export interface CustomEvmToken {
     type: 'erc20' | 'erc721';
     isCustom?: boolean;
     isDeleted?: boolean;
+    image?: string;
 }
 export interface EvmTokenJson {
     erc20: CustomEvmToken[];
@@ -719,6 +723,7 @@ export interface EvmSendTransactionRequest extends TransactionConfig {
 }
 export interface ConfirmationDefinitions {
     addNetworkRequest: [ConfirmationsQueueItem<NetworkJson>, ConfirmationResult<NetworkJson>];
+    addTokenRequest: [ConfirmationsQueueItem<CustomEvmToken>, ConfirmationResult<boolean>];
     switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>];
     evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>];
     evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<boolean>];
@@ -731,7 +736,86 @@ export declare type RequestConfirmationsSubscribe = null;
 export declare type RequestConfirmationComplete = {
     [ConfirmationType in keyof ConfirmationDefinitions]?: ConfirmationDefinitions[ConfirmationType][1];
 };
+export interface ValidatorInfo {
+    address: string;
+    totalStake: number;
+    ownStake: number;
+    otherStake: number;
+    nominatorCount: number;
+    commission: number;
+    expectedReturn: number;
+    blocked: boolean;
+    identity?: string;
+    isVerified: boolean;
+    minBond: number;
+    isNominated: boolean;
+}
+export interface BondingOptionInfo {
+    isBondedBefore: boolean;
+    era: number;
+    maxNominations: number;
+    maxNominatorPerValidator: number;
+    validators: ValidatorInfo[];
+    bondedValidators: string[];
+}
+export interface ChainBondingBasics {
+    stakedReturn: number;
+    isMaxNominators: boolean;
+}
+export interface BasicTxInfo {
+    fee: string;
+    balanceError: boolean;
+}
+export interface BondingSubmitParams {
+    networkKey: string;
+    nominatorAddress: string;
+    amount: number;
+    validatorInfo: ValidatorInfo;
+    password?: string;
+    isBondedBefore: boolean;
+    bondedValidators: string[];
+}
+export interface BasicTxResponse {
+    passwordError?: string | null;
+    callHash?: string;
+    status?: boolean;
+    transactionHash?: string;
+    txError?: boolean;
+}
+export interface BondingOptionParams {
+    networkKey: string;
+    address: string;
+}
+export interface UnbondingSubmitParams {
+    amount: number;
+    networkKey: string;
+    address: string;
+    password?: string;
+}
+export interface UnlockingStakeParams {
+    address: string;
+    networkKey: string;
+}
+export interface UnlockingStakeInfo {
+    nextWithdrawal: number;
+    redeemable: number;
+    nextWithdrawalAmount: number;
+}
+export interface StakeWithdrawalParams {
+    address: string;
+    networkKey: string;
+    password?: string;
+}
 export interface KoniRequestSignatures {
+    'pri(unbonding.submitWithdrawal)': [StakeWithdrawalParams, BasicTxResponse, BasicTxResponse];
+    'pri(unbonding.withdrawalTxInfo)': [StakeWithdrawalParams, BasicTxInfo];
+    'pri(unbonding.unlockingInfo)': [UnlockingStakeParams, UnlockingStakeInfo];
+    'pri(unbonding.submitTransaction)': [UnbondingSubmitParams, BasicTxResponse, BasicTxResponse];
+    'pri(unbonding.txInfo)': [UnbondingSubmitParams, BasicTxInfo];
+    'pri(bonding.txInfo)': [BondingSubmitParams, BasicTxInfo];
+    'pri(bonding.submitTransaction)': [BondingSubmitParams, BasicTxResponse, BasicTxResponse];
+    'pri(bonding.getChainBondingBasics)': [NetworkJson[], Record<string, ChainBondingBasics>];
+    'pri(bonding.getBondingOptions)': [BondingOptionParams, BondingOptionInfo];
     'pri(networkMap.recoverDotSama)': [string, boolean];
     'pri(substrateNft.submitTransaction)': [SubstrateNftSubmitTransaction, NftTransactionResponse, NftTransactionResponse];
     'pri(substrateNft.getTransaction)': [SubstrateNftTransactionRequest, SubstrateNftTransaction];
@@ -780,6 +864,7 @@ export interface KoniRequestSignatures {
     'pri(authorize.forgetSite)': [RequestForgetSite, boolean, AuthUrls];
     'pri(authorize.forgetAllSite)': [null, boolean, AuthUrls];
     'pri(authorize.rejectV2)': [RequestAuthorizeReject, boolean];
+    'pri(authorize.cancelV2)': [RequestAuthorizeCancel, boolean];
     'pri(seed.createV2)': [RequestSeedCreateV2, ResponseSeedCreateV2];
     'pri(seed.validateV2)': [RequestSeedValidateV2, ResponseSeedValidateV2];
     'pri(privateKey.validateV2)': [RequestSeedValidateV2, ResponsePrivateKeyValidateV2];

package/background/handlers/State.d.ts

@@ -22,6 +22,7 @@ export interface AuthUrlInfo {
     url: string;
     accountAuthType?: AccountAuthType;
     isAllowedMap: Record<string, boolean>;
+    currentEvmNetworkKey?: string;
 }
 interface MetaRequest extends Resolver<boolean> {
     id: string;

package/background/handlers/State.js

@@ -165,11 +165,31 @@ export default class State {
   }
 
   popupOpen() {
-    this.#notification !== 'extension' && chrome.windows.create(this.#notification === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
-      if (window) {
-        this.#windows.push(window.id || 0);
+    if (this.#notification !== 'extension') {
+      if (this.#notification === 'window') {
+        chrome.windows.create(NORMAL_WINDOW_OPTS, window => {
+          if (window) {
+            this.#windows.push(window.id || 0);
+          }
+        });
       }
-    });
+
+      chrome.windows.getCurrent(win => {
+        const popupOptions = { ...POPUP_WINDOW_OPTS
+        };
+
+        if (win) {
+          popupOptions.left = (win.left || 0) + (win.width || 0) - (POPUP_WINDOW_OPTS.width || 0) - 20;
+          popupOptions.top = (win.top || 0) + 80;
+        }
+
+        chrome.windows.create(popupOptions, window => {
+          if (window) {
+            this.#windows.push(window.id || 0);
+          }
+        });
+      });
+    }
   }
 
   authComplete = (id, resolve, reject) => {

package/background/types.d.ts

@@ -148,6 +148,9 @@ export interface RequestAuthorizeApprove {
 export interface RequestAuthorizeReject {
     id: string;
 }
+export interface RequestAuthorizeCancel {
+    id: string;
+}
 export declare type RequestAuthorizeSubscribe = null;
 export interface RequestMetadataApprove {
     id: string;

package/cjs/background/handlers/State.js

@@ -200,11 +200,31 @@ class State {
   }
 
   popupOpen() {
-    this.#notification !== 'extension' && chrome.windows.create(this.#notification === 'window' ? NORMAL_WINDOW_OPTS : POPUP_WINDOW_OPTS, window => {
-      if (window) {
-        this.#windows.push(window.id || 0);
+    if (this.#notification !== 'extension') {
+      if (this.#notification === 'window') {
+        chrome.windows.create(NORMAL_WINDOW_OPTS, window => {
+          if (window) {
+            this.#windows.push(window.id || 0);
+          }
+        });
       }
-    });
+
+      chrome.windows.getCurrent(win => {
+        const popupOptions = { ...POPUP_WINDOW_OPTS
+        };
+
+        if (win) {
+          popupOptions.left = (win.left || 0) + (win.width || 0) - (POPUP_WINDOW_OPTS.width || 0) - 20;
+          popupOptions.top = (win.top || 0) + 80;
+        }
+
+        chrome.windows.create(popupOptions, window => {
+          if (window) {
+            this.#windows.push(window.id || 0);
+          }
+        });
+      });
+    }
   }
 
   authComplete = (id, resolve, reject) => {

package/cjs/packageInfo.js

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

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.4.6-0",
+  "version": "0.4.8-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -199,9 +199,9 @@
     "@polkadot/ui-settings": "^0.89.1",
     "@polkadot/util": "^8.3.1",
     "@polkadot/util-crypto": "^8.3.1",
-    "@subwallet/extension-chains": "^0.4.6-0",
-    "@subwallet/extension-dapp": "^0.4.6-0",
-    "@subwallet/extension-inject": "^0.4.6-0",
+    "@subwallet/extension-chains": "^0.4.8-0",
+    "@subwallet/extension-dapp": "^0.4.8-0",
+    "@subwallet/extension-inject": "^0.4.8-0",
     "ethereumjs-tx": "^2.1.2",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.1",

package/packageInfo.js

@@ -5,5 +5,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: '0.4.6-0'
+  version: '0.4.8-0'
 };