Skip to content

Commit

Permalink
Merge branch 'master' into release/kintsugi/2.41.15
Browse files Browse the repository at this point in the history
* master: (247 commits)
  chore: remove parallel (#1675)
  chore: release v2.41.14
  chore: update XCM nodes (#1672)
  Cherry pick: api: add phala-network to the pricefeed (#1668) (#1670)
  chore: Update xcm-endpoints.ts (#1669)
  exclude USDC.wh from foreign assets (#1643)
  chore: release v2.41.13
  chore: bump bridge and add new dependency (#1664)
  Fixed a small dashboard display issue (#1658)
  chore: release v2.41.12
  api: improve cache-control headers (#1659)
  chore: release v2.41.11
  chore: release v2.41.10
  HDX and BNC icons (#1655)
  api: add Vercel KV cache for storing market data (#1654)
  Tom/bridge 0.5.1 (#1651)
  chore: release v2.41.9
  chore: bump bridge (#1648)
  chore: release v2.41.8
  hotfix: XCM polkadot/kintsugi max transferable balance (#1645)
  ...

# Conflicts:
#	src/config/relay-chains.tsx
#	src/hooks/api/xcm/xcm-endpoints.ts
#	src/pages/SendAndReceive/SendAndReceiveForms/components/ChainIcon/ChainIcon.tsx
#	src/pages/SendAndReceive/SendAndReceiveForms/components/ChainIcon/icons/index.ts
  • Loading branch information
tomjeatt committed Jan 21, 2025
2 parents 1c5c582 + f899a74 commit 560f274
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 11 deletions.
3 changes: 0 additions & 3 deletions src/config/relay-chains.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { AstarAdapter } from '@interlay/bridge/build/adapters/astar';
import { BifrostKusamaAdapter, BifrostPolkadotAdapter } from '@interlay/bridge/build/adapters/bifrost';
import { HydraAdapter } from '@interlay/bridge/build/adapters/hydradx';
import { InterlayAdapter, KintsugiAdapter } from '@interlay/bridge/build/adapters/interlay';
import { HeikoAdapter, ParallelAdapter } from '@interlay/bridge/build/adapters/parallel';
import { KusamaAdapter, PolkadotAdapter } from '@interlay/bridge/build/adapters/polkadot';
import { StatemineAdapter, StatemintAdapter } from '@interlay/bridge/build/adapters/statemint';
import { BaseCrossChainAdapter } from '@interlay/bridge/build/base-chain-adapter';
Expand Down Expand Up @@ -168,7 +167,6 @@ switch (process.env.REACT_APP_RELAY_CHAIN_NAME) {
bifrost_polkadot: new BifrostPolkadotAdapter(),
astar: new AstarAdapter(),
hydra: new HydraAdapter(),
parallel: new ParallelAdapter(),
polkadot: new PolkadotAdapter(),
statemint: new StatemintAdapter()
};
Expand Down Expand Up @@ -216,7 +214,6 @@ switch (process.env.REACT_APP_RELAY_CHAIN_NAME) {
karura: new KaruraAdapter(),
statemine: new StatemineAdapter(),
bifrost: new BifrostKusamaAdapter(),
heiko: new HeikoAdapter()
};
SS58_PREFIX = 2;
break;
Expand Down
2 changes: 0 additions & 2 deletions src/hooks/api/xcm/xcm-endpoints.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const XCMEndpoints: XCMEndpointsRecord = {
'wss://bifrost-polkadot-rpc.dwellir.com',
'wss://eu.bifrost-polkadot-rpc.liebi.com/ws'
],
heiko: ['wss://heiko-rpc.parallel.fi'],
hydra: ['wss://rpc.hydradx.cloud', 'wss://hydradx-rpc.dwellir.com'],
interlay: ['wss://api.interlay.io/parachain'],
karura: [
Expand All @@ -22,7 +21,6 @@ const XCMEndpoints: XCMEndpointsRecord = {
],
kintsugi: ['wss://api-kusama.interlay.io/parachain'],
kusama: ['wss://kusama-rpc.dwellir.com', 'wss://rpc.ibp.network/kusama', 'wss://rpc-kusama.luckyfriday.io'],
parallel: ['wss://polkadot-parallel-rpc.parallel.fi', 'wss://parallel-rpc.dwellir.com'],
phala: ['wss://api.phala.network/ws', 'wss://phala-rpc.dwellir.com'],
polkadot: ['wss://polkadot-rpc.dwellir.com', 'wss://rpc.ibp.network/polkadot', 'wss://rpc-polkadot.luckyfriday.io'],
statemine: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ import {
ASTAR,
BIFROST,
BIFROST_POLKADOT,
HEIKO,
HYDRA,
INTERLAY,
KARURA,
KINTSUGI,
KUSAMA,
PARALLEL,
POLKADOT,
STATEMINE,
STATEMINT
Expand All @@ -27,13 +25,11 @@ const chainsIcon: Record<string, ChainComponent> = {
ASTAR,
BIFROST,
BIFROST_POLKADOT,
HEIKO,
HYDRA,
INTERLAY,
KARURA,
KINTSUGI,
KUSAMA,
PARALLEL,
POLKADOT,
STATEMINE,
STATEMINT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ export { ACALA } from './Acala';
export { ASTAR } from './Astar';
export { BIFROST } from './Bifrost';
export { BIFROST_POLKADOT } from './BifrostPolkadot';
export { HEIKO } from './Heiko';
export { HYDRA } from './Hydra';
export { INTERLAY } from './Interlay';
export { KARURA } from './Karura';
export { KINTSUGI } from './Kintsugi';
export { KUSAMA } from './Kusama';
export { PARALLEL } from './Parallel';
export { POLKADOT } from './Polkadot';
export { STATEMINE } from './Statemine';
export { STATEMINT } from './Statemint';

0 comments on commit 560f274

Please sign in to comment.