Skip to content

Commit

Permalink
Merge branch 'main' into mjm/stink
Browse files Browse the repository at this point in the history
  • Loading branch information
mmaurello authored Jun 21, 2024
2 parents f44253f + 193957e commit ad1b2e1
Show file tree
Hide file tree
Showing 15 changed files with 95 additions and 60 deletions.
4 changes: 2 additions & 2 deletions examples/sdk-simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"author": "",
"license": "MIT",
"dependencies": {
"@moonbeam-network/xcm-config": "2.3.1",
"@moonbeam-network/xcm-sdk": "2.3.1",
"@moonbeam-network/xcm-config": "2.4.1",
"@moonbeam-network/xcm-sdk": "2.4.1",
"@moonbeam-network/xcm-utils": "2.1.1"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions packages/config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @moonbeam-network/xcm-config

## 2.4.1

### Patch Changes

- [#281](https://github.com/moonbeam-foundation/xcm-sdk/pull/281) [`b33b190`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b33b1901720d928e2227a4f88a9347763eb98356) Thanks [@mmaurello](https://github.com/mmaurello)! - Change Neuroweb ws endpoint and reduce USDT fees

## 2.4.0

### Minor Changes

- [#279](https://github.com/moonbeam-foundation/xcm-sdk/pull/279) [`453c481`](https://github.com/moonbeam-foundation/xcm-sdk/commit/453c48145c636f7257f24442a9e9cb0d1a6ef913) Thanks [@mmaurello](https://github.com/mmaurello)! - Rename Hydra DX to Hydration

## 2.3.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@moonbeam-network/xcm-config",
"version": "2.3.1",
"version": "2.4.1",
"description": "All necessary configuration to transfer assets from Moonbeam, Moonriver, Moonbase to other parachains and back",
"scripts": {
"build": "tsup",
Expand Down
11 changes: 8 additions & 3 deletions packages/config/src/ConfigService/ConfigService.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ import {
Parachain,
} from '@moonbeam-network/xcm-types';
import { assetsList, dev, glmr, tt1, unit } from '../assets';
import { hydraDX, moonbaseAlpha, moonbeam, pendulumAlphanet } from '../chains';
import {
hydration,
moonbaseAlpha,
moonbeam,
pendulumAlphanet,
} from '../chains';
import { ConfigService } from './ConfigService';

import { AssetConfig } from '../types/AssetConfig';
Expand Down Expand Up @@ -167,11 +172,11 @@ describe('config service', () => {

const chainConfig = new ChainConfig({
assets: [assetConfig],
chain: hydraDX,
chain: hydration,
});

configService.updateChainConfig(chainConfig);
const updated = configService.getChainConfig(hydraDX);
const updated = configService.getChainConfig(hydration);
expect(updated.getAssetsConfigs()).toStrictEqual(
chainConfig.getAssetsConfigs(),
);
Expand Down
18 changes: 9 additions & 9 deletions packages/config/src/chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ export const equilibrium = new Parachain({
ws: 'wss://node.pol.equilibrium.io',
});

export const hydraDX = new Parachain({
export const hydration = new Parachain({
assetsData: [
{
asset: hdx,
Expand Down Expand Up @@ -443,14 +443,14 @@ export const hydraDX = new Parachain({
ecosystem: Ecosystem.Polkadot,
genesisHash:
'0xafdc188f45c71dacbaa0b62e16a91f726c7b8699a9748cdf715459de6b7f366d',
key: 'hydra-dx',
name: 'HydraDX',
key: 'hydration',
name: 'Hydration',
parachainId: 2034,
ss58Format: 63,
ws: 'wss://hydradx-rpc.dwellir.com',
});

export const hydraDxAlphanet = new Parachain({
export const hydrationAlphanet = new Parachain({
assetsData: [
{
asset: hdx,
Expand Down Expand Up @@ -482,8 +482,8 @@ export const hydraDxAlphanet = new Parachain({
genesisHash:
'0x025980095be141a99f983631c49271af15cab61c4ce0d73db73192443932669a',
isTestChain: true,
key: 'hydra-dx-Alphanet',
name: 'HydraDX Alphanet',
key: 'hydration-Alphanet',
name: 'Hydration Alphanet',
parachainId: 2034,
ss58Format: 63,
ws: 'wss://hydradx-moonbase-rpc.play.hydration.cloud',
Expand Down Expand Up @@ -1268,7 +1268,7 @@ export const neuroweb = new Parachain({
name: 'NeuroWeb',
parachainId: 2043,
ss58Format: 101,
ws: 'wss://origintrail-rpc.dwellir.com',
ws: 'wss://neuroweb-rpc.dwellir.com',
});

export const originTrailAlphanet = new Parachain({
Expand Down Expand Up @@ -1871,8 +1871,8 @@ export const chainsList: AnyChain[] = [
darwinia,
darwiniaCrab,
equilibrium,
hydraDX,
hydraDxAlphanet,
hydration,
hydrationAlphanet,
integritee,
interlay,
karura,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import {
FeeBuilder,
} from '@moonbeam-network/xcm-builder';
import { dai, glmr, hdx, usdcwh, usdtwh, wbtc, weth } from '../assets';
import { hydraDX, moonbeam } from '../chains';
import { hydration, moonbeam } from '../chains';
import { AssetConfig } from '../types/AssetConfig';
import { ChainConfig } from '../types/ChainConfig';

export const hydraDxConfig = new ChainConfig({
export const hydrationConfig = new ChainConfig({
assets: [
new AssetConfig({
asset: hdx,
Expand Down Expand Up @@ -108,5 +108,5 @@ export const hydraDxConfig = new ChainConfig({
},
}),
],
chain: hydraDX,
chain: hydration,
});
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import {
FeeBuilder,
} from '@moonbeam-network/xcm-builder';
import { dev, ftmwh, hdx, usdcwh } from '../assets';
import { hydraDxAlphanet, moonbaseAlpha } from '../chains';
import { hydrationAlphanet, moonbaseAlpha } from '../chains';
import { AssetConfig } from '../types/AssetConfig';
import { ChainConfig } from '../types/ChainConfig';

// FIXME: has to be verified
export const hydraDxAlphanetConfig = new ChainConfig({
export const hydrationAlphanetConfig = new ChainConfig({
assets: [
new AssetConfig({
asset: hdx,
Expand Down Expand Up @@ -64,5 +64,5 @@ export const hydraDxAlphanetConfig = new ChainConfig({
},
}),
],
chain: hydraDxAlphanet,
chain: hydrationAlphanet,
});
8 changes: 4 additions & 4 deletions packages/config/src/configs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import { crustShadowConfig } from './crustShadow';
import { darwiniaConfig } from './darwinia';
import { darwiniaCrabConfig } from './darwiniaCrab';
import { equilibriumConfig } from './equilibrium';
import { hydraDxConfig } from './hydraDX';
import { hydraDxAlphanetConfig } from './hydraDXAlphanet';
import { hydrationConfig } from './hydration';
import { hydrationAlphanetConfig } from './hydrationAlphanet';
import { integriteeConfig } from './integritee';
import { interlayConfig } from './interlay';
import { karuraConfig } from './karura';
Expand Down Expand Up @@ -65,8 +65,8 @@ export const chainsConfigList: ChainConfig[] = [
darwiniaConfig,
darwiniaCrabConfig,
equilibriumConfig,
hydraDxConfig,
hydraDxAlphanetConfig,
hydrationConfig,
hydrationAlphanetConfig,
integriteeConfig,
interlayConfig,
karuraConfig,
Expand Down
10 changes: 5 additions & 5 deletions packages/config/src/configs/moonbaseAlpha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import {
alphanetAssetHub,
alphanetRelay,
hydraDxAlphanet,
hydrationAlphanet,
moonbaseAlpha,
moonbaseBeta,
originTrailAlphanet,
Expand Down Expand Up @@ -215,7 +215,7 @@ export const moonbaseAlphaConfig = new ChainConfig({
asset: usdcwh,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDxAlphanet,
destination: hydrationAlphanet,
destinationFee: {
amount: 0.1,
asset: usdcwh,
Expand All @@ -230,7 +230,7 @@ export const moonbaseAlphaConfig = new ChainConfig({
asset: ftmwh,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDxAlphanet,
destination: hydrationAlphanet,
destinationFee: {
amount: 0.01,
asset: ftmwh,
Expand Down Expand Up @@ -260,7 +260,7 @@ export const moonbaseAlphaConfig = new ChainConfig({
asset: dev,
balance: BalanceBuilder().substrate().system().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDxAlphanet,
destination: hydrationAlphanet,
destinationFee: {
amount: 0.0002,
asset: dev,
Expand All @@ -271,7 +271,7 @@ export const moonbaseAlphaConfig = new ChainConfig({
asset: hdx,
balance: BalanceBuilder().substrate().assets().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDxAlphanet,
destination: hydrationAlphanet,
destinationFee: {
amount: 0.5,
asset: hdx,
Expand Down
22 changes: 11 additions & 11 deletions packages/config/src/configs/moonbeam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import {
centrifuge,
darwinia,
equilibrium,
hydraDX,
hydration,
interlay,
mantaParachain,
moonbeam,
Expand Down Expand Up @@ -117,7 +117,7 @@ export const moonbeamConfig = new ChainConfig({
asset: glmr,
balance: BalanceBuilder().substrate().system().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.05,
asset: glmr,
Expand Down Expand Up @@ -466,7 +466,7 @@ export const moonbeamConfig = new ChainConfig({
contract: ContractBuilder().Xtokens().transfer(),
destination: polkadotAssetHub,
destinationFee: {
amount: 0.7,
amount: 0.2,
asset: usdt,
balance: BalanceBuilder().substrate().assets().account(),
},
Expand All @@ -481,7 +481,7 @@ export const moonbeamConfig = new ChainConfig({
contract: ContractBuilder().Xtokens().transfer(),
destination: polkadotAssetHub,
destinationFee: {
amount: 0.7,
amount: 0.2,
asset: usdc,
balance: BalanceBuilder().substrate().assets().account(),
},
Expand All @@ -496,7 +496,7 @@ export const moonbeamConfig = new ChainConfig({
contract: ContractBuilder().Xtokens().transferMultiCurrencies(),
destination: polkadotAssetHub,
destinationFee: {
amount: 0.7,
amount: 0.2,
asset: usdt,
balance: BalanceBuilder().substrate().assets().account(),
},
Expand Down Expand Up @@ -539,7 +539,7 @@ export const moonbeamConfig = new ChainConfig({
asset: hdx,
balance: BalanceBuilder().substrate().assets().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.6,
asset: hdx,
Expand All @@ -554,7 +554,7 @@ export const moonbeamConfig = new ChainConfig({
asset: dai,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.004,
asset: dai,
Expand All @@ -569,7 +569,7 @@ export const moonbeamConfig = new ChainConfig({
asset: usdcwh,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.004,
asset: usdcwh,
Expand Down Expand Up @@ -599,7 +599,7 @@ export const moonbeamConfig = new ChainConfig({
asset: usdtwh,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.004,
asset: usdtwh,
Expand Down Expand Up @@ -689,7 +689,7 @@ export const moonbeamConfig = new ChainConfig({
asset: wbtc,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.0000001,
asset: wbtc,
Expand All @@ -704,7 +704,7 @@ export const moonbeamConfig = new ChainConfig({
asset: weth,
balance: BalanceBuilder().evm().erc20(),
contract: ContractBuilder().Xtokens().transfer(),
destination: hydraDX,
destination: hydration,
destinationFee: {
amount: 0.000002,
asset: weth,
Expand Down
18 changes: 18 additions & 0 deletions packages/sdk/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# @moonbeam-network/xcm-sdk

## 2.4.1

### Patch Changes

- Updated dependencies [[`b33b190`](https://github.com/moonbeam-foundation/xcm-sdk/commit/b33b1901720d928e2227a4f88a9347763eb98356)]:
- @moonbeam-network/xcm-config@2.4.1

## 2.4.0

### Minor Changes

- [#279](https://github.com/moonbeam-foundation/xcm-sdk/pull/279) [`453c481`](https://github.com/moonbeam-foundation/xcm-sdk/commit/453c48145c636f7257f24442a9e9cb0d1a6ef913) Thanks [@mmaurello](https://github.com/mmaurello)! - Rename Hydra DX to Hydration

### Patch Changes

- Updated dependencies [[`453c481`](https://github.com/moonbeam-foundation/xcm-sdk/commit/453c48145c636f7257f24442a9e9cb0d1a6ef913)]:
- @moonbeam-network/xcm-config@2.4.0

## 2.3.1

### Patch Changes
Expand Down
Loading

0 comments on commit ad1b2e1

Please sign in to comment.