git.delta.rocks / unique-network / refs/commits / bad94bc8367a

difftreelog

fix configuration

Igor Kozyrev2022-02-10parent: #e862576.patch.diff
in: master

5 files changed

modifiedREADME.mddiffbeforeafterboth
--- a/README.md
+++ b/README.md
@@ -337,8 +337,8 @@
 
 ## Karura token transfer
 
-To get started, you need to open the hrmr channel.
-Next, we need to register our asset in Karura.
+To get started, you need to open inbound and outbound hrmp channels.
+Next, we need to register our asset at Karura.
 
 ```
 assetRegistry -> registerForeignAsset(location, metadata)
@@ -347,11 +347,11 @@
 metadata:
 	name         OPL
 	symbol       OPL
-	decimals     15
+	decimals     18
 minimalBalance	 1
 ```
 
-Next, we can send tokens of our chain:
+Next, we can send tokens from Opal to Karura:
 ```
 polkadotXcm -> reserveTransferAssets
 dest:
@@ -370,7 +370,7 @@
 tokens -> accounts	
 
 
-To send tokens from karura:
+To send tokens from Karura to Opal:
 
 ```
 xtokens -> transfer
modifiedlaunch-config.jsondiffbeforeafterboth
--- a/launch-config.json
+++ b/launch-config.json
@@ -114,40 +114,21 @@
                     ]
 				}
 			]
-		},
-        {
-            "bin": "../cumulus/target/release/polkadot-collator",
-            "id": "3000",
-            "chain": "statemint-dev",
-            "balance": "1000000000000000000000000",
-            "nodes": [
-                {
-                    "wsPort": 9947,
-                    "port": 31203,
-                    "name": "alice",
-                    "flags": [
-                        "--rpc-cors=all",
-                        "--unsafe-rpc-external",
-                        "--unsafe-ws-external",
-                        "-lxcm=trace"
-                    ]
-                }
-            ]
-        }
+		}
     ],
     "simpleParachains": [],
     "hrmpChannels": [
         {
             "sender": 2000,
             "recipient": 1000,
-            "maxCapacity": 8,
-            "maxMessageSize": 512
+            "maxCapacity": 1000,
+            "maxMessageSize": 102400
         },
         {
             "sender": 1000,
             "recipient": 2000,
-            "maxCapacity": 8,
-            "maxMessageSize": 512
+            "maxCapacity": 1000,
+            "maxMessageSize": 102400
         }
     ],
     "finalization": false
modifiedruntime/Cargo.tomldiffbeforeafterboth
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -377,7 +377,6 @@
 scale-info = { version = "1.0.0", default-features = false, features = [
     "derive",
 ] }
-log = '0.4.14'
 derivative = "2.2.0"
 pallet-unique = { path = '../pallets/unique', default-features = false }
 up-rpc = { path = "../primitives/rpc", default-features = false }
modifiedtests/package.jsondiffbeforeafterboth
--- a/tests/package.json
+++ b/tests/package.json
@@ -68,7 +68,6 @@
     "testPalletPresence": "mocha --timeout 9999999 -r ts-node/register ./**/pallet-presence.test.ts",
     "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
     "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
-    "testXcm": "mocha --timeout 9999999 -r ts-node/register ./**/xcmTransfer.test.ts",
     "polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --input src/interfaces/ --package .",
     "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint ws://localhost:9944 --output src/interfaces/ --package .",
     "polkadot-types": "yarn polkadot-types-from-defs && yarn polkadot-types-from-chain"
