Merge remote-tracking branch 'origin/subwallet-dev'

# Conflicts: # packages/extension-koni-ui/package.json # packages/extension-web-ui/package.json
Carach71 · Dec 12, 2024 · 973ddbe · 973ddbe
2 parents d8c772a + 7ba8512
commit 973ddbe
Show file tree

Hide file tree

Showing 9 changed files with 552 additions and 347 deletions.
diff --git a/package.json b/package.json
@@ -90,25 +90,26 @@
     "@ledgerhq/hw-app-eth": "6.33.4",
     "@ledgerhq/hw-transport": "6.30.3",
     "@mangata-finance/type-definitions": "2.1.2",
-    "@polkadot/api": "^12.0.2",
-    "@polkadot/api-augment": "^12.0.2",
-    "@polkadot/api-base": "^12.0.2",
-    "@polkadot/api-contract": "^12.0.2",
-    "@polkadot/api-derive": "^12.0.2",
-    "@polkadot/networks": "^12.6.2",
-    "@polkadot/rpc-augment": "^12.0.2",
-    "@polkadot/rpc-core": "^12.0.2",
-    "@polkadot/rpc-provider": "^12.0.2",
-    "@polkadot/types": "^12.0.2",
-    "@polkadot/types-codec": "^12.0.2",
-    "@polkadot/types-known": "^12.0.2",
-    "@polkadot/types-support": "^12.0.2",
-    "@polkadot/util": "^12.6.2",
-    "@polkadot/util-crypto": "^12.6.2",
+    "@polkadot/api": "^15.0.1",
+    "@polkadot/api-augment": "^15.0.1",
+    "@polkadot/api-base": "^15.0.1",
+    "@polkadot/api-contract": "^15.0.1",
+    "@polkadot/api-derive": "^15.0.1",
+    "@polkadot/networks": "^13.2.3",
+    "@polkadot/rpc-augment": "^15.0.1",
+    "@polkadot/rpc-core": "^15.0.1",
+    "@polkadot/rpc-provider": "^15.0.1",
+    "@polkadot/types": "^15.0.1",
+    "@polkadot/types-codec": "^15.0.1",
+    "@polkadot/types-known": "^15.0.1",
+    "@polkadot/types-support": "^15.0.1",
+    "@polkadot/util": "^13.2.3",
+    "@polkadot/util-crypto": "^13.2.3",
     "@subwallet/chain-list": "0.2.95",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/react-ui": "5.1.2-b79",
     "@subwallet/ui-keyring": "0.1.8-beta.0",
+    "@types/bn.js": "^5.1.6",
     "@zondax/ledger-substrate": "0.44.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^29.3.1",

diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json
@@ -28,29 +28,29 @@
     "@ethereumjs/common": "^4.1.0",
     "@ethereumjs/tx": "^5.1.0",
     "@ethersproject/abi": "^5.7.0",
-    "@galacticcouncil/sdk": "^4.2.1",
+    "@galacticcouncil/sdk": "^5.1.0",
     "@gear-js/api": "^0.38.1",
     "@json-rpc-tools/utils": "^1.7.6",
     "@metamask/eth-sig-util": "^7.0.3",
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
     "@polkadot-api/merkleize-metadata": "^1.1.0",
-    "@polkadot/api": "^11.0.3",
-    "@polkadot/api-base": "^10.11.2",
-    "@polkadot/api-contract": "^11.0.3",
-    "@polkadot/api-derive": "^11.0.3",
+    "@polkadot/api": "^15.0.1",
+    "@polkadot/api-base": "^15.0.1",
+    "@polkadot/api-contract": "^15.0.1",
+    "@polkadot/api-derive": "^15.0.1",
     "@polkadot/apps-config": "^0.137.1",
     "@polkadot/hw-ledger": "^12.6.2",
-    "@polkadot/networks": "^12.6.2",
+    "@polkadot/networks": "^13.2.3",
     "@polkadot/phishing": "^0.22.7",
-    "@polkadot/rpc-provider": "^11.0.3",
-    "@polkadot/types": "^11.0.3",
-    "@polkadot/types-augment": "^11.0.3",
-    "@polkadot/types-known": "^10.12.4",
+    "@polkadot/rpc-provider": "^15.0.1",
+    "@polkadot/types": "^15.0.1",
+    "@polkadot/types-augment": "^15.0.1",
+    "@polkadot/types-known": "^15.0.1",
     "@polkadot/ui-settings": "^3.6.6",
-    "@polkadot/util": "^12.6.2",
-    "@polkadot/util-crypto": "^12.6.2",
+    "@polkadot/util": "^13.2.3",
+    "@polkadot/util-crypto": "^13.2.3",
     "@polkadot/x-global": "^12.2.1",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",

diff --git a/packages/extension-base/src/services/chain-service/constants.ts b/packages/extension-base/src/services/chain-service/constants.ts
@@ -231,12 +231,12 @@ export const _TRANSFER_CHAIN_GROUP = {
   kintsugi: ['kintsugi', 'kintsugi_test', 'interlay', 'mangatax_para'],
   genshiro: ['genshiro_testnet', 'genshiro', 'equilibrium_parachain'],
   // crab: ['crab', 'pangolin'],
-  bitcountry: ['pioneer', 'bitcountry', 'bifrost', 'bifrost_dot'],
+  bitcountry: ['pioneer', 'bitcountry'],
   statemine: ['statemint', 'statemine', 'darwinia2', 'astar', 'shiden', 'shibuya', 'parallel', 'liberland', 'liberlandTest', 'dentnet', 'dbcchain'],
   riochain: ['riochain'],
   sora_substrate: ['sora_substrate'],
   avail: ['kate', 'goldberg_testnet'],
-  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main'],
+  pendulum: ['pendulum', 'amplitude', 'amplitude_test', 'hydradx_main', 'bifrost', 'bifrost_dot'],
   centrifuge: ['centrifuge'],
   disable_transfer: ['invarch', 'crab', 'pangolin']
 };

