Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OriginTrail - Moonbeam Integration #139

Merged
merged 4 commits into from
Sep 28, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/thin-fishes-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@moonbeam-network/xcm-config': patch
'@moonbeam-network/xcm-sdk': patch
---

OriginTrail integration with Moonbeam - remove Nodle Eden integration with Moonbase
32 changes: 16 additions & 16 deletions packages/config/src/chains.ts
Original file line number Diff line number Diff line change
Expand Up @@ -685,10 +685,6 @@ export const moonbaseAlpha = new EvmParachain({
asset: lit,
id: '65216491554813189869575508812319036608',
},
{
asset: nodl,
id: '128910205779035707777113095265150484699',
},
{
asset: otp,
id: '238111524681612888331172110363070489924',
Expand Down Expand Up @@ -817,6 +813,10 @@ export const moonbeam = new EvmParachain({
asset: nodl,
id: '309163521958167876851250718453738106865',
},
{
asset: otp,
id: '238111524681612888331172110363070489924',
},
{
asset: para,
id: '32615670524745285411807346420584982855',
Expand Down Expand Up @@ -1004,22 +1004,22 @@ export const nodle = new Parachain({
ws: 'wss://nodle-parachain.api.onfinality.io/public-ws',
});

export const nodleEden = new Parachain({
export const originTrail = new Parachain({
assetsData: [
{
asset: nodl,
id: 'NodleNative',
asset: otp,
metadataId: 0,
palletInstance: 10,
},
],
ecosystem: Ecosystem.AlphanetRelay,
ecosystem: Ecosystem.Polkadot,
genesisHash:
'0x3e1f1e6e22ab28e0ee6dc39f3bb3ea6dd2e8501790df0541a7e1fbad44d612ec',
isTestChain: true,
key: 'nodle-eden',
name: 'Nodle Eden',
parachainId: 2036,
ss58Format: 37,
ws: 'wss://node-7047027111071080448.jm.onfinality.io/ws?apikey=c49e30e4-3601-48f4-9629-57fa13cb97c0',
'0xe7e0962324a3b86c83404dbea483f25fb5dab4c224791c81b756cfc948006174',
key: 'origin-trail',
name: 'OriginTrail',
parachainId: 2043,
ss58Format: 101,
ws: 'wss://origintrail.api.onfinality.io/public-ws',
});

export const originTrailAlphanet = new Parachain({
Expand Down Expand Up @@ -1287,7 +1287,7 @@ export const chainsList: AnyChain[] = [
moonbeam,
moonriver,
nodle,
nodleEden,
originTrail,
originTrailAlphanet,
parallel,
parallelHeiko,
Expand Down
4 changes: 2 additions & 2 deletions packages/config/src/configs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { moonbaseBetaConfig } from './moonbaseBeta';
import { moonbeamConfig } from './moonbeam';
import { moonriverConfig } from './moonriver';
import { nodleConfig } from './nodle';
import { nodleEdenConfig } from './nodleEden';
import { originTrailConfig } from './originTrail';
import { originTrailAlphanetConfig } from './originTrailAlphanet';
import { parallelConfig } from './parallel';
import { parallelHeikoConfig } from './parallelHeiko';
Expand Down Expand Up @@ -73,7 +73,7 @@ export const chainsConfigList: ChainConfig[] = [
moonbeamConfig,
moonriverConfig,
nodleConfig,
nodleEdenConfig,
originTrailConfig,
originTrailAlphanetConfig,
parallelConfig,
parallelHeikoConfig,
Expand Down
17 changes: 0 additions & 17 deletions packages/config/src/configs/moonbaseAlpha.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
eq,
eqd,
lit,
nodl,
otp,
paring,
soon,
Expand All @@ -21,7 +20,6 @@ import {
litentryAlphanet,
moonbaseAlpha,
moonbaseBeta,
nodleEden,
originTrailAlphanet,
subsocialAlphanet,
turingAlphanet,
Expand Down Expand Up @@ -139,21 +137,6 @@ export const moonbaseAlphaConfig = new ChainConfig({
balance: BalanceBuilder().substrate().system().account(),
},
}),
new AssetConfig({
asset: nodl,
balance: BalanceBuilder().substrate().assets().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: nodleEden,
destinationFee: {
amount: 0.02,
asset: nodl,
balance: BalanceBuilder().substrate().assets().account(),
},
fee: {
asset: dev,
balance: BalanceBuilder().substrate().system().account(),
},
}),
new AssetConfig({
asset: otp,
balance: BalanceBuilder().substrate().assets().account(),
Expand Down
17 changes: 17 additions & 0 deletions packages/config/src/configs/moonbeam.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import {
ibtc,
intr,
nodl,
otp,
para,
pha,
ring,
Expand All @@ -36,6 +37,7 @@ import {
interlay,
moonbeam,
nodle,
originTrail,
parallel,
phala,
polkadot,
Expand Down Expand Up @@ -288,6 +290,21 @@ export const moonbeamConfig = new ChainConfig({
balance: BalanceBuilder().substrate().system().account(),
},
}),
new AssetConfig({
asset: otp,
balance: BalanceBuilder().substrate().assets().account(),
contract: ContractBuilder().Xtokens().transfer(),
destination: originTrail,
destinationFee: {
amount: 0.004,
asset: otp,
balance: BalanceBuilder().substrate().assets().account(),
},
fee: {
asset: glmr,
balance: BalanceBuilder().substrate().system().account(),
},
}),
new AssetConfig({
asset: para,
balance: BalanceBuilder().substrate().assets().account(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ import {
ExtrinsicBuilder,
FeeBuilder,
} from '@moonbeam-network/xcm-builder';
import { nodl } from '../assets';
import { moonbaseAlpha, nodleEden } from '../chains';
import { otp } from '../assets';
import { moonbeam, originTrail } from '../chains';
import { AssetConfig } from '../types/AssetConfig';
import { ChainConfig } from '../types/ChainConfig';

export const nodleEdenConfig = new ChainConfig({
export const originTrailConfig = new ChainConfig({
assets: [
new AssetConfig({
asset: nodl,
asset: otp,
balance: BalanceBuilder().substrate().system().account(),
destination: moonbaseAlpha,
destination: moonbeam,
destinationFee: {
amount: FeeBuilder().assetManager().assetTypeUnitsPerSecond(),
asset: nodl,
asset: otp,
balance: BalanceBuilder().substrate().system().account(),
},
extrinsic: ExtrinsicBuilder().xTokens().transfer(),
extrinsic: ExtrinsicBuilder()
.polkadotXcm()
.limitedReserveTransferAssets()
.X1(),
}),
],
chain: nodleEden,
chain: originTrail,
});
Loading