upgraded packages

.gas-snapshot

@@ -1,92 +1,92 @@
-CharacterAccountTest:testEquipAndUnequipViaMultiSendDelegateCall() (gas: 856452)
-CharacterAccountTest:testEquipItemToCharacter() (gas: 869187)
+CharacterAccountTest:testEquipAndUnequipViaMultiSendDelegateCall() (gas: 856430)
+CharacterAccountTest:testEquipItemToCharacter() (gas: 869190)
 CharacterAccountTest:testEquipViaMultiSendDelegateCall() (gas: 876672)
 CharacterAccountTest:testUnequipItemToCharacter() (gas: 864025)
 CharacterAccountTest:test_Owner() (gas: 591129)
-CharacterEligibilityAdaptorTest:testIsEligible() (gas: 53518)
-CharacterEligibilityAdaptorTest:testSupportsInterface() (gas: 13449)
-CharacterSheetsFactoryTest:testCreateAndInitialize() (gas: 3884683)
-CharacterSheetsFactoryTest:testCreateAndInitializeWithZeroDao() (gas: 3680345)
-CharacterSheetsFactoryTest:testCreateCharacterEligibilityAdaptor() (gas: 112071)
-CharacterSheetsFactoryTest:testCreateCharacterSheets() (gas: 110055)
+CharacterEligibilityAdaptorTest:testIsEligible() (gas: 53561)
+CharacterEligibilityAdaptorTest:testSupportsInterface() (gas: 13427)
+CharacterSheetsFactoryTest:testCreateAndInitialize() (gas: 3886107)
+CharacterSheetsFactoryTest:testCreateAndInitializeWithZeroDao() (gas: 3681813)
+CharacterSheetsFactoryTest:testCreateCharacterEligibilityAdaptor() (gas: 112049)
+CharacterSheetsFactoryTest:testCreateCharacterSheets() (gas: 110033)
 CharacterSheetsFactoryTest:testCreateClassLevelAdaptor() (gas: 112667)
-CharacterSheetsFactoryTest:testCreateClasses() (gas: 111863)
+CharacterSheetsFactoryTest:testCreateClasses() (gas: 111841)
 CharacterSheetsFactoryTest:testCreateExperience() (gas: 110086)
 CharacterSheetsFactoryTest:testCreateItems() (gas: 111924)
 CharacterSheetsFactoryTest:testDeployment() (gas: 13107)
-CharacterSheetsFactoryTest:testDeploymentRevert() (gas: 16677)
-CharacterSheetsFactoryTest:testInitializeContracts() (gas: 3837712)
-CharacterSheetsFactoryTest:testUpdateImplementationAddressStorage() (gas: 21585)
-CharacterSheetsTest:testChangeBaseUri() (gas: 71708)
-CharacterSheetsTest:testChangeBaseUriRevertNotAdmin() (gas: 71595)
+CharacterSheetsFactoryTest:testDeploymentRevert() (gas: 16722)
+CharacterSheetsFactoryTest:testInitializeContracts() (gas: 3839130)
+CharacterSheetsFactoryTest:testUpdateImplementationAddressStorage() (gas: 21563)
+CharacterSheetsTest:testChangeBaseUri() (gas: 71686)
+CharacterSheetsTest:testChangeBaseUriRevertNotAdmin() (gas: 71586)
 CharacterSheetsTest:testEquipItemToCharacter() (gas: 325279)
-CharacterSheetsTest:testEquipItemToCharacterReverts() (gas: 216820)
-CharacterSheetsTest:testGetCharacterSheetByCharacterId() (gas: 23223)
+CharacterSheetsTest:testEquipItemToCharacterReverts() (gas: 216798)
+CharacterSheetsTest:testGetCharacterSheetByCharacterId() (gas: 23268)
 CharacterSheetsTest:testGetPlayerIdFromAccountAddress() (gas: 28011)
-CharacterSheetsTest:testRemovePlayer() (gas: 947983)
+CharacterSheetsTest:testRemovePlayer() (gas: 947968)
 CharacterSheetsTest:testRenounceSheet() (gas: 73174)
