feat: add Held status to exState status

packages/core/src/internal/batcher.ts

@@ -74,6 +74,7 @@ export class Batcher {
         switch (executionState.status) {
           case ExecutionStatus.FAILED:
           case ExecutionStatus.TIMEOUT:
+          case ExecutionStatus.HELD:
           case ExecutionStatus.STARTED:
             return [f.id, VisitStatus.UNVISITED];
           case ExecutionStatus.SUCCESS:

packages/core/src/internal/deployer.ts

@@ -291,6 +291,26 @@ export class Deployer {
       successful: Object.values(deploymentState.executionStates)
         .filter((ex) => ex.status === ExecutionStatus.SUCCESS)
         .map((ex) => ex.id),
+      held: Object.values(deploymentState.executionStates)
+        .filter(canFail)
+        .filter((ex) => ex.status === ExecutionStatus.HELD)
+        .map((ex) => {
+          assertIgnitionInvariant(
+            ex.result !== undefined,
+            `Execution state ${ex.id} is marked as held but has no result`
+          );
+
+          assertIgnitionInvariant(
+            ex.result.type === ExecutionResultType.STRATEGY_HELD,
+            `Execution state ${ex.id} is marked as held but has ${ex.result.type} instead of a held result`
+          );
+
+          return {
+            futureId: ex.id,
+            heldId: ex.result.heldId,
+            reason: ex.result.reason,
+          };
+        }),
       timedOut: Object.values(deploymentState.executionStates)
         .filter(canTimeout)
         .filter((ex) => ex.status === ExecutionStatus.TIMEOUT)
@@ -304,7 +324,8 @@ export class Deployer {
         .map((ex) => {
           assertIgnitionInvariant(
             ex.result !== undefined &&
-              ex.result.type !== ExecutionResultType.SUCCESS,
+              ex.result.type !== ExecutionResultType.SUCCESS &&
+              ex.result.type !== ExecutionResultType.STRATEGY_HELD,
             `Execution state ${ex.id} is marked as failed but has no error result`
           );
 

packages/core/src/internal/execution/execution-engine.ts

@@ -13,7 +13,7 @@ import {
 import { DeploymentLoader } from "../deployment-loader/types";
 import { getFuturesFromModule } from "../utils/get-futures-from-module";
 import { getPendingNonceAndSender } from "../views/execution-state/get-pending-nonce-and-sender";
-import { hasExecutionFailed } from "../views/has-execution-failed";
+import { hasExecutionSucceeded } from "../views/has-execution-succeeded";
 import { isBatchFinished } from "../views/is-batch-finished";
 
 import { applyNewMessage } from "./deployment-state-helpers";
@@ -108,7 +108,9 @@ export class ExecutionEngine {
         deploymentState
       );
 
-      if (executionBatch.some((f) => hasExecutionFailed(f, deploymentState))) {
+      if (
+        !executionBatch.every((f) => hasExecutionSucceeded(f, deploymentState))
+      ) {
         return deploymentState;
       }
     }

packages/core/src/internal/execution/reducers/helpers/complete-execution-state.ts

@@ -72,5 +72,7 @@ function _mapResultTypeToStatus(
       return ExecutionStatus.FAILED;
     case ExecutionResultType.STRATEGY_ERROR:
       return ExecutionStatus.FAILED;
+    case ExecutionResultType.STRATEGY_HELD:
+      return ExecutionStatus.HELD;
   }
 }

packages/core/src/internal/execution/types/execution-result.ts

@@ -12,6 +12,7 @@ export enum ExecutionResultType {
   REVERTED_TRANSACTION = "REVERTED_TRANSACTION",
   STATIC_CALL_ERROR = "STATIC_CALL_ERROR",
   STRATEGY_ERROR = "STRATEGY_ERROR",
+  STRATEGY_HELD = "STRATEGY_HELD",
 }
 
 /**
@@ -59,6 +60,16 @@ export interface StrategyErrorExecutionResult {
   error: string;
 }
 
+/**
+ * The execution strategy returned a strategy-specific hold e.g.
+ * waiting for off-chain multi-sig confirmations.
+ */
+export interface StrategyHeldExecutionResult {
+  type: ExecutionResultType.STRATEGY_HELD;
+  heldId: number;
+  reason: string;
+}
+
 /**
  * A deployment was successfully executed.
  */
@@ -77,7 +88,8 @@ export type DeploymentExecutionResult =
   | StrategySimulationErrorExecutionResult
   | RevertedTransactionExecutionResult
   | FailedStaticCallExecutionResult
-  | StrategyErrorExecutionResult;
+  | StrategyErrorExecutionResult
+  | StrategyHeldExecutionResult;
 
 /**
  * A call future was successfully executed.
@@ -95,7 +107,8 @@ export type CallExecutionResult =
   | StrategySimulationErrorExecutionResult
   | RevertedTransactionExecutionResult
   | FailedStaticCallExecutionResult
-  | StrategyErrorExecutionResult;
+  | StrategyErrorExecutionResult
+  | StrategyHeldExecutionResult;
 
 /**
  * A send data future was successfully executed.
@@ -113,7 +126,8 @@ export type SendDataExecutionResult =
   | StrategySimulationErrorExecutionResult
   | RevertedTransactionExecutionResult
   | FailedStaticCallExecutionResult
-  | StrategyErrorExecutionResult;
+  | StrategyErrorExecutionResult
+  | StrategyHeldExecutionResult;
 
 /**
  * A static call future was successfully executed.
@@ -129,4 +143,5 @@ export interface SuccessfulStaticCallExecutionResult {
 export type StaticCallExecutionResult =
   | SuccessfulStaticCallExecutionResult
   | FailedStaticCallExecutionResult
-  | StrategyErrorExecutionResult;
+  | StrategyErrorExecutionResult
+  | StrategyHeldExecutionResult;

packages/core/src/internal/execution/types/execution-state.ts

@@ -26,6 +26,7 @@ export enum ExecutionStatus {
   STARTED = "STARATED",
   TIMEOUT = "TIMEOUT",
   SUCCESS = "SUCCESS",
+  HELD = "HELD",
   FAILED = "FAILED",
 }
 

packages/core/src/internal/formatters.ts

@@ -31,19 +31,14 @@ export function formatExecutionError(
       return `Simulating the transaction failed with error: ${formatFailedEvmExecutionResult(
         result.error
       )}`;
-
     case ExecutionResultType.STRATEGY_SIMULATION_ERROR:
       return `Simulating the transaction failed with error: ${result.error}`;
-
-    case ExecutionResultType.REVERTED_TRANSACTION: {
+    case ExecutionResultType.REVERTED_TRANSACTION:
       return `Transaction ${result.txHash} reverted`;
-    }
-
     case ExecutionResultType.STATIC_CALL_ERROR:
       return `Static call failed with error: ${formatFailedEvmExecutionResult(
         result.error
       )}`;
-
     case ExecutionResultType.STRATEGY_ERROR:
       return `Execution failed with error: ${result.error}`;
   }

packages/core/src/internal/journal/utils/emitExecutionEvent.ts

@@ -1,9 +1,9 @@
 import {
   ExecutionEventListener,
-  ExecutionEventType,
+  ExecutionEventNetworkInteractionType,
   ExecutionEventResult,
   ExecutionEventResultType,
-  ExecutionEventNetworkInteractionType,
+  ExecutionEventType,
 } from "../../../types/execution-events";
 import { SolidityParameterType } from "../../../types/module";
 import {
@@ -217,6 +217,13 @@ function convertExecutionResultToEventResult(
         error: "Transaction reverted",
       };
     }
+    case ExecutionResultType.STRATEGY_HELD: {
+      return {
+        type: ExecutionEventResultType.HELD,
+        heldId: result.heldId,
+        reason: result.reason,
+      };
+    }
   }
 }
 
@@ -241,6 +248,13 @@ function convertStaticCallResultToExecutionEventResult(
         error: result.error,
       };
     }
+    case ExecutionResultType.STRATEGY_HELD: {
+      return {
+        type: ExecutionEventResultType.HELD,
+        heldId: result.heldId,
+        reason: result.reason,
+      };
+    }
   }
 }
 

packages/core/src/internal/views/has-execution-failed.ts → packages/core/src/internal/views/has-execution-succeeded.ts

@@ -3,23 +3,21 @@ import { DeploymentState } from "../execution/types/deployment-state";
 import { ExecutionStatus } from "../execution/types/execution-state";
 
 /**
- * Returns true if the execution of the given future has failed.
+ * Returns true if the execution of the given future has succeeded.
  *
  * @param future The future.
  * @param deploymentState The deployment state to check against.
- * @returns true if it failed.
+ * @returns true if it succeeded.
  */
-export function hasExecutionFailed(
+export function hasExecutionSucceeded(
   future: Future,
   deploymentState: DeploymentState
 ): boolean {
   const exState = deploymentState.executionStates[future.id];
+
   if (exState === undefined) {
     return false;
   }
 
-  return (
-    exState.status === ExecutionStatus.FAILED ||
-    exState.status === ExecutionStatus.TIMEOUT
-  );
+  return exState.status === ExecutionStatus.SUCCESS;
 }

packages/core/src/types/deploy.ts

@@ -114,17 +114,23 @@ export interface ExecutionErrorDeploymentResult {
   type: DeploymentResultType.EXECUTION_ERROR;
 
   /**
-   * A list of all the future that have started executed but have not
+   * A list of all the futures that have started executing but have not
    * finished, neither successfully nor unsuccessfully.
    */
   started: string[];
 
   /**
-   * A list of all the future that have timed out, including details of the
+   * A list of all the futures that have timed out, including details of the
    * network interaction that timed out.
    */
   timedOut: Array<{ futureId: string; networkInteractionId: number }>;
 
+  /**
+   * A list of all the futures that are being Held as determined by the execution
+   * strategy, i.e. an off-chain process is not yet complete.
+   */
+  held: Array<{ futureId: string; heldId: number; reason: string }>;
+
   /**
    * A list of all the future that have failed, including the details of
    * the network interaction that errored.

packages/core/src/types/execution-events.ts

@@ -360,14 +360,18 @@ export enum ExecutionEventNetworkInteractionType {
 export enum ExecutionEventResultType {
   SUCCESS = "SUCCESS",
   ERROR = "ERROR",
+  HELD = "HELD",
 }
 
 /**
  * The result of a future's completed execution.
  *
  * @beta
  */
-export type ExecutionEventResult = ExecutionEventSuccess | ExecutionEventError;
+export type ExecutionEventResult =
+  | ExecutionEventSuccess
+  | ExecutionEventError
+  | ExecutionEventHeld;
 
 /**
  * A successful result of a future's execution.
@@ -389,6 +393,17 @@ export interface ExecutionEventError {
   error: string;
 }
 
+/**
+ * A hold result of a future's execution.
+ *
+ * @beta
+ */
+export interface ExecutionEventHeld {
+  type: ExecutionEventResultType.HELD;
+  heldId: number;
+  reason: string;
+}
+
 /**
  * A mapping of execution event types to their corresponding event.
  *

packages/hardhat-plugin/src/ui/UiEventHandler.tsx

@@ -40,6 +40,7 @@ import {
   UiBatches,
   UiFuture,
   UiFutureErrored,
+  UiFutureHeld,
   UiFutureStatusType,
   UiFutureSuccess,
   UiState,
@@ -396,7 +397,7 @@ export class UiEventHandler implements ExecutionEventListener {
 
   private _getFutureStatusFromEventResult(
     result: ExecutionEventResult
-  ): UiFutureSuccess | UiFutureErrored {
+  ): UiFutureSuccess | UiFutureErrored | UiFutureHeld {
     switch (result.type) {
       case ExecutionEventResultType.SUCCESS: {
         return {
@@ -410,6 +411,13 @@ export class UiEventHandler implements ExecutionEventListener {
           message: result.error,
         };
       }
+      case ExecutionEventResultType.HELD: {
+        return {
+          type: UiFutureStatusType.HELD,
+          heldId: result.heldId,
+          reason: result.reason,
+        };
+      }
     }
   }