Autodetect ML version available for polkdotXcm extrinsics (#64)

* Autodetect ML version available for polkdotXcm extrinsics * Update snapshots * Removed origin * Removed origin from tokens deposits definitions * Updated tests
moonbeam-foundation · Mar 9, 2023 · d6aca26 · d6aca26
1 parent cd382fc
commit d6aca26
Show file tree

Hide file tree

Showing 24 changed files with 233 additions and 601 deletions.
diff --git a/packages/config/src/config/moonbase/assets/tt1.ts b/packages/config/src/config/moonbase/assets/tt1.ts
@@ -27,8 +27,7 @@ export const TT1: MoonbaseXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(origin), originAssetId),
     },
   },

diff --git a/packages/config/src/config/moonbase/assets/unit.ts b/packages/config/src/config/moonbase/assets/unit.ts
@@ -22,9 +22,7 @@ export const UNIT: MoonbaseXcmConfig = {
       extrinsic: extrinsic
         .xcmPallet()
         .limitedReserveTransferAssets()
-        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V2(),
+        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted),
     },
   },
   withdraw: {

diff --git a/packages/config/src/config/moonbeam/assets/astr.ts b/packages/config/src/config/moonbeam/assets/astr.ts
@@ -23,8 +23,7 @@ export const ASTR: MoonbeamXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .here(),
     },
   },

diff --git a/packages/config/src/config/moonbeam/assets/dot.ts b/packages/config/src/config/moonbeam/assets/dot.ts
@@ -22,9 +22,7 @@ export const DOT: MoonbeamXcmConfig = {
       extrinsic: extrinsic
         .xcmPallet()
         .limitedReserveTransferAssets()
-        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V0(),
+        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted),
     },
   },
   withdraw: {

diff --git a/packages/config/src/config/moonbeam/assets/glmr.ts b/packages/config/src/config/moonbeam/assets/glmr.ts
@@ -54,8 +54,7 @@ export const GLMR: MoonbeamXcmConfig = {
         .polkadotXcm()
         .limitedReserveWithdrawAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(astar)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(astar)),
     },
     [bifrost.key]: {

diff --git a/packages/config/src/config/moonbeam/assets/ring.ts b/packages/config/src/config/moonbeam/assets/ring.ts
@@ -23,8 +23,7 @@ export const RING: MoonbeamXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X1(),
     },
   },

diff --git a/packages/config/src/config/moonbeam/assets/usdt.ts b/packages/config/src/config/moonbeam/assets/usdt.ts
@@ -27,8 +27,7 @@ export const USDT: MoonbeamXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(origin), originAssetId),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/crab.ts b/packages/config/src/config/moonriver/assets/crab.ts
@@ -23,8 +23,7 @@ export const CRAB: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X1(),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/csm.ts b/packages/config/src/config/moonriver/assets/csm.ts
@@ -23,8 +23,8 @@ export const CSM: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V0(),
+        .V1V2()
+        .here(),
     },
   },
   withdraw: {

diff --git a/packages/config/src/config/moonriver/assets/ksm.ts b/packages/config/src/config/moonriver/assets/ksm.ts
@@ -22,9 +22,7 @@ export const KSM: MoonriverXcmConfig = {
       extrinsic: extrinsic
         .xcmPallet()
         .limitedReserveTransferAssets()
-        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V0(),
+        .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted),
     },
   },
   withdraw: {

diff --git a/packages/config/src/config/moonriver/assets/movr.ts b/packages/config/src/config/moonriver/assets/movr.ts
@@ -118,8 +118,7 @@ export const MOVR: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveWithdrawAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(shiden)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(shiden)),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/rmrk.ts b/packages/config/src/config/moonriver/assets/rmrk.ts
@@ -27,8 +27,7 @@ export const RMRK: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(origin), originAssetId),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/sdn.ts b/packages/config/src/config/moonriver/assets/sdn.ts
@@ -23,8 +23,7 @@ export const SDN: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .here(),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/usdt.ts b/packages/config/src/config/moonriver/assets/usdt.ts
@@ -27,8 +27,7 @@ export const USDT: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .X2(getPalletInstance(origin), originAssetId),
     },
   },

diff --git a/packages/config/src/config/moonriver/assets/xrt.ts b/packages/config/src/config/moonriver/assets/xrt.ts
@@ -23,8 +23,7 @@ export const XRT: MoonriverXcmConfig = {
         .polkadotXcm()
         .limitedReserveTransferAssets()
         .successEvent(PolkadotXcmExtrinsicSuccessEvent.Attempted)
-        .origin(origin)
-        .V1()
+        .V1V2()
         .here(),
     },
   },

