fixed contracts

.gas-snapshot

@@ -1,8 +1,8 @@
-CharacterAccountTest:testEquipAndUnequipViaMultiSendDelegateCall() (gas: 863322)
-CharacterAccountTest:testEquipItemToCharacter() (gas: 876054)
-CharacterAccountTest:testEquipViaMultiSendDelegateCall() (gas: 883491)
-CharacterAccountTest:testUnequipItemToCharacter() (gas: 870850)
-CharacterAccountTest:test_Owner() (gas: 591503)
+CharacterAccountTest:testEquipAndUnequipViaMultiSendDelegateCall() (gas: 863855)
+CharacterAccountTest:testEquipItemToCharacter() (gas: 876542)
+CharacterAccountTest:testEquipViaMultiSendDelegateCall() (gas: 883979)
+CharacterAccountTest:testUnequipItemToCharacter() (gas: 871537)
+CharacterAccountTest:test_Owner() (gas: 591747)
 CharacterEligibilityAdaptorTest:testIsEligible() (gas: 53561)
 CharacterEligibilityAdaptorTest:testSupportsInterface() (gas: 13427)
 CharacterSheetsFactoryTest:testCreateAndInitialize() (gas: 3886107)
@@ -19,76 +19,76 @@ CharacterSheetsFactoryTest:testInitializeContracts() (gas: 3839130)
 CharacterSheetsFactoryTest:testUpdateImplementationAddressStorage() (gas: 21541)
 CharacterSheetsTest:testChangeBaseUri() (gas: 71664)
 CharacterSheetsTest:testChangeBaseUriRevertNotAdmin() (gas: 71564)
-CharacterSheetsTest:testEquipItemToCharacter() (gas: 331724)
-CharacterSheetsTest:testEquipItemToCharacterReverts() (gas: 220816)
-CharacterSheetsTest:testGetCharacterSheetByCharacterId() (gas: 23243)
-CharacterSheetsTest:testGetPlayerIdFromAccountAddress() (gas: 28008)
-CharacterSheetsTest:testRemovePlayer() (gas: 948542)
+CharacterSheetsTest:testEquipItemToCharacter() (gas: 333968)
+CharacterSheetsTest:testEquipItemToCharacterReverts() (gas: 218588)
+CharacterSheetsTest:testGetCharacterSheetByCharacterId() (gas: 25397)
+CharacterSheetsTest:testGetPlayerIdFromAccountAddress() (gas: 30207)
+CharacterSheetsTest:testRemovePlayer() (gas: 948632)
 CharacterSheetsTest:testRenounceSheet() (gas: 73170)
 CharacterSheetsTest:testRenounceSheetReverts() (gas: 72911)
-CharacterSheetsTest:testRestoreSheetAfterRemove() (gas: 788485)
-CharacterSheetsTest:testRestoreSheetAfterRenounce() (gas: 745299)
-CharacterSheetsTest:testRollCharacterSheet() (gas: 590052)
+CharacterSheetsTest:testRestoreSheetAfterRemove() (gas: 788729)
+CharacterSheetsTest:testRestoreSheetAfterRenounce() (gas: 745588)
+CharacterSheetsTest:testRollCharacterSheet() (gas: 590142)
 CharacterSheetsTest:testRollCharacterSheetFailNonMember() (gas: 61385)
 CharacterSheetsTest:testRollCharacterSheetRevertAlreadyACharacter() (gas: 68037)
 CharacterSheetsTest:testRollFailsForRenouncedSheet() (gas: 116739)
-CharacterSheetsTest:testSafeTransferFrom() (gas: 466677)
-CharacterSheetsTest:testSafeTransferFromBackAndForth() (gas: 268314)
-CharacterSheetsTest:testTransferFrom() (gas: 477649)
-CharacterSheetsTest:testUnequipItemFromCharacter() (gas: 314874)
+CharacterSheetsTest:testSafeTransferFrom() (gas: 469091)
+CharacterSheetsTest:testSafeTransferFromBackAndForth() (gas: 268387)
+CharacterSheetsTest:testTransferFrom() (gas: 480040)
+CharacterSheetsTest:testUnequipItemFromCharacter() (gas: 317317)
 CharacterSheetsTest:testUpdateCharacterMetadata() (gas: 98927)
-CharacterSheetsTest:testUpdateContractImplementation() (gas: 5129500)
-ClassLevelAdaptorTest:testFuzz_GetCurrentLevel(uint256) (runs: 256, μ: 37180, ~: 32870)
+CharacterSheetsTest:testUpdateContractImplementation() (gas: 5165408)
+ClassLevelAdaptorTest:testFuzz_GetCurrentLevel(uint256) (runs: 256, μ: 37057, ~: 33214)
 ClassLevelAdaptorTest:testSupportsInterface() (gas: 13427)
 ClassesTest:testAssignClass() (gas: 281864)
