Release

.changeset/yellow-cups-smoke.md

@@ -0,0 +1,6 @@
+---
+'@sphinx-labs/plugins': patch
+'@sphinx-labs/core': patch
+---
+
+Rollback internal hardhat sim change

.circleci/config.yml

@@ -26,7 +26,7 @@ jobs:
           command: sh ./scripts/create-placeholder.sh
       - run:
           name: Install dependencies
-          command: yarn --frozen-lockfile --network-concurrency 1
+          command: yarn --frozen-lockfile --link-duplicates --network-concurrency 1
       - save_cache:
           key: v2-cache-yarn-install-{{ checksum "yarn.lock" }}
           paths:

packages/core/package.json

@@ -52,8 +52,7 @@
     "semver": "^7.3.8",
     "solidity-ast": "^0.4.45",
     "undici": "^5.21.1",
-    "yesno": "^0.4.0",
-    "debug": "^4.3.4"
+    "yesno": "^0.4.0"
   },
   "devDependencies": {
     "@types/sinon": "^17.0.2",

packages/core/src/actions/execute.ts

@@ -1,4 +1,5 @@
 import { Logger } from '@eth-optimism/common-ts'
+import { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider'
 import {
   SphinxLeafWithProof,
   ManagedServiceABI,
@@ -25,7 +26,7 @@ import {
   MerkleRootStatus,
 } from './types'
 import { ExecutionMode } from '../constants'
-import { InProcessEthersProvider, SphinxJsonRpcProvider } from '../provider'
+import { SphinxJsonRpcProvider } from '../provider'
 import {
   addSphinxWalletsToGnosisSafeOwners,
   findLeafWithProof,
@@ -253,7 +254,7 @@ export type DeploymentContext = {
    *
    * Allows us to generate and supply the rpc provider in whatever way we would like.
    */
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider
 
   /**
    * An optional wallet.
@@ -1168,7 +1169,7 @@ export const fetchExecutionTransactionReceipts = async (
   receipts: ethers.TransactionReceipt[],
   moduleAddress: string,
   merkleRoot: string,
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider
 ) => {
   const module = new ethers.Contract(moduleAddress, SphinxModuleABI, provider)
 
@@ -1307,6 +1308,7 @@ export const attemptDeployment = async (
       const signatures: string[] = signers
         .map((signer) => signer.signature)
         .filter((signature) => signature !== null) as any
+
       ;({ receipts, batches, finalStatus, failureAction } =
         await executeDeployment(
           targetNetworkNetworkConfig,
@@ -1323,7 +1325,6 @@ export const attemptDeployment = async (
           targetNetworkNetworkConfig,
           failureAction
         )
-
         return {
           receipts: deploymentTransactionReceipts.map(
             convertEthersTransactionReceipt
@@ -1337,6 +1338,7 @@ export const attemptDeployment = async (
       await deploymentContext.handleError(e, deployment)
       return
     }
+
     await deploymentContext.handleSuccess(
       deploymentContext,
       targetNetworkNetworkConfig

packages/core/src/index.ts

@@ -21,4 +21,3 @@ export * from './provider'
 export * from './artifacts'
 export * from './types'
 export * from './errors'
-export * from './provider'

packages/core/src/languages/solidity/predeploys.ts

@@ -12,6 +12,7 @@ import {
   getOwnerAddress,
   getSphinxConstants,
 } from '@sphinx-labs/contracts'
+import { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider'
 import ora from 'ora'
 
 import {
@@ -21,7 +22,7 @@ import {
   getImpersonatedSigner,
   fundAccountMaxBalance,
 } from '../../utils'
-import { InProcessEthersProvider, SphinxJsonRpcProvider } from '../../provider'
+import { SphinxJsonRpcProvider } from '../../provider'
 import { ExecutionMode, RELAYER_ROLE } from '../../constants'
 import {
   fetchDripSizeForNetwork,
@@ -30,7 +31,7 @@ import {
 } from '../../networks'
 
 export const ensureSphinxAndGnosisSafeDeployed = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider,
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider,
   wallet: ethers.Wallet,
   executionMode: ExecutionMode,
   includeManagedServiceRoles: boolean,
@@ -57,7 +58,7 @@ export const ensureSphinxAndGnosisSafeDeployed = async (
 
 export const cancelPreviousDripVersions = async (
   Drippie: Contract,
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider,
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider,
   wallet: ethers.Signer,
   executionMode: ExecutionMode,
   dripName: string,
@@ -102,7 +103,7 @@ export const cancelPreviousDripVersions = async (
 }
 
 export const checkSystemDeployed = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider
 ): Promise<boolean> => {
   const contracts = getSphinxConstants()
 
@@ -119,7 +120,7 @@ export const checkSystemDeployed = async (
 }
 
 export const assignManagedServiceRoles = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider,
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider,
   signer: ethers.Signer,
   relayers: string[],
   executionMode: ExecutionMode,
@@ -267,7 +268,7 @@ export const assignManagedServiceRoles = async (
 }
 
 export const deploySphinxSystem = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider,
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider,
   signer: ethers.Signer,
   relayers: string[],
   executionMode: ExecutionMode,
@@ -318,7 +319,7 @@ export const deploySphinxSystem = async (
 }
 
 export const getDeterministicFactoryAddress = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider
 ) => {
   // Deploy the deterministic deployer.
   if (
@@ -366,7 +367,7 @@ export const getDeterministicFactoryAddress = async (
 }
 
 export const doDeterministicDeploy = async (
-  provider: SphinxJsonRpcProvider | InProcessEthersProvider,
+  provider: SphinxJsonRpcProvider | HardhatEthersProvider,
   executionMode: ExecutionMode,
   options: {
     contract: {