refactor: remove new-api as intermediary folder

NomicFoundation · Sep 6, 2023 · a6f2dee · a6f2dee
1 parent 087bbc7
commit a6f2dee
Show file tree

Hide file tree

Showing 195 changed files with 311 additions and 311 deletions.
diff --git a/packages/core/src/new-api/build-module.ts → packages/core/src/build-module.ts b/packages/core/src/new-api/build-module.ts → packages/core/src/build-module.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../errors";
+import { IgnitionError } from "./errors";
 
 import { ModuleConstructor } from "./internal/module-builder";
 import { IgnitionModule, IgnitionModuleResult } from "./types/module";

diff --git a/packages/core/src/new-api/deploy.ts → packages/core/src/deploy.ts b/packages/core/src/new-api/deploy.ts → packages/core/src/deploy.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../errors";
+import { IgnitionValidationError } from "./errors";
 
 import {
   DEFAULT_AUTOMINE_REQUIRED_CONFIRMATIONS,

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,15 +1,15 @@
 export * from "./errors";
-export { buildModule } from "./new-api/build-module";
-export { deploy } from "./new-api/deploy";
-export { formatSolidityParameter } from "./new-api/internal/formatters";
-export { plan } from "./new-api/plan";
-export { StoredDeploymentSerializer } from "./new-api/stored-deployment-serializer";
-export * from "./new-api/type-guards";
-export * from "./new-api/types/artifact";
-export * from "./new-api/types/deploy";
-export * from "./new-api/types/execution-events";
-export * from "./new-api/types/module";
-export * from "./new-api/types/module-builder";
-export * from "./new-api/types/provider";
-export * from "./new-api/types/serialized-deployment";
-export { wipe } from "./new-api/wipe";
+export { buildModule } from "./build-module";
+export { deploy } from "./deploy";
+export { formatSolidityParameter } from "./internal/formatters";
+export { plan } from "./plan";
+export { StoredDeploymentSerializer } from "./stored-deployment-serializer";
+export * from "./type-guards";
+export * from "./types/artifact";
+export * from "./types/deploy";
+export * from "./types/execution-events";
+export * from "./types/module";
+export * from "./types/module-builder";
+export * from "./types/provider";
+export * from "./types/serialized-deployment";
+export { wipe } from "./wipe";
diff --git a/...ages/core/src/new-api/internal/batcher.ts → packages/core/src/internal/batcher.ts b/...ages/core/src/new-api/internal/batcher.ts → packages/core/src/internal/batcher.ts
diff --git a/...ore/src/new-api/internal/defaultConfig.ts → packages/core/src/internal/defaultConfig.ts b/...ore/src/new-api/internal/defaultConfig.ts → packages/core/src/internal/defaultConfig.ts
diff --git a/...ges/core/src/new-api/internal/deployer.ts → packages/core/src/internal/deployer.ts b/...ges/core/src/new-api/internal/deployer.ts → packages/core/src/internal/deployer.ts
diff --git a/...ent-loader/ephemeral-deployment-loader.ts → ...ent-loader/ephemeral-deployment-loader.ts b/...ent-loader/ephemeral-deployment-loader.ts → ...ent-loader/ephemeral-deployment-loader.ts
diff --git a/...ployment-loader/file-deployment-loader.ts → ...ployment-loader/file-deployment-loader.ts b/...ployment-loader/file-deployment-loader.ts → ...ployment-loader/file-deployment-loader.ts
diff --git a/...w-api/internal/deployment-loader/types.ts → ...e/src/internal/deployment-loader/types.ts b/...w-api/internal/deployment-loader/types.ts → ...e/src/internal/deployment-loader/types.ts
diff --git a/...s/core/src/new-api/internal/formatters.ts → packages/core/src/internal/formatters.ts b/...s/core/src/new-api/internal/formatters.ts → packages/core/src/internal/formatters.ts
diff --git a/.../new-api/internal/journal/file-journal.ts → ...core/src/internal/journal/file-journal.ts b/.../new-api/internal/journal/file-journal.ts → ...core/src/internal/journal/file-journal.ts
diff --git a/...ew-api/internal/journal/memory-journal.ts → ...re/src/internal/journal/memory-journal.ts b/...ew-api/internal/journal/memory-journal.ts → ...re/src/internal/journal/memory-journal.ts
diff --git a/...c/new-api/internal/journal/types/index.ts → .../core/src/internal/journal/types/index.ts b/...c/new-api/internal/journal/types/index.ts → .../core/src/internal/journal/types/index.ts
diff --git a/...nal/journal/utils/deserialize-replacer.ts → ...nal/journal/utils/deserialize-replacer.ts b/...nal/journal/utils/deserialize-replacer.ts → ...nal/journal/utils/deserialize-replacer.ts
diff --git a/...ernal/journal/utils/emitExecutionEvent.ts → ...ernal/journal/utils/emitExecutionEvent.ts b/...ernal/journal/utils/emitExecutionEvent.ts → ...ernal/journal/utils/emitExecutionEvent.ts
diff --git a/...edEvmExecutionResultToErrorDescription.ts → ...edEvmExecutionResultToErrorDescription.ts b/...edEvmExecutionResultToErrorDescription.ts → ...edEvmExecutionResultToErrorDescription.ts
diff --git a/...src/new-api/internal/journal/utils/log.ts → ...es/core/src/internal/journal/utils/log.ts b/...src/new-api/internal/journal/utils/log.ts → ...es/core/src/internal/journal/utils/log.ts
diff --git a/...ernal/journal/utils/serialize-replacer.ts → ...ernal/journal/utils/serialize-replacer.ts b/...ernal/journal/utils/serialize-replacer.ts → ...ernal/journal/utils/serialize-replacer.ts
diff --git a/...re/src/new-api/internal/module-builder.ts → packages/core/src/internal/module-builder.ts b/...re/src/new-api/internal/module-builder.ts → packages/core/src/internal/module-builder.ts
@@ -1,7 +1,7 @@
 import assert from "assert";
 import { inspect } from "util";
 
-import { IgnitionError, IgnitionValidationError } from "../../errors";
+import { IgnitionError, IgnitionValidationError } from "../errors";
 import {
   isAccountRuntimeValue,
   isAddressResolvableFuture,

diff --git a/packages/core/src/new-api/internal/module.ts → packages/core/src/internal/module.ts b/packages/core/src/new-api/internal/module.ts → packages/core/src/internal/module.ts
diff --git a/...src/new-api/internal/new-execution/abi.ts → ...es/core/src/internal/new-execution/abi.ts b/...src/new-api/internal/new-execution/abi.ts → ...es/core/src/internal/new-execution/abi.ts
@@ -10,7 +10,7 @@ import type {
 import {
   IgnitionValidationError,
   UnsupportedOperationError,
-} from "../../../errors";
+} from "../../errors";
 import { Artifact } from "../../types/artifact";
 import { ArgumentType, SolidityParameterType } from "../../types/module";
 import { assertIgnitionInvariant } from "../utils/assertions";

diff --git a/...new-execution/basic-execution-strategy.ts → ...new-execution/basic-execution-strategy.ts b/...new-execution/basic-execution-strategy.ts → ...new-execution/basic-execution-strategy.ts
diff --git a/...new-execution/deployment-state-helpers.ts → ...new-execution/deployment-state-helpers.ts b/...new-execution/deployment-state-helpers.ts → ...new-execution/deployment-state-helpers.ts
diff --git a/...nternal/new-execution/execution-engine.ts → ...nternal/new-execution/execution-engine.ts b/...nternal/new-execution/execution-engine.ts → ...nternal/new-execution/execution-engine.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../errors";
+import { IgnitionError } from "../../errors";
 import { ArtifactResolver } from "../../types/artifact";
 import { DeploymentParameters } from "../../types/deploy";
 import {

diff --git a/...w-execution/execution-strategy-helpers.ts → ...w-execution/execution-strategy-helpers.ts b/...w-execution/execution-strategy-helpers.ts → ...w-execution/execution-strategy-helpers.ts
diff --git a/...tion/future-processor/future-processor.ts → ...tion/future-processor/future-processor.ts b/...tion/future-processor/future-processor.ts → ...tion/future-processor/future-processor.ts
diff --git a/...r/handlers/monitor-onchain-interaction.ts → ...r/handlers/monitor-onchain-interaction.ts b/...r/handlers/monitor-onchain-interaction.ts → ...r/handlers/monitor-onchain-interaction.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../../../errors";
+import { IgnitionError } from "../../../../errors";
 import { assertIgnitionInvariant } from "../../../utils/assertions";
 import { JsonRpcClient } from "../../jsonrpc-client";
 import { TransactionTrackingTimer } from "../../transaction-tracking-timer";

diff --git a/...e-processor/handlers/query-static-call.ts → ...e-processor/handlers/query-static-call.ts b/...e-processor/handlers/query-static-call.ts → ...e-processor/handlers/query-static-call.ts
diff --git a/...future-processor/handlers/run-strategy.ts → ...future-processor/handlers/run-strategy.ts b/...future-processor/handlers/run-strategy.ts → ...future-processor/handlers/run-strategy.ts
diff --git a/...re-processor/handlers/send-transaction.ts → ...re-processor/handlers/send-transaction.ts b/...re-processor/handlers/send-transaction.ts → ...re-processor/handlers/send-transaction.ts
diff --git a/...r/helpers/build-initialize-message-for.ts → ...r/helpers/build-initialize-message-for.ts b/...r/helpers/build-initialize-message-for.ts → ...r/helpers/build-initialize-message-for.ts
diff --git a/...ure-processor/helpers/future-resolvers.ts → ...ure-processor/helpers/future-resolvers.ts b/...ure-processor/helpers/future-resolvers.ts → ...ure-processor/helpers/future-resolvers.ts
diff --git a/...ure-processor/helpers/messages-helpers.ts → ...ure-processor/helpers/messages-helpers.ts b/...ure-processor/helpers/messages-helpers.ts → ...ure-processor/helpers/messages-helpers.ts
diff --git a/.../helpers/network-interaction-execution.ts → .../helpers/network-interaction-execution.ts b/.../helpers/network-interaction-execution.ts → .../helpers/network-interaction-execution.ts
diff --git a/...elpers/next-action-for-execution-state.ts → ...elpers/next-action-for-execution-state.ts b/...elpers/next-action-for-execution-state.ts → ...elpers/next-action-for-execution-state.ts
diff --git a/...ture-processor/helpers/replay-strategy.ts → ...ture-processor/helpers/replay-strategy.ts b/...ture-processor/helpers/replay-strategy.ts → ...ture-processor/helpers/replay-strategy.ts
diff --git a/...ssor/helpers/save-artifacts-for-future.ts → ...ssor/helpers/save-artifacts-for-future.ts b/...ssor/helpers/save-artifacts-for-future.ts → ...ssor/helpers/save-artifacts-for-future.ts
diff --git a/.../internal/new-execution/jsonrpc-client.ts → .../internal/new-execution/jsonrpc-client.ts b/.../internal/new-execution/jsonrpc-client.ts → .../internal/new-execution/jsonrpc-client.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../errors";
+import { IgnitionError } from "../../errors";
 import { EIP1193Provider } from "../../types/provider";
 
 import {

diff --git a/...w-api/internal/new-execution/libraries.ts → ...e/src/internal/new-execution/libraries.ts b/...w-api/internal/new-execution/libraries.ts → ...e/src/internal/new-execution/libraries.ts
@@ -13,7 +13,7 @@
  * @file
  */
 
-import { IgnitionValidationError } from "../../../errors";
+import { IgnitionValidationError } from "../../errors";
 import { Artifact } from "../../types/artifact";
 
 /**

diff --git a/...nternal/new-execution/nonce-management.ts → ...nternal/new-execution/nonce-management.ts b/...nternal/new-execution/nonce-management.ts → ...nternal/new-execution/nonce-management.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../errors";
+import { IgnitionError } from "../../errors";
 
 import { JsonRpcClient } from "./jsonrpc-client";
 import { DeploymentState } from "./types/deployment-state";

diff --git a/...tion/reducers/deployment-state-reducer.ts → ...tion/reducers/deployment-state-reducer.ts b/...tion/reducers/deployment-state-reducer.ts → ...tion/reducers/deployment-state-reducer.ts
diff --git a/...ution/reducers/execution-state-reducer.ts → ...ution/reducers/execution-state-reducer.ts b/...ution/reducers/execution-state-reducer.ts → ...ution/reducers/execution-state-reducer.ts
diff --git a/...ucers/helpers/complete-execution-state.ts → ...ucers/helpers/complete-execution-state.ts b/...ucers/helpers/complete-execution-state.ts → ...ucers/helpers/complete-execution-state.ts
diff --git a/...ucers/helpers/deployment-state-helpers.ts → ...ucers/helpers/deployment-state-helpers.ts b/...ucers/helpers/deployment-state-helpers.ts → ...ucers/helpers/deployment-state-helpers.ts
diff --git a/...xecution/reducers/helpers/initializers.ts → ...xecution/reducers/helpers/initializers.ts b/...xecution/reducers/helpers/initializers.ts → ...xecution/reducers/helpers/initializers.ts
diff --git a/...rs/helpers/network-interaction-helpers.ts → ...rs/helpers/network-interaction-helpers.ts b/...rs/helpers/network-interaction-helpers.ts → ...rs/helpers/network-interaction-helpers.ts
diff --git a/...w-execution/transaction-tracking-timer.ts → ...w-execution/transaction-tracking-timer.ts b/...w-execution/transaction-tracking-timer.ts → ...w-execution/transaction-tracking-timer.ts
diff --git a/...pi/internal/new-execution/type-helpers.ts → ...rc/internal/new-execution/type-helpers.ts b/...pi/internal/new-execution/type-helpers.ts → ...rc/internal/new-execution/type-helpers.ts
diff --git a/...l/new-execution/types/deployment-state.ts → ...l/new-execution/types/deployment-state.ts b/...l/new-execution/types/deployment-state.ts → ...l/new-execution/types/deployment-state.ts
diff --git a/...rnal/new-execution/types/evm-execution.ts → ...rnal/new-execution/types/evm-execution.ts b/...rnal/new-execution/types/evm-execution.ts → ...rnal/new-execution/types/evm-execution.ts
diff --git a/...l/new-execution/types/execution-result.ts → ...l/new-execution/types/execution-result.ts b/...l/new-execution/types/execution-result.ts → ...l/new-execution/types/execution-result.ts
diff --git a/...al/new-execution/types/execution-state.ts → ...al/new-execution/types/execution-state.ts b/...al/new-execution/types/execution-state.ts → ...al/new-execution/types/execution-state.ts
diff --git a/...new-execution/types/execution-strategy.ts → ...new-execution/types/execution-strategy.ts b/...new-execution/types/execution-strategy.ts → ...new-execution/types/execution-strategy.ts
diff --git a/...i/internal/new-execution/types/jsonrpc.ts → ...c/internal/new-execution/types/jsonrpc.ts b/...i/internal/new-execution/types/jsonrpc.ts → ...c/internal/new-execution/types/jsonrpc.ts
diff --git a/.../internal/new-execution/types/messages.ts → .../internal/new-execution/types/messages.ts b/.../internal/new-execution/types/messages.ts → .../internal/new-execution/types/messages.ts
diff --git a/...ew-execution/types/network-interaction.ts → ...ew-execution/types/network-interaction.ts b/...ew-execution/types/network-interaction.ts → ...ew-execution/types/network-interaction.ts
diff --git a/...ls/convert-evm-tuple-to-solidity-param.ts → ...ls/convert-evm-tuple-to-solidity-param.ts b/...ls/convert-evm-tuple-to-solidity-param.ts → ...ls/convert-evm-tuple-to-solidity-param.ts
diff --git a/...new-execution/utils/get-default-sender.ts → ...new-execution/utils/get-default-sender.ts b/...new-execution/utils/get-default-sender.ts → ...new-execution/utils/get-default-sender.ts
diff --git a/...tion-state/find-onchain-interaction-by.ts → ...tion-state/find-onchain-interaction-by.ts b/...tion-state/find-onchain-interaction-by.ts → ...tion-state/find-onchain-interaction-by.ts
diff --git a/...ws/execution-state/find-static-call-by.ts → ...ws/execution-state/find-static-call-by.ts b/...ws/execution-state/find-static-call-by.ts → ...ws/execution-state/find-static-call-by.ts
diff --git a/...ws/execution-state/find-transaction-by.ts → ...ws/execution-state/find-transaction-by.ts b/...ws/execution-state/find-transaction-by.ts → ...ws/execution-state/find-transaction-by.ts
diff --git a/...ion-state/get-pending-nonce-and-sender.ts → ...ion-state/get-pending-nonce-and-sender.ts b/...ion-state/get-pending-nonce-and-sender.ts → ...ion-state/get-pending-nonce-and-sender.ts
diff --git a/...-state/get-pending-onchain-interaction.ts → ...-state/get-pending-onchain-interaction.ts b/...-state/get-pending-onchain-interaction.ts → ...-state/get-pending-onchain-interaction.ts
diff --git a/...find-address-for-contract-future-by-id.ts → ...find-address-for-contract-future-by-id.ts b/...find-address-for-contract-future-by-id.ts → ...find-address-for-contract-future-by-id.ts
diff --git a/...ind-confirmed-transaction-by-future-id.ts → ...ind-confirmed-transaction-by-future-id.ts b/...ind-confirmed-transaction-by-future-id.ts → ...ind-confirmed-transaction-by-future-id.ts
diff --git a/...xecution/views/find-deployed-contracts.ts → ...xecution/views/find-deployed-contracts.ts b/...xecution/views/find-deployed-contracts.ts → ...xecution/views/find-deployed-contracts.ts
diff --git a/...ution/views/find-execution-state-by-id.ts → ...ution/views/find-execution-state-by-id.ts b/...ution/views/find-execution-state-by-id.ts → ...ution/views/find-execution-state-by-id.ts
diff --git a/...ion/views/find-result-for-future-by-id.ts → ...ion/views/find-result-for-future-by-id.ts b/...ion/views/find-result-for-future-by-id.ts → ...ion/views/find-result-for-future-by-id.ts
diff --git a/...w-execution/views/has-execution-failed.ts → ...w-execution/views/has-execution-failed.ts b/...w-execution/views/has-execution-failed.ts → ...w-execution/views/has-execution-failed.ts
diff --git a/...tion/views/is-execution-state-complete.ts → ...tion/views/is-execution-state-complete.ts b/...tion/views/is-execution-state-complete.ts → ...tion/views/is-execution-state-complete.ts
diff --git a/...on/futures/reconcileArtifactContractAt.ts → ...on/futures/reconcileArtifactContractAt.ts b/...on/futures/reconcileArtifactContractAt.ts → ...on/futures/reconcileArtifactContractAt.ts
diff --git a/...es/reconcileArtifactContractDeployment.ts → ...es/reconcileArtifactContractDeployment.ts b/...es/reconcileArtifactContractDeployment.ts → ...es/reconcileArtifactContractDeployment.ts
diff --git a/...res/reconcileArtifactLibraryDeployment.ts → ...res/reconcileArtifactLibraryDeployment.ts b/...res/reconcileArtifactLibraryDeployment.ts → ...res/reconcileArtifactLibraryDeployment.ts
diff --git a/...ation/futures/reconcileNamedContractAt.ts → ...ation/futures/reconcileNamedContractAt.ts b/...ation/futures/reconcileNamedContractAt.ts → ...ation/futures/reconcileNamedContractAt.ts
diff --git a/...ion/futures/reconcileNamedContractCall.ts → ...ion/futures/reconcileNamedContractCall.ts b/...ion/futures/reconcileNamedContractCall.ts → ...ion/futures/reconcileNamedContractCall.ts
diff --git a/...tures/reconcileNamedContractDeployment.ts → ...tures/reconcileNamedContractDeployment.ts b/...tures/reconcileNamedContractDeployment.ts → ...tures/reconcileNamedContractDeployment.ts
diff --git a/...utures/reconcileNamedLibraryDeployment.ts → ...utures/reconcileNamedLibraryDeployment.ts b/...utures/reconcileNamedLibraryDeployment.ts → ...utures/reconcileNamedLibraryDeployment.ts
diff --git a/...ation/futures/reconcileNamedStaticCall.ts → ...ation/futures/reconcileNamedStaticCall.ts b/...ation/futures/reconcileNamedStaticCall.ts → ...ation/futures/reconcileNamedStaticCall.ts
diff --git a/...ion/futures/reconcileReadEventArgument.ts → ...ion/futures/reconcileReadEventArgument.ts b/...ion/futures/reconcileReadEventArgument.ts → ...ion/futures/reconcileReadEventArgument.ts
diff --git a/...conciliation/futures/reconcileSendData.ts → ...conciliation/futures/reconcileSendData.ts b/...conciliation/futures/reconcileSendData.ts → ...conciliation/futures/reconcileSendData.ts
diff --git a/...nternal/reconciliation/helpers/compare.ts → ...nternal/reconciliation/helpers/compare.ts b/...nternal/reconciliation/helpers/compare.ts → ...nternal/reconciliation/helpers/compare.ts
diff --git a/...conciliation/helpers/reconcile-address.ts → ...conciliation/helpers/reconcile-address.ts b/...conciliation/helpers/reconcile-address.ts → ...conciliation/helpers/reconcile-address.ts
diff --git a/...nciliation/helpers/reconcile-arguments.ts → ...nciliation/helpers/reconcile-arguments.ts b/...nciliation/helpers/reconcile-arguments.ts → ...nciliation/helpers/reconcile-arguments.ts
diff --git a/...nciliation/helpers/reconcile-artifacts.ts → ...nciliation/helpers/reconcile-artifacts.ts b/...nciliation/helpers/reconcile-artifacts.ts → ...nciliation/helpers/reconcile-artifacts.ts
diff --git a/...iation/helpers/reconcile-contract-name.ts → ...iation/helpers/reconcile-contract-name.ts b/...iation/helpers/reconcile-contract-name.ts → ...iation/helpers/reconcile-contract-name.ts
diff --git a/...onciliation/helpers/reconcile-contract.ts → ...onciliation/helpers/reconcile-contract.ts b/...onciliation/helpers/reconcile-contract.ts → ...onciliation/helpers/reconcile-contract.ts
diff --git a/.../reconciliation/helpers/reconcile-data.ts → .../reconciliation/helpers/reconcile-data.ts b/.../reconciliation/helpers/reconcile-data.ts → .../reconciliation/helpers/reconcile-data.ts
diff --git a/.../reconciliation/helpers/reconcile-from.ts → .../reconciliation/helpers/reconcile-from.ts b/.../reconciliation/helpers/reconcile-from.ts → .../reconciliation/helpers/reconcile-from.ts
diff --git a/...iation/helpers/reconcile-function-name.ts → ...iation/helpers/reconcile-function-name.ts b/...iation/helpers/reconcile-function-name.ts → ...iation/helpers/reconcile-function-name.ts
diff --git a/...nciliation/helpers/reconcile-libraries.ts → ...nciliation/helpers/reconcile-libraries.ts b/...nciliation/helpers/reconcile-libraries.ts → ...nciliation/helpers/reconcile-libraries.ts
diff --git a/...reconciliation/helpers/reconcile-value.ts → ...reconciliation/helpers/reconcile-value.ts b/...reconciliation/helpers/reconcile-value.ts → ...reconciliation/helpers/reconcile-value.ts
diff --git a/...oncile-current-and-previous-type-match.ts → ...oncile-current-and-previous-type-match.ts b/...oncile-current-and-previous-type-match.ts → ...oncile-current-and-previous-type-match.ts
diff --git a/...onciliation/reconcile-dependency-rules.ts → ...onciliation/reconcile-dependency-rules.ts b/...onciliation/reconcile-dependency-rules.ts → ...onciliation/reconcile-dependency-rules.ts
diff --git a/...oncile-future-specific-reconciliations.ts → ...oncile-future-specific-reconciliations.ts b/...oncile-future-specific-reconciliations.ts → ...oncile-future-specific-reconciliations.ts
diff --git a/...api/internal/reconciliation/reconciler.ts → ...src/internal/reconciliation/reconciler.ts b/...api/internal/reconciliation/reconciler.ts → ...src/internal/reconciliation/reconciler.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../errors";
+import { IgnitionError } from "../../errors";
 import { ArtifactResolver } from "../../types/artifact";
 import { DeploymentParameters } from "../../types/deploy";
 import { Future, IgnitionModule } from "../../types/module";

diff --git a/.../new-api/internal/reconciliation/types.ts → ...core/src/internal/reconciliation/types.ts b/.../new-api/internal/reconciliation/types.ts → ...core/src/internal/reconciliation/types.ts
diff --git a/.../new-api/internal/reconciliation/utils.ts → ...core/src/internal/reconciliation/utils.ts b/.../new-api/internal/reconciliation/utils.ts → ...core/src/internal/reconciliation/utils.ts
diff --git a/...src/new-api/internal/topological-order.ts → ...es/core/src/internal/topological-order.ts b/...src/new-api/internal/topological-order.ts → ...es/core/src/internal/topological-order.ts
diff --git a/packages/core/src/new-api/internal/utils.ts → packages/core/src/internal/utils.ts b/packages/core/src/new-api/internal/utils.ts → packages/core/src/internal/utils.ts
diff --git a/...nternal/utils/adjacency-list-converter.ts → ...nternal/utils/adjacency-list-converter.ts b/...nternal/utils/adjacency-list-converter.ts → ...nternal/utils/adjacency-list-converter.ts
diff --git a/.../new-api/internal/utils/adjacency-list.ts → ...core/src/internal/utils/adjacency-list.ts b/.../new-api/internal/utils/adjacency-list.ts → ...core/src/internal/utils/adjacency-list.ts
diff --git a/.../src/new-api/internal/utils/assertions.ts → ...ges/core/src/internal/utils/assertions.ts b/.../src/new-api/internal/utils/assertions.ts → ...ges/core/src/internal/utils/assertions.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../../errors";
+import { IgnitionError } from "../../errors";
 
 export function assertIgnitionInvariant(
   invariant: boolean,

diff --git a/...internal/utils/check-automined-network.ts → ...internal/utils/check-automined-network.ts b/...internal/utils/check-automined-network.ts → ...internal/utils/check-automined-network.ts
diff --git a/...internal/utils/get-futures-from-module.ts → ...internal/utils/get-futures-from-module.ts b/...internal/utils/get-futures-from-module.ts → ...internal/utils/get-futures-from-module.ts
diff --git a/...-api/internal/utils/replace-within-arg.ts → .../src/internal/utils/replace-within-arg.ts b/...-api/internal/utils/replace-within-arg.ts → .../src/internal/utils/replace-within-arg.ts
diff --git a/...nternal/utils/resolve-module-parameter.ts → ...nternal/utils/resolve-module-parameter.ts b/...nternal/utils/resolve-module-parameter.ts → ...nternal/utils/resolve-module-parameter.ts
diff --git a/...on/stageOne/validateArtifactContractAt.ts → ...on/stageOne/validateArtifactContractAt.ts b/...on/stageOne/validateArtifactContractAt.ts → ...on/stageOne/validateArtifactContractAt.ts
diff --git a/...One/validateArtifactContractDeployment.ts → ...One/validateArtifactContractDeployment.ts b/...One/validateArtifactContractDeployment.ts → ...One/validateArtifactContractDeployment.ts
diff --git a/...eOne/validateArtifactLibraryDeployment.ts → ...eOne/validateArtifactLibraryDeployment.ts b/...eOne/validateArtifactLibraryDeployment.ts → ...eOne/validateArtifactLibraryDeployment.ts
diff --git a/...ation/stageOne/validateNamedContractAt.ts → ...ation/stageOne/validateNamedContractAt.ts b/...ation/stageOne/validateNamedContractAt.ts → ...ation/stageOne/validateNamedContractAt.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { NamedContractAtFuture } from "../../../types/module";

diff --git a/...ion/stageOne/validateNamedContractCall.ts → ...ion/stageOne/validateNamedContractCall.ts b/...ion/stageOne/validateNamedContractCall.ts → ...ion/stageOne/validateNamedContractCall.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { NamedContractCallFuture } from "../../../types/module";

diff --git a/...ageOne/validateNamedContractDeployment.ts → ...ageOne/validateNamedContractDeployment.ts b/...ageOne/validateNamedContractDeployment.ts → ...ageOne/validateNamedContractDeployment.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { NamedContractDeploymentFuture } from "../../../types/module";

diff --git a/...tageOne/validateNamedLibraryDeployment.ts → ...tageOne/validateNamedLibraryDeployment.ts b/...tageOne/validateNamedLibraryDeployment.ts → ...tageOne/validateNamedLibraryDeployment.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { NamedLibraryDeploymentFuture } from "../../../types/module";

diff --git a/...ation/stageOne/validateNamedStaticCall.ts → ...ation/stageOne/validateNamedStaticCall.ts b/...ation/stageOne/validateNamedStaticCall.ts → ...ation/stageOne/validateNamedStaticCall.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { NamedStaticCallFuture } from "../../../types/module";

diff --git a/...ion/stageOne/validateReadEventArgument.ts → ...ion/stageOne/validateReadEventArgument.ts b/...ion/stageOne/validateReadEventArgument.ts → ...ion/stageOne/validateReadEventArgument.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isArtifactType } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { ReadEventArgumentFuture } from "../../../types/module";

diff --git a/...l/validation/stageOne/validateSendData.ts → ...l/validation/stageOne/validateSendData.ts b/...l/validation/stageOne/validateSendData.ts → ...l/validation/stageOne/validateSendData.ts
diff --git a/...on/stageTwo/validateArtifactContractAt.ts → ...on/stageTwo/validateArtifactContractAt.ts b/...on/stageTwo/validateArtifactContractAt.ts → ...on/stageTwo/validateArtifactContractAt.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isModuleParameterRuntimeValue } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { DeploymentParameters } from "../../../types/deploy";

diff --git a/...Two/validateArtifactContractDeployment.ts → ...Two/validateArtifactContractDeployment.ts b/...Two/validateArtifactContractDeployment.ts → ...Two/validateArtifactContractDeployment.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import {
   isAccountRuntimeValue,
   isModuleParameterRuntimeValue,

diff --git a/...eTwo/validateArtifactLibraryDeployment.ts → ...eTwo/validateArtifactLibraryDeployment.ts b/...eTwo/validateArtifactLibraryDeployment.ts → ...eTwo/validateArtifactLibraryDeployment.ts
diff --git a/...ation/stageTwo/validateNamedContractAt.ts → ...ation/stageTwo/validateNamedContractAt.ts b/...ation/stageTwo/validateNamedContractAt.ts → ...ation/stageTwo/validateNamedContractAt.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import { isModuleParameterRuntimeValue } from "../../../type-guards";
 import { ArtifactResolver } from "../../../types/artifact";
 import { DeploymentParameters } from "../../../types/deploy";

diff --git a/...ion/stageTwo/validateNamedContractCall.ts → ...ion/stageTwo/validateNamedContractCall.ts b/...ion/stageTwo/validateNamedContractCall.ts → ...ion/stageTwo/validateNamedContractCall.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import {
   isAccountRuntimeValue,
   isModuleParameterRuntimeValue,

diff --git a/...ageTwo/validateNamedContractDeployment.ts → ...ageTwo/validateNamedContractDeployment.ts b/...ageTwo/validateNamedContractDeployment.ts → ...ageTwo/validateNamedContractDeployment.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import {
   isAccountRuntimeValue,
   isModuleParameterRuntimeValue,

diff --git a/...tageTwo/validateNamedLibraryDeployment.ts → ...tageTwo/validateNamedLibraryDeployment.ts b/...tageTwo/validateNamedLibraryDeployment.ts → ...tageTwo/validateNamedLibraryDeployment.ts
diff --git a/...ation/stageTwo/validateNamedStaticCall.ts → ...ation/stageTwo/validateNamedStaticCall.ts b/...ation/stageTwo/validateNamedStaticCall.ts → ...ation/stageTwo/validateNamedStaticCall.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import {
   isAccountRuntimeValue,
   isModuleParameterRuntimeValue,

diff --git a/...ion/stageTwo/validateReadEventArgument.ts → ...ion/stageTwo/validateReadEventArgument.ts b/...ion/stageTwo/validateReadEventArgument.ts → ...ion/stageTwo/validateReadEventArgument.ts
diff --git a/...l/validation/stageTwo/validateSendData.ts → ...l/validation/stageTwo/validateSendData.ts b/...l/validation/stageTwo/validateSendData.ts → ...l/validation/stageTwo/validateSendData.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../../errors";
+import { IgnitionValidationError } from "../../../errors";
 import {
   isAccountRuntimeValue,
   isModuleParameterRuntimeValue,

diff --git a/.../src/new-api/internal/validation/utils.ts → ...ges/core/src/internal/validation/utils.ts b/.../src/new-api/internal/validation/utils.ts → ...ges/core/src/internal/validation/utils.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../errors";
+import { IgnitionValidationError } from "../../errors";
 import { isFuture, isRuntimeValue } from "../../type-guards";
 import {
   AccountRuntimeValue,

diff --git a/...i/internal/validation/validateStageOne.ts → ...c/internal/validation/validateStageOne.ts b/...i/internal/validation/validateStageOne.ts → ...c/internal/validation/validateStageOne.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../errors";
+import { IgnitionValidationError } from "../../errors";
 import { ArtifactResolver } from "../../types/artifact";
 import {
   DeploymentResultType,

diff --git a/...i/internal/validation/validateStageTwo.ts → ...c/internal/validation/validateStageTwo.ts b/...i/internal/validation/validateStageTwo.ts → ...c/internal/validation/validateStageTwo.ts
@@ -1,4 +1,4 @@
-import { IgnitionValidationError } from "../../../errors";
+import { IgnitionValidationError } from "../../errors";
 import { ArtifactResolver } from "../../types/artifact";
 import {
   DeploymentParameters,

diff --git a/packages/core/src/new-api/internal/wiper.ts → packages/core/src/internal/wiper.ts b/packages/core/src/new-api/internal/wiper.ts → packages/core/src/internal/wiper.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../../errors";
+import { IgnitionError } from "../errors";
 
 import { DeploymentLoader } from "./deployment-loader/types";
 import {

diff --git a/packages/core/src/new-api/plan.ts → packages/core/src/plan.ts b/packages/core/src/new-api/plan.ts → packages/core/src/plan.ts
@@ -2,7 +2,7 @@ import {
   SerializedStoredDeployment,
   StoredDeployment,
   StoredDeploymentSerializer,
-} from "../ui-helpers";
+} from "./ui-helpers";
 
 import { validateStageOne } from "./internal/validation/validateStageOne";
 import { ArtifactResolver } from "./types/artifact";

diff --git a/...c/new-api/stored-deployment-serializer.ts → .../core/src/stored-deployment-serializer.ts b/...c/new-api/stored-deployment-serializer.ts → .../core/src/stored-deployment-serializer.ts
@@ -1,4 +1,4 @@
-import { IgnitionError } from "../errors";
+import { IgnitionError } from "./errors";
 
 import {
   AccountRuntimeValueImplementation,

diff --git a/packages/core/src/new-api/type-guards.ts → packages/core/src/type-guards.ts b/packages/core/src/new-api/type-guards.ts → packages/core/src/type-guards.ts
diff --git a/packages/core/src/new-api/types/artifact.ts → packages/core/src/types/artifact.ts b/packages/core/src/new-api/types/artifact.ts → packages/core/src/types/artifact.ts
diff --git a/packages/core/src/new-api/types/deploy.ts → packages/core/src/types/deploy.ts b/packages/core/src/new-api/types/deploy.ts → packages/core/src/types/deploy.ts
diff --git a/...ore/src/new-api/types/execution-events.ts → packages/core/src/types/execution-events.ts b/...ore/src/new-api/types/execution-events.ts → packages/core/src/types/execution-events.ts
diff --git a/.../core/src/new-api/types/module-builder.ts → packages/core/src/types/module-builder.ts b/.../core/src/new-api/types/module-builder.ts → packages/core/src/types/module-builder.ts
diff --git a/packages/core/src/new-api/types/module.ts → packages/core/src/types/module.ts b/packages/core/src/new-api/types/module.ts → packages/core/src/types/module.ts
diff --git a/packages/core/src/new-api/types/provider.ts → packages/core/src/types/provider.ts b/packages/core/src/new-api/types/provider.ts → packages/core/src/types/provider.ts
diff --git a/...rc/new-api/types/serialized-deployment.ts → ...s/core/src/types/serialized-deployment.ts b/...rc/new-api/types/serialized-deployment.ts → ...s/core/src/types/serialized-deployment.ts
diff --git a/packages/core/src/ui-helpers.ts b/packages/core/src/ui-helpers.ts
@@ -1,8 +1,8 @@
 export {
   StoredDeploymentDeserializer,
   StoredDeploymentSerializer,
-} from "./new-api/stored-deployment-serializer";
-export * from "./new-api/type-guards";
-export * from "./new-api/types/module";
-export * from "./new-api/types/serialized-deployment";
-export { formatSolidityParameter } from "./new-api/internal/formatters";
+} from "./stored-deployment-serializer";
+export * from "./type-guards";
+export * from "./types/module";
+export * from "./types/serialized-deployment";
+export { formatSolidityParameter } from "./internal/formatters";
diff --git a/packages/core/src/new-api/wipe.ts → packages/core/src/wipe.ts b/packages/core/src/new-api/wipe.ts → packages/core/src/wipe.ts
diff --git a/packages/core/test-integrations/new-api/internal/new-execution/jsonrpc-client.ts b/packages/core/test-integrations/new-api/internal/new-execution/jsonrpc-client.ts
@@ -4,13 +4,13 @@ import { Artifact } from "../../../../src";
 import {
   encodeArtifactDeploymentData,
   encodeArtifactFunctionCall,
-} from "../../../../src/new-api/internal/new-execution/abi";
-import { EIP1193JsonRpcClient } from "../../../../src/new-api/internal/new-execution/jsonrpc-client";
+} from "../../../../src/internal/new-execution/abi";
+import { EIP1193JsonRpcClient } from "../../../../src/internal/new-execution/jsonrpc-client";
 import {
   NetworkFees,
   TransactionReceiptStatus,
-} from "../../../../src/new-api/internal/new-execution/types/jsonrpc";
-import { assertIgnitionInvariant } from "../../../../src/new-api/internal/utils/assertions";
+} from "../../../../src/internal/new-execution/types/jsonrpc";
+import { assertIgnitionInvariant } from "../../../../src/internal/utils/assertions";
 import { useHardhatProject } from "../../../helpers/hardhat-projects";
 
 describe("JSON-RPC client", function () {

diff --git a/packages/core/test-integrations/test-execution-result-fixtures.ts b/packages/core/test-integrations/test-execution-result-fixtures.ts
@@ -3,8 +3,8 @@ import { assert } from "chai";
 import {
   encodeArtifactDeploymentData,
   encodeArtifactFunctionCall,
-} from "../src/new-api/internal/new-execution/abi";
-import { EIP1193JsonRpcClient } from "../src/new-api/internal/new-execution/jsonrpc-client";
+} from "../src/internal/new-execution/abi";
+import { EIP1193JsonRpcClient } from "../src/internal/new-execution/jsonrpc-client";
 import {
   callEncodingFixtures,
   deploymentFixturesArtifacts,

diff --git a/packages/core/test/helpers/execution-result-fixtures.ts b/packages/core/test/helpers/execution-result-fixtures.ts
@@ -7,7 +7,7 @@
 // We use Hardhat artifacts here, that's why we import this type
 import { Artifact } from "hardhat/types";
 
-import { RawStaticCallResult } from "../../src/new-api/internal/new-execution/types/jsonrpc";
+import { RawStaticCallResult } from "../../src/internal/new-execution/types/jsonrpc";
 
 export const staticCallResultFixtures: {
   [contractName: string]: { [functionName: string]: RawStaticCallResult };

diff --git a/packages/core/test/new-api/batcher.ts b/packages/core/test/new-api/batcher.ts
@@ -1,15 +1,15 @@
 /* eslint-disable import/no-unused-modules */
 import { assert } from "chai";
 
-import { buildModule } from "../../src/new-api/build-module";
-import { Batcher } from "../../src/new-api/internal/batcher";
-import { DeploymentState } from "../../src/new-api/internal/new-execution/types/deployment-state";
+import { buildModule } from "../../src/build-module";
+import { Batcher } from "../../src/internal/batcher";
+import { DeploymentState } from "../../src/internal/new-execution/types/deployment-state";
 import {
   DeploymentExecutionState,
   ExecutionSateType,
   ExecutionStatus,
-} from "../../src/new-api/internal/new-execution/types/execution-state";
-import { FutureType, IgnitionModule } from "../../src/new-api/types/module";
+} from "../../src/internal/new-execution/types/execution-state";
+import { FutureType, IgnitionModule } from "../../src/types/module";
 
 describe("batcher", () => {
   const exampleDeploymentState: DeploymentExecutionState = {

diff --git a/packages/core/test/new-api/call.ts b/packages/core/test/new-api/call.ts
@@ -2,14 +2,14 @@
 import { assert } from "chai";
 
 import { Artifact } from "../../src";
-import { buildModule } from "../../src/new-api/build-module";
+import { buildModule } from "../../src/build-module";
 import {
   AccountRuntimeValueImplementation,
   ModuleParameterRuntimeValueImplementation,
   NamedContractCallFutureImplementation,
-} from "../../src/new-api/internal/module";
-import { getFuturesFromModule } from "../../src/new-api/internal/utils/get-futures-from-module";
-import { FutureType } from "../../src/new-api/types/module";
+} from "../../src/internal/module";
+import { getFuturesFromModule } from "../../src/internal/utils/get-futures-from-module";
+import { FutureType } from "../../src/types/module";
 
 import { assertInstanceOf, setupMockArtifactResolver } from "./helpers";
 
@@ -467,12 +467,12 @@ describe("call", () => {
     });
 
     describe("stage one", () => {
-      let vm: typeof import("../../src/new-api/internal/validation/stageOne/validateNamedContractCall");
+      let vm: typeof import("../../src/internal/validation/stageOne/validateNamedContractCall");
       let validateNamedContractCall: typeof vm.validateNamedContractCall;
 
       before(async () => {
         vm = await import(
-          "../../src/new-api/internal/validation/stageOne/validateNamedContractCall"
+          "../../src/internal/validation/stageOne/validateNamedContractCall"
         );
 
         validateNamedContractCall = vm.validateNamedContractCall;
@@ -622,12 +622,12 @@ describe("call", () => {
     });
 
     describe("stage two", () => {
-      let vm: typeof import("../../src/new-api/internal/validation/stageTwo/validateNamedContractCall");
+      let vm: typeof import("../../src/internal/validation/stageTwo/validateNamedContractCall");
       let validateNamedContractCall: typeof vm.validateNamedContractCall;
 
       before(async () => {
         vm = await import(
-          "../../src/new-api/internal/validation/stageTwo/validateNamedContractCall"
+          "../../src/internal/validation/stageTwo/validateNamedContractCall"
         );
 
         validateNamedContractCall = vm.validateNamedContractCall;

diff --git a/packages/core/test/new-api/contract.ts b/packages/core/test/new-api/contract.ts
@@ -2,14 +2,14 @@
 import { assert } from "chai";
 
 import { Artifact } from "../../src";
-import { buildModule } from "../../src/new-api/build-module";
+import { buildModule } from "../../src/build-module";
 import {
   AccountRuntimeValueImplementation,
   ModuleParameterRuntimeValueImplementation,
   NamedContractDeploymentFutureImplementation,
-} from "../../src/new-api/internal/module";
-import { getFuturesFromModule } from "../../src/new-api/internal/utils/get-futures-from-module";
-import { FutureType } from "../../src/new-api/types/module";
+} from "../../src/internal/module";
+import { getFuturesFromModule } from "../../src/internal/utils/get-futures-from-module";
+import { FutureType } from "../../src/types/module";
 
 import { assertInstanceOf, setupMockArtifactResolver } from "./helpers";
 
@@ -452,12 +452,12 @@ describe("contract", () => {
     });
 
     describe("stage one", () => {
-      let vm: typeof import("../../src/new-api/internal/validation/stageOne/validateNamedContractDeployment");
+      let vm: typeof import("../../src/internal/validation/stageOne/validateNamedContractDeployment");
       let validateNamedContractDeployment: typeof vm.validateNamedContractDeployment;
 
       before(async () => {
         vm = await import(
-          "../../src/new-api/internal/validation/stageOne/validateNamedContractDeployment"
+          "../../src/internal/validation/stageOne/validateNamedContractDeployment"
         );
 
         validateNamedContractDeployment = vm.validateNamedContractDeployment;
@@ -510,12 +510,12 @@ describe("contract", () => {
     });
 
     describe("stage two", () => {
-      let vm: typeof import("../../src/new-api/internal/validation/stageTwo/validateNamedContractDeployment");
+      let vm: typeof import("../../src/internal/validation/stageTwo/validateNamedContractDeployment");
       let validateNamedContractDeployment: typeof vm.validateNamedContractDeployment;
 
       before(async () => {
         vm = await import(
-          "../../src/new-api/internal/validation/stageTwo/validateNamedContractDeployment"
+          "../../src/internal/validation/stageTwo/validateNamedContractDeployment"
         );
 
         validateNamedContractDeployment = vm.validateNamedContractDeployment;
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ @@
      * @file
      */
-    import { IgnitionValidationError } from "../../../errors";
+    import { IgnitionValidationError } from "../../errors";
     import { Artifact } from "../../types/artifact";
     /**
@@ Expand Down @@