Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/koni/dev/issue-3985…
Browse files Browse the repository at this point in the history 
…' into webapp-dev

# Conflicts:
#	package.json
#	packages/extension-base/package.json
#	packages/extension-koni-ui/package.json
#	packages/extension-web-ui/package.json
#	yarn.lock
  • Loading branch information
@lw-cdm
lw-cdm committed Jan 14, 2025
2 parents a94cad0 + 4e50fff commit 5a20636
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"@polkadot/types-support": "^12.0.2",
"@polkadot/util": "^12.6.2",
"@polkadot/util-crypto": "^12.6.2",
"@subwallet/chain-list": "0.2.88-webapp",
"@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",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@reduxjs/toolkit": "^1.9.1",
"@sora-substrate/type-definitions": "^1.17.7",
"@substrate/connect": "^0.8.9",
"@subwallet/chain-list": "0.2.88-webapp",
"@subwallet/chain-list": "0.2.89-webapp-v2",
"@subwallet/extension-base": "^1.2.32-0",
"@subwallet/extension-chains": "^1.2.32-0",
"@subwallet/extension-dapp": "^1.2.32-0",
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-base/src/services/chain-service/constants.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,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']
};
Expand Down
2 changes: 1 addition & 1 deletion ...sion-base/src/services/chain-service/health-check/utils/new-utils/asset-asset-validate.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-koni-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@polkadot/util-crypto": "^12.6.2",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.88-webapp",
"@subwallet/chain-list": "0.2.89-webapp-v2",
"@subwallet/extension-base": "^1.2.32-0",
"@subwallet/extension-chains": "^1.2.32-0",
"@subwallet/extension-dapp": "^1.2.32-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension-web-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@polkadot/util-crypto": "^12.6.2",
"@ramonak/react-progress-bar": "^5.0.3",
"@reduxjs/toolkit": "^1.9.1",
"@subwallet/chain-list": "0.2.88-webapp",
"@subwallet/chain-list": "0.2.89-webapp-v2",
"@subwallet/extension-base": "^1.2.32-0",
"@subwallet/extension-chains": "^1.2.32-0",
"@subwallet/extension-dapp": "^1.2.32-0",
Expand Down
2 changes: 1 addition & 1 deletion packages/webapp/package.json
View file
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"
}
}
}
14 changes: 7 additions & 7 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6268,14 +6268,14 @@ __metadata:
languageName: node
linkType: hard

"@subwallet/chain-list@npm:0.2.88-webapp":
version: 0.2.88-webapp
resolution: "@subwallet/chain-list@npm:0.2.88-webapp"
"@subwallet/chain-list@npm:0.2.89-webapp-v2":
version: 0.2.89-webapp-v2
resolution: "@subwallet/chain-list@npm:0.2.89-webapp-v2"
dependencies:
"@polkadot/dev": 0.67.167
"@polkadot/util": ^12.5.1
eventemitter3: ^5.0.1
checksum: 80267a73a42ae2f9160450bb72dc01e92255e4fea15cfba6b3a2889223d210c4b97e02b902ee82dc9e53e66711afcc323ca4a76819161d4fd9dc91fb0a967ccc
checksum: 60a743611e1eb1a81ef2f8a3a01b1ab09e5727c55991f1a89f27cc8c10f51b6abb3a5bf5d031f249de0aa53e32d104daa014cf0437383df14f258eec31aeee56
languageName: node
linkType: hard

Expand Down Expand Up @@ -6318,7 +6318,7 @@ __metadata:
"@reduxjs/toolkit": ^1.9.1
"@sora-substrate/type-definitions": ^1.17.7
"@substrate/connect": ^0.8.9
"@subwallet/chain-list": 0.2.88-webapp
"@subwallet/chain-list": 0.2.89-webapp-v2
"@subwallet/extension-base": ^1.2.32-0
"@subwallet/extension-chains": ^1.2.32-0
"@subwallet/extension-dapp": ^1.2.32-0
Expand Down Expand Up @@ -6451,7 +6451,7 @@ __metadata:
"@polkadot/util-crypto": ^12.6.2
"@ramonak/react-progress-bar": ^5.0.3
"@reduxjs/toolkit": ^1.9.1
"@subwallet/chain-list": 0.2.88-webapp
"@subwallet/chain-list": 0.2.89-webapp-v2
"@subwallet/extension-base": ^1.2.32-0
"@subwallet/extension-chains": ^1.2.32-0
"@subwallet/extension-dapp": ^1.2.32-0
Expand Down Expand Up @@ -6591,7 +6591,7 @@ __metadata:
"@polkadot/util-crypto": ^12.6.2
"@ramonak/react-progress-bar": ^5.0.3
"@reduxjs/toolkit": ^1.9.1
"@subwallet/chain-list": 0.2.88-webapp
"@subwallet/chain-list": 0.2.89-webapp-v2
"@subwallet/extension-base": ^1.2.32-0
"@subwallet/extension-chains": ^1.2.32-0
"@subwallet/extension-dapp": ^1.2.32-0
Expand Down

0 comments on commit 5a20636

Please sign in to comment.