git.delta.rocks / unique-network / refs/commits / 9f2f03a30137

137137
138    const xcmProgram = helper.arrange.makeXcmProgramWithdrawDeposit(138    const xcmProgram = helper.arrange.makeXcmProgramWithdrawDeposit(
139      randomAccountOnUnq.addressRaw,139      randomAccountOnUnq.addressRaw,
140      {
141        Concrete: {
142          parents: 1,
143          interior: {
144            X1: {Parachain: UNIQUE_CHAIN},
145          },
146        },
147      },140      uniqueAssetId,
148      SENDBACK_AMOUNT,141      SENDBACK_AMOUNT,
149    );142    );
150143
233226
234    const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(227    const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(
235      targetAccount.addressRaw,228      targetAccount.addressRaw,
236      {
237        Concrete: {
238          parents: 1,
239          interior: {
240            X1: {
241              Parachain: UNIQUE_CHAIN,
242            },
243          },
244        },
245      },229      uniqueAssetId,
246      testAmount,230      testAmount,
247    );231    );
248232
307  });291  });
308}292}
309293
310async function genericRejectNativeToknsFrom(netwokrName: keyof typeof NETWORKS, sudoerOnTargetChain: IKeyringPair) {294async function genericRejectNativeToknsFrom(networkName: keyof typeof NETWORKS, sudoerOnTargetChain: IKeyringPair) {
311  const networkUrl = mapToChainUrl(netwokrName);295  const networkUrl = mapToChainUrl(networkName);
312  const targetPlayground = getDevPlayground(netwokrName);296  const targetPlayground = getDevPlayground(networkName);
313  let messageSent: any;297  let messageSent: any;
314298
315  await usingPlaygrounds(async (helper) => {299  await usingPlaygrounds(async (helper) => {
320          parents: 1,304          parents: 1,
321          interior: {305          interior: {
322            X1: {306            X1: {
323              Parachain: mapToChainId(netwokrName),307              Parachain: mapToChainId(networkName),
324            },308            },
325          },309          },
326        },310        },
335        const xcmSend = helper.constructApiCall('api.tx.polkadotXcm.send', [uniqueVersionedMultilocation, maliciousXcmProgramFullId]);319        const xcmSend = helper.constructApiCall('api.tx.polkadotXcm.send', [uniqueVersionedMultilocation, maliciousXcmProgramFullId]);
336        // Needed to bypass the call filter.320        // Needed to bypass the call filter.
337        const batchCall = helper.encodeApiCall('api.tx.utility.batch', [[xcmSend]]);321        const batchCall = helper.encodeApiCall('api.tx.utility.batch', [[xcmSend]]);
338        await helper.fastDemocracy.executeProposal(`${netwokrName} sending native tokens to the Unique via fast democracy`, batchCall);322        await helper.fastDemocracy.executeProposal(`${networkName} sending native tokens to the Unique via fast democracy`, batchCall);
339323
340        messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);324        messageSent = await helper.wait.expectEvent(maxWaitBlocks, Event.XcmpQueue.XcmpMessageSent);
341      }325      }

--- a/tests/src/xcm/xcmUnique.test.ts
+++ b/tests/src/xcm/xcmUnique.test.ts
@@ -728,16 +728,7 @@
 
     const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(
       targetAccount.addressRaw,
-      {
-        Concrete: {
-          parents: 1,
-          interior: {
-            X1: {
-              Parachain: UNIQUE_CHAIN,
-            },
-          },
-        },
-      },
+      uniqueAssetId,
       testAmount,
     );
 
@@ -900,14 +891,7 @@
 
     const xcmProgram = helper.arrange.makeXcmProgramWithdrawDeposit(
       randomAccount.addressRaw,
-      {
-        Concrete: {
-          parents: 1,
-          interior: {
-            X1: {Parachain: UNIQUE_CHAIN},
-          },
-        },
-      },
+      uniqueAssetId,
       TRANSFER_AMOUNT,
     );
 
@@ -978,16 +962,7 @@
 
     const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(
       targetAccount.addressRaw,
-      {
-        Concrete: {
-          parents: 1,
-          interior: {
-            X1: {
-              Parachain: UNIQUE_CHAIN,
-            },
-          },
-        },
-      },
+      uniqueAssetId,
       testAmount,
     );
 
@@ -1477,16 +1452,7 @@
 
     const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(
       targetAccount.addressRaw,
-      {
-        Concrete: {
-          parents: 0,
-          interior: {
-            X1: {
-              Parachain: UNIQUE_CHAIN,
-            },
-          },
-        },
-      },
+      uniqueAssetId,
       testAmount,
     );
 
@@ -1821,16 +1787,7 @@
 
     const maliciousXcmProgramFullId = helper.arrange.makeXcmProgramReserveAssetDeposited(
       targetAccount.addressRaw,
-      {
-        Concrete: {
-          parents: 1,
-          interior: {
-            X1: {
-              Parachain: UNIQUE_CHAIN,
-            },
-          },
-        },
-      },
+      uniqueAssetId,
       testAmount,
     );