Replace WETH with ETH

Author: JuaniRios

integration-tests/chopsticks/overrides/polimec.ts

@@ -23,22 +23,17 @@ const dot_location = {
   },
 };
 
-export const weth_location = {
+export const eth_location = {
   parents: 2,
   interior: {
-    x2: [
+    x1: [
       {
         globalConsensus: {
           ethereum: {
             chainId: 1n,
           },
         },
       },
-      {
-        accountKey20: {
-          key: WETH_ADDRESS,
-        },
-      },
     ],
   },
 };
@@ -81,7 +76,7 @@ export const polimec_storage = {
     // Note: We can remove Asset and Metadata from the storage override as soon we set them on-chain.
     Asset: [
       [
-        [weth_location],
+        [eth_location],
         {
           owner: Accounts.ALICE,
           issuer: Accounts.ALICE,
@@ -98,8 +93,6 @@ export const polimec_storage = {
         },
       ],
     ],
-    Metadata: [
-      [[weth_location], { symbol: 'Wrapped Ether', name: 'WETH', decimals: 18, isFrozen: false }],
-    ],
+    Metadata: [[[eth_location], { symbol: 'Ether', name: 'ETH', decimals: 18, isFrozen: false }]],
   },
 } as const;

integration-tests/chopsticks/overrides/polkadot-hub.ts

@@ -1,6 +1,6 @@
 import { INITIAL_BALANCES } from '@/constants';
 import { Accounts, Asset } from '@/types';
-import { weth_location } from './polimec';
+import { eth_location } from './polimec';
 
 export const polkadot_hub_storage = {
   System: {
@@ -35,7 +35,7 @@ export const polkadot_hub_storage = {
   ForeignAssets: {
     Account: [
       [
-        [weth_location, Accounts.POLIMEC],
+        [eth_location, Accounts.POLIMEC],
         {
           balance: INITIAL_BALANCES.WETH,
         },

integration-tests/chopsticks/src/constants.ts

@@ -23,4 +23,4 @@ export const DERIVE_PATHS = {
 export const WETH_ADDRESS = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
 export const DEFAULT_TOPIC = FixedSizeBinary.fromArray(Array(32).fill(1));
 export const FEE_AMOUNT = 40_000_000_000n;
-export const WETH_AMOUNT = 15_000_000_000_000n;
+export const ETH_AMOUNT = 15_000_000_000_000n;

integration-tests/chopsticks/src/managers/BridgeHubManager.ts

@@ -46,10 +46,12 @@ export class BridgerHubManagaer extends BaseChainManager {
         return AssetSourceRelation.Sibling;
       case Asset.USDC:
         return AssetSourceRelation.Sibling;
-      case Asset.WETH:
+      case Asset.ETH:
         // TODO: Check it Placeholder
         return AssetSourceRelation.Self;
     }
+
+    return AssetSourceRelation.Self;
   }
 
   // Note: On BridgeHub, there should be no balance for any asset.

integration-tests/chopsticks/src/managers/PolimecManager.ts

@@ -47,7 +47,7 @@ export class PolimecManager extends BaseChainManager {
         return AssetSourceRelation.Sibling;
       case Asset.USDC:
         return AssetSourceRelation.Sibling;
-      case Asset.WETH:
+      case Asset.ETH:
         // Placeholder
         return AssetSourceRelation.Self;
       case Asset.PLMC:

integration-tests/chopsticks/src/managers/PolkadotHubManager.ts

@@ -43,7 +43,7 @@ export class PolkadotHubManager extends BaseChainManager {
         return AssetSourceRelation.Self;
       case Asset.USDC:
         return AssetSourceRelation.Self;
-      case Asset.WETH:
+      case Asset.ETH:
         // This is not actually used, so we use Self as a placeholder
         return AssetSourceRelation.Self;
       case Asset.PLMC:

integration-tests/chopsticks/src/managers/PolkadotManager.ts

@@ -44,10 +44,12 @@ export class PolkadotManager extends BaseChainManager {
       case Asset.USDC:
         // Placeholder
         return AssetSourceRelation.Self;
-      case Asset.WETH:
+      case Asset.ETH:
         // Placeholder
         return AssetSourceRelation.Self;
     }
+
+    return AssetSourceRelation.Self;
   }
 
   async getAssetBalanceOf(account: Accounts, asset: Asset): Promise<bigint> {

integration-tests/chopsticks/src/tests/bridge.test.ts

@@ -22,12 +22,12 @@ describe('Bridge Hub -> Polimec Transfer Tests', () => {
   afterAll(async () => await chainSetup.cleanup());
 
   test(
-    'Send WETH to Polimec',
+    'Send ETH to Polimec',
     () =>
       transferTest.testTransfer({
         account: Accounts.ALICE,
-        assets: [[Asset.WETH, TRANSFER_AMOUNTS.BRIDGED, AssetSourceRelation.Self]],
+        assets: [[Asset.ETH, TRANSFER_AMOUNTS.BRIDGED, AssetSourceRelation.Self]],
       }),
-    { timeout: 25000 },
+    { timeout: 40000 },
   );
 });

integration-tests/chopsticks/src/transfers/BridgeToPolimec.ts

@@ -1,5 +1,5 @@
 import { expect } from 'bun:test';
-import { DEFAULT_TOPIC, FEE_AMOUNT, WETH_ADDRESS, WETH_AMOUNT } from '@/constants';
+import { DEFAULT_TOPIC, ETH_AMOUNT, FEE_AMOUNT, WETH_ADDRESS } from '@/constants';
 import type { BridgerHubManagaer } from '@/managers/BridgeHubManager';
 import type { PolimecManager } from '@/managers/PolimecManager';
 import type { PolkadotHubManager } from '@/managers/PolkadotHubManager';
@@ -102,7 +102,10 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
       (event) => event.type === 'ForeignAssets' && event.value.type === 'Issued',
     );
 
-    // TODO: Check why we have 3 events instead of 2 (WETH + DOT). Curently we have 3 events (WETH + DOT + DOT)
+    console.log('Issued Events on Destination: \n');
+    console.dir(issuedEventsOnDest, { depth: null });
+
+    // TODO: Check why we have 3 events instead of 2 (ETH + DOT). Curently we have 3 events (ETH + DOT + DOT)
     expect(issuedEventsOnDest.length).toBe(3);
 
     return { sourceBlock, destBlock };
@@ -147,15 +150,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
           {
             id: XcmV3MultiassetAssetId.Concrete({
               parents: 2,
-              interior: XcmV3Junctions.X2([
+              interior: XcmV3Junctions.X1(
                 XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
-                XcmV3Junction.AccountKey20({
-                  network: undefined,
-                  key: FixedSizeBinary.fromHex(WETH_ADDRESS),
-                }),
-              ]),
+              ),
             }),
-            fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
+            fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
           },
         ]),
 
@@ -190,15 +189,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
             {
               id: XcmV3MultiassetAssetId.Concrete({
                 parents: 2,
-                interior: XcmV3Junctions.X2([
+                interior: XcmV3Junctions.X1(
                   XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
-                  XcmV3Junction.AccountKey20({
-                    network: undefined,
-                    key: FixedSizeBinary.fromHex(WETH_ADDRESS),
-                  }),
-                ]),
+                ),
               }),
-              fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
+              fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
             },
           ]),
           dest: {
@@ -250,15 +245,11 @@ export class BridgeToPolimecTransfer extends BaseTransferTest {
           {
             id: XcmV3MultiassetAssetId.Concrete({
               parents: 2,
-              interior: XcmV3Junctions.X2([
+              interior: XcmV3Junctions.X1(
                 XcmV3Junction.GlobalConsensus(XcmV3JunctionNetworkId.Ethereum({ chain_id: 1n })),
-                XcmV3Junction.AccountKey20({
-                  network: undefined,
-                  key: FixedSizeBinary.fromHex(WETH_ADDRESS),
-                }),
-              ]),
+              ),
             }),
-            fun: XcmV3MultiassetFungibility.Fungible(WETH_AMOUNT),
+            fun: XcmV3MultiassetFungibility.Fungible(ETH_AMOUNT),
           },
         ]),
 

integration-tests/chopsticks/src/transfers/PolimecToHub.ts

@@ -64,26 +64,6 @@ export class PolimecToHubTransfer extends BaseTransferTest {
     return { asset_balances: [{ source, destination }] };
   }
 
-  // verifyFinalBalances(
-  //   initialBalances: BalanceCheck[],
-  //   finalBalances: BalanceCheck[],
-  //   options: TransferOptions,
-  // ) {
-  //   // TODO: At the moment we exclude fees from the balance check since the PAPI team is wotking on some utilies to calculate fees.
-  //   const initialBalance =
-  //     options.assets[0][0] === Asset.DOT
-  //       ? INITIAL_BALANCES.DOT
-  //       : options.assets[0][0] === Asset.USDT
-  //         ? INITIAL_BALANCES.USDT
-  //         : INITIAL_BALANCES.USDC;
-  //   for (let i = 0; i < options.assets.length; i++) {
-  //     expect(initialBalances[i].destination).toBe(0n);
-  //     expect(initialBalances[i].source).toBe(initialBalance);
-  //     expect(finalBalances[i].source).toBeLessThan(initialBalances[i].source);
-  //     expect(finalBalances[i].destination).toBeGreaterThan(initialBalances[i].destination);
-  //   }
-  // }
-
   async verifyFinalBalances(
     assetInitialBalances: PolimecBalanceCheck[],
     assetFinalBalances: PolimecBalanceCheck[],