Allow router and server node to be debugged remotely

modules/browser-node/src/index.ts

@@ -24,7 +24,6 @@ import { constructRpcRequest, hydrateProviders, NatsMessagingService } from "@co
 import pino, { BaseLogger } from "pino";
 
 import { BrowserStore } from "./services/store";
-import { BrowserLockService } from "./services/lock";
 import { DirectProvider, IframeChannelProvider, IRpcChannelProvider } from "./channelProvider";
 import { BrowserNodeError } from "./errors";
 export * from "./constants";
@@ -108,11 +107,6 @@ export class BrowserNode implements INodeService {
       config.signer.publicIdentifier,
       config.logger.child({ module: "BrowserStore" }),
     );
-    const lock = new BrowserLockService(
-      config.signer.publicIdentifier,
-      messaging,
-      config.logger.child({ module: "BrowserLockService" }),
-    );
     const chainService = new VectorChainService(
       store,
       chainJsonProviders,
@@ -146,7 +140,6 @@ export class BrowserNode implements INodeService {
 
     const engine = await VectorEngine.connect(
       messaging,
-      lock,
       store,
       config.signer,
       chainService,

modules/contracts/src.ts/services/ethService.ts

@@ -23,8 +23,7 @@ import {
   encodeTransferResolver,
   encodeTransferState,
   getRandomBytes32,
-  generateMerkleTreeData,
-  hashCoreTransferState,
+  getMerkleProof,
 } from "@connext/vector-utils";
 import { Signer } from "@ethersproject/abstract-signer";
 import { BigNumber } from "@ethersproject/bignumber";
@@ -1029,15 +1028,15 @@ export class EthereumChainService extends EthereumChainReader implements IVector
     }
 
     // Generate merkle root
-    const { tree } = generateMerkleTreeData(activeTransfers);
+    const proof = getMerkleProof(activeTransfers, transferIdToDispute);
 
     return this.sendTxWithRetries(
       transferState.channelAddress,
       transferState.chainId,
       TransactionReason.disputeTransfer,
       () => {
         const channel = new Contract(transferState.channelAddress, VectorChannel.abi, signer);
-        return channel.disputeTransfer(transferState, tree.getHexProof(hashCoreTransferState(transferState)));
+        return channel.disputeTransfer(transferState, proof);
       },
     ) as Promise<Result<TransactionResponseWithResult, ChainError>>;
   }

modules/contracts/src.ts/tests/cmcs/adjudicator.spec.ts

@@ -15,7 +15,9 @@ import {
   hashCoreTransferState,
   hashTransferState,
   signChannelMessage,
+  getMerkleProof,
 } from "@connext/vector-utils";
+import { TransactionReceipt } from "@ethersproject/abstract-provider";
 import { BigNumber, BigNumberish } from "@ethersproject/bignumber";
 import { AddressZero, HashZero, Zero } from "@ethersproject/constants";
 import { Contract } from "@ethersproject/contracts";
@@ -69,7 +71,7 @@ describe("CMCAdjudicator.sol", async function () {
   const verifyTransferDispute = async (cts: FullTransferState, disputeBlockNumber: number) => {
     const { timestamp } = await provider.getBlock(disputeBlockNumber);
     const transferDispute = await channel.getTransferDispute(cts.transferId);
-    expect(transferDispute.transferStateHash).to.be.eq(`0x` + hashCoreTransferState(cts).toString("hex"));
+    expect(transferDispute.transferStateHash).to.be.eq("0x" + hashCoreTransferState(cts).toString("hex"));
     expect(transferDispute.isDefunded).to.be.false;
     expect(transferDispute.transferDisputeExpiry).to.be.eq(BigNumber.from(timestamp).add(cts.transferTimeout));
   };
@@ -115,14 +117,16 @@ describe("CMCAdjudicator.sol", async function () {
   };
 
   // Get merkle proof of transfer
-  const getMerkleProof = (cts: FullTransferState[] = [transferState], toProve: string = transferState.transferId) => {
-    const { tree } = generateMerkleTreeData(cts);
-    return tree.getHexProof(hashCoreTransferState(cts.find((t) => t.transferId === toProve)!));
+  const getMerkleProofTest = (
+    cts: FullTransferState[] = [transferState],
+    toProve: string = transferState.transferId,
+  ) => {
+    return getMerkleProof(cts, toProve);
   };
 
   // Helper to dispute transfers + bring to defund phase
   const disputeTransfer = async (cts: FullTransferState = transferState) => {
-    await (await channel.disputeTransfer(cts, getMerkleProof([cts], cts.transferId))).wait();
+    await (await channel.disputeTransfer(cts, getMerkleProofTest([cts], cts.transferId))).wait();
   };
 
   // Helper to defund channels and verify transfers
@@ -536,7 +540,7 @@ describe("CMCAdjudicator.sol", async function () {
       }
       await disputeChannel();
       await expect(
-        channel.disputeTransfer({ ...transferState, channelAddress: getRandomAddress() }, getMerkleProof()),
+        channel.disputeTransfer({ ...transferState, channelAddress: getRandomAddress() }, getMerkleProofTest()),
       ).revertedWith("CMCAdjudicator: INVALID_TRANSFER");
     });
 
@@ -546,7 +550,7 @@ describe("CMCAdjudicator.sol", async function () {
       }
       await disputeChannel();
       await expect(
-        channel.disputeTransfer({ ...transferState, transferId: getRandomBytes32() }, getMerkleProof()),
+        channel.disputeTransfer({ ...transferState, transferId: getRandomBytes32() }, getMerkleProofTest()),
       ).revertedWith("CMCAdjudicator: INVALID_MERKLE_PROOF");
     });
 
@@ -558,7 +562,7 @@ describe("CMCAdjudicator.sol", async function () {
       // the defund phase
       const tx = await channel.disputeChannel(channelState, aliceSignature, bobSignature);
       await tx.wait();
-      await expect(channel.disputeTransfer(transferState, getMerkleProof())).revertedWith(
+      await expect(channel.disputeTransfer(transferState, getMerkleProofTest())).revertedWith(
         "CMCAdjudicator: INVALID_PHASE",
       );
     });
@@ -569,9 +573,9 @@ describe("CMCAdjudicator.sol", async function () {
       }
       const longerTimeout = { ...channelState, timeout: "4" };
       await disputeChannel(longerTimeout);
-      const tx = await channel.disputeTransfer(transferState, getMerkleProof());
+      const tx = await channel.disputeTransfer(transferState, getMerkleProofTest());
       await tx.wait();
-      await expect(channel.disputeTransfer(transferState, getMerkleProof())).revertedWith(
+      await expect(channel.disputeTransfer(transferState, getMerkleProofTest())).revertedWith(
         "CMCAdjudicator: TRANSFER_ALREADY_DISPUTED",
       );
     });
@@ -581,7 +585,7 @@ describe("CMCAdjudicator.sol", async function () {
         this.skip();
       }
       await disputeChannel();
-      const tx = await channel.disputeTransfer(transferState, getMerkleProof());
+      const tx = await channel.disputeTransfer(transferState, getMerkleProofTest());
       const { blockNumber } = await tx.wait();
       await verifyTransferDispute(transferState, blockNumber);
     });
@@ -597,14 +601,14 @@ describe("CMCAdjudicator.sol", async function () {
         { ...transferState, transferId: getRandomBytes32() },
         { ...transferState, transferId: getRandomBytes32() },
       ];
-      const { root, tree } = generateMerkleTreeData(transfers);
+      const { root } = generateMerkleTreeData(transfers);
 
       const newState = { ...channelState, merkleRoot: root };
       await disputeChannel(newState);
 
       const txs = [];
       for (const t of transfers) {
-        const tx = await channel.disputeTransfer(t, tree.getHexProof(hashCoreTransferState(t)));
+        const tx = await channel.disputeTransfer(t, getMerkleProof(transfers, t.transferId));
         txs.push(tx);
       }
       const receipts = await Promise.all(txs.map((tx) => tx.wait()));