@moonbeam-network/mrl 1.0.0-dev.278 → 1.0.0-dev.280

package/build/index.mjs

@@ -16808,7 +16808,6 @@ import {
 } from "@moonbeam-network/xcm-builder";
 import { EvmService as EvmService2 } from "@moonbeam-network/xcm-sdk";
 import { EvmChain } from "@moonbeam-network/xcm-types";
-import { isEthAddress } from "@moonbeam-network/xcm-utils";
 import { u8aToHex } from "@polkadot/util";
 import { decodeAddress } from "@polkadot/util-crypto";
 import { encodeFunctionData } from "viem";
@@ -16874,17 +16873,16 @@ var SnowbridgeService = class _SnowbridgeService {
       requiresApproval
     } = args;
     const value = requiresApproval ? bridgeFeeAmount : amount + bridgeFeeAmount;
-    const isEthereumDestination = isEthAddress(destinationAddress);
-    const destination = isEthereumDestination ? { kind: 2, data: destinationAddress } : { kind: 1, data: u8aToHex(decodeAddress(destinationAddress)) };
     const contractArgs = [
       tokenAddress,
       destinationParaId,
-      destination,
-      10000000000000n,
-      // TODO mjm get from config
+      {
+        kind: 1,
+        data: u8aToHex(decodeAddress(destinationAddress))
+      },
+      0n,
       amount
     ];
-    console.log("contractArgs", contractArgs);
     return new ContractConfig({
       address: this.#gatewayAddress,
       abi: GATEWAY_ABI,
@@ -16963,10 +16961,7 @@ var SnowbridgeService = class _SnowbridgeService {
 // src/getTransferData/getBridgeChainData.ts
 import { getBalance, getDestinationFee } from "@moonbeam-network/xcm-sdk";
 import { EvmParachain, Parachain } from "@moonbeam-network/xcm-types";
-import {
-  getMultilocationDerivedAddresses,
-  isEthAddress as isEthAddress2
-} from "@moonbeam-network/xcm-utils";
+import { getMultilocationDerivedAddresses } from "@moonbeam-network/xcm-utils";
 import { evmToAddress } from "@polkadot/util-crypto";
 async function getBridgeChainData({
   route,
@@ -16984,7 +16979,6 @@ async function getBridgeChainData({
     sourceAddress,
     destinationAddress
   });
-  console.log("bridgeChain bridgeChainAddress", bridgeChainAddress);
   const fee = await getDestinationFee({
     address: bridgeChainAddress,
     asset: route.source.asset,
@@ -16993,21 +16987,18 @@ async function getBridgeChainData({
     feeAsset: route.mrl.bridgeChain.fee.asset,
     source: route.source.chain
   });
-  console.log("bridgeChain fee", fee);
   const balance = await getBalance({
     address: bridgeChainAddress,
     asset: bridgeChain.getChainAsset(route.mrl.bridgeChain.asset),
     builder: route.mrl.bridgeChain.balance,
     chain: bridgeChain
   });
-  console.log("bridgeChain balance", balance);
   const feeBalance = await getBalance({
     address: bridgeChainAddress,
     asset: bridgeChain.getChainAsset(route.mrl.bridgeChain.fee.asset),
     builder: route.mrl.bridgeChain.fee.balance,
     chain: bridgeChain
   });
-  console.log("bridgeChain feeBalance", feeBalance);
   return {
     address: bridgeChainAddress,
     balance,
@@ -17027,9 +17018,6 @@ function getBridgeChainAddress({
   const isDestinationBridgeChain = bridgeChain.isEqual(destination);
   const isSourceBridgeChain = bridgeChain.isEqual(source);
   let bridgeChainAddress = isDestinationBridgeChain ? destinationAddress : sourceAddress;
-  if (Parachain.isExactly(bridgeChain) && isEthAddress2(bridgeChainAddress)) {
-    bridgeChainAddress = evmToAddress(bridgeChainAddress);
-  }
   if (Parachain.is(source) && !isSourceBridgeChain) {
     const isSourceEvmSigner = EvmParachain.is(source) && source.isEvmSigner;
     const { address20: computedOriginAccount } = getMultilocationDerivedAddresses({