~~ aa

.gas-snapshot

@@ -12,14 +12,14 @@ KaliTest:testExtensionBurn() (gas: 125045)
 KaliTest:testExtensionDeleteProposal() (gas: 311172)
 KaliTest:testExtensionMint() (gas: 128533)
 KaliTest:testExtensionRelay() (gas: 102506)
-KaliTest:testExtensionSetExtension(address,bool) (runs: 256, μ: 51080, ~: 45491)
-KaliTest:testExtensionSetTransferability(bool) (runs: 256, μ: 89034, ~: 83360)
-KaliTest:testExtensionSetURI(string) (runs: 256, μ: 91130, ~: 97656)
+KaliTest:testExtensionSetExtension(address,bool) (runs: 256, μ: 51002, ~: 45491)
+KaliTest:testExtensionSetTransferability(bool) (runs: 256, μ: 89112, ~: 83360)
+KaliTest:testExtensionSetURI(string) (runs: 256, μ: 91401, ~: 97656)
 KaliTest:testExtensionUpdateGovSettings() (gas: 78959)
 KaliTest:testExtensionUpdateGovSettingsInvalid() (gas: 126344)
 KaliTest:testFailDeploy() (gas: 8937393460516749706)
 KaliTest:testFailNotAuthorizedExtension() (gas: 18102)
-KaliTest:testFailProposalCreation() (gas: 132488)
+KaliTest:testFailProposalCreation() (gas: 133307)
 KaliTest:testFailProposalRepeatVoting() (gas: 310819)
 KaliTest:testGracePeriod() (gas: 10365)
 KaliTest:testGracePeriodProposal() (gas: 266211)
@@ -56,16 +56,16 @@ KeepTest:testBurnSigner() (gas: 28745)
 KeepTest:testCannotBatchTransferKeepERC1155ToUnsafeContractAddress() (gas: 390794)
 KeepTest:testCannotBatchTransferKeepERC1155ToZeroAddress() (gas: 247550)
 KeepTest:testCannotBurnUnderflow() (gas: 116287)
-KeepTest:testCannotExecuteWithImproperSignatures() (gas: 44742)
+KeepTest:testCannotExecuteWithImproperSignatures() (gas: 44658)
 KeepTest:testCannotExecuteWithNullSignatures() (gas: 32330)
-KeepTest:testCannotExecuteWithSignaturesOutOfOrder() (gas: 42061)
-KeepTest:testCannotExecuteWithSignaturesRepeated() (gas: 37849)
-KeepTest:testCannotFetchMismatchedLengthBalanceOfBatch() (gas: 13287)
+KeepTest:testCannotExecuteWithSignaturesOutOfOrder() (gas: 42001)
+KeepTest:testCannotExecuteWithSignaturesRepeated() (gas: 37789)
+KeepTest:testCannotFetchMismatchedLengthBalanceOfBatch() (gas: 14769)
 KeepTest:testCannotMintOverflowExecuteID() (gas: 65940)
 KeepTest:testCannotMintOverflowSupply() (gas: 261379)
 KeepTest:testCannotMintToUnsafeAddress() (gas: 313707)
 KeepTest:testCannotMintToZeroAddress() (gas: 119138)
-KeepTest:testCannotRepeatKeepSetup() (gas: 4267374)
+KeepTest:testCannotRepeatKeepSetup() (gas: 4220655)
 KeepTest:testCannotSetTransferability(address,uint256) (runs: 256, μ: 24778, ~: 24778)
 KeepTest:testCannotSetupWithExcessiveQuorum() (gas: 83492)
 KeepTest:testCannotSetupWithOutOfOrderSigners() (gas: 102766)
