diff --git a/.changeset/five-dots-fold.md b/.changeset/five-dots-fold.md new file mode 100644 index 000000000..51499a408 --- /dev/null +++ b/.changeset/five-dots-fold.md @@ -0,0 +1,5 @@ +--- +'@chugsplash/plugins': patch +--- + +Replace spinner in chugsplash-deploy task due to clash with Hardhat's logs diff --git a/packages/plugins/src/hardhat/deployments.ts b/packages/plugins/src/hardhat/deployments.ts index 94d919cee..c1b7e723d 100644 --- a/packages/plugins/src/hardhat/deployments.ts +++ b/packages/plugins/src/hardhat/deployments.ts @@ -7,7 +7,6 @@ import { ChugSplashConfig, getProxyAddress, loadChugSplashConfig, - writeSnapshotId, isSetImplementationAction, fromRawChugSplashAction, isEmptyChugSplashConfig, @@ -19,6 +18,7 @@ import { parseChugSplashConfig, createDeploymentFolderForNetwork, writeDeploymentArtifact, + log, } from '@chugsplash/core' import { ChugSplashManagerABI, @@ -26,14 +26,11 @@ import { EXECUTOR_BOND_AMOUNT, ProxyABI, } from '@chugsplash/contracts' -import ora from 'ora' import { getChainId } from '@eth-optimism/core-utils' import { getConstructorArgValues, getContractArtifact, - generateRuntimeBytecode, - getDeployedBytecode, getStorageLayout, getBuildInfo, } from './artifacts' @@ -80,8 +77,7 @@ export const deployChugSplashConfig = async ( }) const parsedConfig = parseChugSplashConfig(config) - const spinner = ora({ isSilent: hide }) - spinner.start(`Deploying: ${parsedConfig.options.projectName}`) + log(`Deploying: ${parsedConfig.options.projectName}`, hide) // Register the project with the signer as the owner. Once we've completed the deployment, we'll // transfer ownership to the project owner specified in the config. @@ -244,8 +240,6 @@ export const deployChugSplashConfig = async ( } } - spinner.succeed(`Deployed: ${parsedConfig.options.projectName}`) - if (!hide) { const deployments = {} Object.entries(parsedConfig.contracts).forEach( @@ -260,8 +254,6 @@ export const deployChugSplashConfig = async ( } if ((await getChainId(hre.ethers.provider)) !== 31337) { - spinner.start('Generating artifacts...') - createDeploymentFolderForNetwork( hre.network.name, hre.config.paths.deployed @@ -297,10 +289,10 @@ export const deployChugSplashConfig = async ( artifact, referenceName ) - - spinner.succeed('Generated artifacts.') } } + + log(`Deployed: ${parsedConfig.options.projectName}`, hide) } export const getContract = async ( diff --git a/packages/plugins/src/hardhat/index.ts b/packages/plugins/src/hardhat/index.ts index 4b4ddf6af..29e4e56f0 100644 --- a/packages/plugins/src/hardhat/index.ts +++ b/packages/plugins/src/hardhat/index.ts @@ -2,4 +2,4 @@ export * from './artifacts' export * from './tasks' export * from './deployments' export * from './type-extensions' -export * from './utils' \ No newline at end of file +export * from './utils'