Merge beta into main

.gas-snapshot

@@ -0,0 +1,56 @@
+BatchCreateHats:testBatchCreateHatsErrorArrayLength(uint256,uint256,uint256) (runs: 256, μ: 12559014, ~: 9695798)
+BatchCreateHats:testBatchCreateHatsSameAdmin(uint256) (runs: 256, μ: 4560900, ~: 593589)
+BatchCreateHats:testBatchCreateHatsSkinnyFullBranch() (gas: 8881460)
+BatchCreateHats:testBatchCreateOneHat() (gas: 412963)
+BatchCreateHats:testBatchCreateTwoHats() (gas: 593518)
+BatchCreateHats:testTemp() (gas: 14430)
+CreateHatsTest:testHatCreated() (gas: 249889)
+CreateHatsTest:testHatsBranchCreated() (gas: 593366)
+CreateTopHatTest:testTopHatCreated() (gas: 164948)
+CreateTopHatTest:testTopHatMinted() (gas: 183773)
+CreateTopHatTest:testTransferTopHat() (gas: 180085)
+DeployTest:testDeployWithParams() (gas: 12334)
+EligibilityGetHatsTests:testCannotGetHatWearerStandingNoFunctionInEligibilityContract() (gas: 26389)
+EligibilityGetHatsTests:testCheckEligibilityAndDoNotRevokeHatFromEligibleWearer() (gas: 60919)
+EligibilityGetHatsTests:testCheckEligibilityToRevokeHatFromEligibleWearerInBadStanding() (gas: 72627)
+EligibilityGetHatsTests:testCheckEligibilityToRevokeHatFromIneligibleWearerInBadStanding() (gas: 72597)
+EligibilityGetHatsTests:testCheckEligibilityToRevokeHatFromIneligibleWearerInGoodStanding() (gas: 52331)
+EligibilitySetHatsTests:testCannotRevokeHatAsNonWearer() (gas: 25735)
+EligibilitySetHatsTests:testDoNotRevokeHatFromEligibleWearerInGoodStanding() (gas: 54141)
+EligibilitySetHatsTests:testRemintAfterRevokeHatFromWearerInGoodStanding() (gas: 88039)
+EligibilitySetHatsTests:testRevokeHatFromEligibleWearerInBadStanding() (gas: 67745)
+EligibilitySetHatsTests:testRevokeHatFromIneligibleWearerInBadStanding() (gas: 67711)
+EligibilitySetHatsTests:testRevokeHatFromIneligibleWearerInGoodStanding() (gas: 50103)
+ImageURITest:testEmptyHatBranchImageURI() (gas: 895843)
+ImageURITest:testEmptyHatImageURI() (gas: 163187)
+ImageURITest:testEmptyTopHatImageURI() (gas: 115566)
+ImageURITest:testHatImageURI() (gas: 21901)
+ImageURITest:testTopHatImageURI() (gas: 21751)
+MintHatsTest:testBatchMintHats(uint256) (runs: 256, μ: 2240070, ~: 382866)
+MintHatsTest:testBatchMintHatsErrorArrayLength(uint256,uint256) (runs: 256, μ: 10579308, ~: 12202061)
+MintHatsTest:testCannotMint2HatsToSameWearer() (gas: 163631)
+MintHatsTest:testCannotMintMoreThanMaxSupplyErrorAllHatsWorn() (gas: 210742)
+MintHatsTest:testCannotMintNonExistentHat() (gas: 23240)
+MintHatsTest:testMintAnotherHat() (gas: 185940)
+MintHatsTest:testMintHat() (gas: 125481)
+MintHatsTest:testMintHatErrorNotAdmin() (gas: 69875)
+MintHatsTest:testMintInactiveHat() (gas: 110370)
+OverridesHatTests:testCreateUri() (gas: 156002)
+OverridesHatTests:testCreateUriForTopHat() (gas: 153936)
+OverridesHatTests:testFailSafeTransferFrom() (gas: 12615)
+OverridesHatTests:testFailSetApprovalForAll() (gas: 7773)
+RenounceHatsTest:testCannotRenounceHatAsNonWearer() (gas: 34523)
+RenounceHatsTest:testRenounceHat() (gas: 44068)
+ToggleGetHatsTest:testCannotCheckHatStatusNoFunctionInToggleContract() (gas: 24012)
+ToggleGetHatsTest:testCheckToggleToActivateDeactivatedHat() (gas: 50151)
+ToggleGetHatsTest:testCheckToggleToDeactivateHat() (gas: 41533)
+ToggleSetHatsTest:testActivateDeactivatedHat() (gas: 46029)
+ToggleSetHatsTest:testCannotActivateDeactivatedHatAsNonWearer() (gas: 25986)
+ToggleSetHatsTest:testCannotDeactivateHatAsNonWearer() (gas: 15614)
+ToggleSetHatsTest:testDeactivateHat() (gas: 55730)
+TransferHatTests:testCannotTransferHatFromNonAdmin() (gas: 37339)
+TransferHatTests:testTransferHat() (gas: 103063)
+ViewHatTests:testGetHatLevel() (gas: 11612)
+ViewHatTests:testIsAdminOfHat() (gas: 29647)
+ViewHatTests:testViewHat() (gas: 32363)
+ViewHatTests:testViewHatOfTopHat() (gas: 28580)

.github/workflows/Testing.yml → .github/workflows/ci.yml

@@ -1,14 +1,25 @@
-name: Testing
+name: ci
 
 on:
   push:
     branches:
       - main
+      - beta
   pull_request:
 
-
 jobs:
-  check:
+
+  lint:
+    name: "Markdown linting"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        name: Check out the code
+      - name: Lint Code Base
+        uses: docker://avtodev/markdown-lint:v1
+        with:
+          args: "**/*.md"
+  test:
     name: Foundry project
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -1,5 +1,7 @@
 cache/
 out/
 .vscode/
-broadcast/Hats.s.sol/31337
-.env
+broadcast/*/31337
+broadcast/*/*/dry-run
+.env
+uri.json

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
+[submodule "lib/solbase"]
+	path = lib/solbase
+	url = https://github.com/sol-dao/solbase