From 83a8f10d59e55b84d067e6cb3fc07a8dfa5ffc9f Mon Sep 17 00:00:00 2001
From: cbrzn <cesarbrazon10@gmail.com>
Date: Mon, 9 Aug 2021 19:43:12 +0200
Subject: [PATCH] chore: init owner on set up function

---
 contracts/DelayModule.sol |  1 +
 src/tasks/setup.ts        |  4 ++--
 yarn.lock                 | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/contracts/DelayModule.sol b/contracts/DelayModule.sol
index 8b2928d..4f92e1b 100644
--- a/contracts/DelayModule.sol
+++ b/contracts/DelayModule.sol
@@ -54,6 +54,7 @@ contract DelayModule is Modifier {
         txCooldown = _cooldown;
 
         if (_executor != address(0)) {
+            __Ownable_init();
             transferOwnership(_owner);
             setupModules();
         }
diff --git a/src/tasks/setup.ts b/src/tasks/setup.ts
index 65a2878..a954fc5 100644
--- a/src/tasks/setup.ts
+++ b/src/tasks/setup.ts
@@ -78,9 +78,9 @@ task("deployMasterCopy", "deploy a master copy of Delay Module").setAction(
         await module.deployTransaction.wait(3);
     
         console.log("Module deployed to:", module.address);
-        await hardhatRuntime.run("verify:verify", {
+        await hardhatRuntime.run("verify", {
             address: module.address,
-            constructorArguments: [FirstAddress, FirstAddress, 0, 0]
+            constructorArguments: [FirstAddress, FirstAddress, "0", "0"]
         });
     }
 );
diff --git a/yarn.lock b/yarn.lock
index ed7ebe5..2e2bf02 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -500,10 +500,10 @@
 
 "@gnosis/zodiac@github:gnosis/zodiac#master":
   version "0.0.0"
-  resolved "https://codeload.github.com/gnosis/zodiac/tar.gz/ab5b40752ce3b1548b4e41b66a37927c8f4c3b06"
+  resolved "https://codeload.github.com/gnosis/zodiac/tar.gz/03ebe5aced6744a8e1aad7ad71cd31989da5bb16"
   dependencies:
     "@gnosis.pm/mock-contract" "^4.0.0"
-    "@openzeppelin/contracts" "^4.2.0"
+    "@openzeppelin/contracts-upgradeable" "^4.2.0"
     argv "^0.0.2"
     dotenv "^8.0.0"
     ethers "^5.0.19"
@@ -577,10 +577,10 @@
     "@types/sinon-chai" "^3.2.3"
     "@types/web3" "1.0.19"
 
-"@openzeppelin/contracts@^4.2.0":
+"@openzeppelin/contracts-upgradeable@^4.2.0":
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.2.0.tgz#260d921d99356e48013d9d760caaa6cea35dc642"
-  integrity sha512-LD4NnkKpHHSMo5z9MvFsG4g1xxZUDqV3A3Futu3nvyfs4wPwXxqOgMaxOoa2PeyGL2VNeSlbxT54enbQzGcgJQ==
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-4.2.0.tgz#3b12d6fe9d51e563c8a6ae39c96c1d32c5d0fa4a"
+  integrity sha512-vn0hoUqQzgOLzLZwFgh+w/D5hzJHX8F7X/7t/gZdSQYIEXMyGpXUwkr5A3eoAeoc42f/n7yDhwusvBmNknM41Q==
 
 "@resolver-engine/core@^0.3.3":
   version "0.3.3"