Skip to content

Commit

Permalink
Merge branch 'koni/dev/issue-3910' into webapp-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
S2kael committed Jan 14, 2025
2 parents 57ed381 + 62ae6c4 commit ee1edbc
Show file tree
Hide file tree
Showing 13 changed files with 713 additions and 538 deletions.
31 changes: 16 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,25 +89,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.89-webapp-v2",
"@subwallet/keyring": "^0.1.7",
"@subwallet/react-ui": "5.1.2-b79",
"@subwallet/ui-keyring": "^0.1.7",
"@types/bn.js": "^5.1.6",
"@zondax/ledger-substrate": "0.44.2",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^29.3.1",
Expand Down
30 changes: 15 additions & 15 deletions packages/extension-base/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,22 @@
"@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/apps-config": "^0.137.1",
"@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.146.1",
"@polkadot/hw-ledger": "^12.6.2",
"@polkadot/networks": "^12.6.2",
"@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/ui-settings": "^3.6.6",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@polkadot/x-global": "^12.2.1",
"@polkadot/networks": "^13.2.3",
"@polkadot/phishing": "^0.24.5",
"@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.11.3",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@polkadot/x-global": "^13.2.3",
"@reduxjs/toolkit": "^1.9.1",
"@sora-substrate/type-definitions": "^1.17.7",
"@substrate/connect": "^0.8.9",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export interface BifrostVtokenExchangeRate {
token_pool: number
}

const STATS_URL = 'https://api.bifrost.app/api/site';
const RATIO_URL = 'https://api.bifrost.app/api/omni/MANTA';
const STATS_URL = 'https://dapi.bifrost.io/api/site';
const RATIO_URL = 'https://dapi.bifrost.io/api/omni/MANTA';

export default class BifrostMantaLiquidStakingPoolHandler extends BifrostLiquidStakingPoolHandler {
protected override readonly altInputAsset: string = 'manta_network-NATIVE-MANTA';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
const rs = await api.call.assetConversionApi.getReserves(assetLocation1, assetLocation2);

if (!rs) {
Expand Down
6 changes: 3 additions & 3 deletions packages/extension-chains/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"main": "index.js",
"dependencies": {
"@babel/runtime": "^7.20.6",
"@polkadot/networks": "^12.6.2",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@polkadot/networks": "^13.2.3",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@subwallet/extension-inject": "^1.2.32-0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-compat-metamask/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"dependencies": {
"@babel/runtime": "^7.20.6",
"@metamask/detect-provider": "^1.2.0",
"@polkadot/types": "^11.0.3",
"@polkadot/util": "^12.6.2",
"@polkadot/types": "^15.0.1",
"@polkadot/util": "^13.2.3",
"@subwallet/extension-inject": "^1.2.32-0",
"web3": "^1.10.0"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"main": "index.js",
"dependencies": {
"@babel/runtime": "^7.20.6",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@subwallet/extension-inject": "^1.2.32-0"
},
"peerDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/extension-inject/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"main": "index.js",
"dependencies": {
"@babel/runtime": "^7.20.6",
"@polkadot/rpc-provider": "^11.0.3",
"@polkadot/types": "^11.0.3",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@polkadot/x-global": "^12.2.1",
"@polkadot/rpc-provider": "^15.0.1",
"@polkadot/types": "^15.0.1",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@polkadot/x-global": "^13.2.3",
"web3-core": "^1.10.0"
},
"devDependencies": {
Expand Down
14 changes: 7 additions & 7 deletions packages/extension-koni-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"@fortawesome/free-solid-svg-icons": "^6.2.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@ledgerhq/hw-app-eth": "^6.35.0",
"@polkadot/api-contract": "^11.0.3",
"@polkadot/api-contract": "^15.0.1",
"@polkadot/hw-ledger": "^12.6.2",
"@polkadot/networks": "^12.6.2",
"@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",
"@polkadot/networks": "^13.2.3",
"@polkadot/types": "^15.0.1",
"@polkadot/types-augment": "^15.0.1",
"@polkadot/ui-settings": "^3.11.3",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.89-webapp-v2",
Expand Down
14 changes: 7 additions & 7 deletions packages/extension-web-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"@garvae/react-pie-donut-chart": "1.0.0",
"@ledgerhq/hw-app-eth": "^6.35.0",
"@polkadot/api-contract": "^11.0.3",
"@polkadot/api-contract": "^15.0.1",
"@polkadot/hw-ledger": "^12.6.2",
"@polkadot/networks": "^12.6.2",
"@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",
"@polkadot/networks": "^13.2.3",
"@polkadot/types": "^15.0.1",
"@polkadot/types-augment": "^15.0.1",
"@polkadot/ui-settings": "^3.11.3",
"@polkadot/util": "^13.2.3",
"@polkadot/util-crypto": "^13.2.3",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.89-webapp-v2",
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4"
}
}
}
Original file line number Diff line number Diff line change
@@ -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 = []) {
Expand All @@ -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.
*/
Expand Down
Loading

0 comments on commit ee1edbc

Please sign in to comment.