@subwallet/extension-base 1.3.36-0 → 1.3.38-0

package/background/KoniTypes.d.ts

@@ -98,6 +98,11 @@ export interface ResultResolver {
     result: boolean;
     accounts: string[];
 }
+export interface RequestSwitchCurrentNetworkAuthorization {
+    url: string;
+    networkKey: string;
+    authSwitchNetworkType: AccountAuthType;
+}
 export declare enum StakingType {
     NOMINATED = "nominated",
     POOLED = "pooled",
@@ -895,6 +900,7 @@ export interface TonSignatureRequest extends TonSignRequest {
 export interface CardanoSignatureRequest extends CardanoSignRequest {
     id: string;
     errors?: ErrorValidation[];
+    currentAddress: string;
     payload: unknown;
 }
 export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignRequest {
@@ -1836,6 +1842,7 @@ export interface KoniRequestSignatures {
     'cardano(account.get.address)': [null, string[]];
     'cardano(account.get.balance)': [null, Cbor];
     'cardano(account.get.change.address)': [null, string];
+    'cardano(account.get.reward.address)': [null, string[]];
     'cardano(account.get.utxos)': [RequestCardanoGetUtxos, Cbor[] | null];
     'cardano(account.get.collateral)': [RequestCardanoGetCollateral, Cbor[] | null];
     'cardano(network.get.current)': [null, number];

package/background/types.d.ts

@@ -4,7 +4,7 @@ import type { KeyringPairs$Json } from '@subwallet/ui-keyring/types';
 import type { JsonRpcResponse } from '@polkadot/rpc-provider/types';
 import type { SignerPayloadJSON, SignerPayloadRaw } from '@polkadot/types/types';
 import type { HexString } from '@polkadot/util/types';
-import { KoniRequestSignatures, NetworkJson } from '@subwallet/extension-base/background/KoniTypes';
+import { KoniRequestSignatures, NetworkJson, RequestSwitchCurrentNetworkAuthorization } from '@subwallet/extension-base/background/KoniTypes';
 import { AuthUrls } from '@subwallet/extension-base/services/request-service/types';
 import { AccountJson } from '@subwallet/extension-base/types';
 import { TypeRegistry } from '@polkadot/types';
@@ -68,6 +68,7 @@ export interface RequestSignatures extends KoniRequestSignatures {
     'pri(authorize.reject)': [RequestAuthorizeReject, boolean];
     'pri(authorize.requests)': [RequestAuthorizeSubscribe, boolean, AuthorizeRequest[]];
     'pri(authorize.toggle)': [string, ResponseAuthorizeList];
+    'pri(authorize.switchCurrentNetwork)': [RequestSwitchCurrentNetworkAuthorization, ResponseAuthorizeList];
     'pri(derivation.create)': [RequestDeriveCreate, boolean];
     'pri(derivation.validate)': [RequestDeriveValidate, ResponseDeriveValidate];
     'pri(json.batchRestore)': [RequestBatchRestore, void];

package/cjs/core/logic-validation/request.js

@@ -11,6 +11,7 @@ exports.joiValidate = void 0;
 exports.validateSignMessageData = validateSignMessageData;
 exports.validateTypedSignMessageDataV1 = validateTypedSignMessageDataV1;
 exports.validateTypedSignMessageDataV3V4 = validateTypedSignMessageDataV3V4;
+exports.validationAuthCardanoMiddleware = validationAuthCardanoMiddleware;
 exports.validationAuthMiddleware = validationAuthMiddleware;
 exports.validationAuthWCMiddleware = validationAuthWCMiddleware;
 exports.validationCardanoSignDataMiddleware = validationCardanoSignDataMiddleware;
@@ -24,6 +25,7 @@ var _TransactionError = require("@subwallet/extension-base/background/errors/Tra
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _types = require("@subwallet/extension-base/types");
 var _utils = require("@subwallet/extension-base/utils");
+var _cardano = require("@subwallet/extension-base/utils/cardano");
 var _parseTransaction = require("@subwallet/extension-base/utils/eth/parseTransaction");
 var _getId = require("@subwallet/extension-base/utils/getId");
 var _keyring = require("@subwallet/keyring");
@@ -147,36 +149,33 @@ async function generateValidationProcess(koni, url, payloadValidate, validationM
   }
   return resultValidated;
 }
+function handleAuthError(payload, message, errorPosition, errors) {
+  payload.errorPosition = errorPosition;
+  errors.push(new Error(convertErrorMessage(message)[0]));
+  return payload;
+}
 async function validationAuthMiddleware(koni, url, payload) {
   const {
     address,
     errors
   } = payload;
   if (!address || !(0, _util.isString)(address)) {
-    payload.errorPosition = 'dApp';
-    const [message] = convertErrorMessage('Not found address to sign');
-    errors.push(new Error(message));
+    return handleAuthError(payload, 'Not found address to sign', 'dApp', errors);
   } else {
     try {
       payload.pair = _uiKeyring.keyring.getPair(address);
       if (!payload.pair) {
-        payload.errorPosition = 'dApp';
-        const [message] = convertErrorMessage('Unable to find account');
-        errors.push(new Error(message));
+        return handleAuthError(payload, 'Unable to find account', 'dApp', errors);
       } else {
         const authList = await koni.getAuthList();
         const authInfo = authList[(0, _utils.stripUrl)(url)];
         if (!authInfo || !authInfo.isAllowed || !authInfo.isAllowedMap[payload.pair.address]) {
-          payload.errorPosition = 'dApp';
-          const [message] = convertErrorMessage('Account not in allowed list', '');
-          errors.push(new Error(message));
+          return handleAuthError(payload, 'Account not in allowed list', 'dApp', errors);
         }
         payload.authInfo = authInfo;
       }
     } catch (e) {
-      const [message] = convertErrorMessage(e.message);
-      payload.errorPosition = 'dApp';
-      errors.push(new Error(message));
+      return handleAuthError(payload, e.message, 'dApp', errors);
     }
   }
   return payload;
@@ -564,11 +563,51 @@ function validationAuthWCMiddleware(koni, url, payload, topic) {
   });
   return promise;
 }
+async function validationAuthCardanoMiddleware(koni, url, payload) {
+  const authList = await koni.getAuthList();
+  const authInfo = authList[(0, _utils.stripUrl)(url)];
+  const {
+    address,
+    errors
+  } = payload;
+  if (!authInfo || !authInfo.isAllowed) {
+    return handleAuthError(payload, 'Account not in allowed list', 'dApp', errors);
+  }
+  const currentAddress = authInfo.currentAccount;
+  const currentNetwork = authInfo.currentNetworkMap.cardano || 'cardano';
+  const currentNetworkId = +(currentNetwork === 'cardano');
+  if (!currentAddress || !authInfo.isAllowedMap[currentAddress]) {
+    return handleAuthError(payload, 'Unable to find account', 'dApp', errors);
+  }
+  const pair = _uiKeyring.keyring.getPair(currentAddress);
+  if (!pair) {
+    return handleAuthError(payload, 'Unable to find account', 'dApp', errors);
+  }
+  payload.pair = pair;
+  if ((0, _keyring.isCardanoBaseAddress)(address)) {
+    if (!authInfo.isAllowedMap[address]) {
+      return handleAuthError(payload, 'Account not in allowed list', 'dApp', errors);
+    }
+    const addressByChainFormat = (0, _utils.reformatAddress)(currentAddress, currentNetworkId);
+    if (!(0, _utils.isSameAddress)(addressByChainFormat, address)) {
+      return handleAuthError(payload, 'Current account is changed', 'dApp', errors);
+    }
+  } else if ((0, _keyring.isCardanoRewardAddress)(address)) {
+    const rewardAddress = pair.cardano.rewardAddress;
+    const addressByChainFormat = (0, _utils.reformatAddress)(rewardAddress, currentNetworkId);
+    if (!(0, _utils.isSameAddress)(addressByChainFormat, address)) {
+      return handleAuthError(payload, 'Current account is changed', 'dApp', errors);
+    }
+  }
+  return payload;
+}
 async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   const {
     address,
+    authInfo,
     errors,
-    pair: pair_
+    pair: pair_,
+    type
   } = payload_;
   const payload = payload_.payloadAfterValidated;
   const {
@@ -590,6 +629,15 @@ async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   if (!(0, _keyring.isCardanoAddress)(address)) {
     handleError('Not found cardano address');
   }
+  const currentCardanoNetwork = koni.requestService.getDAppChainInfo({
+    autoActive: true,
+    accessType: 'cardano',
+    defaultChain: authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap[type],
+    url
+  });
+  if (!(0, _cardano.validateAddressNetwork)(address, currentCardanoNetwork)) {
+    handleError('Invalid address network');
+  }
   const pair = pair_ || _uiKeyring.keyring.getPair(address);
   if (!(pair !== null && pair !== void 0 && pair.meta.isExtneral)) {
     canSign = true;
@@ -597,6 +645,7 @@ async function validationCardanoSignDataMiddleware(koni, url, payload_) {
   const payloadAfterValidated = {
     address,
     payload: payload,
+    currentAddress: authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentAccount,
     hashPayload: payload,
     canSign: canSign,
     id: ''