-CharacterSheetsTest:testRenounceSheetReverts() (gas: 72868)
-CharacterSheetsTest:testRestoreSheetAfterRemove() (gas: 786167)
+CharacterSheetsTest:testRenounceSheetReverts() (gas: 72846)
+CharacterSheetsTest:testRestoreSheetAfterRemove() (gas: 786137)
 CharacterSheetsTest:testRestoreSheetAfterRenounce() (gas: 722615)
 CharacterSheetsTest:testRollCharacterSheet() (gas: 589612)
 CharacterSheetsTest:testRollCharacterSheetFailNonMember() (gas: 61074)
 CharacterSheetsTest:testRollCharacterSheetRevertAlreadyACharacter() (gas: 67837)
 CharacterSheetsTest:testRollFailsForRenouncedSheet() (gas: 118620)
-CharacterSheetsTest:testSafeTransferFrom() (gas: 466667)
-CharacterSheetsTest:testSafeTransferFromBackAndForth() (gas: 250215)
-CharacterSheetsTest:testTransferFrom() (gas: 459787)
+CharacterSheetsTest:testSafeTransferFrom() (gas: 466606)
+CharacterSheetsTest:testSafeTransferFromBackAndForth() (gas: 250176)
+CharacterSheetsTest:testTransferFrom() (gas: 459763)
 CharacterSheetsTest:testUnequipItemFromCharacter() (gas: 308423)
 CharacterSheetsTest:testUpdateCharacterMetadata() (gas: 98930)
-CharacterSheetsTest:testUpdateContractImplementation() (gas: 5106247)
-ClassLevelAdaptorTest:testFuzz_GetCurrentLevel(uint256) (runs: 256, μ: 37486, ~: 34155)
-ClassLevelAdaptorTest:testSupportsInterface() (gas: 13383)
-ClassesTest:testAssignClass() (gas: 281908)
+CharacterSheetsTest:testUpdateContractImplementation() (gas: 5106259)
+ClassLevelAdaptorTest:testFuzz_GetCurrentLevel(uint256) (runs: 256, μ: 37072, ~: 34133)
+ClassLevelAdaptorTest:testSupportsInterface() (gas: 13427)
+ClassesTest:testAssignClass() (gas: 281886)
 ClassesTest:testClaimClass() (gas: 156784)
 ClassesTest:testClassExp() (gas: 256831)
 ClassesTest:testCreateClass() (gas: 134641)
-ClassesTest:testFuzz_BalanceOf(uint256) (runs: 256, μ: 296688, ~: 306302)
-ClassesTest:testRenounceClass() (gas: 240880)
+ClassesTest:testFuzz_BalanceOf(uint256) (runs: 256, μ: 297170, ~: 306346)
+ClassesTest:testRenounceClass() (gas: 240925)
 ClassesTest:testRevokeClass() (gas: 213123)
-ClassesTest:testTransferClass() (gas: 761696)
+ClassesTest:testTransferClass() (gas: 761708)
 ExperienceTest:testBurnExp() (gas: 195465)
-ExperienceTest:testDropExp() (gas: 251938)
+ExperienceTest:testDropExp() (gas: 251916)
 ExperienceTest:testExperienceDeployment() (gas: 18130)
-HatsAdaptorTest:testAddGameMaster() (gas: 147571)
-HatsAdaptorTest:testHatsAdaptorDeployment() (gas: 116881)
-HatsAdaptorTest:testIsCharacter() (gas: 83722)
+HatsAdaptorTest:testAddGameMaster() (gas: 147549)
+HatsAdaptorTest:testHatsAdaptorDeployment() (gas: 116841)
+HatsAdaptorTest:testIsCharacter() (gas: 83700)
 HatsAdaptorTest:testIsGameMaster() (gas: 63928)
-HatsAdaptorTest:testIsPlayer() (gas: 86890)
-HatsAdaptorTest:testMintCharacterHat() (gas: 213247)
-HatsAdaptorTest:testMintPlayerHat() (gas: 697864)
-HatsAdaptorTest:test_CheckCharacterHatEligibility() (gas: 93065)
+HatsAdaptorTest:testIsPlayer() (gas: 86868)
+HatsAdaptorTest:testMintCharacterHat() (gas: 213244)
+HatsAdaptorTest:testMintPlayerHat() (gas: 697854)
+HatsAdaptorTest:test_CheckCharacterHatEligibility() (gas: 93109)
 HatsAdaptorTest:test_addValidGame() (gas: 233)
