✨ 4337 style aggregation

package.json

@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "ds-test": "github:dapphub/ds-test#e282159d5170298eb2455a6c05280ab5a73a4ef0",
+    "@ERC4337/account-abstraction": "github:kopy-kat/account-abstraction#develop",
     "forge-std": "github:foundry-rs/forge-std#v1.7.6",
     "solmate": "github:transmissions11/solmate#c892309933b25c03d32b1b0d674df7ae292ba925",
     "solady": "github:vectorized/solady#9deb9ed36a27261a8745db5b7cd7f4cdc3b1cd4e",

remappings.txt

@@ -1,5 +1,6 @@
 @openzeppelin/=node_modules/@openzeppelin/
+@ERC4337/=node_modules/@ERC4337/
 solmate/=node_modules/solmate/src/
-solady/=node_modules/solady/src/
+solady/=node_modules/solady/
 forge-std/=node_modules/forge-std/src/
 ds-test/=node_modules/ds-test/src/

src/core/Aggregator.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity ^0.8.24;
+
+import { IAggregator } from "@ERC4337/account-abstraction/contracts/interfaces/IAggregator.sol";
+import { PackedUserOperation } from "@ERC4337/account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+import { ModuleType } from "../DataTypes.sol";
+
+
+interface ValidatorSelection {
+
+  function getValidator(PackedUserOperation calldata userOp) external view returns (address validator);
+
+}
+
+abstract contract Aggregator is IAggregator {
+    function validateSignatures(PackedUserOperation[] calldata userOps, bytes calldata signature) external view { 
+        uint256 length = userOps.length;
+
+        for (uint256 i; i < length; i++) {
+            PackedUserOperation calldata userOp = userOps[i];
+            address smartAccount = userOp.sender;
+            address validator = _getValidator(userOp);
+            _check(smartAccount, validator, ModuleType.wrap(1));
+        }
+
+    }
+    function validateUserOpSignature(PackedUserOperation calldata userOp) external view returns (bytes memory sigForUserOp) { }
+
+    function _getValidator(PackedUserOperation calldata userOp) internal pure returns (address validator) { 
+            uint256 nonce = userOp.nonce;
+            assembly {
+                validator := shr(96, nonce)
+            }
+            address validator = ValidatorSelection(smartAccount).getValidator(userOp);
+    }
+
+
+
+    function aggregateSignatures(PackedUserOperation[] calldata userOps) external view returns (bytes memory aggregatedSignature) {
+        uint256 length = userOps.length;
+
+        for (uint256 i; i < length; i++) {
+            PackedUserOperation calldata userOp = userOps[i];
+            address validator = _getValidator(userOp);
+            address smartAccount = userOp.sender;
+            _check(smartAccount, validator, ModuleType.wrap(1));
+
+        }
+    }
+
+    function _check(address smartAccount, address module, ModuleType moduleType) internal view virtual;
+}

src/core/Attestation.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.24;
 
 import { AttestationRecord, AttestationRequest, RevocationRequest, SchemaUID } from "../DataTypes.sol";
 import { AttestationManager } from "./AttestationManager.sol";
+import { Aggregator } from "./Aggregator.sol";
 import { IRegistry } from "../IRegistry.sol";
 
 /**

src/core/SignedAttestation.sol

@@ -4,8 +4,8 @@ pragma solidity ^0.8.24;
 import { Attestation } from "./Attestation.sol";
 import { AttestationRequest, RevocationRequest, SchemaUID } from "../DataTypes.sol";
 import { AttestationLib } from "../lib/AttestationLib.sol";
-import { EIP712 } from "solady/utils/EIP712.sol";
-import { SignatureCheckerLib } from "solady/utils/SignatureCheckerLib.sol";
+import { EIP712 } from "solady/src/utils/EIP712.sol";
+import { SignatureCheckerLib } from "solady/src/utils/SignatureCheckerLib.sol";
 import { IRegistry } from "../IRegistry.sol";
 
 /**

src/core/TrustManager.sol

@@ -7,7 +7,8 @@ import { ZERO_MODULE_TYPE, ZERO_ADDRESS } from "../Common.sol";
 import { IRegistry, IERC7484 } from "../IRegistry.sol";
 import { ModuleTypeLib } from "../lib/ModuleTypeLib.sol";
 import { TrustLib } from "../lib/TrustLib.sol";
-import { LibSort } from "solady/utils/LibSort.sol";
+import { Aggregator } from "./Aggregator.sol";
+import { LibSort } from "solady/src/utils/LibSort.sol";
 
 /**
  * Allows smart accounts to query the registry for the security status of modules.
@@ -18,7 +19,7 @@ import { LibSort } from "solady/utils/LibSort.sol";
  * @dev This contract is abstract and provides utility functions to query attestations.
  * @author rhinestone | zeroknots.eth, Konrad Kopp (@kopy-kat)
  */
