Adjust extract task to use minimal compiler input

package.json

@@ -11,7 +11,7 @@
     "test": "hardhat test",
     "coverage": "hardhat coverage",
     "deploy": "yarn hardhat deploy",
-    "mastercopy:extract": "yarn hardhat mastercopy:extract",
+    "mastercopy:extract": "yarn run build && yarn hardhat mastercopy:extract",
     "mastercopy:deploy": "yarn hardhat mastercopy:deploy --network",
     "mastercopy:verify": "yarn hardhat mastercopy:verify --network",
     "prepack": "yarn run clean && yarn run build",

tasks/mastercopy-deploy.ts

@@ -9,9 +9,9 @@ task(
   'For every version entry on the artifacts file, deploys a mastercopy into the current network'
 ).setAction(async (_, hre) => {
   const [signer] = await hre.ethers.getSigners()
-  const provider = createEIP1193(hre.network.provider, signer)
-
-  await deployMastercopies({ provider })
+  await deployMastercopies({
+    provider: createEIP1193(hre.network.provider, signer),
+  })
 })
 
 function createEIP1193(

tasks/mastercopy-extract.ts

@@ -1,4 +1,4 @@
-import { task, types } from 'hardhat/config'
+import { task } from 'hardhat/config'
 
 import { extractMastercopyArtifact } from 'zodiac-core'
 
@@ -8,25 +8,23 @@ const AddressOne = '0x0000000000000000000000000000000000000001'
 
 task(
   'mastercopy:extract',
-  'Extracts current mastercopy build artifacts, and persists it'
-)
-  .addParam(
-    'mastercopyVersion',
-    'The extracted artifact version',
-    undefined,
-    types.string,
-    true
-  )
-  .setAction(async (params) => {
-    const version = params.mastercopyVersion || packageJson.version
+  'Extracts and persists current mastercopy build artifacts'
+).setAction(async (_, hre) => {
+  const contractVersion = packageJson.version
+  const contractName = 'Delay'
+  const contractSource = 'contracts/Delay.sol'
+  const compilerInput = await hre.run('verify:etherscan-get-minimal-input', {
+    sourceName: contractSource,
+  })
 
-    extractMastercopyArtifact({
-      version,
-      contractName: 'Delay',
-      constructorArgs: {
-        types: ['address', 'address', 'address', 'uint256', 'uint256'],
-        values: [AddressOne, AddressOne, AddressOne, 0, 0],
-      },
-      salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
-    })
+  extractMastercopyArtifact({
+    contractVersion,
+    contractName,
+    compilerInput,
+    constructorArgs: {
+      types: ['address', 'address', 'address', 'uint256', 'uint256'],
+      values: [AddressOne, AddressOne, AddressOne, 0, 0],
+    },
+    salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
   })
+})