rm extra check, remove addresses from callback

Author: barnjamin

sdk/__tests__/utils.ts

@@ -296,9 +296,7 @@ async function waitForRelay(
 
   // long timeout because the relayer has consistency level set to 15
   const vaa = await wh.getVaa(msgId, "Uint8Array", 2 * 60 * 1000);
-  const deliveryHash = vaa!.hash;
-  console.log("Hash", deliveryHash);
-  console.log("Hash", keccak256(deliveryHash));
+  const deliveryHash = keccak256(vaa!.hash);
 
   const wormholeRelayer = IWormholeRelayer__factory.connect(
     dst.context.config.contracts.relayer!,
@@ -307,22 +305,16 @@ async function waitForRelay(
 
   let success = false;
   while (!success) {
-    await new Promise((resolve) => setTimeout(resolve, retryTime));
     try {
       const successBlock = await wormholeRelayer.deliverySuccessBlock(
         deliveryHash
       );
-      console.log("Checking for single hash: ", successBlock);
       if (successBlock > 0) success = true;
-
-      const altSuccessBlock = await wormholeRelayer.deliverySuccessBlock(
-        keccak256(deliveryHash)
-      );
-      console.log("Checking for double hash: ", altSuccessBlock);
-      if (altSuccessBlock > 0) success = true;
+      console.log("Relayer delivery: ", success);
     } catch (e) {
       console.error(e);
     }
+    await new Promise((resolve) => setTimeout(resolve, retryTime));
   }
 }
 
@@ -487,14 +479,15 @@ async function deployEvm(ctx: Ctx): Promise<Ctx> {
   // // Setup with the proxy
   console.log("Deploy transceiver proxy");
   const transceiverProxyFactory = new ERC1967Proxy__factory(wallet);
-  const transceiverProxyAddress = await transceiverProxyFactory.deploy(
+  const transceiverProxyDeployment = await transceiverProxyFactory.deploy(
     await WormholeTransceiverAddress.getAddress(),
     "0x"
   );
-  await transceiverProxyAddress.waitForDeployment();
+  await transceiverProxyDeployment.waitForDeployment();
 
+  const transceiverProxyAddress = await transceiverProxyDeployment.getAddress();
   const transceiver = WormholeTransceiver__factory.connect(
-    await transceiverProxyAddress.getAddress(),
+    transceiverProxyAddress,
     wallet
   );
 
@@ -506,9 +499,7 @@ async function deployEvm(ctx: Ctx): Promise<Ctx> {
 
   // Setup the initial calls, like transceivers for the manager
   console.log("Set transceiver for manager");
-  await tryAndWaitThrice(() =>
-    transceiver.getAddress().then((addr) => manager.setTransceiver(addr))
-  );
+  await tryAndWaitThrice(() => manager.setTransceiver(transceiverProxyAddress));
 
   console.log("Set outbound limit for manager");
   await tryAndWaitThrice(() =>
@@ -519,7 +510,7 @@ async function deployEvm(ctx: Ctx): Promise<Ctx> {
     ...ctx,
     contracts: {
       transceiver: {
-        wormhole: await transceiverProxyAddress.getAddress(),
+        wormhole: transceiverProxyAddress,
       },
       manager: await managerProxyAddress.getAddress(),
       token: ERC20NTTAddress,
@@ -623,8 +614,8 @@ async function setupPeer(targetCtx: Ctx, peerCtx: Ctx) {
     transceiver: { wormhole: transceiver },
   } = peerCtx.contracts!;
 
-  const managerAddress = Wormhole.chainAddress(peer.chain, manager);
-  const transceiverEmitter = Wormhole.chainAddress(peer.chain, transceiver);
+  const peerManager = Wormhole.chainAddress(peer.chain, manager);
+  const peerTransceiver = Wormhole.chainAddress(peer.chain, transceiver);
 
   const tokenDecimals = target.config.nativeTokenDecimals;
   const inboundLimit = amount.units(amount.parse("1000", tokenDecimals));
@@ -633,15 +624,15 @@ async function setupPeer(targetCtx: Ctx, peerCtx: Ctx) {
 
   const nttManager = await getNtt(targetCtx);
   const setPeerTxs = nttManager.setPeer(
-    managerAddress,
+    peerManager,
     tokenDecimals,
     inboundLimit,
     sender.address
   );
   await signSendWait(target, setPeerTxs, signer);
 
   const setXcvrPeerTxs = nttManager.setWormholeTransceiverPeer(
-    transceiverEmitter,
+    peerTransceiver,
     sender.address
   );
   const xcvrPeerTxids = await signSendWait(target, setXcvrPeerTxs, signer);
@@ -666,7 +657,7 @@ async function setupPeer(targetCtx: Ctx, peerCtx: Ctx) {
 
     const peerChainId = toChainId(peer.chain);
 
-    console.log("Setting wormhole relaying for: ", peer.chain);
+    console.log("Setting isEvmChain for: ", peer.chain);
     await tryAndWaitThrice(() =>
       xcvr.setIsWormholeEvmChain.send(peerChainId, true, {
         nonce: expectedNonce,