diff --git a/sdk/js/src/relayer/__tests__/wormhole_relayer.ts b/sdk/js/src/relayer/__tests__/wormhole_relayer.ts index 8d952e013..a08a9f8ae 100644 --- a/sdk/js/src/relayer/__tests__/wormhole_relayer.ts +++ b/sdk/js/src/relayer/__tests__/wormhole_relayer.ts @@ -108,13 +108,13 @@ const optionalParams = { environment: network, sourceChainProvider: source.provider, targetChainProviders: myMap, - wormholeRelayerAddress: source.wormholeRelayerAddress + wormholeRelayerAddress: source.wormholeRelayerAddress, }; const optionalParamsTarget = { environment: network, sourceChainProvider: target.provider, targetChainProviders: myMap, - wormholeRelayerAddress: target.wormholeRelayerAddress + wormholeRelayerAddress: target.wormholeRelayerAddress, }; // for signing wormhole messages @@ -130,14 +130,13 @@ const TOO_LOW_GAS_LIMIT = 10000; const REASONABLE_GAS_LIMIT_FORWARDS = 900000; const wormholeRelayerAddresses = new Map(); - wormholeRelayerAddresses.set(sourceChain, source.wormholeRelayerAddress); - wormholeRelayerAddresses.set(targetChain, target.wormholeRelayerAddress); +wormholeRelayerAddresses.set(sourceChain, source.wormholeRelayerAddress); +wormholeRelayerAddresses.set(targetChain, target.wormholeRelayerAddress); const getStatus = async ( txHash: string, _sourceChain?: ChainName ): Promise => { - const info = (await relayer.getWormholeRelayerInfo( _sourceChain || sourceChain, txHash, @@ -145,7 +144,7 @@ const getStatus = async ( environment: network, targetChainProviders: myMap, sourceChainProvider: myMap.get(_sourceChain || sourceChain), - wormholeRelayerAddresses + wormholeRelayerAddresses, } )) as relayer.DeliveryInfo; return info.targetChainStatus.events[0].status; @@ -425,11 +424,10 @@ describe("Wormhole Relayer Tests", () => { const status = await getStatus(tx.hash); expect(status).toBe("Receiver Failure"); - const info = (await relayer.getWormholeRelayerInfo( - sourceChain, - tx.hash, - {wormholeRelayerAddresses, ...optionalParams} - )) as relayer.DeliveryInfo; + const info = (await relayer.getWormholeRelayerInfo(sourceChain, tx.hash, { + wormholeRelayerAddresses, + ...optionalParams, + })) as relayer.DeliveryInfo; await waitForRelay(); @@ -500,7 +498,7 @@ describe("Wormhole Relayer Tests", () => { const info = (await relayer.getWormholeRelayerInfo( sourceChain, rx.transactionHash, - {wormholeRelayerAddresses, ...optionalParams} + { wormholeRelayerAddresses, ...optionalParams } )) as relayer.DeliveryInfo; console.log("Redelivering message"); @@ -525,7 +523,7 @@ describe("Wormhole Relayer Tests", () => { gasLimit: REASONABLE_GAS_LIMIT, }, { transport: NodeHttpTransport() }, - {wormholeRelayerAddress: source.wormholeRelayerAddress} + { wormholeRelayerAddress: source.wormholeRelayerAddress } ); console.log("redelivery tx:", redeliveryReceipt.hash); diff --git a/sdk/js/src/relayer/relayer/info.ts b/sdk/js/src/relayer/relayer/info.ts index 513e90d67..7fcf04d81 100644 --- a/sdk/js/src/relayer/relayer/info.ts +++ b/sdk/js/src/relayer/relayer/info.ts @@ -61,10 +61,9 @@ export async function getPriceAndRefundInfo( throw Error( "No default RPC for this chain; pass in your own provider (as sourceChainProvider)" ); - const wormholeRelayerAddress = optionalParams?.wormholeRelayerAddress || getWormholeRelayerAddress( - sourceChain, - environment - ); + const wormholeRelayerAddress = + optionalParams?.wormholeRelayerAddress || + getWormholeRelayerAddress(sourceChain, environment); const sourceWormholeRelayer = ethers_contracts.IWormholeRelayer__factory.connect( wormholeRelayerAddress, @@ -190,7 +189,15 @@ export function stringifyWormholeRelayerInfo(info: DeliveryInfo): string { info.deliveryInstruction.targetAddress.toString("hex") !== "0000000000000000000000000000000000000000000000000000000000000000" ) { - stringifiedInfo += `Found delivery request in transaction ${info.sourceTransactionHash} on ${info.sourceChain}\nfrom sender ${info.deliveryInstruction.senderAddress.toString("hex")} from ${info.sourceChain} with delivery sequence number ${info.sourceDeliverySequenceNumber}\n`; + stringifiedInfo += `Found delivery request in transaction ${ + info.sourceTransactionHash + } on ${ + info.sourceChain + }\nfrom sender ${info.deliveryInstruction.senderAddress.toString( + "hex" + )} from ${info.sourceChain} with delivery sequence number ${ + info.sourceDeliverySequenceNumber + }\n`; const numMsgs = info.deliveryInstruction.vaaKeys.length; const payload = info.deliveryInstruction.payload.toString("hex"); diff --git a/sdk/js/src/relayer/relayer/resend.ts b/sdk/js/src/relayer/relayer/resend.ts index 9ca39b3ea..c5df86ae1 100644 --- a/sdk/js/src/relayer/relayer/resend.ts +++ b/sdk/js/src/relayer/relayer/resend.ts @@ -20,13 +20,18 @@ export async function resendRaw( newReceiverValue: BigNumber | number, deliveryProviderAddress: string, overrides?: ethers.PayableOverrides, - wormholeRelayerAddress?: string, + wormholeRelayerAddress?: string ): Promise { const provider = signer.provider; if (!provider) throw Error("No provider on signer"); - const wormholeRelayer = getWormholeRelayer(sourceChain, environment, signer, wormholeRelayerAddress); + const wormholeRelayer = getWormholeRelayer( + sourceChain, + environment, + signer, + wormholeRelayerAddress + ); return wormholeRelayer.resendToEvm( vaaKeyToVaaKeyStruct(vaaKey), @@ -40,7 +45,7 @@ export async function resendRaw( type ResendOptionalParams = { wormholeRelayerAddress?: string; -} +}; export async function resend( signer: ethers.Signer, @@ -101,7 +106,12 @@ export async function resend( ); } - const wormholeRelayer = getWormholeRelayer(sourceChain, environment, signer, optionalParams?.wormholeRelayerAddress); + const wormholeRelayer = getWormholeRelayer( + sourceChain, + environment, + signer, + optionalParams?.wormholeRelayerAddress + ); const [deliveryPrice, refundPerUnitGas]: [BigNumber, BigNumber] = await wormholeRelayer[ diff --git a/sdk/js/src/relayer/relayer/send.ts b/sdk/js/src/relayer/relayer/send.ts index 60084490f..214fa32e9 100644 --- a/sdk/js/src/relayer/relayer/send.ts +++ b/sdk/js/src/relayer/relayer/send.ts @@ -43,10 +43,9 @@ export async function sendToEvm( const targetChainId = CHAINS[targetChain]; const environment = sendOptionalParams?.environment || "MAINNET"; - const wormholeRelayerAddress = sendOptionalParams?.wormholeRelayerAddress || getWormholeRelayerAddress( - sourceChain, - environment - ); + const wormholeRelayerAddress = + sendOptionalParams?.wormholeRelayerAddress || + getWormholeRelayerAddress(sourceChain, environment); const sourceWormholeRelayer = ethers_contracts.IWormholeRelayer__factory.connect( wormholeRelayerAddress,