@subwallet/extension-base 1.3.31-1 → 1.3.33-0

package/koni/background/handlers/Tabs.js

@@ -1,21 +1,25 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import * as CardanoWasm from '@emurgo/cardano-serialization-lib-nodejs';
 import { _AssetType } from '@subwallet/chain-list/types';
+import { CardanoProviderError } from '@subwallet/extension-base/background/errors/CardanoProviderError';
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
+import { CardanoProviderErrorType, EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
 import RequestBytesSign from '@subwallet/extension-base/background/RequestBytesSign';
 import RequestExtrinsicSign from '@subwallet/extension-base/background/RequestExtrinsicSign';
-import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS, PERMISSIONS_TO_REVOKE } from '@subwallet/extension-base/constants';
+import { ALL_ACCOUNT_KEY, CRON_GET_API_MAP_STATUS, MAX_COLLATERAL_AMOUNT, PERMISSIONS_TO_REVOKE } from '@subwallet/extension-base/constants';
 import { generateValidationProcess, validationAuthMiddleware } from '@subwallet/extension-base/core/logic-validation';
 import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
+import { hasSufficientCardanoValue } from '@subwallet/extension-base/services/request-service/helper';
 import { DEFAULT_CHAIN_PATROL_ENABLE } from '@subwallet/extension-base/services/setting-service/constants';
