git.delta.rocks / unique-network / refs/commits / 2870ffebb9d9

difftreelog

Merge branch 'develop' of https://github.com/UniqueNetwork/unique-chain into develop

Dev2022-07-12parents: #efc3398 #12c8c8f.patch.diff
in: master

4 files changed

modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
707pub type Barrier = (707pub type Barrier = (
708	TakeWeightCredit,708	TakeWeightCredit,
709	AllowTopLevelPaidExecutionFrom<Everything>,709	AllowTopLevelPaidExecutionFrom<Everything>,
710	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,
711	// ^^^ Parent & its unit plurality gets free execution710	// ^^^ Parent & its unit plurality gets free execution
712);711);
713712
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -706,7 +706,6 @@
 pub type Barrier = (
 	TakeWeightCredit,
 	AllowTopLevelPaidExecutionFrom<Everything>,
-	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,
 	// ^^^ Parent & its unit plurality gets free execution
 );
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -705,7 +705,6 @@
 pub type Barrier = (
 	TakeWeightCredit,
 	AllowTopLevelPaidExecutionFrom<Everything>,
-	AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,
 	// ^^^ Parent & its unit plurality gets free execution
 );
modifiedtests/src/xcmTransfer.test.tsdiffbeforeafterboth
--- a/tests/src/xcmTransfer.test.ts
+++ b/tests/src/xcmTransfer.test.ts
@@ -31,6 +31,7 @@
 const UNIQUE_CHAIN = 1000;
 const KARURA_CHAIN = 2000;
 const KARURA_PORT = '9946';
+const TRANSFER_AMOUNT = 2000000000000000000000000n;
 
 describe('Integration test: Exchanging QTZ with Karura', () => {
   let alice: IKeyringPair;
@@ -113,7 +114,7 @@
               },
             },
             fun: {
-              Fungible: 5000000000,
+              Fungible: TRANSFER_AMOUNT,
             },
           },
         ],
@@ -148,19 +149,17 @@
 
     await usingApi(async (api) => {
       const destination = {
-        V0: {
-          X3: [
-            'Parent',
-            {
-              Parachain: UNIQUE_CHAIN,
-            },
-            {
-              AccountId32: {
+        V1: {
+          parents: 1,
+          interior: {
+            X2: [
+              {Parachain: UNIQUE_CHAIN},
+              {AccountId32: {
                 network: 'Any',
                 id: alice.addressRaw,
-              },
-            },
-          ],
+              }},
+            ],
+          },
         },
       };
 
@@ -168,7 +167,7 @@
         ForeignAsset: 0,
       };
 
-      const amount = 5000000000;
+      const amount = TRANSFER_AMOUNT;
       const destWeight = 50000000;
 
       const tx = api.tx.xTokens.transfer(id, amount, destination, destWeight);