adapt foreignAssets pallet queries and add snowbridge assets configur…

…ations
moonbeam-foundation · Nov 25, 2024 · dcc64c5 · dcc64c5
1 parent 610d37b
commit dcc64c5
Show file tree

Hide file tree

Showing 14 changed files with 317 additions and 636 deletions.
diff --git a/packages/builder/fixtures/builderParamsMock.ts b/packages/builder/fixtures/builderParamsMock.ts
@@ -216,14 +216,3 @@ export const wormholeToMoonchainConfigBuilderParams: MrlBuilderParams = {
   sourceAddress: '0xeF46c7649270C912704fB09B75097f6E32208b85',
   sourceApi: apiMock,
 };
-
-export const buildParamsMockEth: ExtrinsicConfigBuilderPrams = {
-  address: '0xeF46c7649270C912704fB09B75097f6E32208b85',
-  amount: 99_000_000_000n,
-  asset: '0xeF46c7649270C912704fB09B75097f6E32208b85',
-  destination: moonbaseAlphaMock,
-  fee: 5_000_000_000n,
-  feeAsset: 'WETH.e',
-  palletInstance: 10,
-  source: alphanetAssetHubMock,
-};
diff --git a/packages/builder/src/asset-min/AssetMinBuilder.interfaces.ts b/packages/builder/src/asset-min/AssetMinBuilder.interfaces.ts
@@ -8,5 +8,6 @@ export type AssetMinConfigBuilder = ConfigBuilder<
 >;
 
 export interface AssetMinConfigBuilderParams {
+  address?: string;
   asset: ChainAssetId;
 }
diff --git a/packages/builder/src/asset-min/AssetMinBuilder.test.ts b/packages/builder/src/asset-min/AssetMinBuilder.test.ts
@@ -83,7 +83,10 @@ describe('assetMinBuilder', () => {
       const config = AssetMinBuilder()
         .foreignAssets()
         .asset()
-        .build({ asset: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' });
+        .build({
+          asset,
+          address: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+        });
 
       it('should be correct config', () => {
         expect(config).toMatchSnapshot();

diff --git a/packages/builder/src/asset-min/AssetMinBuilder.ts b/packages/builder/src/asset-min/AssetMinBuilder.ts
@@ -60,7 +60,12 @@ function assets() {
 function foreignAssets() {
   return {
     asset: (): AssetMinConfigBuilder => ({
-      build: ({ asset }) => {
+      build: ({ address }) => {
+        if (!address) {
+          throw new Error(
+            'Asset address is missing for foreignAssets.asset min calculation',
+          );
+        }
         const multilocation = {
           parents: 2,
           interior: {
@@ -72,7 +77,7 @@ function foreignAssets() {
                   },
                 },
               },
-              getExtrinsicAccount(asset as string),
+              getExtrinsicAccount(address),
             ],
           },
         };

diff --git a/packages/builder/src/asset-min/__snapshots__/AssetMinBuilder.test.ts.snap b/packages/builder/src/asset-min/__snapshots__/AssetMinBuilder.test.ts.snap
@@ -65,50 +65,7 @@ SubstrateQueryConfig {
   "func": "asset",
   "module": "foreignAssets",
   "transform": [Function],
-  "type": "Substrate",
 }
 `;
 
 exports[`assetMinBuilder > foreignAssets > asset > should transform correctly 1`] = `999n`;
-
-exports[`assetMinBuilder assetRegistry assetMetadatas should be correct config 1`] = `
-SubstrateQueryConfig {
-  "args": [
-    "<ASSET>",
-  ],
-  "func": "assetMetadatas",
-  "module": "assetRegistry",
-  "transform": [Function],
-  "type": "Substrate",
-}
-`;
-
-exports[`assetMinBuilder assetRegistry assetMetadatas should transform correctly 1`] = `999n`;
-
-exports[`assetMinBuilder assetRegistry currencyMetadatas should be correct config 1`] = `
-SubstrateQueryConfig {
-  "args": [
-    "<ASSET>",
-  ],
-  "func": "currencyMetadatas",
-  "module": "assetRegistry",
-  "transform": [Function],
-  "type": "Substrate",
-}
-`;
-
-exports[`assetMinBuilder assetRegistry currencyMetadatas should transform correctly 1`] = `999n`;
-
-exports[`assetMinBuilder assets asset should be correct config 1`] = `
-SubstrateQueryConfig {
-  "args": [
-    "<ASSET>",
-  ],
-  "func": "asset",
-  "module": "assets",
-  "transform": [Function],
-  "type": "Substrate",
-}
-`;
-
-exports[`assetMinBuilder assets asset should transform correctly 1`] = `999n`;
diff --git a/packages/builder/src/balance/BalanceBuilder.ts b/packages/builder/src/balance/BalanceBuilder.ts
@@ -89,12 +89,18 @@ function foreignAssets() {
   return {
     account: (): BalanceConfigBuilder => ({
       build: ({ address, asset }) => {
+        if (!asset.address) {
+          throw new Error(
+            'Asset address is needed to calculate balance with foreignAssets.account function',
+          );
+        }
+
         const multilocation = {
           parents: 2,
           interior: {
             X2: [
               { GlobalConsensus: { ethereum: { chainId: 1 } } },
-              getExtrinsicAccount(asset.address as string), // TODO mjm fix
+              getExtrinsicAccount(asset.address),
             ],
           },
         };

diff --git a/packages/builder/src/balance/__snapshots__/BalanceBuilder.test.ts.snap b/packages/builder/src/balance/__snapshots__/BalanceBuilder.test.ts.snap
@@ -29,19 +29,18 @@ SubstrateQueryConfig {
           },
           {
             "AccountKey20": {
-              "key": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+              "key": "0x98891e5FD24Ef33A488A47101F65D212Ff6E650E",
             },
           },
         ],
       },
       "parents": 2,
     },
-    "<ACCOUNT>",
+    "<ADDRESS>",
   ],
   "func": "account",
   "module": "foreignAssets",
   "transform": [Function],
-  "type": "Substrate",
 }
 `;