From 6856293ff2235522c71832b6bd9b40e3cf0311d1 Mon Sep 17 00:00:00 2001
From: Mario J Maurello <marioj@purestake.com>
Date: Wed, 5 Jun 2024 13:58:42 +0900
Subject: [PATCH] fix peaqEvm asset configs

---
 packages/config/src/chains.ts           | 31 +++++++++++++++++--------
 packages/config/src/configs/moonbeam.ts |  6 +----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/config/src/chains.ts b/packages/config/src/chains.ts
index 7a4133c8..8de2ed1b 100644
--- a/packages/config/src/chains.ts
+++ b/packages/config/src/chains.ts
@@ -1331,12 +1331,14 @@ export const peaqEvmAlphanet = new EvmParachain({
       decimals: 18,
       id: '0xFfFfFffF000000000000000000000000000003e8',
       metadataId: 0,
+      minId: 1000,
     },
     {
       asset: ftmwh,
       decimals: 18,
       id: '0xFffFffFF000000000000000000000000000003E9',
       metadataId: 0,
+      minId: 1001,
     },
   ],
   contracts: {
@@ -1363,47 +1365,56 @@ export const peaqEvmAlphanet = new EvmParachain({
 
 export const peaqEvm = new EvmParachain({
   assetsData: [
+    {
+      asset: peaq,
+      decimals: 18,
+    },
     {
       asset: glmr,
       decimals: 18,
       id: '0xFfFfFffF000000000000000000000000000003e8',
       metadataId: 0,
+      minId: 1000,
     },
     {
       asset: usdcwh,
-      decimals: 6,
       id: '0xFffFffFF000000000000000000000000000003E9',
-      metadataId: 0,
+      metadataId: 1001,
+      minId: 1001,
     },
     {
       asset: weth,
-      decimals: 18,
       id: '0xFFFfFfFf000000000000000000000000000003ea',
-      metadataId: 0,
+      metadataId: 1002,
+      minId: 1002,
     },
     {
       asset: wbtc,
-      decimals: 8,
       id: '0xfffFFFFF000000000000000000000000000003eb',
-      metadataId: 0,
+      metadataId: 1003,
+      minId: 1003,
     },
     {
       asset: dai,
-      decimals: 18,
       id: '0xfFffFFFF000000000000000000000000000003Ec',
-      metadataId: 0,
+      metadataId: 1004,
+      minId: 1004,
     },
     {
       asset: usdtwh,
-      decimals: 6,
       id: '0xfFffffFF000000000000000000000000000003Ed',
-      metadataId: 0,
+      metadataId: 1005,
+      minId: 1005,
     },
   ],
+  contracts: {
+    Xtokens: '0x0000000000000000000000000000000000000803',
+  },
   ecosystem: Ecosystem.Polkadot,
   genesisHash:
     '0xd2a5d385932d1f650dae03ef8e2748983779ee342c614f80854d32b8cd8fa48c',
   id: 3338,
+  isEvmSigner: true,
   isTestChain: false,
   key: 'peaq-evm',
   name: 'Peaq EVM',
diff --git a/packages/config/src/configs/moonbeam.ts b/packages/config/src/configs/moonbeam.ts
index 96b6450b..6f972389 100644
--- a/packages/config/src/configs/moonbeam.ts
+++ b/packages/config/src/configs/moonbeam.ts
@@ -846,15 +846,11 @@ export const moonbeamConfig = new ChainConfig({
     }),
     new AssetConfig({
       asset: glmr,
-      balance: BalanceBuilder().evm().erc20(),
+      balance: BalanceBuilder().substrate().system().account(),
       contract: ContractBuilder().Xtokens().transferWithEvmTo32(),
       destination: peaqEvm,
       destinationFee: {
         amount: 0.00000001,
-        asset: glmr,
-        balance: BalanceBuilder().evm().erc20(),
-      },
-      fee: {
         asset: glmr,
         balance: BalanceBuilder().substrate().system().account(),
       },