Correctly queue proposals received (#2335)

Author: snario

packages/node/src/message-handling/handle-node-message.ts

@@ -3,6 +3,7 @@ import {
   getOrCreateStateChannelBetweenVirtualAppParticipants
 } from "../methods/app-instance/propose-install-virtual/operation";
 import { NO_APP_INSTANCE_ID_TO_INSTALL } from "../methods/errors";
+import { executeFunctionWithinQueues } from "../methods/queued-execution";
 import { AppInstanceProposal } from "../models";
 import { RequestHandler } from "../request-handler";
 import {
@@ -74,24 +75,29 @@ export async function handleReceivedProposalMessage(
     networkContext.MinimumViableMultisig
   );
 
-  const stateChannel = await store.getStateChannel(multisigAddress);
-
-  await store.addAppInstanceProposal(
-    stateChannel,
-    new AppInstanceProposal(
-      {
-        ...params,
-        proposedByIdentifier,
-        initiatorDeposit: params.responderDeposit,
-        initiatorDepositTokenAddress: params.responderDepositTokenAddress!,
-        responderDeposit: params.initiatorDeposit!,
-        responderDepositTokenAddress: params.initiatorDepositTokenAddress!
-      },
-      stateChannel
-    )
+  await executeFunctionWithinQueues(
+    [await requestHandler.getShardedQueue(multisigAddress)],
+    async () => {
+      const stateChannel = await store.getStateChannel(multisigAddress);
+
+      await store.addAppInstanceProposal(
+        stateChannel,
+        new AppInstanceProposal(
+          {
+            ...params,
+            proposedByIdentifier,
+            initiatorDeposit: params.responderDeposit,
+            initiatorDepositTokenAddress: params.responderDepositTokenAddress!,
+            responderDeposit: params.initiatorDeposit!,
+            responderDepositTokenAddress: params.initiatorDepositTokenAddress!
+          },
+          stateChannel
+        )
+      );
+
+      await store.saveStateChannel(stateChannel.bumpProposedApps());
+    }
   );
-
-  await store.saveStateChannel(stateChannel.bumpProposedApps());
 }
 
 export async function handleRejectProposalMessage(
@@ -144,28 +150,40 @@ export async function handleReceivedProposeVirtualMessage(
       } as ProposeVirtualMessage
     );
   } else {
-    const stateChannel = await getOrCreateStateChannelBetweenVirtualAppParticipants(
-      proposedByIdentifier,
-      publicIdentifier,
-      intermediaryIdentifier,
-      store,
-      networkContext
+    const multisigAddress = getCreate2MultisigAddress(
+      [proposedByIdentifier, proposedToIdentifier],
+      networkContext.ProxyFactory,
+      networkContext.MinimumViableMultisig
     );
 
-    const proposal = new AppInstanceProposal(
-      {
-        ...params,
-        proposedByIdentifier,
-        initiatorDeposit: responderDeposit,
-        initiatorDepositTokenAddress: responderDepositTokenAddress!,
-        responderDeposit: initiatorDeposit,
-        responderDepositTokenAddress: initiatorDepositTokenAddress!
-      },
-      stateChannel
+    await executeFunctionWithinQueues(
+      [await requestHandler.getShardedQueue(multisigAddress)],
+      async () => {
+        const stateChannel = await getOrCreateStateChannelBetweenVirtualAppParticipants(
+          multisigAddress,
+          proposedByIdentifier,
+          proposedToIdentifier,
+          intermediaryIdentifier,
+          store,
+          networkContext
+        );
+
+        await store.addVirtualAppInstanceProposal(
+          new AppInstanceProposal(
+            {
+              ...params,
+              proposedByIdentifier,
+              initiatorDeposit: responderDeposit,
+              initiatorDepositTokenAddress: responderDepositTokenAddress!,
+              responderDeposit: initiatorDeposit,
+              responderDepositTokenAddress: initiatorDepositTokenAddress!
+            },
+            stateChannel
+          )
+        );
+
+        await store.saveStateChannel(stateChannel.bumpProposedApps());
+      }
     );
-
-    await store.addVirtualAppInstanceProposal(proposal);
-
-    await store.saveStateChannel(stateChannel.bumpProposedApps());
   }
 }

packages/node/src/methods/app-instance/propose-install-virtual/operation.ts

@@ -21,7 +21,14 @@ export async function createProposedVirtualAppInstance(
 ): Promise<string> {
   const { intermediaryIdentifier, proposedToIdentifier } = params;
 
+  const multisigAddress = getCreate2MultisigAddress(
+    [myIdentifier, proposedToIdentifier],
+    networkContext.ProxyFactory,
+    networkContext.MinimumViableMultisig
+  );
+
   const channel = await getOrCreateStateChannelBetweenVirtualAppParticipants(
+    multisigAddress,
     myIdentifier,
     proposedToIdentifier,
     intermediaryIdentifier,
@@ -67,18 +74,13 @@ export function getNextNodeAddress(
 }
 
 export async function getOrCreateStateChannelBetweenVirtualAppParticipants(
+  multisigAddress: string,
   initiatorXpub: string,
   responderXpub: string,
   hubXpub: string,
   store: Store,
   networkContext: NetworkContext
 ): Promise<StateChannel> {
-  const multisigAddress = getCreate2MultisigAddress(
-    [initiatorXpub, responderXpub],
-    networkContext.ProxyFactory,
-    networkContext.MinimumViableMultisig
-  );
-
   try {
     return await store.getStateChannel(multisigAddress);
   } catch (e) {
@@ -88,12 +90,6 @@ export async function getOrCreateStateChannelBetweenVirtualAppParticipants(
         .includes(NO_STATE_CHANNEL_FOR_MULTISIG_ADDR(multisigAddress)) &&
       hubXpub !== undefined
     ) {
-      const multisigAddress = getCreate2MultisigAddress(
-        [initiatorXpub, responderXpub],
-        networkContext.ProxyFactory,
-        networkContext.MinimumViableMultisig
-      );
-
       const stateChannel = StateChannel.createEmptyChannel(multisigAddress, [
         initiatorXpub,
         responderXpub