-ClassesTest:testClaimClass() (gas: 156790)
-ClassesTest:testClassExp() (gas: 256849)
+ClassesTest:testClaimClass() (gas: 156835)
+ClassesTest:testClassExp() (gas: 256984)
 ClassesTest:testCreateClass() (gas: 134641)
-ClassesTest:testFuzz_BalanceOf(uint256) (runs: 256, μ: 297234, ~: 306336)
-ClassesTest:testRenounceClass() (gas: 240909)
+ClassesTest:testFuzz_BalanceOf(uint256) (runs: 256, μ: 297203, ~: 306426)
+ClassesTest:testRenounceClass() (gas: 240954)
 ClassesTest:testRevokeClass() (gas: 213123)
-ClassesTest:testTransferClass() (gas: 762109)
-ExperienceTest:testBurnExp() (gas: 195449)
-ExperienceTest:testDropExp() (gas: 251928)
+ClassesTest:testTransferClass() (gas: 762398)
+ExperienceTest:testBurnExp() (gas: 195494)
+ExperienceTest:testDropExp() (gas: 252018)
 ExperienceTest:testExperienceDeployment() (gas: 18173)
 HatsAdaptorTest:testAddGameMaster() (gas: 147549)
 HatsAdaptorTest:testHatsAdaptorDeployment() (gas: 116819)
-HatsAdaptorTest:testIsCharacter() (gas: 83761)
+HatsAdaptorTest:testIsCharacter() (gas: 87252)
 HatsAdaptorTest:testIsGameMaster() (gas: 63906)
 HatsAdaptorTest:testIsPlayer() (gas: 86846)
-HatsAdaptorTest:testMintCharacterHat() (gas: 213240)
-HatsAdaptorTest:testMintPlayerHat() (gas: 698228)
-HatsAdaptorTest:test_CheckCharacterHatEligibility() (gas: 93093)
+HatsAdaptorTest:testMintCharacterHat() (gas: 213375)
+HatsAdaptorTest:testMintPlayerHat() (gas: 698318)
+HatsAdaptorTest:test_CheckCharacterHatEligibility() (gas: 93138)
 HatsAdaptorTest:test_addValidGame() (gas: 211)
-ItemsTest:testClaimItem() (gas: 877456)
-ItemsTest:testClaimItemRevert() (gas: 1270449)
-ItemsTest:testComplexRequirementsClaimRevert() (gas: 1257400)
-ItemsTest:testComplexRequirementsClaimRevertWithTooMuchExp() (gas: 1286928)
-ItemsTest:testComplexRequirementsClaimWithItem1() (gas: 1333957)
-ItemsTest:testComplexRequirementsClaimWithItem1ForShallowNot() (gas: 1288021)
-ItemsTest:testComplexRequirementsClaimWithItem2() (gas: 1338831)
-ItemsTest:testCraftItem() (gas: 693200)
-ItemsTest:testCraftItemRevert() (gas: 434002)
+ItemsTest:testClaimItem() (gas: 877546)
+ItemsTest:testClaimItemRevert() (gas: 1270719)
+ItemsTest:testComplexRequirementsClaimRevert() (gas: 1257535)
+ItemsTest:testComplexRequirementsClaimRevertWithTooMuchExp() (gas: 1287018)
+ItemsTest:testComplexRequirementsClaimWithItem1() (gas: 1334047)
+ItemsTest:testComplexRequirementsClaimWithItem1ForShallowNot() (gas: 1288111)
+ItemsTest:testComplexRequirementsClaimWithItem2() (gas: 1338921)
+ItemsTest:testCraftItem() (gas: 694968)
+ItemsTest:testCraftItemRevert() (gas: 434092)
 ItemsTest:testCreateClaimableItem() (gas: 77741)
 ItemsTest:testCreateCraftableItem() (gas: 69511)
 ItemsTest:testCreateItemTypeRevert() (gas: 63965)
 ItemsTest:testDeleteItem() (gas: 240249)
-ItemsTest:testDismantleItems() (gas: 1158284)
-ItemsTest:testDismantleItemsRevert() (gas: 1216279)
-ItemsTest:testDropLoot() (gas: 1247910)
+ItemsTest:testDismantleItems() (gas: 1160135)
+ItemsTest:testDismantleItemsRevert() (gas: 1218085)
+ItemsTest:testDropLoot() (gas: 1248244)
 ItemsTest:testDropLootRevert() (gas: 258077)
 ItemsTest:testInvalidTreeAnd() (gas: 633183)
 ItemsTest:testInvalidTreeNot() (gas: 850493)
 ItemsTest:testInvalidTreeOr() (gas: 867837)
