successfull deploy to sepolia with update module

raid-guild · Apr 11, 2024 · d4fcc1c · d4fcc1c
1 parent c4c2c15
commit d4fcc1c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 37 deletions.
diff --git a/addresses.json b/addresses.json
@@ -8,7 +8,6 @@
     "CharacterSheetsImplementation": "0xB4BcAb0a8F7dAe2757e52a0b77346a089832A6FC",
     "ClassesImplementation": "0x6be4FA764062c6455223a5bE50aEaEA8CEB7009C",
     "CharacterSheetsFactory": "0x734f6333ADbE88064a5fFdEbb487f59063Ba4068",
-    "CharacterEligibilityAdaptor": "",
     "ClassLevelAdaptor": "0x8aBcdc5B54f8F85eAB5eE21EF4123a78dEd24E6a",
     "HatsAdaptor": "0xBe7A3fcE59A44F9a025352F2e0f6e7a97e4b83a9",
     "CharacterSheetsLevelEligibilityModule": "0xB2Ad134eB41695Ca87a62C7529259dC271d810Ce",
@@ -36,7 +35,6 @@
     "CharacterSheetsImplementation": "",
     "ClassesImplementation": "",
     "CharacterSheetsFactory": "",
-    "CharacterEligibilityAdaptor": "",
     "ClassLevelAdaptor": "",
     "HatsAdaptor": "",
     "CharacterSheetsLevelEligibilityModule": "",
@@ -49,8 +47,8 @@
     "ClonesAddressStorage": "",
     "ImplementationAddressStorage": "",
     "ItemsImplementation": "",
-    "HatsContract": "",
-    "HatsModuleFactory": "",
+    "HatsContract": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
+    "HatsModuleFactory": "0xfE661c01891172046feE16D3a57c3Cf456729efA",
     "MolochV2EligibilityAdaptor": "",
     "MolochV3EligibilityAdaptor": "",
     "ClonesAddressStorageImplementation": ""
@@ -64,7 +62,6 @@
     "CharacterSheetsImplementation": "",
     "ClassesImplementation": "",
     "CharacterSheetsFactory": "",
-    "CharacterEligibilityAdaptor": "",
     "ClassLevelAdaptor": "",
     "HatsAdaptor": "",
     "CharacterSheetsLevelEligibilityModule": "",
@@ -77,8 +74,8 @@
     "ClonesAddressStorage": "",
     "ImplementationAddressStorage": "",
     "ItemsImplementation": "",
-    "HatsContract": "",
-    "HatsModuleFactory": "",
+    "HatsContract": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
+    "HatsModuleFactory": "0xfE661c01891172046feE16D3a57c3Cf456729efA",
     "MolochV2EligibilityAdaptor": "",
     "MolochV3EligibilityAdaptor": "",
     "ClonesAddressStorageImplementation": ""
@@ -92,7 +89,6 @@
     "CharacterSheetsImplementation": "",
     "ClassesImplementation": "",
     "CharacterSheetsFactory": "",
-    "CharacterEligibilityAdaptor": "",
     "ClassLevelAdaptor": "",
     "HatsAdaptor": "",
     "CharacterSheetsLevelEligibilityModule": "",
@@ -105,8 +101,8 @@
     "ClonesAddressStorage": "",
     "ImplementationAddressStorage": "",
     "ItemsImplementation": "",
-    "HatsContract": "",
-    "HatsModuleFactory": "",
+    "HatsContract": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
+    "HatsModuleFactory": "0xfE661c01891172046feE16D3a57c3Cf456729efA",
     "MolochV2EligibilityAdaptor": "",
     "MolochV3EligibilityAdaptor": "",
     "ClonesAddressStorageImplementation": ""
@@ -126,7 +122,6 @@
     "ImplementationAddressStorage": "0x07ECa0752E074C981fB0a5eE16E7114d809ed3ff",
     "ItemsImplementation": "0x8117C81B65dF2d899E413F65dd1230Ccd92Ea80a",
     "CharacterSheetsImplementation": "0x5d429668Cc7FAE3657359548B413Ced02398F030",
