Merge branch 'refs/heads/subwallet-dev' into koni/dev/issue-4321

# Conflicts:
#	packages/extension-base/src/services/swap-service/handler/uniswap-handler.ts

Author: bluezdot

.123trigger

@@ -197,4 +197,6 @@
 1.3.29
 1.3.30
 1.3.31
-1.3.32
+1.3.32
+1.3.33
+1.3.34

CHANGELOG.md

@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## 1.3.34
+Build date: May 05, 2025.
+
+Features & Update:
+- Support extension side panel (#4091)
+- Update padding for the time frame selector for price chart
+
+
+## 1.3.33
+Build date: Apr 30, 2025.
+
+Features & Update:
+- Support price chart (#4122, #4266)
+- Update link for "Contact support" (#4324)
+
+
 ## 1.3.32
 Build date: Apr 26, 2025.
 

CONTRIBUTORS

@@ -1,4 +1,4 @@
-    3017	AnhMTV                        	Release version 1.3.32
+    3022	AnhMTV                        	Release version 1.3.34
     2668	Nam Phạm                      	disable block explorer for truth network
     2549	S2kael                        	[Isssue-4163] Update stable version for chain-list
      869	lw-cdm                        	[MasterAccount] Update logic to reorder account on select account modal
@@ -8,7 +8,7 @@
      354	Thiendekaco                   	[Issue-3707] [fix] Unified account - fix dApp ui bug #4
      286	Frenkie Nguyen                	
      240	tunghp2002                    	[Issue-4290] Update: Change earning positions
-     217	lw                            	[Issue-4114] fix: Fix error in transaction submission screen
+     237	lw                            	[Issue-4332] refactor: Update padding for the time frame selector
      186	dominhquang                   	[Issue-3507] Fix UI bug for Notification
      185	quangdo                       	
      170	lw-cdm                        	
@@ -22,12 +22,12 @@
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
       28	S2kael                        	[Issue-3658] Hide estimate fee field on Send Fund screen with cardano chain
-      24	Thiendekaco                   	[Issue-4100] fix: resolve PR feedback
+      28	Thiendekaco                   	[Issue-4100] fix: resolve PR feedback
+      15	Thiendekaco                   	[Issue-4122] feat: update price history product url
       10	Trang Trịnh                   	api get karura and acala nfts
       10	tunghp2002                    	
        9	Minh Le                       	
        9	minhld1029                    	[#115] [ForgetAccount] catch exception refList undefined
-       8	Thiendekaco                   	[Issue-4100] fix: resolve ui bug
        7	Ivan Rukhavets                	Mention derivation in FAQ (#334)
        6	unknown                       	refactor code
        5	anhnhu                        	[issue-2231]: add condition branch_name webapp-dev auto increase run scripts change build number

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.3.32",
+  "version": "1.3.34",
   "workspaces": [
     "packages/*"
   ],

packages/extension-base/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.3.32-0",
+  "version": "1.3.34-0",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -55,12 +55,12 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.104",
-    "@subwallet/extension-base": "^1.3.32-0",
-    "@subwallet/extension-chains": "^1.3.32-0",
-    "@subwallet/extension-dapp": "^1.3.32-0",
-    "@subwallet/extension-inject": "^1.3.32-0",
+    "@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/keyring": "^0.1.11",
-    "@subwallet/subwallet-api-sdk": "^1.3.32-0",
+    "@subwallet/subwallet-api-sdk": "^1.3.34-0",
     "@subwallet/ui-keyring": "^0.1.11",
     "@ton/core": "^0.56.3",
     "@ton/crypto": "^3.2.0",
@@ -105,7 +105,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.3.32-0",
+    "@subwallet/extension-mocks": "^1.3.34-0",
     "@types/uuid": "^9.0.1"
   }
 }

packages/extension-base/src/core/logic-validation/request.ts

@@ -455,7 +455,7 @@ export async function validationEvmDataTransactionMiddleware (koni: KoniState, u
             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) {

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -7,7 +7,7 @@ import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { createSubscription } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountExternalError, AddressBookInfo, AmountData, AmountDataWithId, AssetSetting, AssetSettingUpdateReq, BondingOptionParams, BrowserConfirmationType, CampaignBanner, CampaignData, CampaignDataType, ChainType, CronReloadRequest, CrowdloanJson, ExternalRequestPromiseStatus, ExtrinsicType, HistoryTokenPriceJSON, KeyringState, MantaPayEnableMessage, MantaPayEnableParams, MantaPayEnableResponse, MantaPaySyncState, MetadataItem, NftCollection, NftJson, NftTransactionRequest, NftTransactionResponse, PriceJson, RequestAccountCreateExternalV2, RequestAccountCreateHardwareMultiple, RequestAccountCreateHardwareV2, RequestAccountCreateWithSecretKey, RequestAccountExportPrivateKey, RequestAddInjectedAccounts, RequestApproveConnectWalletSession, RequestApproveWalletConnectNotSupport, RequestAuthorization, RequestAuthorizationBlock, RequestAuthorizationPerAccount, RequestAuthorizationPerSite, RequestAuthorizeApproveV2, RequestBondingSubmit, RequestCameraSettings, RequestCampaignBannerComplete, RequestChangeEnableChainPatrol, RequestChangeLanguage, RequestChangeMasterPassword, RequestChangePriceCurrency, RequestChangeShowBalance, RequestChangeShowZeroBalance, RequestChangeTimeAutoLock, RequestConfirmationComplete, RequestConfirmationCompleteCardano, RequestConfirmationCompleteTon, RequestConnectWalletConnect, RequestCrowdloanContributions, RequestDeleteContactAccount, RequestDisconnectWalletConnectSession, RequestEditContactAccount, RequestFindRawMetadata, RequestForgetSite, RequestFreeBalance, RequestGetHistoryTokenPriceData, RequestGetTransaction, RequestKeyringExportMnemonic, RequestMigratePassword, RequestMigrateSoloAccount, RequestMigrateUnifiedAndFetchEligibleSoloAccounts, RequestParseEvmContractInput, RequestParseTransactionSubstrate, RequestPassPhishingPage, RequestPingSession, RequestQrParseRLP, RequestQrSignEvm, RequestQrSignSubstrate, RequestRejectConnectWalletSession, RequestRejectExternalRequest, RequestRejectWalletConnectNotSupport, RequestRemoveInjectedAccounts, RequestResetWallet, RequestResolveExternalRequest, RequestSaveAppConfig, RequestSaveBrowserConfig, RequestSaveMigrationAcknowledgedStatus, RequestSaveOSConfig, RequestSaveRecentAccount, RequestSaveUnifiedAccountMigrationInProgress, RequestSettingsType, RequestSigningApprovePasswordV2, RequestStakePoolingBonding, RequestStakePoolingUnbonding, RequestSubscribeHistory, RequestSubstrateNftSubmitTransaction, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, RequestUnlockKeyring, RequestUnlockType, ResolveAddressToDomainRequest, ResolveDomainRequest, ResponseAccountCreateWithSecretKey, ResponseAccountExportPrivateKey, ResponseChangeMasterPassword, ResponseFindRawMetadata, ResponseKeyringExportMnemonic, ResponseMigratePassword, ResponseMigrateSoloAccount, ResponseMigrateUnifiedAndFetchEligibleSoloAccounts, ResponseNftImport, ResponseParseEvmContractInput, ResponseParseTransactionSubstrate, ResponseQrParseRLP, ResponseQrSignEvm, ResponseQrSignSubstrate, ResponseRejectExternalRequest, ResponseResetWallet, ResponseResolveExternalRequest, ResponseSubscribeCurrentTokenPrice, ResponseSubscribeHistory, ResponseUnlockKeyring, ShowCampaignPopupRequest, StakingJson, StakingRewardJson, StakingType, ThemeNames, TokenPriorityDetails, TransactionHistoryItem, TransactionResponse, UiSettings, ValidateNetworkRequest, ValidateNetworkResponse, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountExternalError, AddressBookInfo, AmountData, AmountDataWithId, AssetSetting, AssetSettingUpdateReq, BondingOptionParams, BrowserConfirmationType, CampaignBanner, CampaignData, CampaignDataType, ChainType, CronReloadRequest, CrowdloanJson, ExternalRequestPromiseStatus, ExtrinsicType, HistoryTokenPriceJSON, KeyringState, MantaPayEnableMessage, MantaPayEnableParams, MantaPayEnableResponse, MantaPaySyncState, NftCollection, NftJson, NftTransactionRequest, NftTransactionResponse, PriceJson, RequestAccountCreateExternalV2, RequestAccountCreateHardwareMultiple, RequestAccountCreateHardwareV2, RequestAccountCreateWithSecretKey, RequestAccountExportPrivateKey, RequestAddInjectedAccounts, RequestApproveConnectWalletSession, RequestApproveWalletConnectNotSupport, RequestAuthorization, RequestAuthorizationBlock, RequestAuthorizationPerAccount, RequestAuthorizationPerSite, RequestAuthorizeApproveV2, RequestBondingSubmit, RequestCameraSettings, RequestCampaignBannerComplete, RequestChangeEnableChainPatrol, RequestChangeLanguage, RequestChangeMasterPassword, RequestChangePriceCurrency, RequestChangeShowBalance, RequestChangeShowZeroBalance, RequestChangeTimeAutoLock, RequestConfirmationComplete, RequestConfirmationCompleteCardano, RequestConfirmationCompleteTon, RequestConnectWalletConnect, RequestCrowdloanContributions, RequestDeleteContactAccount, RequestDisconnectWalletConnectSession, RequestEditContactAccount, RequestFindRawMetadata, RequestForgetSite, RequestFreeBalance, RequestGetHistoryTokenPriceData, RequestGetTransaction, RequestKeyringExportMnemonic, RequestMigratePassword, RequestMigrateSoloAccount, RequestMigrateUnifiedAndFetchEligibleSoloAccounts, RequestParseEvmContractInput, RequestParseTransactionSubstrate, RequestPassPhishingPage, RequestPingSession, RequestQrParseRLP, RequestQrSignEvm, RequestQrSignSubstrate, RequestRejectConnectWalletSession, RequestRejectExternalRequest, RequestRejectWalletConnectNotSupport, RequestRemoveInjectedAccounts, RequestResetWallet, RequestResolveExternalRequest, RequestSaveAppConfig, RequestSaveBrowserConfig, RequestSaveMigrationAcknowledgedStatus, RequestSaveOSConfig, RequestSaveRecentAccount, RequestSaveUnifiedAccountMigrationInProgress, RequestSettingsType, RequestSigningApprovePasswordV2, RequestStakePoolingBonding, RequestStakePoolingUnbonding, RequestSubscribeHistory, RequestSubstrateNftSubmitTransaction, RequestTuringCancelStakeCompound, RequestTuringStakeCompound, RequestUnbondingSubmit, RequestUnlockKeyring, RequestUnlockType, ResolveAddressToDomainRequest, ResolveDomainRequest, ResponseAccountCreateWithSecretKey, ResponseAccountExportPrivateKey, ResponseChangeMasterPassword, ResponseFindRawMetadata, ResponseKeyringExportMnemonic, ResponseMigratePassword, ResponseMigrateSoloAccount, ResponseMigrateUnifiedAndFetchEligibleSoloAccounts, ResponseNftImport, ResponseParseEvmContractInput, ResponseParseTransactionSubstrate, ResponseQrParseRLP, ResponseQrSignEvm, ResponseQrSignSubstrate, ResponseRejectExternalRequest, ResponseResetWallet, ResponseResolveExternalRequest, ResponseSubscribeCurrentTokenPrice, ResponseSubscribeHistory, ResponseUnlockKeyring, ShowCampaignPopupRequest, StakingJson, StakingRewardJson, StakingType, ThemeNames, TokenPriorityDetails, TransactionHistoryItem, TransactionResponse, UiSettings, ValidateNetworkRequest, ValidateNetworkResponse, ValidatorInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountAuthType, AuthorizeRequest, MessageTypes, MetadataRequest, RequestAccountExport, RequestAuthorizeCancel, RequestAuthorizeReject, RequestCurrentAccountAddress, RequestMetadataApprove, RequestMetadataReject, RequestSigningApproveSignature, RequestSigningCancel, RequestTypes, ResponseAccountExport, ResponseAuthorizeList, ResponseType, SigningRequest, WindowOpenParams } from '@subwallet/extension-base/background/types';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { _SUPPORT_TOKEN_PAY_FEE_GROUP, ALL_ACCOUNT_KEY, LATEST_SESSION } from '@subwallet/extension-base/constants';
@@ -35,7 +35,7 @@ import { getERC20TransactionObject, getERC721Transaction, getEVMTransactionObjec
 import { createSubstrateExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/token';
 import { createTonTransaction } from '@subwallet/extension-base/services/balance-service/transfer/ton-transfer';
 import { createAcrossBridgeExtrinsic, createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, CreateXcmExtrinsicProps, createXcmExtrinsicV2, dryRunXcmExtrinsicV2, FunctionCreateXcmExtrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
-import { _isAcrossChainBridge, getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
+import { _isAcrossChainBridge, AcrossQuote, getAcrossQuote } from '@subwallet/extension-base/services/balance-service/transfer/xcm/acrossBridge';
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
 import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
@@ -1651,7 +1651,8 @@ export default class KoniExtension {
       }
 
       if (isAcrossBridgeTransfer) {
-        const metadata = await getAcrossQuote(params);
+        const data = await getAcrossQuote(params);
+        const metadata = data.metadata as AcrossQuote;
 
         inputData.metadata = {
           amountOut: metadata.outputAmount,
@@ -2860,23 +2861,18 @@ export default class KoniExtension {
     if (isJsonPayload(payload)) {
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
 
-      const allRegistry: RegistrySource[] = [
+      const registries = await Promise.all([
         setupApiRegistry(chainInfo, this.#koniState),
-        setupDatabaseRegistry(
-          await this.#koniState.chainService.getMetadataByHash(payload.genesisHash) as MetadataItem,
-          chainInfo,
-          payload
-        ),
-        setupDappRegistry(
-          this.#koniState.knownMetadata.find((meta: MetadataDef) => meta.genesisHash === payload.genesisHash) as MetadataDef,
-          payload
-        )
-      ].filter((item): item is RegistrySource => item !== null && item.registry !== undefined);
-
-      if (allRegistry.length === 0) {
+        setupDatabaseRegistry(chainInfo, payload, this.#koniState),
+        setupDappRegistry(payload, this.#koniState)
+      ]);
+
+      const validRegistries = registries.filter((item): item is RegistrySource => !!item?.registry);
+
+      if (validRegistries.length === 0) {
         registry.setSignedExtensions(payload.signedExtensions);
       } else {
-        registry = getSuitableRegistry(allRegistry, payload);
+        registry = getSuitableRegistry(validRegistries, payload);
       }
     }
 

packages/extension-base/src/koni/background/utils.ts

@@ -3,6 +3,7 @@
 
 import { _ChainInfo } from '@subwallet/chain-list/types';
 import { MetadataItem } from '@subwallet/extension-base/background/KoniTypes';
+import { wait } from '@subwallet/extension-base/utils';
 import { metadataExpand } from '@subwallet/extension-chains/bundle';
 import { MetadataDef } from '@subwallet/extension-inject/types';
 
@@ -44,51 +45,97 @@ export function getSuitableRegistry (registries: RegistrySource[], payload: Sign
   return sortedRegistries[0].registry;
 }
 
-export function setupApiRegistry (chainInfo: _ChainInfo | undefined, koniState: KoniState): RegistrySource | null {
+export async function setupApiRegistry (chainInfo: _ChainInfo | undefined, koniState: KoniState): Promise<RegistrySource | null> {
   if (!chainInfo) {
     return null;
   }
 
-  const api = koniState.getSubstrateApi(chainInfo.slug).api;
-  const apiSpecVersion = api?.runtimeVersion.specVersion.toString();
-  const registry = api?.registry as unknown as TypeRegistry;
+  try {
+    const api = koniState.getSubstrateApi(chainInfo.slug).api;
 
-  return {
-    registry,
-    specVersion: apiSpecVersion
-  };
+    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 as TypeRegistry;
+
+    return {
+      registry,
+      specVersion: apiSpecVersion
+    };
+  } catch (e) {
+    console.error('Error in setupApiRegistry:', e);
+
+    return null;
+  }
 }
 
-export function setupDatabaseRegistry (metadata: MetadataItem, chainInfo: _ChainInfo | undefined, payload: SignerPayloadJSON): RegistrySource | null {
-  if (!metadata || !metadata.genesisHash || !chainInfo) {
+export async function setupDatabaseRegistry (chainInfo: _ChainInfo | undefined, payload: SignerPayloadJSON, koniState: KoniState): Promise<RegistrySource | null> {
+  if (!chainInfo) {
+    console.warn('setupDatabaseRegistry: Missing chainInfo');
+
     return null;
   }
 
-  const registry = new TypeRegistry();
-  const _metadata = new Metadata(registry, metadata.hexValue);
+  try {
+    const metadata = await koniState.chainService.getMetadataByHash(payload.genesisHash) as MetadataItem;
 
-  registry.register(metadata.types);
-  registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo) as unknown as ChainProperties);
-  registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+    if (!metadata?.genesisHash) {
+      console.warn('setupDatabaseRegistry: Metadata not found or invalid for genesisHash:', payload.genesisHash);
 
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
-}
+      return null;
+    }
+
+    const registry = new TypeRegistry();
+    const _metadata = new Metadata(registry, metadata.hexValue);
+
+    registry.register(metadata.types);
+    registry.setChainProperties(registry.createType('ChainProperties', metadata.tokenInfo) as unknown as ChainProperties);
+    registry.setMetadata(_metadata, payload.signedExtensions, metadata.userExtensions);
+
+    return {
+      registry,
+      specVersion: metadata.specVersion
+    };
+  } catch (e) {
+    console.error('setupDatabaseRegistry: Error setting up database registry:', e);
 
-export function setupDappRegistry (metadata: MetadataDef, payload: SignerPayloadJSON): RegistrySource | null {
-  if (!metadata || !metadata.genesisHash) {
     return null;
   }
+}
+
+export function setupDappRegistry (payload: SignerPayloadJSON, koniState: KoniState): Promise<RegistrySource | null> {
+  return new Promise((resolve) => {
+    const metadata = koniState.knownMetadata.find((meta: MetadataDef) => meta.genesisHash === payload.genesisHash);
+
+    if (!metadata?.genesisHash) {
+      return resolve(null);
+    }
+
+    try {
+      const expanded = metadataExpand(metadata, false);
+      const registry = expanded.registry;
 
-  const expanded = metadataExpand(metadata, false);
-  const registry = expanded.registry;
+      registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
 
-  registry.setSignedExtensions(payload.signedExtensions, expanded.definition.userExtensions);
+      resolve({
+        registry,
+        specVersion: metadata.specVersion
+      });
+    } catch (e) {
+      console.error('setupDappRegistry: Error setting up DApp registry:', e);
 
-  return {
-    registry,
-    specVersion: metadata.specVersion
-  };
+      resolve(null);
+    }
+  });
 }