-import { canDerive, getEVMChainInfo, stripUrl } from '@subwallet/extension-base/utils';
-import { EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
+import { convertCardanoAddressToHex, getEVMChainInfo, reformatAddress, stripUrl } from '@subwallet/extension-base/utils';
+import { CardanoKeypairTypes, EthereumKeypairTypes, SubstrateKeypairTypes, TonKeypairTypes } from '@subwallet/keyring/types';
+import { keyring } from '@subwallet/ui-keyring';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { isArray, isNumber } from '@polkadot/util';
@@ -32,7 +36,8 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
       const validTypes = {
         evm: EthereumKeypairTypes,
         substrate: SubstrateKeypairTypes,
-        ton: TonKeypairTypes
+        ton: TonKeypairTypes,
+        cardano: CardanoKeypairTypes
       };
       return accountAuthTypes.some(authType => {
         var _validTypes$authType;
@@ -48,9 +53,7 @@ function transformAccountsV2(accounts, anyType = false, authInfo, accountAuthTyp
         isHidden
       }
     }
-  }) => !isHidden).filter(({
-    type
-  }) => anyType ? true : canDerive(type)).filter(authTypeFilter).filter(({
+  }) => !isHidden).filter(authTypeFilter).filter(({
     json: {
       address
     }
@@ -116,6 +119,7 @@ export default class KoniTabs {
     const payloadValidate = {
       address,
       networkKey: '',
+      type: 'substrate',
       errors: [],
       payloadAfterValidated: request
     };
@@ -132,6 +136,7 @@ export default class KoniTabs {
     const address = request.address;
     const payloadValidate = {
       address,
+      type: 'substrate',
       networkKey: '',
       errors: [],
       payloadAfterValidated: request
@@ -262,6 +267,12 @@ export default class KoniTabs {
       if (authInfo.accountAuthTypes.includes('evm')) {
         accountAuthTypes.push('evm');
       }
+      if (authInfo.accountAuthTypes.includes('ton')) {
+        accountAuthTypes.push('ton');
+      }
+      if (authInfo.accountAuthTypes.includes('cardano')) {
+        accountAuthTypes.push('cardano');
+      }
     }
     return transformAccountsV2(this.#koniState.keyringService.context.pairs, anyType, authInfo, accountAuthTypes);
   }
@@ -314,25 +325,32 @@ export default class KoniTabs {
     return true;
   }
   authorizeV2(url, request) {
-    var _request$accountAuthT, _request$accountAuthT2;
+    var _request$accountAuthT, _request$accountAuthT2, _request$accountAuthT3, _request$accountAuthT4;
     const isConnectOnlyEvmAccountType = ((_request$accountAuthT = request.accountAuthTypes) === null || _request$accountAuthT === void 0 ? void 0 : _request$accountAuthT.length) === 1 && ((_request$accountAuthT2 = request.accountAuthTypes) === null || _request$accountAuthT2 === void 0 ? void 0 : _request$accountAuthT2.includes('evm'));
+    const isConnectOnlyCardanoAccountType = ((_request$accountAuthT3 = request.accountAuthTypes) === null || _request$accountAuthT3 === void 0 ? void 0 : _request$accountAuthT3.length) === 1 && ((_request$accountAuthT4 = request.accountAuthTypes) === null || _request$accountAuthT4 === void 0 ? void 0 : _request$accountAuthT4.includes('cardano'));
     if (isConnectOnlyEvmAccountType) {
       return new Promise((resolve, reject) => {
         this.#koniState.authorizeUrlV2(url, request).then(resolve).catch(e => {
           reject(new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST));
         });
       });
+    } else if (isConnectOnlyCardanoAccountType) {
+      return new Promise((resolve, reject) => {
+        this.#koniState.authorizeUrlV2(url, request).then(resolve).catch(e => {
+          reject(new CardanoProviderError(CardanoProviderErrorType.REFUSED_REQUEST));
+        });
+      });
     } else {
       return this.#koniState.authorizeUrlV2(url, request);
     }
   }
 
   // TODO: Update logic
-  async getEvmCurrentAccount(url) {
+  async getCurrentAccount(url, authType) {
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
         const allAccounts = this.#koniState.keyringService.context.pairs;
-        const accountList = transformAccountsV2(allAccounts, false, authInfo, ['evm']).map(a => a.address);
+        const accountList = transformAccountsV2(allAccounts, false, authInfo, [authType]).map(a => a.address);
         let accounts = [];
         const proxyId = this.#koniState.keyringService.context.currentAccount.proxyId;
         if (proxyId === ALL_ACCOUNT_KEY || !proxyId) {
@@ -360,8 +378,8 @@ export default class KoniTabs {
     let autoActiveChain = false;
     if (url) {
       const authInfo = await this.getAuthInfo(url);
-      if (authInfo !== null && authInfo !== void 0 && authInfo.currentEvmNetworkKey) {
-        currentChain = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentEvmNetworkKey;
+      if (authInfo !== null && authInfo !== void 0 && authInfo.currentNetworkMap.evm) {
+        currentChain = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.evm;
       }
       if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
         autoActiveChain = true;
@@ -413,7 +431,7 @@ export default class KoniTabs {
     }
   }
   async getEvmPermission(url, id) {
-    const accounts = await this.getEvmCurrentAccount(url);
+    const accounts = await this.getCurrentAccount(url, 'evm');
     return [{
       id: id,
       invoker: url,
@@ -726,9 +744,9 @@ export default class KoniTabs {
     };
 
     // Detect accounts changed
-    let currentAccountList = await this.getEvmCurrentAccount(url);
+    let currentAccountList = await this.getCurrentAccount(url, 'evm');
     const onCurrentAccountChanged = async () => {
-      const newAccountList = await this.getEvmCurrentAccount(url);
+      const newAccountList = await this.getCurrentAccount(url, 'evm');
 
       // Compare to void looping reload
       if (JSON.stringify(currentAccountList) !== JSON.stringify(newAccountList)) {
@@ -755,7 +773,7 @@ export default class KoniTabs {
       }
 
       // Detect account
-      const newAccountList = await this.getEvmCurrentAccount(url);
+      const newAccountList = await this.getCurrentAccount(url, 'evm');
 
       // Compare to void looping reload
       if (JSON.stringify(currentAccountList) !== JSON.stringify(newAccountList)) {
@@ -884,7 +902,7 @@ export default class KoniTabs {
     });
   }
   async canUseAccount(address, url) {
-    const allowedAccounts = await this.getEvmCurrentAccount(url);
+    const allowedAccounts = await this.getCurrentAccount(url, 'evm');
     return !!allowedAccounts.find(acc => acc.toLowerCase() === address.toLowerCase());
   }
   async evmSign(id, url, {
@@ -921,7 +939,7 @@ export default class KoniTabs {
         case 'net_version':
           return parseInt(await this.getEvmCurrentChainId(url), 16);
         case 'eth_accounts':
-          return await this.getEvmCurrentAccount(url);
+          return await this.getCurrentAccount(url, 'evm');
         case 'eth_sendTransaction':
           return await this.evmSendTransaction(id, url, request);
         case 'eth_sign':
@@ -1042,6 +1060,191 @@ export default class KoniTabs {
     });
     return await this.#koniState.addTokenConfirm(id, url, tokenInfo);
   }
+
+  // Cardano
+
+  async getCurrentInformationCardanoDapp(url) {
+    const authInfo = await this.getAuthInfo(url);
+    if (!authInfo || !authInfo.isAllowedMap || !authInfo.isAllowed) {
+      throw new CardanoProviderError(CardanoProviderErrorType.REFUSED_REQUEST, 'You need to connect to the wallet first');
+    }
+    const cardanoAddress = authInfo.currentAccount;
+    if (!cardanoAddress || !authInfo.isAllowedMap[cardanoAddress]) {
+      throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, 'No Cardano address found');
+    }
+    const keypair = keyring.getPair(cardanoAddress);
+    if (!keypair) {
+      throw new CardanoProviderError(CardanoProviderErrorType.ACCOUNT_CHANGED, 'No Cardano address found');
+    }
+    const network = authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano;
+    if (!network) {
+      throw new CardanoProviderError(CardanoProviderErrorType.INTERNAL_ERROR, 'No network key found');
+    }
+    return {
+      address: cardanoAddress,
+      network
+    };
+  }
+  async cardanoGetAccountList(id, url) {
+    const authList = await this.#koniState.getAuthList();
+    const urlStripped = stripUrl(url);
+    const authInfo = authList[urlStripped];
+    if (!authInfo || !authInfo.isAllowedMap) {
+      throw new CardanoProviderError(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 isTestnet = (authInfo === null || authInfo === void 0 ? void 0 : authInfo.currentNetworkMap.cardano) !== 'cardano_preproduction';
+      const addressChainFormat = reformatAddress(address, +isTestnet);
+      return convertCardanoAddressToHex(addressChainFormat);
+    });
+  }
+  async cardanoGetAccountBalance(id, url) {
+    const {
+      address
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const balanceValue = await this.#koniState.cardanoGetBalance(id, url, address);
+    return balanceValue.to_hex();
+  }
+  async cardanoGetChangeAddress(id, url) {
+    const authList = await this.#koniState.getAuthList();
+    const urlStripped = stripUrl(url);
+    const authInfo = authList[urlStripped];
+    if (!authInfo || !authInfo.isAllowedMap) {
+      throw new CardanoProviderError(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);
+    }
+    const {
+      address,
+      network
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const isTestnet = network !== 'cardano_preproduction';
+    const addressChainFormat = reformatAddress(address, +isTestnet);
+    return convertCardanoAddressToHex(addressChainFormat);
+  }
+  async cardanoGetCurrentNetworkId(id, url) {
+    let currentChain;
+    let autoActiveChain = false;
+    if (url) {
+      const authInfo = await this.getAuthInfo(url);
+      if (authInfo !== null && authInfo !== void 0 && authInfo.currentNetworkMap.cardano) {
+        currentChain = authInfo.currentNetworkMap.cardano;
+      }
+      if (authInfo !== null && authInfo !== void 0 && authInfo.isAllowed) {
+        autoActiveChain = true;
+      }
+    }
+    const currentNetwork = this.#koniState.requestService.getDAppChainInfo({
+      autoActive: autoActiveChain,
+      accessType: 'cardano',
+      defaultChain: currentChain,
+      url
+    });
+    if (!(currentNetwork !== null && currentNetwork !== void 0 && currentNetwork.cardanoInfo)) {
+      throw new CardanoProviderError(CardanoProviderErrorType.INTERNAL_ERROR, 'Can\'t get current network');
+    }
+    return +!(currentNetwork !== null && currentNetwork !== void 0 && currentNetwork.isTestnet);
+  }
+  async cardanoGetUtxo(id, url, params) {
+    const {
+      address,
+      network
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const utxos = await this.#koniState.chainService.getUtxosByAddress(address, network, params === null || params === void 0 ? void 0 : params.paginate);
+    if (!(params !== null && params !== void 0 && params.amount)) {
+      return utxos.map(utxo => utxo.to_hex());
+    }
+    let expectedValue = CardanoWasm.Value.zero();
+    try {
+      expectedValue = CardanoWasm.Value.from_hex(params === null || params === void 0 ? void 0 : params.amount);
+    } catch (e) {
+      throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, 'Amount is invalid');
+    }
+    let currentTotalUtxoValue = CardanoWasm.Value.zero();
+    const utxosFiltered = [];
+    for (const utxo of utxos) {
+      currentTotalUtxoValue = currentTotalUtxoValue.checked_add(utxo.output().amount());
+      utxosFiltered.push(utxo);
+      if (hasSufficientCardanoValue(currentTotalUtxoValue, expectedValue)) {
+        return utxosFiltered.map(utxo => utxo.to_hex());
+      }
+    }
+    return null;
+  }
+  async cardanoGetCollateral(id, url, params) {
+    const {
+      address,
+      network
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const utxos = await this.#koniState.chainService.getUtxosByAddress(address, network);
+    let expectedValue = CardanoWasm.Value.zero();
+    try {
+      if (params !== null && params !== void 0 && params.amount) {
+        expectedValue = CardanoWasm.Value.from_hex(params === null || params === void 0 ? void 0 : params.amount);
+      } else {
+        expectedValue = CardanoWasm.Value.new(CardanoWasm.BigNum.from_str(MAX_COLLATERAL_AMOUNT));
+      }
+    } catch (e) {
+      throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, 'Amount is invalid');
+    }
+    if (expectedValue.multiasset() || expectedValue.coin().compare(CardanoWasm.BigNum.from_str(MAX_COLLATERAL_AMOUNT)) > 0) {
+      throw new CardanoProviderError(CardanoProviderErrorType.INVALID_REQUEST, 'Amount is invalid');
+    }
+    let currentTotalUtxoValue = CardanoWasm.Value.zero();
+    const utxosFinal = [];
+    for (const utxo of utxos) {
+      const amount = utxo.output().amount();
+      if (amount.multiasset()) {
+        continue;
+      }
+      currentTotalUtxoValue = currentTotalUtxoValue.checked_add(amount);
+      utxosFinal.push(utxo);
+      if (hasSufficientCardanoValue(currentTotalUtxoValue, expectedValue)) {
+        break;
+      }
+    }
+    return utxosFinal.length ? utxosFinal.map(utxo => utxo.to_hex()) : null;
+  }
+  async cardanoSignData(id, url, params) {
+    const {
+      address
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const signResult = await this.#koniState.cardanoSignData(id, url, params, address);
+    if (signResult) {
+      return signResult;
+    } else {
+      throw new CardanoProviderError(CardanoProviderErrorType.INTERNAL_ERROR, 'Failed to sign data');
+    }
+  }
+  async cardanoSignTransaction(id, url, params) {
+    const {
+      address
+    } = await this.getCurrentInformationCardanoDapp(url);
+    const signResult = await this.#koniState.cardanoSignTx(id, url, params, address);
+    if (signResult) {
+      return signResult;
+    } else {
+      throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Failed to sign message');
+    }
+  }
+  async cardanoSubmitTransaction(id, url, params) {
+    const txHash = await this.#koniState.cardanoSubmitTx(id, url, params);
+    if (txHash) {
+      return txHash;
+    } else {
+      throw new CardanoProviderError(CardanoProviderErrorType.INTERNAL_ERROR, 'Failed to submit transaction');
+    }
+  }
   async handle(id, type, request, url, port) {
     if (type === 'pub(phishing.redirectIfDenied)') {
       return this.redirectIfPhishing(url);
@@ -1101,6 +1304,26 @@ export default class KoniTabs {
         return await this.handleEvmRequest(id, url, request);
       case 'evm(provider.send)':
         return await this.handleEvmSend(id, url, port, request);
+
+      // Cardano
+      case 'cardano(account.get.address)':
+        return await this.cardanoGetAccountList(id, url);
+      case 'cardano(account.get.balance)':
+        return await this.cardanoGetAccountBalance(id, url);
+      case 'cardano(account.get.change.address)':
+        return await this.cardanoGetChangeAddress(id, url);
+      case 'cardano(account.get.collateral)':
+        return await this.cardanoGetCollateral(id, url, request);
+      case 'cardano(account.get.utxos)':
+        return await this.cardanoGetUtxo(id, url, request);
+      case 'cardano(network.get.current)':
+        return await this.cardanoGetCurrentNetworkId(id, url);
+      case 'cardano(data.sign)':
+        return await this.cardanoSignData(id, url, request);
+      case 'cardano(transaction.sign)':
+        return await this.cardanoSignTransaction(id, url, request);
+      case 'cardano(transaction.submit)':
+        return await this.cardanoSubmitTransaction(id, url, request);
       default:
         throw new Error(`Unable to handle message of type ${type}`);
     }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.31-1",
+  "version": "1.3.33-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -34,6 +34,11 @@
       "require": "./cjs/background/errors/BalanceError.js",
       "default": "./background/errors/BalanceError.js"
     },
+    "./background/errors/CardanoProviderError": {
+      "types": "./background/errors/CardanoProviderError.d.ts",
+      "require": "./cjs/background/errors/CardanoProviderError.js",
+      "default": "./background/errors/CardanoProviderError.js"
+    },
     "./background/errors/EvmProviderError": {
       "types": "./background/errors/EvmProviderError.d.ts",
       "require": "./cjs/background/errors/EvmProviderError.js",
@@ -594,35 +599,50 @@
       "require": "./cjs/page/index.js",
       "default": "./page/index.js"
     },
-    "./page/Accounts": {
-      "types": "./page/Accounts.d.ts",
-      "require": "./cjs/page/Accounts.js",
-      "default": "./page/Accounts.js"
-    },
-    "./page/Injected": {
-      "types": "./page/Injected.d.ts",
-      "require": "./cjs/page/Injected.js",
-      "default": "./page/Injected.js"
-    },
-    "./page/Metadata": {
-      "types": "./page/Metadata.d.ts",
-      "require": "./cjs/page/Metadata.js",
-      "default": "./page/Metadata.js"
-    },
-    "./page/PostMessageProvider": {
-      "types": "./page/PostMessageProvider.d.ts",
-      "require": "./cjs/page/PostMessageProvider.js",
-      "default": "./page/PostMessageProvider.js"
-    },
-    "./page/Signer": {
-      "types": "./page/Signer.d.ts",
-      "require": "./cjs/page/Signer.js",
-      "default": "./page/Signer.js"
-    },
-    "./page/SubWalleEvmProvider": {
-      "types": "./page/SubWalleEvmProvider.d.ts",
-      "require": "./cjs/page/SubWalleEvmProvider.js",
-      "default": "./page/SubWalleEvmProvider.js"
+    "./page/cardano": {
+      "types": "./page/cardano/index.d.ts",
+      "require": "./cjs/page/cardano/index.js",
+      "default": "./page/cardano/index.js"
+    },
+    "./page/cardano/cips": {
+      "types": "./page/cardano/cips/index.d.ts",
+      "require": "./cjs/page/cardano/cips/index.js",
+      "default": "./page/cardano/cips/index.js"
+    },
+    "./page/cardano/cips/cip30": {
+      "types": "./page/cardano/cips/cip30.d.ts",
+      "require": "./cjs/page/cardano/cips/cip30.js",
+      "default": "./page/cardano/cips/cip30.js"
+    },
+    "./page/evm": {
+      "types": "./page/evm/index.d.ts",
+      "require": "./cjs/page/evm/index.js",
+      "default": "./page/evm/index.js"
+    },
+    "./page/substrate": {
+      "types": "./page/substrate/index.d.ts",
+      "require": "./cjs/page/substrate/index.js",
+      "default": "./page/substrate/index.js"
+    },
+    "./page/substrate/Accounts": {
+      "types": "./page/substrate/Accounts.d.ts",
+      "require": "./cjs/page/substrate/Accounts.js",
+      "default": "./page/substrate/Accounts.js"
+    },
+    "./page/substrate/Metadata": {
+      "types": "./page/substrate/Metadata.d.ts",
+      "require": "./cjs/page/substrate/Metadata.js",
+      "default": "./page/substrate/Metadata.js"
+    },
+    "./page/substrate/PostMessageProvider": {
+      "types": "./page/substrate/PostMessageProvider.d.ts",
+      "require": "./cjs/page/substrate/PostMessageProvider.js",
+      "default": "./page/substrate/PostMessageProvider.js"
+    },
+    "./page/substrate/Signer": {
+      "types": "./page/substrate/Signer.d.ts",
+      "require": "./cjs/page/substrate/Signer.js",
+      "default": "./page/substrate/Signer.js"
     },
     "./page/types": {
       "types": "./page/types.d.ts",
@@ -2481,10 +2501,10 @@
       "require": "./cjs/utils/auth.js",
       "default": "./utils/auth.js"
     },
-    "./utils/canDerive": {
-      "types": "./utils/canDerive.d.ts",
-      "require": "./cjs/utils/canDerive.js",
-      "default": "./utils/canDerive.js"
+    "./utils/cardano": {
+      "types": "./utils/cardano.d.ts",
+      "require": "./cjs/utils/cardano.js",
+      "default": "./utils/cardano.js"
     },
     "./utils/environment": {
       "types": "./utils/environment.d.ts",
@@ -2596,6 +2616,11 @@
       "require": "./cjs/utils/object.js",
       "default": "./utils/object.js"
     },
+    "./utils/price": {
+      "types": "./utils/price.d.ts",
+      "require": "./cjs/utils/price.js",
+      "default": "./utils/price.js"
+    },
     "./utils/promise": {
       "types": "./utils/promise.d.ts",
       "require": "./cjs/utils/promise.js",
@@ -2679,14 +2704,14 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.103",
-    "@subwallet/extension-base": "^1.3.31-1",
-    "@subwallet/extension-chains": "^1.3.31-1",
-    "@subwallet/extension-dapp": "^1.3.31-1",
-    "@subwallet/extension-inject": "^1.3.31-1",
-    "@subwallet/keyring": "^0.1.9",
-    "@subwallet/subwallet-api-sdk": "^1.3.31-1",
-    "@subwallet/ui-keyring": "^0.1.9",
+    "@subwallet/chain-list": "0.2.104",
+    "@subwallet/extension-base": "^1.3.33-0",
+    "@subwallet/extension-chains": "^1.3.33-0",
+    "@subwallet/extension-dapp": "^1.3.33-0",
+    "@subwallet/extension-inject": "^1.3.33-0",
+    "@subwallet/keyring": "^0.1.11",
+    "@subwallet/subwallet-api-sdk": "^1.3.33-0",
+    "@subwallet/ui-keyring": "^0.1.11",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
     "@ton/ton": "^15.0.0",

package/packageInfo.js

@@ -7,5 +7,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: '1.3.31-1'
+  version: '1.3.33-0'
 };

package/page/cardano/cips/cip30.d.ts

@@ -0,0 +1,22 @@
+import { CardanoPaginate, Cbor } from '@subwallet/extension-base/background/KoniTypes';
+import { SendRequest } from '@subwallet/extension-base/page/types';
+export declare class CIP30Api {
+    private sendMessage;
+    constructor(sendMessage: SendRequest);
+    getExtension(): {
+        cip: number;
+    }[];
+    getNetworkId(): Promise<number>;
+    getCollateral(payload: {
+        amount: Cbor;
+    }): Promise<string[] | null>;
+    getUtxos(amount?: Cbor, paginate?: CardanoPaginate): Promise<string[] | null>;
+    getUsedAddresses(): Promise<string[]>;
+    getChangeAddress(): Promise<string>;
+    getUnusedAddresses(): Promise<string[]>;
+    getRewardAddresses(): Promise<string[]>;
+    signTx(tx: Cbor, partialSign?: boolean): Promise<string>;
+    signData(address: string, payload: string): Promise<import("@subwallet/extension-base/background/KoniTypes").ResponseCardanoSignData>;
+    submitTx(tx: Cbor): Promise<string>;
+    getBalance(): Promise<string>;
+}

package/page/cardano/cips/cip30.js

@@ -0,0 +1,55 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export class CIP30Api {
+  constructor(sendMessage) {
+    this.sendMessage = sendMessage;
+  }
+  getExtension() {
+    return [{
+      cip: 30
+    }];
+  }
+  async getNetworkId() {
+    return await this.sendMessage('cardano(network.get.current)');
+  }
+  async getCollateral(payload) {
+    return await this.sendMessage('cardano(account.get.collateral)', payload);
+  }
+  async getUtxos(amount, paginate) {
+    return await this.sendMessage('cardano(account.get.utxos)', {
+      amount,
+      paginate
+    });
+  }
+  async getUsedAddresses() {
+    return await this.sendMessage('cardano(account.get.address)');
+  }
+  async getChangeAddress() {
+    return await this.sendMessage('cardano(account.get.change.address)');
+  }
+  async getUnusedAddresses() {
+    return new Promise(resolve => resolve([]));
+  }
+  async getRewardAddresses() {
+    return new Promise(resolve => resolve([]));
+  }
+  async signTx(tx, partialSign = false) {
+    return await this.sendMessage('cardano(transaction.sign)', {
+      tx,
+      partialSign
+    });
+  }
+  async signData(address, payload) {
+    return await this.sendMessage('cardano(data.sign)', {
+      address,
+      payload
+    });
+  }
+  async submitTx(tx) {
+    return await this.sendMessage('cardano(transaction.submit)', tx);
+  }
+  async getBalance() {
+    return await this.sendMessage('cardano(account.get.balance)');
+  }
+}

package/page/cardano/cips/index.d.ts

@@ -0,0 +1,3 @@
+import { CardanoExtensionCIP } from '@subwallet/extension-inject/types';
+export { CIP30Api } from './cip30';
+export declare const ExtensionCIPsSupported: CardanoExtensionCIP[];

package/page/cardano/cips/index.js

@@ -0,0 +1,7 @@
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { CIP30Api } from "./cip30.js";
+export const ExtensionCIPsSupported = [{
+  cip: 30
+}];

package/page/cardano/index.d.ts

@@ -0,0 +1,13 @@
+import type { CardanoExtensionCIP, CardanoProvider } from '@subwallet/extension-inject/types';
+import { CIP30Api } from '@subwallet/extension-base/page/cardano/cips';
+import { SendRequest } from '@subwallet/extension-base/page/types';
+export default class SubWalletCardanoProvider implements CardanoProvider {
+    readonly apiVersion: string;
+    readonly icon: string;
+    readonly name: string;
+    readonly supportedExtensions: CardanoExtensionCIP[];
+    protected sendMessage: SendRequest;
+    constructor(sendMessage: SendRequest);
+    enable(): Promise<Readonly<CIP30Api>>;
+    isEnable(): Promise<boolean>;
+}