@subwallet/extension-base 1.3.34-0 → 1.3.35-0

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

@@ -140,6 +140,7 @@ class UniswapHandler {
     if (!quote) {
       return Promise.resolve(undefined);
     }
+    console.log('params', params);
     const sendingAmount = quote.toAmount;
     const senderAddress = params.request.address;
     const fromTokenInfo = this.chainService.getAssetBySlug(quote.pair.to);
@@ -147,13 +148,25 @@ class UniswapHandler {
     const fromChainId = (0, _utils2._getEvmChainId)(fromChainInfo);
     const evmApi = this.chainService.getEvmApi(fromChainInfo.slug);
     const tokenContract = (0, _utils2._getContractAddressOfToken)(fromTokenInfo);
+    const toTokenInfo = this.chainService.getAssetBySlug(params.request.pair.to);
+    const toChainInfo = this.chainService.getChainInfoByKey((0, _utils2._getAssetOriginChain)(toTokenInfo));
     if ((0, _utils2._isNativeToken)(fromTokenInfo)) {
       return Promise.resolve(undefined);
     }
     if (!fromChainId) {
       throw Error('Error getting Evm chain Id');
     }
-    const spokePoolAddress = _acrossBridge.SpokePoolMapping[fromChainId].SpokePool.address;
+    const inputData = {
+      destinationTokenInfo: toTokenInfo,
+      originTokenInfo: fromTokenInfo,
+      sendingValue: sendingAmount,
+      sender: senderAddress,
+      recipient: senderAddress,
+      destinationChain: toChainInfo,
+      originChain: fromChainInfo
+    };
+    const acrossQuote = await (0, _acrossBridge.getAcrossQuote)(inputData);
+    const spokePoolAddress = acrossQuote.to;
     const allowance = await (0, _web.getERC20Allowance)(spokePoolAddress, senderAddress, tokenContract, evmApi);
     if (allowance && (0, _bignumber.default)(allowance).gt(sendingAmount)) {
       return Promise.resolve(undefined);

package/cjs/services/swap-service/index.js

@@ -130,6 +130,12 @@ class SwapService {
     } catch (e) {
       throw new Error(e.message);
     }
+    if (swapQuoteResponse.error) {
+      return {
+        process: optimalProcess,
+        quote: swapQuoteResponse
+      };
+    }
     console.log('optimalProcess', optimalProcess);
     console.groupEnd();
     if (JSON.stringify((0, _utils2.processStepsToPathActions)(optimalProcess.steps)) !== JSON.stringify(optimalProcess.path.map(e => e.action))) {

package/cjs/services/transaction-service/index.js

@@ -1435,44 +1435,65 @@ class TransactionService {
       this.handleTransactionTimeout(emitter, eventData);
       emitter.emit('send', eventData); // This event is needed after sending transaction with queue
 
+      let isBroadcast = false;
+      let isInBlock = false;
+      let isFinish = false;
       rs.send(txState => {
         // handle events, logs, history
         if (!txState || !txState.status) {
           return;
         }
-        if (txState.status.isInBlock) {
-          eventData.eventLogs = txState.events;
-          if (!eventData.extrinsicHash || eventData.extrinsicHash === '' || !(0, _util.isHex)(eventData.extrinsicHash)) {
+
+        // Broadcast transaction
+        if (!isBroadcast) {
+          if (txState.status.isBroadcast || txState.status.isInBlock || txState.status.isFinalized) {
             eventData.extrinsicHash = txState.txHash.toHex();
+            isBroadcast = true;
+            if (!isFinish) {
+              emitter.emit('extrinsicHash', eventData);
+            }
+          }
+        }
+
+        // Transaction in block
+        if (!isInBlock) {
+          if (txState.status.isInBlock || txState.status.isFinalized) {
             eventData.blockHash = txState.status.asInBlock.toHex();
-            emitter.emit('extrinsicHash', eventData);
+            eventData.eventLogs = txState.events;
+            isInBlock = true;
           }
         }
-        if (txState.status.isFinalized) {
-          eventData.extrinsicHash = txState.txHash.toHex();
-          eventData.eventLogs = txState.events;
-          // TODO: push block hash and block number into eventData
-          txState.events.filter(_ref13 => {
-            let {
-              event: {
-                section
-              }
-            } = _ref13;
-            return section === 'system';
-          }).forEach(_ref14 => {
-            let {
-              event: {
-                data: [error],
-                method
-              }
-            } = _ref14;
-            if (method === 'ExtrinsicFailed') {
-              eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.SEND_TRANSACTION_FAILED, error.toString()));
-              emitter.emit('error', eventData);
-            } else if (method === 'ExtrinsicSuccess') {
-              emitter.emit('success', eventData);
+
+        // Transaction finished
+        if (!isFinish) {
+          if (txState.status.isInBlock || txState.status.isFinalized) {
+            if (!eventData.extrinsicHash) {
+              eventData.extrinsicHash = txState.txHash.toHex();
             }
-          });
+            txState.events.filter(_ref13 => {
+              let {
+                event: {
+                  section
+                }
+              } = _ref13;
+              return section === 'system';
+            }).forEach(_ref14 => {
+              let {
+                event: {
+                  data: [error],
+                  method
+                }
+              } = _ref14;
+              if (method === 'ExtrinsicFailed') {
+                eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.SEND_TRANSACTION_FAILED, error.toString()));
+                emitter.emit('error', eventData);
+                isFinish = true;
+              } else if (method === 'ExtrinsicSuccess') {
+                emitter.emit('success', eventData);
+                isFinish = true;
+              }
+            });
+          }
         }
       }).catch(e => {
         eventData.errors.push(new _TransactionError.TransactionError(_types.BasicTxErrorType.SEND_TRANSACTION_FAILED, e.message));

package/core/logic-validation/request.js

@@ -351,7 +351,7 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
             transaction.maxPriorityFeePerGas = feeCombine.maxPriorityFeePerGas;
           } else if (feeCombine.gasPrice) {
             estimateGas = new BigN(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
-            transaction.maxPriorityFeePerGas = feeCombine.gasPrice;
+            transaction.gasPrice = feeCombine.gasPrice;
           }
         }
       } catch (e) {

package/koni/background/handlers/Extension.d.ts

@@ -91,6 +91,7 @@ export default class KoniExtension {
     private updateAssetSetting;
     private getPrice;
     private getHistoryTokenPrice;
+    private checkCoinGeckoPriceSupport;
     private subscribeCurrentTokenPrice;
     private setPriceCurrency;
     private subscribePrice;

package/koni/background/handlers/Extension.js

@@ -880,6 +880,9 @@ export default class KoniExtension {
   }) {
     return this.#koniState.priceService.getHistoryTokenPriceData(priceId, timeframe);
   }
+  checkCoinGeckoPriceSupport(priceId) {
+    return this.#koniState.priceService.checkCoinGeckoPriceSupport(priceId);
+  }
   subscribeCurrentTokenPrice(priceId, id, port) {
     const cb = createSubscription(id, port);
     const {
@@ -1443,7 +1446,8 @@ export default class KoniExtension {
         xcmFeeDryRun = dryRunInfo.fee;
       }
       if (isAcrossBridgeTransfer) {
-        const metadata = await getAcrossQuote(params);
+        const data = await getAcrossQuote(params);
+        const metadata = data.metadata;
         inputData.metadata = {
           amountOut: metadata.outputAmount,
           rate: metadata.rate,
@@ -2583,11 +2587,12 @@ export default class KoniExtension {
     let registry = new TypeRegistry();
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      const allRegistry = [setupApiRegistry(chainInfo, this.#koniState), setupDatabaseRegistry(await this.#koniState.chainService.getMetadataByHash(payload.genesisHash), chainInfo, payload), setupDappRegistry(this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash), payload)].filter(item => item !== null && item.registry !== undefined);
-      if (allRegistry.length === 0) {
+      const registries = await Promise.all([setupApiRegistry(chainInfo, this.#koniState), setupDatabaseRegistry(chainInfo, payload, this.#koniState), setupDappRegistry(payload, this.#koniState)]);
+      const validRegistries = registries.filter(item => !!(item !== null && item !== void 0 && item.registry));
+      if (validRegistries.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = getSuitableRegistry(allRegistry, payload);
+        registry = getSuitableRegistry(validRegistries, payload);
       }
     }
     const result = request.sign(registry, pair);
@@ -4271,6 +4276,8 @@ export default class KoniExtension {
         return await this.subscribePrice(id, port);
       case 'pri(price.getHistory)':
         return await this.getHistoryTokenPrice(request);
+      case 'pri(price.checkCoinGeckoPriceSupport)':
+        return this.checkCoinGeckoPriceSupport(request);
       case 'pri(price.subscribeCurrentTokenPrice)':
         return this.subscribeCurrentTokenPrice(request, id, port);
       case 'pri(settings.savePriceCurrency)':

package/koni/background/utils.d.ts

@@ -1,6 +1,4 @@
 import { _ChainInfo } from '@subwallet/chain-list/types';
-import { MetadataItem } from '@subwallet/extension-base/background/KoniTypes';
-import { MetadataDef } from '@subwallet/extension-inject/types';
 import { Registry, SignerPayloadJSON } from '@polkadot/types/types';
 import KoniState from './handlers/State';
 export interface RegistrySource {
@@ -8,6 +6,6 @@ export interface RegistrySource {
     specVersion: string | number;
 }
 export declare function getSuitableRegistry(registries: RegistrySource[], payload: SignerPayloadJSON): Registry;
-export declare function setupApiRegistry(chainInfo: _ChainInfo | undefined, koniState: KoniState): RegistrySource | null;
-export declare function setupDatabaseRegistry(metadata: MetadataItem, chainInfo: _ChainInfo | undefined, payload: SignerPayloadJSON): RegistrySource | null;
-export declare function setupDappRegistry(metadata: MetadataDef, payload: SignerPayloadJSON): RegistrySource | null;
+export declare function setupApiRegistry(chainInfo: _ChainInfo | undefined, koniState: KoniState): Promise<RegistrySource | null>;
+export declare function setupDatabaseRegistry(chainInfo: _ChainInfo | undefined, payload: SignerPayloadJSON, koniState: KoniState): Promise<RegistrySource | null>;
+export declare function setupDappRegistry(payload: SignerPayloadJSON, koniState: KoniState): Promise<RegistrySource | null>;

package/koni/background/utils.js

@@ -1,6 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { wait } from '@subwallet/extension-base/utils';
 import { metadataExpand } from '@subwallet/extension-chains/bundle';
 import { Metadata, TypeRegistry } from '@polkadot/types';
 export function getSuitableRegistry(registries, payload) {
@@ -23,41 +24,75 @@ export function getSuitableRegistry(registries, payload) {
   });
   return sortedRegistries[0].registry;
 }
-export function setupApiRegistry(chainInfo, koniState) {
+export async function setupApiRegistry(chainInfo, koniState) {
   if (!chainInfo) {
     return null;
   }
-  const api = koniState.getSubstrateApi(chainInfo.slug).api;
-  const apiSpecVersion = api === null || api === void 0 ? void 0 : api.runtimeVersion.specVersion.toString();
-  const registry = api === null || api === void 0 ? void 0 : api.registry;
-  return {
-    registry,
-    specVersion: apiSpecVersion
-  };
-}
-export function setupDatabaseRegistry(metadata, chainInfo, payload) {
-  if (!metadata || !metadata.genesisHash || !chainInfo) {
+  try {
+    const api = koniState.getSubstrateApi(chainInfo.slug).api;
+    if (!api) {
+      return null;
+    }
+
+    // Wait for the API to be ready or timeout after 1 second
+    await Promise.race([wait(1000).then(() => {
+      throw new Error('Timeout waiting for API to be ready');
+    }), api.isReady]);
+
+    // Extract the spec version and registry
+    const apiSpecVersion = api.runtimeVersion.specVersion.toString();
+    const registry = api.registry;
+    return {
+      registry,
+      specVersion: apiSpecVersion
+    };
+  } catch (e) {
+    console.error('Error in setupApiRegistry:', e);
     return null;
   }
-  const registry = new TypeRegistry();
-  const _metadata = new Metadata(registry, metadata.hexValue);
-  registry.register(metadata.types);
-  registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
-  registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
 }
-export function setupDappRegistry(metadata, payload) {
-  if (!metadata || !metadata.genesisHash) {
+export async function setupDatabaseRegistry(chainInfo, payload, koniState) {
+  if (!chainInfo) {
+    console.warn('setupDatabaseRegistry: Missing chainInfo');
+    return null;
+  }
+  try {
+    const metadata = await koniState.chainService.getMetadataByHash(payload.genesisHash);
+    if (!(metadata !== null && metadata !== void 0 && metadata.genesisHash)) {
+      console.warn('setupDatabaseRegistry: Metadata not found or invalid for genesisHash:', payload.genesisHash);
+      return null;
+    }
+    const registry = new TypeRegistry();
+    const _metadata = new Metadata(registry, metadata.hexValue);
+    registry.register(metadata.types);
+    registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo));
+    registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+    return {
+      registry,
+      specVersion: metadata.specVersion
+    };
+  } catch (e) {
+    console.error('setupDatabaseRegistry: Error setting up database registry:', e);
     return null;
   }
-  const expanded = metadataExpand(metadata, false);
-  const registry = expanded.registry;
-  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
+}
+export function setupDappRegistry(payload, koniState) {
+  return new Promise(resolve => {
+    const metadata = koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
+    if (!(metadata !== null && metadata !== void 0 && metadata.genesisHash)) {
+      return resolve(null);
+    }
+    try {
+      const expanded = metadataExpand(metadata, false);
+      const registry = expanded.registry;
+      registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+      resolve({
+        registry,
+        specVersion: metadata.specVersion
+      });
+    } catch (e) {
+      console.error('setupDappRegistry: Error setting up DApp registry:', e);
+      resolve(null);
+    }
+  });
 }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.34-0",
+  "version": "1.3.35-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -2705,12 +2705,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.34-0",
-    "@subwallet/extension-chains": "^1.3.34-0",
-    "@subwallet/extension-dapp": "^1.3.34-0",
-    "@subwallet/extension-inject": "^1.3.34-0",
+    "@subwallet/extension-base": "^1.3.35-0",
+    "@subwallet/extension-chains": "^1.3.35-0",
+    "@subwallet/extension-dapp": "^1.3.35-0",
+    "@subwallet/extension-inject": "^1.3.35-0",
     "@subwallet/keyring": "^0.1.11",
-    "@subwallet/subwallet-api-sdk": "^1.3.34-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.35-0",
     "@subwallet/ui-keyring": "^0.1.11",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.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.34-0'
+  version: '1.3.35-0'
 };

package/services/balance-service/helpers/process.d.ts

@@ -1,4 +1,4 @@
-import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _ChainAsset } from '@subwallet/chain-list/types';
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
 import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
 import { CommonOptimalTransferPath } from '@subwallet/extension-base/types/service-base';
@@ -11,4 +11,4 @@ export interface RequestOptimalTransferProcess {
 }
 export declare function getDefaultTransferProcess(): CommonOptimalTransferPath;
 export declare function getSnowbridgeTransferProcessFromEvm(address: string, evmApi: _EvmApi, tokenInfo: _ChainAsset, amount: string): Promise<CommonOptimalTransferPath>;
-export declare function getAcrossbridgeTransferProcessFromEvm(originChainInfo: _ChainInfo): Promise<CommonOptimalTransferPath>;
+export declare function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress: string): Promise<CommonOptimalTransferPath>;

package/services/balance-service/helpers/process.js

@@ -3,8 +3,6 @@
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { CommonStepType, DEFAULT_FIRST_STEP, MOCK_STEP_FEE } from '@subwallet/extension-base/types/service-base';
-import { _getEvmChainId } from "../../chain-service/utils/index.js";
-import { SpokePoolMapping } from "../transfer/xcm/acrossBridge/index.js";
 export function getDefaultTransferProcess() {
   return {
     totalFee: [MOCK_STEP_FEE, MOCK_STEP_FEE],
@@ -44,9 +42,7 @@ export async function getSnowbridgeTransferProcessFromEvm(address, evmApi, token
   result.totalFee.push(MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-export async function getAcrossbridgeTransferProcessFromEvm(originChainInfo) {
-  const chainId = _getEvmChainId(originChainInfo);
-  const SpokePoolAddress = SpokePoolMapping[chainId].SpokePool.address;
+export async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
   const result = {
     totalFee: [MOCK_STEP_FEE],
     steps: [DEFAULT_FIRST_STEP]

package/services/balance-service/index.js

@@ -18,7 +18,7 @@ import BigN from 'bignumber.js';
 import { t } from 'i18next';
 import { BehaviorSubject } from 'rxjs';
 import { noop } from '@polkadot/util';
-import { _isAcrossChainBridge } from "./transfer/xcm/acrossBridge/index.js";
+import { _isAcrossChainBridge, getAcrossQuote } from "./transfer/xcm/acrossBridge/index.js";
 import { BalanceMapImpl } from "./BalanceMapImpl.js";
 import { subscribeBalance } from "./helpers/index.js";
 
@@ -577,7 +577,26 @@ export class BalanceService {
     if (_isAcrossChainBridge(originChainInfo.slug, destChainInfo.slug)) {
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       if (!_isNativeToken(tokenInfo)) {
-        return getAcrossbridgeTransferProcessFromEvm(originChainInfo);
+        const chainInfoMap = this.state.getChainInfoMap();
+        const originTokenInfo = this.state.getAssetBySlug(params.tokenSlug);
+        const destinationTokenInfo = this.state.getXcmEqualAssetByChain(params.destChain, params.tokenSlug);
+        if (!destinationTokenInfo) {
+          throw new Error('Destination token info not found');
+        }
+        const inputData = {
+          destinationTokenInfo,
+          originTokenInfo,
+          sendingValue: params.amount,
+          sender: params.address,
+          recipient: params.address,
+          destinationChain: chainInfoMap[destinationTokenInfo.originChain],
+          originChain: chainInfoMap[originTokenInfo.originChain]
+        };
+        const data = await getAcrossQuote(inputData);
+        if (!data) {
+          throw new Error('Failed to fetch Across Bridge Data. Please try again later');
+        }
+        return getAcrossbridgeTransferProcessFromEvm(data.to);
       }
     }
     return getDefaultTransferProcess();

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -1,19 +1,20 @@
 import { CreateXcmExtrinsicProps } from '..';
 export declare function _isAcrossChainBridge(srcChain: string, destChain: string): boolean;
 export declare function _isAcrossTestnetBridge(srcChain: string): boolean;
-export declare const SpokePoolMapping: Record<number, {
-    SpokePool: {
-        address: string;
-        blockNumber: number;
-    };
-}>;
 export declare const AcrossErrorMsg: {
     AMOUNT_TOO_LOW: string;
     AMOUNT_TOO_HIGH: string;
 };
-interface AcrossQuote {
+export interface AcrossQuote {
     outputAmount: string;
     rate: string;
 }
-export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<AcrossQuote>;
+interface XcmApiResponse {
+    sender: string;
+    to: string;
+    transferEncodedCall: string;
+    value: string;
+    metadata?: any;
+}
+export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<XcmApiResponse>;
 export {};