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

package/background/KoniTypes.d.ts

@@ -900,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 {
@@ -1841,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/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;
@@ -148,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;
@@ -565,6 +563,44 @@ 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,
@@ -609,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: ''

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

@@ -1068,14 +1068,12 @@ class KoniState {
       errors: [],
       networkKey: ''
     };
-    const validationSteps = [_logicValidation.validationAuthMiddleware, _logicValidation.validationCardanoSignDataMiddleware];
+    const validationSteps = [_logicValidation.validationAuthCardanoMiddleware, _logicValidation.validationCardanoSignDataMiddleware];
     const result = await (0, _logicValidation.generateValidationProcess)(this, url, payloadValidation, validationSteps);
-    if (!(0, _utils3.isSameAddress)(address, currentAddress)) {
-      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.ACCOUNT_CHANGED);
-    }
     const errorsFormated = (0, _logicValidation.convertErrorFormat)(result.errors);
     const payloadAfterValidated = {
       ...result.payloadAfterValidated,
+      currentAddress,
       errors: errorsFormated,
       id
     };
@@ -1184,7 +1182,6 @@ class KoniState {
         };
       }
     }
-    transactionValue = transactionValue.checked_sub(CardanoWasm.Value.new(tx.body().fee()));
     const transactionBody = tx.body();
     const getSpecificUtxo = this.chainService.getSpecificUtxo.bind(this);
     requireKeyHashes.push(...(0, _helper.extractKeyHashFromCertificate)(transactionBody.certs()));
