Merge branch 'v3-next' of github.com:moonbeam-foundation/xcm-sdk into…

… v3-next-mrl-integration-2
moonbeam-foundation · Dec 16, 2024 · 70f4e70 · 70f4e70
2 parents 0984def + 991cdeb
commit 70f4e70
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/packages/mrl/src/getTransferData/getRedeemData.ts b/packages/mrl/src/getTransferData/getRedeemData.ts
@@ -1,14 +1,18 @@
 import { type ContractConfig, MrlBuilder } from '@moonbeam-network/xcm-builder';
 import { EvmService, type EvmSigner } from '@moonbeam-network/xcm-sdk';
 import type { EvmChain, EvmParachain } from '@moonbeam-network/xcm-types';
+import type { RedeemData } from '../mrl.interfaces';
 import { WormholeService } from '../services/wormhole';
 
 export interface WormholeRedeemParams {
   txId: string;
   chain: EvmChain | EvmParachain;
 }
 
-export async function getRedeemData({ txId, chain }: WormholeRedeemParams) {
+export async function getRedeemData({
+  txId,
+  chain,
+}: WormholeRedeemParams): Promise<RedeemData> {
   // TODO this is just for wormhole
   const wh = WormholeService.create(chain);
 

diff --git a/packages/mrl/src/mrl.interfaces.ts b/packages/mrl/src/mrl.interfaces.ts
@@ -55,8 +55,8 @@ export interface ChainTransferData {
 }
 
 // TODO this is just for Wormhole
-export type RedeemData = {
+export interface RedeemData {
   vaa: TokenTransfer.VAA;
   tokenTransfer: TokenTransfer;
-  transfer(signer: EvmSigner): Promise<string[]>;
-};
+  redeem(signer: EvmSigner): Promise<string>;
+}
diff --git a/packages/types/src/chain/parachain/EvmParachain.ts b/packages/types/src/chain/parachain/EvmParachain.ts
@@ -1,6 +1,7 @@
 import type { Address } from 'viem';
 import type { Chain } from 'viem/chains';
 import { getViemChain } from '../Chain.utils';
+import { EvmChain } from '../EvmChain';
 import { Parachain, type ParachainConstructorParams } from './Parachain';
 
 export interface EvmParachainConstructorParams
@@ -34,6 +35,10 @@ export class EvmParachain extends Parachain {
     return obj instanceof EvmParachain || obj instanceof Parachain;
   }
 
+  static isAnyEvmChain(obj: unknown): obj is EvmParachain | EvmChain {
+    return obj instanceof EvmParachain || obj instanceof EvmChain;
+  }
+
   constructor({
     id,
     rpc,