-ItemsTest:testClaimItem() (gas: 873529)
-ItemsTest:testClaimItemRevert() (gas: 1261452)
+ItemsTest:testClaimItem() (gas: 873498)
+ItemsTest:testClaimItemRevert() (gas: 1261443)
 ItemsTest:testComplexRequirementsClaimRevert() (gas: 1265462)
 ItemsTest:testComplexRequirementsClaimRevertWithTooMuchExp() (gas: 1286183)
-ItemsTest:testComplexRequirementsClaimWithItem1() (gas: 1329194)
-ItemsTest:testComplexRequirementsClaimWithItem1ForShallowNot() (gas: 1283320)
+ItemsTest:testComplexRequirementsClaimWithItem1() (gas: 1329261)
+ItemsTest:testComplexRequirementsClaimWithItem1ForShallowNot() (gas: 1283298)
 ItemsTest:testComplexRequirementsClaimWithItem2() (gas: 1335622)
-ItemsTest:testCraftItem() (gas: 683855)
-ItemsTest:testCraftItemRevert() (gas: 437380)
-ItemsTest:testCreateClaimableItem() (gas: 77608)
-ItemsTest:testCreateCraftableItem() (gas: 69555)
-ItemsTest:testCreateItemTypeRevert() (gas: 63981)
-ItemsTest:testDeleteItem() (gas: 212170)
-ItemsTest:testDismantleItems() (gas: 1130490)
-ItemsTest:testDropLoot() (gas: 1234553)
-ItemsTest:testDropLootRevert() (gas: 234552)
-ItemsTest:testInvalidTreeAnd() (gas: 629553)
-ItemsTest:testInvalidTreeNot() (gas: 845292)
-ItemsTest:testInvalidTreeOr() (gas: 862658)
+ItemsTest:testCraftItem() (gas: 683930)
+ItemsTest:testCraftItemRevert() (gas: 437358)
+ItemsTest:testCreateClaimableItem() (gas: 77675)
+ItemsTest:testCreateCraftableItem() (gas: 69533)
+ItemsTest:testCreateItemTypeRevert() (gas: 63959)
+ItemsTest:testDeleteItem() (gas: 212152)
+ItemsTest:testDismantleItems() (gas: 1130468)
+ItemsTest:testDropLoot() (gas: 1234531)
+ItemsTest:testDropLootRevert() (gas: 234539)
+ItemsTest:testInvalidTreeAnd() (gas: 629531)
+ItemsTest:testInvalidTreeNot() (gas: 845270)
+ItemsTest:testInvalidTreeOr() (gas: 862636)
 ItemsTest:testURI() (gas: 20937)
-ItemsTest:testUpdateClaimableItemRequirements() (gas: 346711)
-ItemsTest:testUpdateCraftableItemRequirements() (gas: 202093)
-Test_AdminEligibilityModule:testAddNewAdmin() (gas: 165781)
-Test_AdminEligibilityModule:testRemoveAdmin() (gas: 154433)
-Test_ElderEligibilityModule:testAddClassToElderModule() (gas: 465457)
-Test_ElderEligibilityModule:testCharacterSheetsLevelEligibilityModule() (gas: 659744)
+ItemsTest:testUpdateClaimableItemRequirements() (gas: 346689)
+ItemsTest:testUpdateCraftableItemRequirements() (gas: 202158)
+Test_AdminEligibilityModule:testAddNewAdmin() (gas: 165759)
+Test_AdminEligibilityModule:testRemoveAdmin() (gas: 154411)
+Test_ElderEligibilityModule:testAddClassToElderModule() (gas: 465435)
+Test_ElderEligibilityModule:testCharacterSheetsLevelEligibilityModule() (gas: 659816)
 Test_ElderEligibilityModule:testElderModuleNoCharacter() (gas: 471970)