@@ -1197,9 +1194,8 @@ class KoniState {
     const keyHashAddressMap = {};
     const pair = _uiKeyring.keyring.getPair(currentAddress);
     if (pair) {
-      const publicKey = CardanoWasm.Bip32PublicKey.from_bytes(pair.publicKey);
-      const paymentPubKey = publicKey.derive(0).derive(0).to_raw_key().hash().to_hex();
-      const stakePubKey = publicKey.derive(2).derive(0).to_raw_key().hash().to_hex();
+      const paymentPubKey = CardanoWasm.Bip32PublicKey.from_hex(pair.cardano.paymentPubKey).to_raw_key().hash().to_hex();
+      const stakePubKey = CardanoWasm.Bip32PublicKey.from_hex(pair.cardano.stakePubKey).to_raw_key().hash().to_hex();
       keyHashAddressMap[paymentPubKey] = 'payment';
       keyHashAddressMap[stakePubKey] = 'stake';
     } else {

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

@@ -40,6 +40,7 @@ function transformAccountsV2(accounts) {
   const accountSelected = authInfo ? authInfo.isAllowed ? Object.keys(authInfo.isAllowedMap).filter(address => authInfo.isAllowedMap[address]) : [] : [];
   const authTypeFilter = _ref => {
     let {
+      json,
       type
     } = _ref;
     if (accountAuthTypes) {
@@ -52,10 +53,19 @@ function transformAccountsV2(accounts) {
         ton: _types3.TonKeypairTypes,
         cardano: _types3.CardanoKeypairTypes
       };
-      return accountAuthTypes.some(authType => {
+      const isValidTypes = accountAuthTypes.some(authType => {
         var _validTypes$authType;
         return (_validTypes$authType = validTypes[authType]) === null || _validTypes$authType === void 0 ? void 0 : _validTypes$authType.includes(type);
       });
+      if (!isValidTypes) {
+        return false;
+      }
+
+      // This condition ensures that the resulting UTXOs from the user's transaction are not sent to addresses the wallet cannot manage.
+      if (type === 'cardano' && json.meta.isReadOnly) {
+        return false;
+      }
+      return true;
     } else {
       return true;
     }
@@ -1143,8 +1153,8 @@ class KoniTabs {
       this.#koniState.setAuthorize(authList);
     }
     return accountList.map(address => {
-      const isTestnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
-      const addressChainFormat = (0, _utils2.reformatAddress)(address, +isTestnet);
+      const isMainnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
+      const addressChainFormat = (0, _utils2.reformatAddress)(address, +isMainnet);
       return (0, _utils2.convertCardanoAddressToHex)(addressChainFormat);
     });
   }
@@ -1172,10 +1182,31 @@ class KoniTabs {
       address,
       network
     } = await this.getCurrentInformationCardanoDapp(url);
-    const isTestnet = network !== 'cardano_preproduction';
-    const addressChainFormat = (0, _utils2.reformatAddress)(address, +isTestnet);
+    const isMainnet = network !== 'cardano_preproduction';
+    const addressChainFormat = (0, _utils2.reformatAddress)(address, +isMainnet);
     return (0, _utils2.convertCardanoAddressToHex)(addressChainFormat);
   }
+  async cardanoGetRewardAddress(id, url) {
+    const authList = await this.#koniState.getAuthList();
+    const urlStripped = (0, _utils2.stripUrl)(url);
+    const authInfo = authList[urlStripped];
+    if (!authInfo || !authInfo.isAllowedMap) {
+      throw new _CardanoProviderError.CardanoProviderError(_KoniTypes.CardanoProviderErrorType.REFUSED_REQUEST, 'You need to connect to the wallet first');
+    }
+    const accountList = await this.getCurrentAccount(url, 'cardano');
+    const currentCardanoAccount = authInfo.currentAccount;
+    if (currentCardanoAccount !== accountList[0]) {
+      authList[urlStripped].currentAccount = accountList[0];
+      this.#koniState.setAuthorize(authList);
+    }
+    return accountList.map(address => {
+      const pair = _uiKeyring.keyring.getPair(address);
+      const rewardAddress = pair.cardano.rewardAddress;
+      const isTestnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
+      const addressChainFormat = (0, _utils2.reformatAddress)(rewardAddress, +isTestnet);
+      return (0, _utils2.convertCardanoAddressToHex)(addressChainFormat);
+    });
+  }
   async cardanoGetCurrentNetworkId(id, url) {
     let currentChain;
     let autoActiveChain = false;
@@ -1356,6 +1387,8 @@ class KoniTabs {
         return await this.cardanoGetAccountBalance(id, url);
       case 'cardano(account.get.change.address)':
         return await this.cardanoGetChangeAddress(id, url);
+      case 'cardano(account.get.reward.address)':
+        return await this.cardanoGetRewardAddress(id, url);
       case 'cardano(account.get.collateral)':
         return await this.cardanoGetCollateral(id, url, request);
       case 'cardano(account.get.utxos)':

package/cjs/packageInfo.js

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

package/cjs/page/cardano/cips/cip30.js

@@ -38,7 +38,7 @@ class CIP30Api {
     return new Promise(resolve => resolve([]));
   }
   async getRewardAddresses() {
-    return new Promise(resolve => resolve([]));
+    return await this.sendMessage('cardano(account.get.reward.address)');
   }
   async signTx(tx) {
     let partialSign = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -59,5 +59,25 @@ class CIP30Api {
   async getBalance() {
     return await this.sendMessage('cardano(account.get.balance)');
   }
+  get apis() {
+    var _this = this;
+    return {
+      getExtension: () => this.getExtension(),
+      getNetworkId: () => this.getNetworkId(),
+      getCollateral: payload => this.getCollateral(payload),
+      getUtxos: (amount, paginate) => this.getUtxos(amount, paginate),
+      getUsedAddresses: () => this.getUsedAddresses(),
+      getChangeAddress: () => this.getChangeAddress(),
+      getUnusedAddresses: () => this.getUnusedAddresses(),
+      getRewardAddresses: () => this.getRewardAddresses(),
+      signTx: function (tx) {
+        let partialSign = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+        return _this.signTx(tx, partialSign);
+      },
+      signData: (address, payload) => this.signData(address, payload),
+      submitTx: tx => this.submitTx(tx),
+      getBalance: () => this.getBalance()
+    };
+  }
 }
 exports.CIP30Api = CIP30Api;

package/cjs/page/cardano/index.js

@@ -20,7 +20,7 @@ class SubWalletCardanoProvider {
     this.icon = WALLET_ICON;
     this.sendMessage = sendMessage;
   }
-  async enable() {
+  enable = async () => {
     const isEnabled = await this.sendMessage('pub(authorize.tabV2)', {
       origin,
       accountAuthTypes: ['cardano']
@@ -29,13 +29,13 @@ class SubWalletCardanoProvider {
       throw new Error('Access to the wallet is denied');
     }
     const CIP30 = new _cips.CIP30Api(this.sendMessage);
-    return Object.freeze(CIP30);
-  }
-  async isEnable() {
+    return Object.freeze(CIP30.apis);
+  };
+  isEnable = async () => {
     const accountList = await this.sendMessage('pub(accounts.list)', {
       accountAuthType: 'cardano'
     });
     return accountList.length > 0;
-  }
+  };
 }
 exports.default = SubWalletCardanoProvider;

package/cjs/services/request-service/handler/CardanoRequestHandler.js

@@ -140,14 +140,15 @@ class CardanoRequestHandler {
   }
   signMessage(confirmation) {
     const {
-      address,
+      address: addressToSign,
+      currentAddress,
       payload
     } = confirmation.payload;
-    const pair = _uiKeyring.keyring.getPair(address);
+    const pair = _uiKeyring.keyring.getPair(currentAddress);
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
     }
-    return pair.cardano.signMessage(payload, true);
+    return pair.cardano.signMessage(payload, addressToSign);
   }
   signTransactionCardano(confirmation) {
     // alibaba

package/cjs/services/request-service/helper/index.js

@@ -70,25 +70,27 @@ exports.extractMetadata = extractMetadata;
 const convertAssetToValue = amount => {
   const value = CardanoWasm.Value.new(CardanoWasm.BigNum.from_str('0'));
   const multiAsset = CardanoWasm.MultiAsset.new();
-  for (const item of amount) {
-    if (item.unit === 'lovelace') {
-      value.set_coin(CardanoWasm.BigNum.from_str(item.quantity));
-    } else {
-      const policyIdHex = item.unit.slice(0, 56);
-      const assetNameHex = item.unit.slice(56);
-      const scriptHash = CardanoWasm.ScriptHash.from_bytes(Buffer.from(policyIdHex, 'hex'));
-      const assetName = CardanoWasm.AssetName.new(Buffer.from(assetNameHex, 'hex'));
-      const quantity = CardanoWasm.BigNum.from_str(item.quantity);
-      let assets = multiAsset.get(scriptHash);
-      if (!assets) {
-        assets = CardanoWasm.Assets.new();
+  if (amount !== null && amount !== void 0 && amount.length) {
+    for (const item of amount) {
+      if (item.unit === 'lovelace') {
+        value.set_coin(CardanoWasm.BigNum.from_str(item.quantity));
+      } else {
+        const policyIdHex = item.unit.slice(0, 56);
+        const assetNameHex = item.unit.slice(56);
+        const scriptHash = CardanoWasm.ScriptHash.from_bytes(Buffer.from(policyIdHex, 'hex'));
+        const assetName = CardanoWasm.AssetName.new(Buffer.from(assetNameHex, 'hex'));
+        const quantity = CardanoWasm.BigNum.from_str(item.quantity);
+        let assets = multiAsset.get(scriptHash);
+        if (!assets) {
+          assets = CardanoWasm.Assets.new();
+        }
+        assets.insert(assetName, quantity);
+        multiAsset.insert(scriptHash, assets);
       }
-      assets.insert(assetName, quantity);
-      multiAsset.insert(scriptHash, assets);
     }
-  }
-  if (multiAsset.len() > 0) {
-    value.set_multiasset(multiAsset);
+    if (multiAsset.len() > 0) {
+      value.set_multiasset(multiAsset);
+    }
   }
   return value;
 };

package/cjs/services/swap-service/handler/base-handler.js

@@ -173,6 +173,8 @@ class SwapBaseHandler {
         if (needEditAmount) {
           bnSendingValue = (0, _bignumber.default)(selectedQuote.toAmount).multipliedBy(_utils3.DEFAULT_EXCESS_AMOUNT_WEIGHT); // need to round
         } else {
+          // todo: remove
+          console.log('The code cannot run into here, if it runs into here, pls ask dev to check');
           bnSendingValue = (0, _bignumber.default)(selectedQuote.toAmount);
         }
       }
@@ -373,8 +375,8 @@ class SwapBaseHandler {
     if (recipient) {
       const isEvmAddress = (0, _utilCrypto.isEthereumAddress)(recipient);
       const isEvmDestChain = (0, _utils2._isChainEvmCompatible)(swapToChain);
-      if (isEvmAddress && !isEvmDestChain || !isEvmAddress && isEvmDestChain) {
-        // todo: update this condition
+      if (isEvmAddress !== isEvmDestChain) {
+        // todo: update condition if support swap chain # EVM or Substrate
         return [new _TransactionError.TransactionError(_swap.SwapErrorType.INVALID_RECIPIENT)];
       }
     }