-    "CharacterEligibilityAdaptor": "0xc94eb020b474a8320a7500CcC0E29cb5Aa86BD34",
     "CharacterEligibilityAdaptorV2": "",
     "CharacterEligibilityAdaptorV3": "0xC557D0a20e0BfC06adFA2eD0503523dF011E850B",
     "ClassLevelAdaptor": "0x1F4Bf13C531f4875fb5d2859dCD88591b8d471f1",
@@ -142,28 +137,27 @@
     "chainId": "11155111",
     "network": "sepolia",
     "Erc6551Registry": "0x02101dfB77FDE026414827Fdc604ddAF224F0921",
-    "CharacterAccount": "0xab632238a54826214E59eDBA5c94e626905cA9A1",
-    "CharacterSheetsImplementation": "0x758BCc6fFc9BF1A11059102A829c533297A0CFB5",
-    "ClassesImplementation": "0x0e95dFa4E0F55c19836863cF409381edf08EA821",
-    "CharacterSheetsFactory": "",
-    "CharacterEligibilityAdaptor": "",
-    "ClassLevelAdaptor": "0xb0eB7213E37307CEAaBcc10E0F224D8982FcA7Ba",
-    "HatsAdaptor": "0xC994B88a04841d8E4BCa7a2320eB1D4ef73c88Cb",
+    "CharacterAccount": "0xb37557c4d1208A786fE0C28Dd865034c3e3d9038",
+    "ExperienceImplementation": "0xCA8d9B4c514B28a1aD5240F3071E3167E9074A53",
+    "CharacterSheetsImplementation": "0xF4A596FC9a70CDB508Ea21686ae20d42e6068423",
+    "ClassesImplementation": "0xA32b0d22cf72556D9caa1397E3c1096bFBb9CdCe",
+    "CharacterSheetsFactory": "0xc3158e0aB9aa1623022FeFdF4a3Ac022ff0dfcc1",
+    "ClassLevelAdaptor": "0x1d598591374D314AfFB2aed1370D8c81CbbA261F",
+    "HatsAdaptor": "0x1D5B39612a354C2Ff1f50cfd8D9FDEdB4d4F9e62",
     "AddressHatsEligibilityModule": "0x9AaF0df5657b634131784523F4F5e83459c61986",
     "ERC721HatsEligibilityModule": "0xF37cf12fB4493D29270806e826fDDf50dd722bab",
-    "ERC6551HatsEligibilityModule": "0x4f1a5769adE79e9e672454d958a39B9b4FBf1e45",
+    "ERC6551HatsEligibilityModule": "0x74e35a750DF66D3845a9359afb9EE0B4D7E41B99",
     "MultiERC6511HatsEligibilityModule": "",
-    "CharacterSheetsLevelEligibilityModule": "0xfd5C36d5AdfC59B6FC2c557Eff10Bf89c677553a",
-    "ExperienceImplementation": "0x619ce9BF204A59ccDA269bD90A0994B89996BBb1",
-    "ItemsManagerImplementation": "0x7D0B79d84A984702Aa2DFb77D3D80d948Ec7d791",
+    "CharacterSheetsLevelEligibilityModule": "0xb2Fe75E4FF7520A85938ff755BD6d2fCEFb9196E",
+    "ItemsManagerImplementation": "0x982EFC86035e838de7967De1b1A8f72097d84733",
     "ClonesAddressStorage": "",
-    "ImplementationAddressStorage": "",
-    "ItemsImplementation": "0x8c329218deE2f9D0e20AfEEE63fD6E8086B37B4a",
+    "ImplementationAddressStorage": "0x33018D9cCF2FE77130Cf22AA81CbA07E8B098dF3",
+    "ItemsImplementation": "0xE27109834a24838c2659b9a023803cb15e7633Ef",
     "HatsContract": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
     "HatsModuleFactory": "0xfE661c01891172046feE16D3a57c3Cf456729efA",