diff --git a/packages/config/src/extrinsic/extrinsic.ts b/packages/config/src/extrinsic/extrinsic.ts
@@ -10,8 +10,8 @@ export function createExtrinsicBuilder<
   ChainKeys extends ChainKey,
 >(chain: MoonChain) {
   return {
-    polkadotXcm: () => polkadotXcm<ChainKeys>(chain),
-    xcmPallet: () => xcmPallet<ChainKeys>(chain),
+    polkadotXcm: () => polkadotXcm(chain),
+    xcmPallet: () => xcmPallet(chain),
     xTokens: () => xTokens<Symbols, ChainKeys>(chain),
     xTransfer: () => xTransfer<ChainKeys>(chain),
   };

diff --git a/packages/config/src/extrinsic/polkadotXcm/__snapshots__/polkadotXcm.test.ts.snap b/packages/config/src/extrinsic/polkadotXcm/__snapshots__/polkadotXcm.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`polkadotXcm limitedReserveTransferAssets v0 should be correct config 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 here should be correct config 1`] = `
 {
   "extrinsic": "limitedReserveTransferAssets",
   "getParams": [Function],
@@ -9,58 +9,7 @@ exports[`polkadotXcm limitedReserveTransferAssets v0 should be correct config 1`
 }
 `;
 
-exports[`polkadotXcm limitedReserveTransferAssets v0 should get correct params 1`] = `
-[
-  {
-    "V1": {
-      "interior": {
-        "X1": {
-          "Parachain": 1000,
-        },
-      },
-      "parents": 1,
-    },
-  },
-  {
-    "V1": {
-      "interior": {
-        "X1": {
-          "AccountKey20": {
-            "key": "0xeF46c7649270C912704fB09B75097f6E32208b85",
-            "network": "Any",
-          },
-        },
-      },
-      "parents": 0,
-    },
-  },
-  {
-    "V0": [
-      {
-        "ConcreteFungible": {
-          "amount": 1000n,
-          "id": "Null",
-        },
-      },
-    ],
-  },
-  0,
-  {
-    "Limited": 1000000000,
-  },
-]
-`;
-
-exports[`polkadotXcm limitedReserveTransferAssets v1 here should be correct config 1`] = `
-{
-  "extrinsic": "limitedReserveTransferAssets",
-  "getParams": [Function],
-  "pallet": "polkadotXcm",
-  "successEvent": "Attempted",
-}
-`;
-
-exports[`polkadotXcm limitedReserveTransferAssets v1 here should get correct params 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 here should get correct params 1`] = `
 [
   {
     "V1": {
@@ -101,13 +50,11 @@ exports[`polkadotXcm limitedReserveTransferAssets v1 here should get correct par
     ],
   },
   0,
-  {
-    "Limited": 1000000000,
-  },
+  "Unlimited",
 ]
 `;
 
-exports[`polkadotXcm limitedReserveTransferAssets v1 x1 should be correct config 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 x1 should be correct config 1`] = `
 {
   "extrinsic": "limitedReserveTransferAssets",
   "getParams": [Function],
@@ -116,7 +63,7 @@ exports[`polkadotXcm limitedReserveTransferAssets v1 x1 should be correct config
 }
 `;
 
-exports[`polkadotXcm limitedReserveTransferAssets v1 x1 should get correct params 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 x1 should get correct params 1`] = `
 [
   {
     "V1": {
@@ -161,13 +108,11 @@ exports[`polkadotXcm limitedReserveTransferAssets v1 x1 should get correct param
     ],
   },
   0,
-  {
-    "Limited": 1000000000,
-  },
+  "Unlimited",
 ]
 `;
 
-exports[`polkadotXcm limitedReserveTransferAssets v1 x2 should be correct config 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 x2 should be correct config 1`] = `
 {
   "extrinsic": "limitedReserveTransferAssets",
   "getParams": [Function],
@@ -176,7 +121,7 @@ exports[`polkadotXcm limitedReserveTransferAssets v1 x2 should be correct config
 }
 `;
 
-exports[`polkadotXcm limitedReserveTransferAssets v1 x2 should get correct params 1`] = `
+exports[`polkadotXcm limitedReserveTransferAssets v1v2 x2 should get correct params 1`] = `
 [
   {
     "V1": {
@@ -226,13 +171,11 @@ exports[`polkadotXcm limitedReserveTransferAssets v1 x2 should get correct param
     ],
   },
   0,
-  {
-    "Limited": 1000000000,
-  },
+  "Unlimited",
 ]
 `;
 
-exports[`polkadotXcm limitedReserveWithdrawAssets v1 x2 should be correct config 1`] = `
+exports[`polkadotXcm limitedReserveWithdrawAssets v1v2 x2 should be correct config 1`] = `
 {
   "extrinsic": "limitedReserveWithdrawAssets",
   "getParams": [Function],
@@ -241,7 +184,7 @@ exports[`polkadotXcm limitedReserveWithdrawAssets v1 x2 should be correct config
 }
 `;
 
-exports[`polkadotXcm limitedReserveWithdrawAssets v1 x2 should get correct params 1`] = `
+exports[`polkadotXcm limitedReserveWithdrawAssets v1v2 x2 should get correct params 1`] = `
 [
   {
     "V1": {
@@ -291,8 +234,6 @@ exports[`polkadotXcm limitedReserveWithdrawAssets v1 x2 should get correct param
     ],
   },
   0,
-  {
-    "Limited": 1000000000,
-  },
+  "Unlimited",
 ]
 `;