modifiedtests/src/xcmTransfer.test.tsdiffbeforeafterboth
before · tests/src/xcmTransfer.test.ts
1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56import chai from 'chai';7import chaiAsPromised from 'chai-as-promised';89import {WsProvider} from '@polkadot/api';10import {ApiOptions} from '@polkadot/api/types';11import {IKeyringPair} from '@polkadot/types/types';12import privateKey from './substrate/privateKey';13import usingApi, {submitTransactionAsync} from './substrate/substrate-api';14import {getGenericResult} from './util/helpers';15import waitNewBlocks from './substrate/wait-new-blocks';16import getBalance from './substrate/get-balance';17import {alicesPublicKey} from './accounts';1819chai.use(chaiAsPromised);20const expect = chai.expect;2122const UNIQUE_CHAIN = 1000;23const KARURA_CHAIN = 2000;24const KARURA_PORT = '9946';2526describe('Integration test: Exchanging QTZ/OPL with Karura', () => {27  let alice: IKeyringPair;28  29  before(async () => {30    await usingApi(async () => {31      alice = privateKey('//Alice');32    });3334    const karuraApiOptions: ApiOptions = {35      provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT),36    };3738    await usingApi(async (api) => {39      const destination = {40        V0: {41          X2: [42            'Parent',43            {44              Parachain: UNIQUE_CHAIN,45            },46          ],47        },48      };4950      const metadata =51      {52        name: 'OPL',53        symbol: 'OPL',54        decimals: 15,55        minimalBalance: 1,56      };5758      const tx = api.tx.assetRegistry.registerForeignAsset(destination, metadata);59      const sudoTx = api.tx.sudo.sudo(tx as any);60      const events = await submitTransactionAsync(alice, sudoTx);61      const result = getGenericResult(events);62      expect(result.success).to.be.true;63    }, karuraApiOptions);64  });6566  it('Should connect and send OPL to Karura', async () => {67    let balanceOnKaruraBefore: bigint;68    69    await usingApi(async (api) => {70      const {free} = (await api.query.tokens.accounts(alice.addressRaw, {ForeignAsset: 0})).toJSON() as any;71      balanceOnKaruraBefore = free;72    }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});7374    await usingApi(async (api) => {75      const destination = {76        V0: {77          X2: [78            'Parent',79            {80              Parachain: KARURA_CHAIN,81            },82          ],83        },84      };8586      const beneficiary = {87        V0: {88          X1: {89            AccountId32: {90              network: 'Any',91              id: alice.addressRaw,92            },93          },94        },95      };9697      const assets = {98        V1: [99          {100            id: {101              Concrete: {102                parents: 0,103                interior: 'Here',104              },105            },106            fun: {107              Fungible: 5000000000,108            },109          },110        ],111      };112113      const feeAssetItem = 0;114115      const weightLimit = {116        Limited: 5000000000,117      };118119      const tx = api.tx.polkadotXcm.limitedReserveTransferAssets(destination, beneficiary, assets, feeAssetItem, weightLimit);120      const events = await submitTransactionAsync(alice, tx);121      const result = getGenericResult(events);122      expect(result.success).to.be.true;123    });124125    await usingApi(async (api) => {126      // todo do something about instant sealing, where there might not be any new blocks127      await waitNewBlocks(api, 1);128      const {free} = (await api.query.tokens.accounts(alice.addressRaw, {ForeignAsset: 0})).toJSON() as any;129      expect(free > balanceOnKaruraBefore).to.be.true;130    }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});131  });132133  it('Should connect to Karura and send OPL back', async () => {134    let balanceBefore: bigint;135    136    await usingApi(async (api) => {137      [balanceBefore] = await getBalance(api, [alicesPublicKey]);138    });139140    await usingApi(async (api) => {141      const destination = {142        V0: {143          X3: [144            'Parent',145            {146              Parachain: UNIQUE_CHAIN,147            },148            {149              AccountId32: {150                network: 'Any',151                id: alice.addressRaw,152              },153            },154          ],155        },156      };157158      const id = {159        ForeignAsset: 0,160      };161162      const amount = 5000000000;163      const destWeight = 50000000;164165      const tx = api.tx.xTokens.transfer(id, amount, destination, destWeight);166      const events = await submitTransactionAsync(alice, tx);167      const result = getGenericResult(events);168      expect(result.success).to.be.true;169    }, {provider: new WsProvider('ws://127.0.0.1:' + KARURA_PORT)});170171    await usingApi(async (api) => {172      // todo do something about instant sealing, where there might not be any new blocks173      await waitNewBlocks(api, 1);174      const [balanceAfter] = await getBalance(api, [alicesPublicKey]);175      expect(balanceAfter > balanceBefore).to.be.true;176    });177  });178});