-abstract contract TrustManager is IRegistry {
+abstract contract TrustManager is IRegistry, Aggregator {
     using ModuleTypeLib for PackedModuleTypes;
     using TrustLib for AttestationRecord;
     using LibSort for address[];
@@ -97,7 +98,7 @@ abstract contract TrustManager is IRegistry {
      * @param module address of the module to check
      * @param moduleType (optional param), setting  moduleType = 0, will ignore moduleTypes in attestations
      */
-    function _check(address smartAccount, address module, ModuleType moduleType) internal view {
+    function _check(address smartAccount, address module, ModuleType moduleType) internal view override {
         TrustedAttesterRecord storage $trustedAttesters = $accountToAttester[smartAccount];
         // SLOAD from one slot
         uint256 attesterCount = $trustedAttesters.attesterCount;

src/lib/AttestationLib.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.24;
 
 import { AttestationRequest, RevocationRequest, AttestationDataRef } from "../DataTypes.sol";
-import { SSTORE2 } from "solady/utils/SSTORE2.sol";
+import { SSTORE2 } from "solady/src/utils/SSTORE2.sol";
 
 library AttestationLib {
     // The hash of the data type used to relay calls to the attest function. It's the value of

test/Aggregator.t.sol

@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+pragma solidity ^0.8.24;
+
+import "./TrustDelegation.t.sol";
+import { PackedUserOperation } from "@ERC4337/account-abstraction/contracts/interfaces/PackedUserOperation.sol";
+
+contract AggregatorTest is TrustTest {
+    function setUp() public override {
+        super.setUp();
+
+        address[] memory attesters = new address[](1);
+        attesters[0] = address(attester1.addr);
+        _make_WhenUsingValidECDSA(attester1);
+        test_WhenSupplyingManyAttesters(1, attesters);
+    }
+
+    function test_aggregate() public {
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
+        userOps[0] = PackedUserOperation({
+            sender: smartAccount1.addr,
+            nonce: getNonce(1, address(module1)),
+            initCode: "",
+            callData: "",
+            accountGasLimits: bytes32(abi.encodePacked(uint128(2e6), uint128(2e6))),
+            preVerificationGas: 2e6,
+            gasFees: bytes32(abi.encodePacked(uint128(2e6), uint128(2e6))),
+            paymasterAndData: bytes(""),
+            signature: abi.encodePacked(hex"41414141")
+        });
+
+        // userOps[1] = PackedUserOperation({
+        //     sender: smartAccount2.addr,
+        //     nonce: getNonce(1, address(module1)),
+        //     initCode: "",
+        //     callData: "",
+        //     accountGasLimits: bytes32(abi.encodePacked(uint128(2e6), uint128(2e6))),
+        //     preVerificationGas: 2e6,
+        //     gasFees: bytes32(abi.encodePacked(uint128(2e6), uint128(2e6))),
+        //     paymasterAndData: bytes(""),
+        //     signature: abi.encodePacked(hex"41414141")
+        // });
+        bytes memory sig = registry.aggregateSignatures(userOps);
+
+        registry.validateSignatures(userOps, sig);
+    }
+
+    function getNonce(uint256 _nonce, address validator) internal view returns (uint256 nonce) {
+        uint192 key = uint192(bytes24(bytes20(address(validator))));
+        nonce = _nonce | uint256(key) << 64;
+    }
+
+    function signatureInNonce(
+        address account,
+        uint256 nonce,
+        PackedUserOperation memory userOp,
+        address validator,
+        bytes memory signature
+    )
+        internal
+        view
+        returns (PackedUserOperation memory)
+    {
+        userOp.nonce = getNonce(nonce, validator);
+        userOp.signature = signature;
+
+        return userOp;
+    }
+}

test/TrustDelegation.t.sol

@@ -8,7 +8,7 @@ import { LibSort } from "solady/utils/LibSort.sol";
 contract TrustTest is AttestationTest {
     using LibSort for address[];
 
-    function setUp() public override {
+    function setUp() public virtual override {
         super.setUp();
         // test_WhenAttestingWithNoAttestationData(address(module1));
     }
@@ -17,7 +17,7 @@ contract TrustTest is AttestationTest {
         _;
     }
 
-    function test_WhenSupplyingOneAttester() external whenSettingAttester prankWithAccount(smartAccount1) {
+    function test_WhenSupplyingOneAttester() public whenSettingAttester prankWithAccount(smartAccount1) {
         // It should set.
         address[] memory trustedAttesters = new address[](1);
         trustedAttesters[0] = address(attester1.addr);
@@ -31,7 +31,7 @@ contract TrustTest is AttestationTest {
         uint8 threshold,
         address[] memory attesters
     )
-        external
+        public
         whenSettingAttester
         prankWithAccount(smartAccount1)
     {