merged

1Hive · Aug 23, 2023 · 9587e7c · 9587e7c
2 parents ddaae72 + e201e4c
commit 9587e7c
Show file tree

Hide file tree

Showing 16 changed files with 1,303 additions and 1,013 deletions.
diff --git a/packages/hardhat/.openzeppelin/goerli.json b/packages/hardhat/.openzeppelin/goerli.json
@@ -279,6 +279,128 @@
     "5e9ff64d2f8c29ea479b86854efdb27d8660c24701351b95a6f3997727ae61d1": {
       "address": "0x01cf8920D51B579b10e1d8CeaB2afc25708d8C15",
       "txHash": "0x93edc2c4e9818257200d9919bca42993174c7f15c2b1419525a935f38d6e5d2c",
+      "layout": {
+        "solcVersion": "0.8.2",
+        "storage": [
+          {
+            "label": "_initialized",
+            "offset": 0,
+            "slot": "0",
+            "type": "t_uint8",
+            "contract": "Initializable",
+            "src": "@openzeppelin\\contracts-upgradeable\\proxy\\utils\\Initializable.sol:63",
+            "retypedFrom": "bool"
+          },
+          {
+            "label": "_initializing",
+            "offset": 1,
+            "slot": "0",
+            "type": "t_bool",
+            "contract": "Initializable",
+            "src": "@openzeppelin\\contracts-upgradeable\\proxy\\utils\\Initializable.sol:68"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "1",
+            "type": "t_array(t_uint256)50_storage",
+            "contract": "ContextUpgradeable",
+            "src": "@openzeppelin\\contracts-upgradeable\\utils\\ContextUpgradeable.sol:36"
+          },
+          {
+            "label": "_owner",
+            "offset": 0,
+            "slot": "51",
+            "type": "t_address",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin\\contracts-upgradeable\\access\\OwnableUpgradeable.sol:22"
+          },
+          {
+            "label": "__gap",
+            "offset": 0,
+            "slot": "52",
+            "type": "t_array(t_uint256)49_storage",
+            "contract": "OwnableUpgradeable",
+            "src": "@openzeppelin\\contracts-upgradeable\\access\\OwnableUpgradeable.sol:94"
+          },
+          {
+            "label": "aragonGovernAddress",
+            "offset": 0,
+            "slot": "101",
+            "type": "t_address",
+            "contract": "QuestFactory",
+            "src": "contracts\\QuestFactory.sol:15"
+          },
+          {
+            "label": "createDeposit",
+            "offset": 0,
+            "slot": "102",
+            "type": "t_struct(Deposit)2534_storage",
+            "contract": "QuestFactory",
+            "src": "contracts\\QuestFactory.sol:16"
+          },
+          {
+            "label": "playDeposit",
+            "offset": 0,
+            "slot": "104",
+            "type": "t_struct(Deposit)2534_storage",
+            "contract": "QuestFactory",
+            "src": "contracts\\QuestFactory.sol:17"
+          }
+        ],
+        "types": {
+          "t_address": {
+            "label": "address",
+            "numberOfBytes": "20"
+          },
+          "t_array(t_uint256)49_storage": {
+            "label": "uint256[49]",
+            "numberOfBytes": "1568"
+          },
+          "t_array(t_uint256)50_storage": {
+            "label": "uint256[50]",
+            "numberOfBytes": "1600"
+          },
+          "t_bool": {
+            "label": "bool",
+            "numberOfBytes": "1"
+          },
+          "t_contract(IERC20Upgradeable)378": {
+            "label": "contract IERC20Upgradeable",
+            "numberOfBytes": "20"
+          },
+          "t_struct(Deposit)2534_storage": {
+            "label": "struct Models.Deposit",
+            "members": [
+              {
+                "label": "token",
+                "type": "t_contract(IERC20Upgradeable)378",
+                "offset": 0,
+                "slot": "0"
+              },
+              {
+                "label": "amount",
+                "type": "t_uint256",
+                "offset": 0,
+                "slot": "1"
+              }
+            ],
+            "numberOfBytes": "64"
+          },
+          "t_uint256": {
+            "label": "uint256",
+            "numberOfBytes": "32"
+          },
+          "t_uint8": {
+            "label": "uint8",
+            "numberOfBytes": "1"
+          }
+        }
+      }
+    },
+    "de52b0ea94600e22bb1a04240f6f598b21211a05d4828563b15fc5a57f57de0a": {
+      "address": "0x9f2FD32105e18E9047E0C110D8De2bd8442eCe51",
+      "txHash": "0x7c0402440a6035002c44f30978473f022ca57da789cb208d77ab22fefc9f62ab",
       "layout": {
         "solcVersion": "0.8.2",
         "storage": [

diff --git a/packages/hardhat/contracts/QuestFactory.sol b/packages/hardhat/contracts/QuestFactory.sol
@@ -45,21 +45,9 @@ contract QuestFactory is OwnableUpgradeable {
         _disableInitializers();
     }
 
-    function initialize(
-        address _aragonGovernAddress,
-        IERC20Upgradeable _createDepositToken,
-        uint256 _createDepositAmount,
-        IERC20Upgradeable _playDepositToken,
-        uint256 _playDepositAmount,
-        address _initialOwner
-    ) public initializer {
+    function initialize(address _aragonGovernAddress) public initializer {
         __Ownable_init();
         aragonGovernAddress = _aragonGovernAddress;
-        setCreateDeposit(_createDepositToken, _createDepositAmount);
-        setPlayDeposit(_playDepositToken, _playDepositAmount);
-        if (_initialOwner != msg.sender) {
-            transferOwnership(_initialOwner);
-        }
     }
 
     /*

diff --git a/packages/hardhat/deploy/deploy-quest_factory.ts b/packages/hardhat/deploy/deploy-quest_factory.ts
@@ -32,18 +32,13 @@ export const buildQuestFactoryConstructorArguments = async ({
 export default async (
   {
     getNamedAccounts,
-    deployments,
     ethers,
     network,
     run,
     upgrades,
   }: HardhatRuntimeEnvironment,
   args?: {
     governAddress: string;
-    createDepositToken: string;
-    createDepositAmount: number;
-    playDepositToken: string;
-    playDepositAmount: number;
   }
 ) => {
   const constructorArguments = await buildQuestFactoryConstructorArguments({