diff --git a/...sion-base/src/services/chain-service/health-check/utils/new-utils/asset-asset-validate.ts b/...sion-base/src/services/chain-service/health-check/utils/new-utils/asset-asset-validate.ts
@@ -71,7 +71,7 @@ export function validateNativeLocalTransferMetadata (chainAsset: _ChainAsset) {
   }
 
   const moonbeamGroup = ['moonbeam, moonbase, moonriver'];
-  const onChainInfoLocalGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi, 'pendulum', 'amplitude'];
+  const onChainInfoLocalGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.bitcountry, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi, 'pendulum', 'amplitude', 'bifrost', 'bifrost_dot'];
   const onChainInfoNativeGroup = [_TRANSFER_CHAIN_GROUP.centrifuge, ..._TRANSFER_CHAIN_GROUP.acala, ..._TRANSFER_CHAIN_GROUP.kintsugi];
   const assetIdLocalGroup = [..._TRANSFER_CHAIN_GROUP.statemine, ..._TRANSFER_CHAIN_GROUP.genshiro, ...moonbeamGroup, 'hydradx'];
   const assetIdNativeGroup = [..._TRANSFER_CHAIN_GROUP.sora_substrate, 'hydradx'];

diff --git a/packages/extension-base/src/services/swap-service/handler/asset-hub/utils.ts b/packages/extension-base/src/services/swap-service/handler/asset-hub/utils.ts
@@ -13,6 +13,7 @@ import { StagingXcmV3MultiLocation } from '@polkadot/types/lookup';
 export const _getPoolInfo = async (api: ApiPromise, asset1: _ChainAsset, asset2: _ChainAsset): Promise<[string, string]> => {
   const assetLocation1 = _getXcmAssetMultilocation(asset1) as StagingXcmV3MultiLocation;
   const assetLocation2 = _getXcmAssetMultilocation(asset2) as StagingXcmV3MultiLocation;
+  // @ts-ignore - Type auto detect incorrect
   const rs = await api.call.assetConversionApi.getReserves(assetLocation1, assetLocation2);
 
   if (!rs) {

diff --git a/packages/extension-koni-ui/package.json b/packages/extension-koni-ui/package.json
@@ -88,7 +88,7 @@
   },
   "devDependencies": {
     "@subwallet/extension-mocks": "^1.3.9-0",
-    "@types/bn.js": "^5.1.1",
+    "@types/bn.js": "^5.1.6",
     "@types/enzyme": "^3.10.12",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/file-saver": "^2.0.5",

diff --git a/packages/extension-web-ui/package.json b/packages/extension-web-ui/package.json
@@ -89,7 +89,7 @@
   },
   "devDependencies": {
     "@subwallet/extension-mocks": "^1.3.9-0",
-    "@types/bn.js": "^5.1.1",
+    "@types/bn.js": "^5.1.6",
     "@types/enzyme": "^3.10.12",
     "@types/enzyme-adapter-react-16": "^1.0.6",
     "@types/file-saver": "^2.0.5",

diff --git a/patches/@polkadot+util+12.6.2.patch → patches/@polkadot+util+13.2.3.patch b/patches/@polkadot+util+12.6.2.patch → patches/@polkadot+util+13.2.3.patch
@@ -1,8 +1,8 @@
-diff --git a/node_modules/@polkadot/util/cjs/versionDetect.js b/node_modules/@polkadot/util/cjs/versionDetect.js
-index af482b7..23518d9 100644
---- a/node_modules/@polkadot/util/cjs/versionDetect.js
-+++ b/node_modules/@polkadot/util/cjs/versionDetect.js
-@@ -75,7 +75,7 @@ function warn(pre, all, fmt) {
+diff --git a/node_modules/@polkadot/util/cjs/detectPackage.js b/node_modules/@polkadot/util/cjs/detectPackage.js
+index c6ffc8f..df543f0 100644
+--- a/node_modules/@polkadot/util/cjs/detectPackage.js
++++ b/node_modules/@polkadot/util/cjs/detectPackage.js
+@@ -76,7 +76,7 @@ function warn(pre, all, fmt) {
   * @description A `@polkadot/*` version detection utility, checking for one occurrence of a package in addition to checking for dependency versions.
   */
  function detectPackage({ name, path, type, version }, pathOrFn, deps = []) {
@@ -11,10 +11,10 @@ index af482b7..23518d9 100644
          throw new Error(`Invalid package descriptor ${name}`);
      }
      const entry = getEntry(name);
-diff --git a/node_modules/@polkadot/util/versionDetect.js b/node_modules/@polkadot/util/versionDetect.js
-index 23b8f8d..4f5cdd6 100644
---- a/node_modules/@polkadot/util/versionDetect.js
-+++ b/node_modules/@polkadot/util/versionDetect.js
+diff --git a/node_modules/@polkadot/util/detectPackage.js b/node_modules/@polkadot/util/detectPackage.js
+index c66aad8..afd4cc6 100644
+--- a/node_modules/@polkadot/util/detectPackage.js
++++ b/node_modules/@polkadot/util/detectPackage.js
 @@ -72,7 +72,7 @@ function warn(pre, all, fmt) {
   * @description A `@polkadot/*` version detection utility, checking for one occurrence of a package in addition to checking for dependency versions.
   */