From b354d46a84f6744d2f8b4da00605fb66c4aa4ad6 Mon Sep 17 00:00:00 2001
From: halaprix <panicz.klos@gmail.com>
Date: Wed, 3 Aug 2022 12:37:53 +0200
Subject: [PATCH 1/6] fix

---
 hardhat.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 70954602..e58c5ba0 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -64,6 +64,7 @@ const config: HardhatUserConfig = {
             gas: 'auto',
             initialBaseFeePerGas: 1000000000,
             allowUnlimitedContractSize: false,
+            accounts: [{ privateKey: process.env.PRIVATE_KEY_GOERLI!, balance: '10000000000000000000' }],
         },
         ...Object.fromEntries(
             [

From 5ef77cd745a0e27d4002b1047eb6ace4d7bbdd60 Mon Sep 17 00:00:00 2001
From: Halaprix <panicz.klos@gmail.com>
Date: Thu, 4 Aug 2022 08:35:24 +0200
Subject: [PATCH 2/6] Update hardhat.config.ts

---
 hardhat.config.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index e58c5ba0..70954602 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -64,7 +64,6 @@ const config: HardhatUserConfig = {
             gas: 'auto',
             initialBaseFeePerGas: 1000000000,
             allowUnlimitedContractSize: false,
-            accounts: [{ privateKey: process.env.PRIVATE_KEY_GOERLI!, balance: '10000000000000000000' }],
         },
         ...Object.fromEntries(
             [

From 6d1b188a01d0680a5e9484a49adb6d205ce0b35f Mon Sep 17 00:00:00 2001
From: Halaprix <panicz.klos@gmail.com>
Date: Thu, 4 Aug 2022 08:35:45 +0200
Subject: [PATCH 3/6] Update deploy.ts

---
 scripts/deployment/deploy.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/deployment/deploy.ts b/scripts/deployment/deploy.ts
index e335db98..04f3b219 100644
--- a/scripts/deployment/deploy.ts
+++ b/scripts/deployment/deploy.ts
@@ -4,7 +4,7 @@
 // When running the script with `npx hardhat run <script>` you'll find the Hardhat
 // Runtime Environment's members available in the global scope.
 import hre from 'hardhat'
-import { HardhatUtils } from '../common'
+import { HardhatUtils, isLocalNetwork } from '../common'
 import { deploySystem } from '../common/deploy-system'
 
 async function main() {
@@ -15,7 +15,12 @@ async function main() {
     console.log(`Deployer address: ${await signer.getAddress()}`)
     console.log(`Network: ${network}`)
 
-    await deploySystem({ utils, addCommands: true, deployMcdView: false, logDebug: true })
+    await deploySystem({
+        utils,
+        addCommands: true,
+        deployMcdView: isLocalNetwork(network) ? true : false,
+        logDebug: true,
+    })
 }
 
 // We recommend this pattern to be able to use async/await everywhere

From 11bfba889e67275a18f2e93e60f60fd3a8e75648 Mon Sep 17 00:00:00 2001
From: Roman Krasiuk <rokrassyuk@gmail.com>
Date: Thu, 4 Aug 2022 10:17:53 +0300
Subject: [PATCH 4/6] improve deployment script logging

---
 hardhat.config.ts               |  1 +
 scripts/common/deploy-system.ts | 96 +++++++++++++++++++--------------
 2 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 70954602..3e15f08c 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -64,6 +64,7 @@ const config: HardhatUserConfig = {
             gas: 'auto',
             initialBaseFeePerGas: 1000000000,
             allowUnlimitedContractSize: false,
+            accounts: [{ privateKey: process.env.PRIVATE_KEY_GOERLI!, balance: '10000000000000000000000000' }],
         },
         ...Object.fromEntries(
             [
diff --git a/scripts/common/deploy-system.ts b/scripts/common/deploy-system.ts
index 2d5b9b44..d111e598 100644
--- a/scripts/common/deploy-system.ts
+++ b/scripts/common/deploy-system.ts
@@ -43,24 +43,42 @@ export interface DeploySystemArgs {
     addressOverrides?: Partial<AddressRegistry>
 }
 
-const createServiceRegistry = (utils: HardhatUtils, serviceRegistry: ServiceRegistry, overwrite: string[] = []) => {
+const createServiceRegistry = (
+    utils: HardhatUtils,
+    serviceRegistry: ServiceRegistry,
+    overwrite: string[],
+    logDebug = false,
+) => {
     return async (hash: string, address: string): Promise<void> => {
         if (address === constants.AddressZero) {
-            console.log(`WARNING: attempted to add zero address to ServiceRegistry. Hash: ${hash}. Skipping...`)
+            logDebug &&
+                console.log(`WARNING: attempted to add zero address to ServiceRegistry. Hash: ${hash}. Skipping...`)
             return
         }
 
         const existingAddress = await serviceRegistry.getServiceAddress(hash)
+
+        if (existingAddress.toLowerCase() === address.toLowerCase()) {
+            return
+        }
+
         const gasSettings = await utils.getGasSettings()
         if (existingAddress === constants.AddressZero) {
             await (await serviceRegistry.addNamedService(hash, address, gasSettings)).wait()
-        } else if (overwrite.includes(hash)) {
+            logDebug && console.log(`Successfully added service registry entry. Hash: ${hash}. Address: ${address}`)
+            return
+        }
+
+        if (overwrite.includes(hash)) {
             await (await serviceRegistry.updateNamedService(hash, address, gasSettings)).wait()
-        } else {
+            logDebug && console.log(`Successfully updated service registry entry. Hash: ${hash}. Address: ${address}`)
+            return
+        }
+
+        logDebug &&
             console.log(
                 `WARNING: attempted to change service registry entry, but overwrite is not allowed. Hash: ${hash}. Address: ${address}`,
             )
-        }
     }
 }
 
@@ -82,13 +100,13 @@ export async function deploySystem({
     const { ethers } = utils.hre
     const addresses = { ...utils.addresses, ...addressOverrides }
 
-    if (logDebug) console.log('Deploying ServiceRegistry....')
+    logDebug && console.log('Deploying ServiceRegistry....')
     const ServiceRegistryInstance: ServiceRegistry = await utils.deployContract(
         ethers.getContractFactory('ServiceRegistry'),
         [delay],
     )
 
-    if (logDebug) console.log('Deploying McdUtils....')
+    logDebug && console.log('Deploying McdUtils....')
     const McdUtilsInstance: McdUtils = await utils.deployContract(ethers.getContractFactory('McdUtils'), [
         ServiceRegistryInstance.address,
         addresses.DAI,
@@ -96,7 +114,7 @@ export async function deploySystem({
         addresses.MCD_JUG,
     ])
 
-    if (logDebug) console.log('Deploying AutomationBot....')
+    logDebug && console.log('Deploying AutomationBot....')
     const AutomationBotInstance: AutomationBot = await utils.deployContract(
         ethers.getContractFactory('AutomationBot'),
         [ServiceRegistryInstance.address],
@@ -111,7 +129,7 @@ export async function deploySystem({
         [],
     )
 
-    if (logDebug) console.log('Deploying AutomationExecutor....')
+    logDebug && console.log('Deploying AutomationExecutor....')
     const AutomationExecutorInstance: AutomationExecutor = await utils.deployContract(
         ethers.getContractFactory('AutomationExecutor'),
         [
@@ -122,7 +140,7 @@ export async function deploySystem({
         ],
     )
 
-    if (logDebug) console.log('Deploying AutomationSwap....')
+    logDebug && console.log('Deploying AutomationSwap....')
     const AutomationSwapInstance: AutomationSwap = await utils.deployContract(
         ethers.getContractFactory('AutomationSwap'),
         [AutomationExecutorInstance.address, addresses.DAI],
@@ -141,27 +159,27 @@ export async function deploySystem({
         : await ethers.getContractAt('McdView', addresses.AUTOMATION_MCD_VIEW, ethers.provider.getSigner(0))
 
     if (addCommands) {
-        if (logDebug) console.log('Deploying CloseCommand....')
+        logDebug && console.log('Deploying CloseCommand....')
         CloseCommandInstance = (await utils.deployContract(ethers.getContractFactory('CloseCommand'), [
             ServiceRegistryInstance.address,
         ])) as CloseCommand
 
-        if (logDebug) console.log('Deploying BasicBuy....')
+        logDebug && console.log('Deploying BasicBuy....')
         BasicBuyInstance = (await utils.deployContract(ethers.getContractFactory('BasicBuyCommand'), [
             ServiceRegistryInstance.address,
         ])) as BasicBuyCommand
 
-        if (logDebug) console.log('Deploying BasicSell....')
+        logDebug && console.log('Deploying BasicSell....')
         BasicSellInstance = (await utils.deployContract(ethers.getContractFactory('BasicSellCommand'), [
             ServiceRegistryInstance.address,
         ])) as BasicSellCommand
 
-        if (logDebug) console.log('Deploying CmBasicBuy....')
+        logDebug && console.log('Deploying CmBasicBuy....')
         CmBasicBuyInstance = (await utils.deployContract(ethers.getContractFactory('CmBasicBuyCommand'), [
             ServiceRegistryInstance.address,
         ])) as CmBasicBuyCommand
 
-        if (logDebug) console.log('Deploying CmBasicSell....')
+        logDebug && console.log('Deploying CmBasicSell....')
         CmBasicSellInstance = (await utils.deployContract(ethers.getContractFactory('CmBasicSellCommand'), [
             ServiceRegistryInstance.address,
         ])) as CmBasicSellCommand
@@ -208,7 +226,7 @@ export async function configureRegistryEntries(
     overwrite: string[] = [],
     logDebug = false,
 ) {
-    const ensureServiceRegistryEntry = createServiceRegistry(utils, system.serviceRegistry, overwrite)
+    const ensureServiceRegistryEntry = createServiceRegistry(utils, system.serviceRegistry, overwrite, logDebug)
     const ensureMcdViewWhitelist = async (address: string) => {
         const isWhitelisted = await system.mcdView.whitelisted(address)
         if (!isWhitelisted) {
@@ -217,99 +235,99 @@ export async function configureRegistryEntries(
     }
 
     if (system.closeCommand && system.closeCommand.address !== constants.AddressZero) {
-        if (logDebug) console.log('Adding CLOSE_TO_COLLATERAL command to ServiceRegistry....')
+        logDebug && console.log('Adding CLOSE_TO_COLLATERAL command to ServiceRegistry....')
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.CLOSE_TO_COLLATERAL), system.closeCommand.address)
 
-        if (logDebug) console.log('Adding CLOSE_TO_DAI command to ServiceRegistry....')
+        logDebug && console.log('Adding CLOSE_TO_DAI command to ServiceRegistry....')
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.CLOSE_TO_DAI), system.closeCommand.address)
 
-        if (logDebug) console.log('Whitelisting CloseCommand on McdView....')
+        logDebug && console.log('Whitelisting CloseCommand on McdView....')
         await ensureMcdViewWhitelist(system.closeCommand.address)
     }
 
     if (system.basicBuy && system.basicBuy.address !== constants.AddressZero) {
-        if (logDebug) console.log(`Adding BASIC_BUY command to ServiceRegistry....`)
+        logDebug && console.log(`Adding BASIC_BUY command to ServiceRegistry....`)
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.BASIC_BUY), system.basicBuy.address)
 
-        if (logDebug) console.log('Whitelisting BasicBuyCommand on McdView....')
+        logDebug && console.log('Whitelisting BasicBuyCommand on McdView....')
         await ensureMcdViewWhitelist(system.basicBuy.address)
     }
 
     if (system.basicSell && system.basicSell.address !== constants.AddressZero) {
-        if (logDebug) console.log(`Adding BASIC_SELL command to ServiceRegistry....`)
+        logDebug && console.log(`Adding BASIC_SELL command to ServiceRegistry....`)
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.BASIC_SELL), system.basicSell.address)
 
-        if (logDebug) console.log('Whitelisting BasicSellCommand on McdView....')
+        logDebug && console.log('Whitelisting BasicSellCommand on McdView....')
         await ensureMcdViewWhitelist(system.basicSell.address)
     }
     if (system.cmBasicBuy && system.cmBasicBuy.address !== constants.AddressZero) {
-        if (logDebug) console.log(`Adding CM_BASIC_BUY command to ServiceRegistry....`)
+        logDebug && console.log(`Adding CM_BASIC_BUY command to ServiceRegistry....`)
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.CM_BASIC_BUY), system.cmBasicBuy.address)
 
-        if (logDebug) console.log('Whitelisting CmBasicBuyCommand on McdView....')
+        logDebug && console.log('Whitelisting CmBasicBuyCommand on McdView....')
         await ensureMcdViewWhitelist(system.cmBasicBuy.address)
     }
 
     if (system.cmBasicSell && system.cmBasicSell.address !== constants.AddressZero) {
-        if (logDebug) console.log(`Adding CM_BASIC_SELL command to ServiceRegistry....`)
+        logDebug && console.log(`Adding CM_BASIC_SELL command to ServiceRegistry....`)
         await ensureServiceRegistryEntry(getCommandHash(TriggerType.CM_BASIC_SELL), system.cmBasicSell.address)
 
-        if (logDebug) console.log('Whitelisting CmBasicSellCommand on McdView....')
+        logDebug && console.log('Whitelisting CmBasicSellCommand on McdView....')
         await ensureMcdViewWhitelist(system.cmBasicSell.address)
     }
 
-    if (logDebug) console.log('Adding CDP_MANAGER to ServiceRegistry....')
+    logDebug && console.log('Adding CDP_MANAGER to ServiceRegistry....')
     await ensureServiceRegistryEntry(getServiceNameHash(AutomationServiceName.CDP_MANAGER), addresses.CDP_MANAGER)
 
-    if (logDebug) console.log('Adding MCD_VAT to ServiceRegistry....')
+    logDebug && console.log('Adding MCD_VAT to ServiceRegistry....')
     await ensureServiceRegistryEntry(getServiceNameHash(AutomationServiceName.MCD_VAT), addresses.MCD_VAT)
 
-    if (logDebug) console.log('Adding MCD_SPOT to ServiceRegistry....')
+    logDebug && console.log('Adding MCD_SPOT to ServiceRegistry....')
     await ensureServiceRegistryEntry(getServiceNameHash(AutomationServiceName.MCD_SPOT), addresses.MCD_SPOT)
 
-    if (logDebug) console.log('Adding AUTOMATION_BOT to ServiceRegistry....')
+    logDebug && console.log('Adding AUTOMATION_BOT to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.AUTOMATION_BOT),
         system.automationBot.address,
     )
 
-    if (logDebug) console.log('Adding AUTOMATION_BOT_AGGREGATOR to ServiceRegistry....')
+    logDebug && console.log('Adding AUTOMATION_BOT_AGGREGATOR to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.AUTOMATION_BOT_AGGREGATOR),
         system.automationBotAggregator.address,
     )
-    if (logDebug) console.log('Adding CLOSE_TO_COLLATERAL command to ServiceRegistry....')
+    logDebug && console.log('Adding CLOSE_TO_COLLATERAL command to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getValidatorHash(TriggerGroupType.CONSTANT_MULTIPLE),
         system.constantMultipleValidator.address,
     )
-    if (logDebug) console.log('Adding CONSTANT_MULTIPLE_VALIDATOR to ServiceRegistry....')
+    logDebug && console.log('Adding CONSTANT_MULTIPLE_VALIDATOR to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.CONSTANT_MULTIPLE_VALIDATOR),
         system.constantMultipleValidator.address,
     )
 
-    if (logDebug) console.log('Adding MCD_VIEW to ServiceRegistry....')
+    logDebug && console.log('Adding MCD_VIEW to ServiceRegistry....')
     await ensureServiceRegistryEntry(getServiceNameHash(AutomationServiceName.MCD_VIEW), system.mcdView.address)
 
-    if (logDebug) console.log('Adding MULTIPLY_PROXY_ACTIONS to ServiceRegistry....')
+    logDebug && console.log('Adding MULTIPLY_PROXY_ACTIONS to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.MULTIPLY_PROXY_ACTIONS),
         addresses.MULTIPLY_PROXY_ACTIONS,
     )
 
-    if (logDebug) console.log('Adding AUTOMATION_EXECUTOR to ServiceRegistry....')
+    logDebug && console.log('Adding AUTOMATION_EXECUTOR to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.AUTOMATION_EXECUTOR),
         system.automationExecutor.address,
     )
 
-    if (logDebug) console.log('Adding AUTOMATION_SWAP to ServiceRegistry....')
+    logDebug && console.log('Adding AUTOMATION_SWAP to ServiceRegistry....')
     await ensureServiceRegistryEntry(
         getServiceNameHash(AutomationServiceName.AUTOMATION_SWAP),
         system.automationSwap.address,
     )
 
-    if (logDebug) console.log('Adding MCD_UTILS command to ServiceRegistry....')
+    logDebug && console.log('Adding MCD_UTILS command to ServiceRegistry....')
     await ensureServiceRegistryEntry(getServiceNameHash(AutomationServiceName.MCD_UTILS), system.mcdUtils.address)
 }

From 96764618dee0f75cd8b21842e896ccbfa2a72ec7 Mon Sep 17 00:00:00 2001
From: halaprix <panicz.klos@gmail.com>
Date: Thu, 4 Aug 2022 20:01:03 +0200
Subject: [PATCH 5/6] hardhat config

---
 hardhat.config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 3e15f08c..2cc5004d 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -9,6 +9,7 @@ import '@tenderly/hardhat-tenderly'
 import { HardhatNetworkConfig } from 'hardhat/types'
 
 import './scripts/tasks'
+import { Wallet } from 'ethers'
 
 dotenv.config()
 
@@ -49,6 +50,7 @@ const config: HardhatUserConfig = {
         local: {
             url: 'http://127.0.0.1:8545',
             timeout: 100000,
+            accounts: [process.env.PRIVATE_KEY_GOERLI!, Wallet.createRandom()._signingKey().privateKey],
         },
         hardhat: {
             forking: {
@@ -64,7 +66,6 @@ const config: HardhatUserConfig = {
             gas: 'auto',
             initialBaseFeePerGas: 1000000000,
             allowUnlimitedContractSize: false,
-            accounts: [{ privateKey: process.env.PRIVATE_KEY_GOERLI!, balance: '10000000000000000000000000' }],
         },
         ...Object.fromEntries(
             [

From 3bf2a40bf45185ec4c57f4bbcb1d3f06abde26a3 Mon Sep 17 00:00:00 2001
From: halaprix <panicz.klos@gmail.com>
Date: Mon, 8 Aug 2022 11:16:06 +0200
Subject: [PATCH 6/6] fix

---
 hardhat.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardhat.config.ts b/hardhat.config.ts
index 2cc5004d..67d87cbf 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -50,7 +50,7 @@ const config: HardhatUserConfig = {
         local: {
             url: 'http://127.0.0.1:8545',
             timeout: 100000,
-            accounts: [process.env.PRIVATE_KEY_GOERLI!, Wallet.createRandom()._signingKey().privateKey],
+            accounts: [process.env.PRIVATE_KEY!, Wallet.createRandom()._signingKey().privateKey],
         },
         hardhat: {
             forking: {