@@ -75,29 +75,29 @@ KeepTest:testCannotSpendKeepTokenPermitAfterDeadline(address,bool) (runs: 256, 
 KeepTest:testCannotTransferKeepERC1155ToUnsafeContractAddress() (gas: 380892)
 KeepTest:testCannotTransferKeepERC1155ToZeroAddress() (gas: 241982)
 KeepTest:testCannotTransferKeepTokenWithUnderflow(uint256) (runs: 256, μ: 154659, ~: 154659)
-KeepTest:testCannotTransferKeepTokenWithoutPermission(address,address,uint256,uint256) (runs: 256, μ: 180066, ~: 183984)
-KeepTest:testExecuteCreateCall() (gas: 1500184)
-KeepTest:testExecuteDelegateCall() (gas: 46886)
-KeepTest:testExecuteEthCall() (gas: 72686)
-KeepTest:testExecuteTokenCallWithContractSignatures() (gas: 68306)
-KeepTest:testExecuteTokenCallWithRole() (gas: 144861)
-KeepTest:testExecuteTokenCallWithSignatures() (gas: 56968)
+KeepTest:testCannotTransferKeepTokenWithoutPermission(address,address,uint256,uint256) (runs: 256, μ: 180382, ~: 183984)
+KeepTest:testExecuteCreateCall() (gas: 1500110)
+KeepTest:testExecuteDelegateCall() (gas: 46781)
+KeepTest:testExecuteEthCall() (gas: 72575)
+KeepTest:testExecuteTokenCallWithContractSignatures() (gas: 68201)
+KeepTest:testExecuteTokenCallWithRole() (gas: 140280)
+KeepTest:testExecuteTokenCallWithSignatures() (gas: 56863)
 KeepTest:testIdKeyRole() (gas: 230237)
 KeepTest:testKeepNonce() (gas: 10396)
 KeepTest:testKeepTokenApprove(address,address) (runs: 256, μ: 29557, ~: 29528)
 KeepTest:testKeepTokenBatchTransferByOperator() (gas: 444672)
 KeepTest:testKeepTokenBatchTransferByOwner() (gas: 419371)
-KeepTest:testKeepTokenDelegateBySig(address,uint256,uint256) (runs: 256, μ: 222646, ~: 229001)
-KeepTest:testKeepTokenDelegation(address,address,uint256,uint256) (runs: 256, μ: 255462, ~: 261812)
-KeepTest:testKeepTokenDelegationBalanceByTransfer(address,address,uint256,uint256) (runs: 256, μ: 269111, ~: 276114)
-KeepTest:testKeepTokenInitDelegationBalance(address,uint256,uint256) (runs: 256, μ: 125127, ~: 129100)
-KeepTest:testKeepTokenPermit(address,bool) (runs: 256, μ: 53358, ~: 47839)
-KeepTest:testMint(uint256,uint256,bytes) (runs: 256, μ: 122048, ~: 125302)
-KeepTest:testMintCoreIdKey(uint256) (runs: 256, μ: 120814, ~: 126113)
+KeepTest:testKeepTokenDelegateBySig(address,uint256,uint256) (runs: 256, μ: 222603, ~: 228971)
+KeepTest:testKeepTokenDelegation(address,address,uint256,uint256) (runs: 256, μ: 255469, ~: 261812)
+KeepTest:testKeepTokenDelegationBalanceByTransfer(address,address,uint256,uint256) (runs: 256, μ: 269142, ~: 276114)
+KeepTest:testKeepTokenInitDelegationBalance(address,uint256,uint256) (runs: 256, μ: 124776, ~: 129100)
+KeepTest:testKeepTokenPermit(address,bool) (runs: 256, μ: 53483, ~: 47809)
+KeepTest:testMint(uint256,uint256,bytes) (runs: 256, μ: 121707, ~: 125302)
+KeepTest:testMintCoreIdKey(uint256) (runs: 256, μ: 121149, ~: 126113)
 KeepTest:testMintExecuteIdKey() (gas: 56215)
 KeepTest:testName() (gas: 9857)
 KeepTest:testNoKeepKeyCollision() (gas: 230)
-KeepTest:testNonceIncrementAfterExecute() (gas: 88647)
+KeepTest:testNonceIncrementAfterExecute() (gas: 88482)
 KeepTest:testQuorum() (gas: 23966)
 KeepTest:testReceiveBatchERC1155() (gas: 44337)
 KeepTest:testReceiveERC1155() (gas: 40945)
@@ -115,20 +115,20 @@ MulticallableTest:testMulticallablePreservesMsgSender() (gas: 11022)
 MulticallableTest:testMulticallablePreservesMsgValue() (gas: 37542)
 MulticallableTest:testMulticallablePreservesMsgValueUsedTwice() (gas: 39315)
 MulticallableTest:testMulticallableReturnDataIsProperlyEncoded() (gas: 11617)
-MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(string,string,uint256) (runs: 256, μ: 9732, ~: 7390)
+MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(string,string,uint256) (runs: 256, μ: 9673, ~: 7390)
 MulticallableTest:testMulticallableReturnDataIsProperlyEncoded(uint256,uint256,uint256,uint256) (runs: 256, μ: 11718, ~: 11718)
-MulticallableTest:testMulticallableRevertWithCustomError() (gas: 10247)
-MulticallableTest:testMulticallableRevertWithMessage() (gas: 11992)
-MulticallableTest:testMulticallableRevertWithMessage(string) (runs: 256, μ: 12638, ~: 12672)
-MulticallableTest:testMulticallableRevertWithNothing() (gas: 10168)
+MulticallableTest:testMulticallableRevertWithCustomError() (gas: 11725)
+MulticallableTest:testMulticallableRevertWithMessage() (gas: 13474)
+MulticallableTest:testMulticallableRevertWithMessage(string) (runs: 256, μ: 14121, ~: 14156)
+MulticallableTest:testMulticallableRevertWithNothing() (gas: 11646)
 MulticallableTest:testMulticallableWithNoData() (gas: 6266)
 OwnedTest:testCallFunctionAsNonOwner() (gas: 11280)
 OwnedTest:testCallFunctionAsNonOwner(address) (runs: 256, μ: 16217, ~: 16236)
 OwnedTest:testCallFunctionAsOwner() (gas: 10432)
 OwnedTest:testERC165Support() (gas: 5479)
 OwnedTest:testTransferOwnership() (gas: 13097)
 OwnedTest:testTransferOwnership(address) (runs: 256, μ: 13170, ~: 13189)
-ReentrancyGuardTest:invariantReentrancyStatusAlways1() (runs: 256, calls: 3840, reverts: 290)
+ReentrancyGuardTest:invariantReentrancyStatusAlways1() (runs: 256, calls: 3840, reverts: 268)
 ReentrancyGuardTest:testFailUnprotectedCall() (gas: 43432)
 ReentrancyGuardTest:testNoReentrancy() (gas: 5354)
 ReentrancyGuardTest:testProtectedCall() (gas: 30985)

.vscode/settings.json

@@ -5,5 +5,5 @@
   "[solidity]": {
     "editor.defaultFormatter": "JuanBlanco.solidity"
   },
-  "solidity.compileUsingRemoteVersion": "v0.8.18"
+  "solidity.compileUsingRemoteVersion": "v0.8.19"
 }

foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc = "0.8.18"
+solc = "0.8.19"
 optimizer_runs = 9_999_999
 
 # Configure remappings

package.json

@@ -12,8 +12,8 @@
   "private": false,
   "scripts": {
     "format": "prettier --write src/**.sol src/utils/**.sol src/utils/interfaces/**.sol src/extensions/dao/**.sol src/extensions/dao/utils/**.sol src/extensions/metadata/**.sol src/extensions/mint/**.sol src/extensions/storage/**.sol src/extensions/utils/**.sol test/**.sol test/utils/mocks/**.sol flat/**.sol --plugin-search-dir=.",
-    "format:list": "prettier --list-different 'src/**/*.sol' --plugin-search-dir=.",
-    "format:check": "prettier --check 'src/**/*.sol' --plugin-search-dir=.",
+    "format:list": "prettier --list-different 'src/**/*.sol'",
+    "format:check": "prettier --check 'src/**/*.sol'",
     "solhint": "solhint --config ./.solhint.json 'src/**/*.sol' --fix --ignore-path .solhintignore",
     "solhint:check": "solhint --config ./.solhint.json 'src/**/*.sol'",
     "clean": "forge clean",
@@ -23,8 +23,8 @@
     "snapshot": "forge clean && forge snapshot --optimize --optimizer-runs 9999999"
   },
   "devDependencies": {
-    "prettier": "^2.8.8",
+    "prettier": "^3.0.1",
     "prettier-plugin-solidity": "1.1.3",
-    "solhint": "^3.4.1"
+    "solhint": "^3.6.1"
   }
 }

src/Conditions.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.4;
+
+contract Conditional {
+    // holds core key so authorized to call any function on keep
+    // would it be recursive if we call 'relay' on keep with this contract as the recipient and this contract calls 'relay' on keep with the calldata in it
+    // {
+    //     conditions: [
+    //         {
+    //             type: "price",
+    //             amount: 1000 // in usd
+    //             address: '0xfucku'
+    //         }
+    //     ],
+    //     actions: [
+    //         {
+    //                op
+    //                to
+    //                value
+    //                data
+    //
+    //         }
+    //     ]
+    // }
+}