-Test_GameMasterEligibilityModule:testAddNewGameMaster() (gas: 206763)
-Test_GameMasterEligibilityModule:testNewModuleSetup() (gas: 135565)
-Test_GameMasterEligibilityModule:testRemoveGameMaster() (gas: 192976)
+Test_GameMasterEligibilityModule:testAddNewGameMaster() (gas: 206830)
+Test_GameMasterEligibilityModule:testNewModuleSetup() (gas: 135543)
+Test_GameMasterEligibilityModule:testRemoveGameMaster() (gas: 192954)

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
         run: forge build --sizes --skip test
 
       - name: Check gas snapshots
-        run: forge snapshot --check
+        run: forge snapshot --nmt "testFuzz_\w{1,}?" --check
 
       - name: Run tests
         run: forge test

Makefile

@@ -8,7 +8,7 @@ all: clean remove install update build
 clean  :; forge clean
 
 # Remove modules
-remove :; rm -rf .gitmodules && rm -rf lib
+remove :; rm -rf lib
 
 install :; forge install --no-commit foundry-rs/forge-std openzeppelin/openzeppelin-contracts https://github.com/Hats-Protocol/hats-protocol.git https://github.com/Hats-Protocol/hats-module https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable.git https://github.com/dmfxyz/murky.git
 

src/adaptors/HatsAdaptor.sol

@@ -421,7 +421,7 @@ contract HatsAdaptor is Initializable, OwnableUpgradeable, UUPSUpgradeable, ERC1
             customAdminModule == address(0) ? implementations.addressHatsEligibilityModule() : customAdminModule;
 
         return HatsModuleFactory(implementations.hatsModuleFactory()).createHatsModule(
-            customAdminModule, adminId, encodedHatsAddress, encodedAdmins
+            customAdminModule, adminId, encodedHatsAddress, encodedAdmins, uint256(bytes32("admin"))
         );
     }
 
@@ -480,7 +480,7 @@ contract HatsAdaptor is Initializable, OwnableUpgradeable, UUPSUpgradeable, ERC1
         customDmModule = customDmModule == address(0) ? implementations.addressHatsEligibilityModule() : customDmModule;
 
         return HatsModuleFactory(implementations.hatsModuleFactory()).createHatsModule(
-            customDmModule, gameMasterId, encodedHatsAddress, gameMasters
+            customDmModule, gameMasterId, encodedHatsAddress, gameMasters, uint256(bytes32("gameMaster"))
         );
     }
 
@@ -557,7 +557,7 @@ contract HatsAdaptor is Initializable, OwnableUpgradeable, UUPSUpgradeable, ERC1
         customCharacterModule =
             customCharacterModule == address(0) ? implementations.erc6551HatsEligibilityModule() : customCharacterModule;
         address characterHatsModule = HatsModuleFactory(implementations.hatsModuleFactory()).createHatsModule(
-            customCharacterModule, characterHatId, characterModuleData, ""
+            customCharacterModule, characterHatId, characterModuleData, "", uint256(bytes32("character"))
         );
         return characterHatsModule;
     }
@@ -577,7 +577,7 @@ contract HatsAdaptor is Initializable, OwnableUpgradeable, UUPSUpgradeable, ERC1
         customPlayerModule =
             customPlayerModule == address(0) ? implementations.erc721HatsEligibilityModule() : customPlayerModule;
         address playerHatsModule = HatsModuleFactory(implementations.hatsModuleFactory()).createHatsModule(
-            customPlayerModule, playerHatId, playerModuleData, ""
+            customPlayerModule, playerHatId, playerModuleData, "", uint256(bytes32("player"))
         );
         return playerHatsModule;
     }

test/HatsEligibilityModules.t.sol

@@ -221,7 +221,7 @@ contract Test_ElderEligibilityModule is Base {
         bytes memory initData = abi.encode(tokenIds, balances);
 
         elderModAddress = hatsContracts.hatsModuleFactory.createHatsModule(
-            elderModuleImplementation, elderModId, immutableArgs, initData
+            elderModuleImplementation, elderModId, immutableArgs, initData, uint256(0)
         );
     }