-    "MolochV2EligibilityAdaptor": "0x8cDdf7438129b804D885783A7aCB60fC5F28f2be",
-    "MolochV3EligibilityAdaptor": "0xBaa16BAd02Ad7Aacb710BE8e0aA815578955fCfc",
-    "ClonesAddressStorageImplementation": "0xa71C5e4A5468C782B952C09C9E7Fa70A1caaA113"
+    "MolochV2EligibilityAdaptor": "0x0E0514a13c905F4DEd5e46769aC5FD049fB8aC6F",
+    "MolochV3EligibilityAdaptor": "0xCb6787d033750D610107C96bcff4d925dde026b5",
+    "ClonesAddressStorageImplementation": "0xeCb73607DD8fD80F4E8f50b5B46A3286eA3e1854"
   },
   "anvil": {
     "chainId": "31337",
@@ -192,4 +186,4 @@
     "ERC6551HatsEligibilityModule": "",
     "MultiERC6511HatsEligibilityModule": ""
   }
-}
+}
diff --git a/scripts/ImplementationAddressStorage.s.sol b/scripts/ImplementationAddressStorage.s.sol
@@ -124,9 +124,7 @@ contract DeployImplementationAddressStorage is BaseDeployer {
         hatsAddresses.erc721HatsEligibilityModule =
             json.readAddress(string(abi.encodePacked(".", targetEnv, ".ERC721HatsEligibilityModule")));
         hatsAddresses.erc6551HatsEligitbilityModule =
-            json.readAddress(string(abi.encodePacked(".", targetEnv, ".ERC6511HatsEligibilityModule")));
-        hatsAddresses.multiErc6551HatsEligitbilityModule =
-            json.readAddress(string(abi.encodePacked(".", targetEnv, ".MultiERC6511HatsEligibilityModule")));
+            json.readAddress(string(abi.encodePacked(".", targetEnv, ".ERC6551HatsEligibilityModule")));
     }
 
     function _loadExternalAddresses(string memory json, string memory targetEnv) internal {

diff --git a/src/ImplementationAddressStorage.sol b/src/ImplementationAddressStorage.sol
@@ -243,9 +243,8 @@ contract ImplementationAddressStorage is Initializable, OwnableUpgradeable {
         (
             _implementationsAddresses.addressHatsEligibilityModule,
             _implementationsAddresses.erc721HatsEligibilityModule,
-            _implementationsAddresses.erc6551HatsEligibilityModule,
-            _implementationsAddresses.multiERC6551HatsEligibilityModule
-        ) = abi.decode(encodedModuleAddresses, (address, address, address, address));
+            _implementationsAddresses.erc6551HatsEligibilityModule
+        ) = abi.decode(encodedModuleAddresses, (address, address, address));
     }
 
     function _initAdaptors(bytes calldata encodedAdaptorAddresses) internal {

diff --git a/test/setup/SetUp.t.sol b/test/setup/SetUp.t.sol
@@ -277,7 +277,7 @@ contract SetUp is Test, Accounts, TestStructs {
         implementations.addressModule = new AllowlistEligibility("v 0.1");
         implementations.erc721Module = new ERC721HatsEligibilityModule("v 0.1");
         implementations.erc6551Module = new ERC6551HatsEligibilityModule("v 0.1");
-        implementations.multiErc6551Module = new MultiERC6551HatsEligibilityModule("v 0.1");
+        // implementations.multiErc6551Module = new MultiERC6551HatsEligibilityModule("v 0.1");
 
         vm.label(address(dao), "Moloch Implementation");
         vm.label(address(merkle), "Merkle Implementation");
@@ -334,8 +334,8 @@ contract SetUp is Test, Accounts, TestStructs {
         bytes memory encodedModuleAddresses = abi.encode(
             address(implementations.addressModule),
             address(implementations.erc721Module),
-            address(implementations.erc6551Module),
-            address(implementations.multiErc6551Module)
+            address(implementations.erc6551Module)
+            // address(implementations.multiErc6551Module)
         );
 
         bytes memory encodedAdaptorAddresses = abi.encode(