Merge remote-tracking branch 'refs/remotes/origin/subwallet-dev' into webapp-dev

# Conflicts:
#	packages/extension-base/src/services/chain-service/index.ts
#	packages/webapp/package.json

Author: saltict

.123trigger

@@ -131,4 +131,6 @@
 1.1.61
 1.1.62
 1.1.63
-1.1.64
+1.1.64
+1.1.65
+1.1.66

CHANGELOG.md

@@ -1,5 +1,34 @@
 # CHANGELOG
 
+## 1.1.66
+Build date: May 21, 2024.
+
+Features & Update:
+- Update chain-list (#3055)
+  - Support SQD token on Arbitrum
+  - Support for Common LP Drops and Common Staking Drops
+  - Update price-id for AUDD
+- Update new chain-list interface (#3085)
+- Support GRC-20 token (#2852, #3067)
+
+Bugs fixed:
+- Handle the case of not resetting the wallet to the default state when click Erase all (#3035)
+
+## 1.1.65
+Build date: May 17, 2024.
+
+Features & Update:
+- Update chain-list (#3040)
+  - Update chainBalanceSlug and explorer for some chains
+  - Add support for Hyperbridge (Nexus)
+  - Add support for CESS testnet
+  - Add support for Pendulum, Amplitude assets
+  - Add support for BOB and tokens on BOB
+
+Bugs fixed:
+- Fixed bug Unable to back screen in case open General settings to Marketing campaign (#3062)
+- Fixed bug when transferring PSP22 token (#3041)
+
 ## 1.1.64
 Build date: May 11, 2024.
 

CONTRIBUTORS

@@ -1,19 +1,19 @@
-    2511	AnhMTV                        	Release version 1.1.64
+    2522	AnhMTV                        	Release version 1.1.66
     2352	Nam Phạm                      	[Issue 2754] fix: fix eslint
-    2027	S2kael                        	[Issue-3020] Update chain-list stable version
-     813	lw-cdm                        	
+    2036	S2kael                        	[Issue-3055] Update stable version for chain-list
+     815	lw-cdm                        	Fix eslint issues
      465	Jaco                          	0.42.5 (#969)
-     403	nguyentiendung                	[Issue-3011] Update UI code for change symbol
+     416	nguyentiendung                	[Issue-2914] Update yarn.lock
      185	quangdo                       	
-     129	bluezdot                      	[Issue-3020] Update ED for mythos
+     148	bluezdot                      	[Issue-3055] Update chainlist
      106	dominhquang                   	[Issue-2649] Add send crash log feature
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
+     102	Automation Bot                	[CI Skip] Auto increase webapp build number
      101	lw-cdm                        	
-      99	Automation Bot                	[CI Skip] Auto increase webapp build number
       83	Hieu Dao                      	Update README.md
       82	Thibaut Sardan                	Add account filtering feature (#832)
       81	leewong                       	Swap - Change idle time to 300s
-      73	Thiendekaco                   	[Issue 2859] [fix] Extension - deploy smart contract when use ledger
+      75	Thiendekaco                   	[Issue 3062] [fix] Extension - Unable to back screen in case open General settings to Marketing campaign
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
       48	bluedot                       	[Issue-2771] Update multichain asset logo for ASTR

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.1.64",
+  "version": "1.1.66",
   "workspaces": [
     "packages/*"
   ],
@@ -79,21 +79,21 @@
     "sinon-chrome": "^3.0.1"
   },
   "resolutions": {
-    "@subwallet/react-ui": "5.1.2-b77",
     "@ethereumjs/common": "^4.1.0",
     "@google/model-viewer": "3.1.1",
     "@ledgerhq/hw-app-eth": "6.33.4",
     "@mangata-finance/type-definitions": "2.1.2",
-    "@polkadot/api": "^10.12.4",
-    "@polkadot/api-base": "^10.11.2",
-    "@polkadot/api-contract": "^10.12.4",
+    "@polkadot/api": "^11.0.3",
+    "@polkadot/api-base": "^11.0.3",
+    "@polkadot/api-contract": "^11.0.3",
     "@polkadot/networks": "^12.6.2",
-    "@polkadot/types": "^10.12.4",
-    "@polkadot/types-codec": "10.10.1",
+    "@polkadot/types": "^11.0.3",
+    "@polkadot/types-codec": "^11.0.3",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
-    "@subwallet/chain-list": "0.2.60",
+    "@subwallet/chain-list": "0.2.62",
     "@subwallet/keyring": "^0.1.5",
+    "@subwallet/react-ui": "5.1.2-b77",
     "@subwallet/ui-keyring": "^0.1.5",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^29.3.1",

packages/extension-base/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.64-0",
+  "version": "1.1.66-0",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -29,32 +29,33 @@
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
     "@galacticcouncil/sdk": "^2.1.0",
+    "@gear-js/api": "^0.37.2",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.12.4",
+    "@polkadot/api": "^11.0.3",
     "@polkadot/api-base": "^10.11.2",
-    "@polkadot/api-contract": "^10.12.4",
-    "@polkadot/api-derive": "^10.12.4",
-    "@polkadot/apps-config": "^0.135.1",
+    "@polkadot/api-contract": "^11.0.3",
+    "@polkadot/api-derive": "^11.0.3",
+    "@polkadot/apps-config": "^0.137.1",
     "@polkadot/hw-ledger": "^12.6.2",
     "@polkadot/networks": "^12.6.2",
-    "@polkadot/phishing": "^0.22.4",
-    "@polkadot/rpc-provider": "^10.12.4",
-    "@polkadot/types": "^10.12.4",
-    "@polkadot/types-augment": "^10.12.4",
-    "@polkadot/ui-settings": "^3.6.5",
+    "@polkadot/phishing": "^0.22.7",
+    "@polkadot/rpc-provider": "^11.0.3",
+    "@polkadot/types": "^11.0.3",
+    "@polkadot/types-augment": "^11.0.3",
+    "@polkadot/ui-settings": "^3.6.6",
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.60",
-    "@subwallet/extension-base": "^1.1.64-0",
-    "@subwallet/extension-chains": "^1.1.64-0",
-    "@subwallet/extension-dapp": "^1.1.64-0",
-    "@subwallet/extension-inject": "^1.1.64-0",
+    "@subwallet/chain-list": "0.2.62",
+    "@subwallet/extension-base": "^1.1.66-0",
+    "@subwallet/extension-chains": "^1.1.66-0",
+    "@subwallet/extension-dapp": "^1.1.66-0",
+    "@subwallet/extension-inject": "^1.1.66-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",
@@ -82,6 +83,7 @@
     "moment": "^2.29.4",
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
+    "sails-js": "^0.1.3",
     "uuid": "^9.0.0",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
@@ -92,7 +94,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.1.64-0",
+    "@subwallet/extension-mocks": "^1.1.66-0",
     "@types/uuid": "^9.0.1"
   }
 }

packages/extension-base/src/koni/api/dotsama/transfer.ts

@@ -1,17 +1,20 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
+import { GearApi } from '@gear-js/api';
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { SupportTransferResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { _BALANCE_TOKEN_GROUP, _MANTA_ZK_CHAIN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
-import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenGearSmartContract, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
+import { getGRC20ContractPromise } from '@subwallet/extension-base/utils';
 
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { AccountInfoWithProviders, AccountInfoWithRefCount } from '@polkadot/types/interfaces';
-import { BN } from '@polkadot/util';
+import { BN, u8aToHex } from '@polkadot/util';
+import { decodeAddress } from '@polkadot/util-crypto';
 
 function isRefCount (accountInfo: AccountInfoWithProviders | AccountInfoWithRefCount): accountInfo is AccountInfoWithRefCount {
   return !!(accountInfo as AccountInfoWithRefCount).refcount;
@@ -142,6 +145,12 @@ interface CreateTransferExtrinsicProps {
 export const createTransferExtrinsic = async ({ from, networkKey, substrateApi, to, tokenInfo, transferAll, value }: CreateTransferExtrinsicProps): Promise<[SubmittableExtrinsic | null, string]> => {
   const api = substrateApi.api;
 
+  const isDisableTransfer = tokenInfo.metadata?.isDisableTransfer as boolean;
+
+  if (isDisableTransfer) {
+    return [null, value];
+  }
+
   // @ts-ignore
   let transfer: SubmittableExtrinsic<'promise'> | null = null;
   const isTxCurrenciesSupported = !!api && !!api.tx && !!api.tx.currencies;
@@ -159,6 +168,15 @@ export const createTransferExtrinsic = async ({ from, networkKey, substrateApi,
     // @ts-ignore
     transfer = contractPromise.tx['psp22::transfer']({ gasLimit }, to, value, {});
     transferAmount = value;
+  } else if (_isTokenGearSmartContract(tokenInfo) && (api instanceof GearApi)) {
+    const contractPromise = getGRC20ContractPromise(api, _getContractAddressOfToken(tokenInfo));
+    const transaction = await contractPromise
+      .transfer(u8aToHex(decodeAddress(to)), BigInt(value)) // Create transfer transaction
+      .withAccount(from) // Set sender account
+      .calculateGas(); // Add account arg to extrinsic
+
+    transfer = transaction.tx;
+    transferAmount = value;
   } else if (_TRANSFER_CHAIN_GROUP.acala.includes(networkKey)) {
     if (!_isNativeToken(tokenInfo)) {
       if (isTxCurrenciesSupported) {

packages/extension-base/src/koni/api/staking/bonding/relayChain.ts

@@ -754,7 +754,7 @@ export async function getRelayValidatorsInfo (chain: string, substrateApi: _Subs
   const bnTotalEraStake = new BN(_totalEraStake.toString());
   const eraStakers = _eraStakers as any[];
 
-  const rawMinBond = _minBond.toHuman() as string;
+  const rawMinBond = _minBond.toHuman();
   const minBond = rawMinBond.replaceAll(',', '');
 
   const totalStakeMap: Record<string, BN> = {};
@@ -916,6 +916,7 @@ export async function getRelayBondingExtrinsic (substrateApi: _SubstrateApi, amo
     if (paramsCount === 2) {
       bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
     } else {
+      // @ts-ignore
       bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
     }
 
@@ -928,6 +929,7 @@ export async function getRelayBondingExtrinsic (substrateApi: _SubstrateApi, amo
     if (paramsCount === 2) {
       bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
     } else {
+      // @ts-ignore
       bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
     }
 
@@ -950,6 +952,7 @@ export async function getRelayBondingExtrinsic (substrateApi: _SubstrateApi, amo
     return nominateTx;
   }
 
+  // @ts-ignore
   return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
 }
 
@@ -978,6 +981,7 @@ export async function getRelayWithdrawalExtrinsic (substrateApi: _SubstrateApi,
 
     return chainApi.api.tx.staking.withdrawUnbonded(slashingSpanCount);
   } else {
+    // @ts-ignore
     return chainApi.api.tx.staking.withdrawUnbonded();
   }
 }
@@ -1026,6 +1030,7 @@ export async function getPoolingWithdrawalExtrinsic (substrateApi: _SubstrateApi
 
     return chainApi.api.tx.nominationPools.withdrawUnbonded({ Id: nominatorMetadata.address }, slashingSpanCount);
   } else {
+    // @ts-ignore
     return chainApi.api.tx.nominationPools.withdrawUnbonded({ Id: nominatorMetadata.address });
   }
 }

packages/extension-base/src/koni/api/tokens/wasm/utils.ts

@@ -44,13 +44,16 @@ export async function getWasmContractGasLimit (
     // @ts-ignore
     const { gasLimit, storageDepositLimit, value } = options;
 
-    // @ts-ignore
     const { gasRequired } = await api.call.contractsApi.call(
       callerAddress,
       contract.address,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       value ?? new BN(0),
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       gasLimit ?? null,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       storageDepositLimit ?? null,
+      // @ts-ignore
       abiMessage?.value?.toU8a(args)
     );
 

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

@@ -5,7 +5,7 @@ import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
 import { isSubscriptionRunning, unsubscribe } from '@subwallet/extension-base/background/handlers/subscriptions';
-import { AccountRefMap, AddTokenRequestExternal, AmountData, APIItemState, ApiMap, AuthRequestV2, BasicTxErrorType, ChainStakingMetadata, ChainType, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrentAccountInfo, EvmProviderErrorType, EvmSendTransactionParams, EvmSendTransactionRequest, EvmSignatureRequest, ExternalRequestPromise, ExternalRequestPromiseStatus, ExtrinsicType, MantaAuthorizationContext, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
+import { AccountRefMap, AddTokenRequestExternal, AmountData, APIItemState, ApiMap, AuthRequestV2, BasicTxErrorType, ChainStakingMetadata, ChainType, ConfirmationsQueue, CrowdloanItem, CrowdloanJson, CurrencyType, CurrentAccountInfo, EvmProviderErrorType, EvmSendTransactionParams, EvmSendTransactionRequest, EvmSignatureRequest, ExternalRequestPromise, ExternalRequestPromiseStatus, ExtrinsicType, MantaAuthorizationContext, MantaPayConfig, MantaPaySyncState, NftCollection, NftItem, NftJson, NominatorMetadata, RequestAccountExportPrivateKey, RequestCheckPublicAndSecretKey, RequestConfirmationComplete, RequestCrowdloanContributions, RequestSettingsType, ResponseAccountExportPrivateKey, ResponseCheckPublicAndSecretKey, ServiceInfo, SingleModeJson, StakingItem, StakingJson, StakingRewardItem, StakingRewardJson, StakingType, UiSettings } from '@subwallet/extension-base/background/KoniTypes';
 import { AccountJson, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning } from '@subwallet/extension-base/background/types';
 import { ALL_ACCOUNT_KEY, ALL_GENESIS_HASH, MANTA_PAY_BALANCE_INTERVAL } from '@subwallet/extension-base/constants';
 import { BalanceService } from '@subwallet/extension-base/services/balance-service';
@@ -87,6 +87,8 @@ const generateDefaultCrowdloanMap = (): Record<string, CrowdloanItem> => {
   return crowdloanMap;
 };
 
+const DEFAULT_CURRENCY: CurrencyType = 'USD';
+
 export default class KoniState {
   private injectedProviders = new Map<chrome.runtime.Port, ProviderInterface>();
   private readonly providers: Providers;
@@ -1874,6 +1876,7 @@ export default class KoniState {
 
     if (resetAll) {
       this.settingService.resetWallet();
+      await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
     }
 
     this.chainService.resetWallet(resetAll);

packages/extension-base/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.64-0' };
+export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.66-0' };

packages/extension-base/src/services/balance-service/helpers/subscribe/index.ts

@@ -100,7 +100,7 @@ export function subscribeBalance (addresses: string[], chains: string[], tokens:
     const [useAddresses, notSupportAddresses] = filterAddress(addresses, chainInfo);
 
     if (notSupportAddresses.length) {
-      const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL]);
+      const tokens = filterAssetsByChainAndType(chainAssetMap, chainSlug, [_AssetType.NATIVE, _AssetType.ERC20, _AssetType.PSP22, _AssetType.LOCAL, _AssetType.GRC20]);
 
       const now = new Date().getTime();