-ItemsTest:testSimpleRequirementsClaimWithItem1() (gas: 628285)
+ItemsTest:testSimpleRequirementsClaimWithItem1() (gas: 628330)
 ItemsTest:testURI() (gas: 20934)
 ItemsTest:testUpdateClaimableItemRequirements() (gas: 338153)
 ItemsTest:testUpdateCraftableItemRequirements() (gas: 196725)
 Test_AdminEligibilityModule:testAddNewAdmin() (gas: 165759)
 Test_AdminEligibilityModule:testRemoveAdmin() (gas: 154477)
 Test_ElderEligibilityModule:testAddClassToElderModule() (gas: 465413)
-Test_ElderEligibilityModule:testCharacterSheetsLevelEligibilityModule() (gas: 659828)
+Test_ElderEligibilityModule:testCharacterSheetsLevelEligibilityModule() (gas: 659711)
 Test_ElderEligibilityModule:testElderModuleNoCharacter() (gas: 471970)
 Test_GameMasterEligibilityModule:testAddNewGameMaster() (gas: 206808)
-Test_GameMasterEligibilityModule:testNewModuleSetup() (gas: 135594)
+Test_GameMasterEligibilityModule:testNewModuleSetup() (gas: 135639)
 Test_GameMasterEligibilityModule:testRemoveGameMaster() (gas: 192932)

addresses.json

@@ -27,39 +27,12 @@
     "MolochV3EligibilityAdaptor": "0x620646b1E1b27b56afDaf87eE13CA727F4E87cC8",
     "ClonesAddressStorageImplementation": "0x20C270dD8F5F8A341AA90fB8Eb0B3bc44237cc29"
   },
-  "goerli": {
-    "chainId": "5",
-    "network": "goerli",
-    "Erc6551Registry": "0x02101dfB77FDE026414827Fdc604ddAF224F0921",
-    "HatsContract": "0x3bc1A0Ad72417f2d411118085256fC53CBdDd137",
-    "HatsModuleFactory": "0xfE661c01891172046feE16D3a57c3Cf456729efA",
-    "CharacterAccount": "0x3cD942A7902b955E0a5222d80376B29062Ea9DaA",
-    "ClassesImplementation": "0x62b97b232Ed8b11409ff8a7648214010426355ed",
-    "CharacterSheetsFactory": "0x570F219D3FA620E7Fd48ff4787F2Da169Ed12244",
-    "ExperienceImplementation": "0x8065d9c66d41bF35473B71D17aCBD535dd2a3488",
-    "ItemsManagerImplementation": "0xEC48EB7BE3B867cB9Af481533008752d64514d84",
-    "CloneAddressStorage": "0xbc0A467b8100c87282988c6ff71d4227C822bF2e",
-    "ImplementationAddressStorage": "0x07ECa0752E074C981fB0a5eE16E7114d809ed3ff",
-    "ItemsImplementation": "0x8117C81B65dF2d899E413F65dd1230Ccd92Ea80a",
-    "CharacterSheetsImplementation": "0x5d429668Cc7FAE3657359548B413Ced02398F030",
-    "CharacterEligibilityAdaptor": "0xc94eb020b474a8320a7500CcC0E29cb5Aa86BD34",
-    "CharacterEligibilityAdaptorV2": "",
-    "CharacterEligibilityAdaptorV3": "0xC557D0a20e0BfC06adFA2eD0503523dF011E850B",
-    "ClassLevelAdaptor": "0x1F4Bf13C531f4875fb5d2859dCD88591b8d471f1",
-    "HatsAdaptor": "0x163920D269760feB9eD161601648832d963e4143",
-    "AddressHatsEligibilityModule": "0x9AaF0df5657b634131784523F4F5e83459c61986",
-    "CharacterSheetsLevelEligibilityModule": "0x6f52b30a4730C5Cb765E7c762249dc4Ae02fB8eD",
-    "ERC721HatsEligibilityModule": "0x6bAa65D3E024D8ebA717085691dd8A985e9F267E",
-    "ERC6551HatsEligibilityModule": "0xa25B005B82209B2D2dC6E86006ae75649b1dAb5b",
-    "MultiERC6511HatsEligibilityModule": "",
-    "ClonesAddressStorageImplementation": "0xfFE77f170cEFcC2248e6697c32ef665FcF685E14"
-  },
   "sepolia": {
     "chainId": "11155111",
     "network": "sepolia",
     "Erc6551Registry": "0x02101dfB77FDE026414827Fdc604ddAF224F0921",
     "CharacterAccount": "0x42D6c5A636f6359C36e37cBaA09568627B8F6Afc",
-    "CharacterSheetsImplementation": "0x62f81Be2545651e1a11a0eF7548Abf5248A41eDb",
+    "CharacterSheetsImplementation": "0x6639BD11fA55384184208ae8bC49d5235E5eA30B",
     "ClassesImplementation": "0xC75219c28E8E9CAaBa6c2928519f179543daee0F",
     "CharacterSheetsFactory": "0xAfFCc11509C4EBCfA78b72128eB1a2256504F135",
     "ClassLevelAdaptor": "0x12b097B25BE1Ca56fB9943e8725b1965CF0908c2",