fix(core): Handle bytecode hash is none during verification

.changeset/quick-singers-fly.md

@@ -0,0 +1,6 @@
+---
+'@sphinx-labs/plugins': patch
+'@sphinx-labs/core': patch
+---
+
+Handle bytecodeHash=none during etherscan verification

packages/core/src/etherscan.ts

@@ -1,6 +1,5 @@
 import * as dotenv from 'dotenv'
 import { ethers } from 'ethers'
-import { CompilerInput } from 'hardhat/types'
 import {
   CompilerOutputMetadata,
   SystemContractType,
@@ -25,7 +24,7 @@ import {
   isLiveNetwork,
   sleep,
 } from './utils'
-import { BuildInfo } from './languages'
+import { BuildInfo, SolcInput } from './languages'
 import {
   fetchNameForNetwork,
   isVerificationSupportedForNetwork,
@@ -192,7 +191,7 @@ export const attemptVerification = async (
   encodedConstructorArgs: string,
   fullyQualifiedName: string,
   solcLongVersion: string,
-  minimumCompilerInput: CompilerInput,
+  minimumCompilerInput: SolcInput,
   provider: ethers.Provider,
   chainId: string,
   etherscanApiKey: string

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

@@ -1,6 +1,7 @@
-import { CompilerInput } from 'hardhat/types'
 import { CompilerOutputMetadata } from '@sphinx-labs/contracts'
 
+import { SolcInput } from './types'
+
 /**
  * Returns the minimum compiler input necessary to compile a given source name. All contracts that
  * are imported in the given source must be included in the minimum compiler input.
@@ -11,16 +12,16 @@ import { CompilerOutputMetadata } from '@sphinx-labs/contracts'
  * @returns Minimum compiler input necessary to compile the source name.
  */
 export const getMinimumCompilerInput = (
-  fullCompilerInput: CompilerInput,
+  fullCompilerInput: SolcInput,
   metadata: CompilerOutputMetadata
-): CompilerInput => {
-  const minimumSources: CompilerInput['sources'] = {}
+): SolcInput => {
+  const minimumSources: SolcInput['sources'] = {}
   for (const newSourceName of Object.keys(metadata.sources)) {
     minimumSources[newSourceName] = fullCompilerInput.sources[newSourceName]
   }
 
   const { language, settings } = fullCompilerInput
-  const minimumCompilerInput: CompilerInput = {
+  const minimumCompilerInput: SolcInput = {
     language,
     settings,
     sources: minimumSources,

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

@@ -294,7 +294,11 @@ export interface SolcInput {
         }
       }
     }
-    metadata?: { useLiteralContent: boolean }
+    metadata?: {
+      useLiteralContent: boolean
+      bytecodeHash: string
+      appendCBOR: boolean
+    }
     outputSelection: {
       [sourceName: string]: {
         [contractName: string]: string[]

packages/demo/test/Solc.spec.ts

@@ -47,7 +47,7 @@ describe('Solidity Compiler', () => {
         '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266',
       ],
       {
-        SPHINX_INTERNAL_TEST__SKIP_GIT: 'true',
+        SPHINX_INTERNAL_TEST__DEMO_TEST: 'true',
       }
     )
     if (code !== 0) {

packages/demo/test/init.spec.ts

@@ -50,10 +50,10 @@ describe('Init CLI command', () => {
 
     const ownerAddress = '0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266'
 
-    // We use `SPHINX_INTERNAL_TEST__SKIP_GIT` to skip the init command steps where we create a git repo and commit all the files to it.
+    // We use `SPHINX_INTERNAL_TEST__DEMO_TEST` to skip the init command steps where we create a git repo and commit all the files to it.
     // We do this to avoid messing with out commit history when testing locally.
     await execAsync(
-      `export SPHINX_INTERNAL_TEST__SKIP_GIT=true && npx sphinx init --org-id TEST_ORG_ID --sphinx-api-key TEST_SPHINX_KEY --alchemy-api-key TEST_ALCHEMY_KEY --owner ${ownerAddress}`
+      `export SPHINX_INTERNAL_TEST__DEMO_TEST=true && npx sphinx init --org-id TEST_ORG_ID --sphinx-api-key TEST_SPHINX_KEY --alchemy-api-key TEST_ALCHEMY_KEY --owner ${ownerAddress}`
     )
 
     // Check that the files have been created

packages/plugins/src/cli/install/index.ts

@@ -12,9 +12,11 @@ const installWithUpdate = async (
   ci: boolean
 ) => {
   if (!ci) {
-    await userConfirmation(
-      'Would you like to install the Sphinx Foundry fork? This is required to use Sphinx and will replace your existing Foundry installation.\nConfirm? (y\\n):'
-    )
+    if (process.env.SPHINX_INTERNAL_TEST__DEMO_TEST !== 'true') {
+      await userConfirmation(
+        'Would you like to install the Sphinx Foundry fork? This is required to use Sphinx and will replace your existing Foundry installation.\nConfirm? (y\\n):'
+      )
+    }
     const foundryupStatus = await spawnAsync('/bin/bash', [
       '-c',
       'curl -L https://foundry.paradigm.xyz | bash',
@@ -103,9 +105,9 @@ const installWithUpdate = async (
 export const handleInstall = async (
   spinner: ora.Ora,
   skipLibrary: boolean,
-  confirm: boolean
+  ci: boolean
 ) => {
-  await installWithUpdate(spinner, skipLibrary, confirm)
+  await installWithUpdate(spinner, skipLibrary, ci)
   if (skipLibrary) {
     return
   }

packages/plugins/src/foundry/utils/trim.ts

@@ -96,6 +96,8 @@ export const BuildInfoTemplate: BuildInfo = {
       },
       metadata: {
         useLiteralContent: false,
+        bytecodeHash: '',
+        appendCBOR: true,
       },
       outputSelection: {
         sphinx_all_keys: {

packages/plugins/src/sample-project/index.ts

@@ -24,7 +24,7 @@ export const sampleScriptFileName = 'HelloSphinx.s.sol'
 export const sampleTestFileName = 'HelloSphinx.t.sol'
 
 const handleGitInit = async () => {
-  if (process.env.SPHINX_INTERNAL_TEST__SKIP_GIT === 'true') {
+  if (process.env.SPHINX_INTERNAL_TEST__DEMO_TEST === 'true') {
     return
   }
 
@@ -40,7 +40,7 @@ const handleGitInit = async () => {
 }
 
 const handleCommit = async () => {
-  if (process.env.SPHINX_INTERNAL_TEST__SKIP_GIT === 'true') {
+  if (process.env.SPHINX_INTERNAL_TEST__DEMO_TEST === 'true') {
     return
   }