feat: remove intent struct (#365)

* feat: simplify multichain nonce design

* chore: readd merkle verification prefix

* chore: undo blank line addns

* chore: lint

* .

* ~50 failing tests down to 5

* down to 1 failing test

* fixed failing test

* chore: remove console logs and bench

* .

* Update test/Base.t.sol

* Update src/Orchestrator.sol

* Update test/utils/mocks/MockPayerWithSignatureOptimized.sol

* chore: final cleanup, rebench

* Update src/Orchestrator.sol

* chore: bump contract versions due to bytecode changes - Contracts updated: IthacaAccount,Orchestrator,SimpleFunder,Simulator

* chore: cleanup

* rebase

* fix

---------

Co-authored-by: GitHub Action <[email protected]>

Author: 2 people

src/Escrow.sol

@@ -235,8 +235,9 @@ contract Escrow is IEscrow {
         statuses[escrowId] = EscrowStatus.FINALIZED;
 
         // Check with the settler if the message has been sent from the correct sender and chainId.
-        bool isSettled = ISettler(_escrow.settler)
-            .read(_escrow.settlementId, _escrow.sender, _escrow.senderChainId);
+        bool isSettled = ISettler(_escrow.settler).read(
+            _escrow.settlementId, _escrow.sender, _escrow.senderChainId
+        );
 
         if (!isSettled) {
             revert SettlementInvalid();

src/GuardedExecutor.sol

@@ -384,8 +384,9 @@ abstract contract GuardedExecutor is ERC7821 {
         if (_isSelfExecute(target, fnSel)) revert CannotSelfExecute();
 
         // Impose a max capacity of 2048 for set enumeration, which should be more than enough.
-        _getGuardedExecutorKeyStorage(keyHash).canExecute
-            .update(_packCanExecute(target, fnSel), can, 2048);
+        _getGuardedExecutorKeyStorage(keyHash).canExecute.update(
+            _packCanExecute(target, fnSel), can, 2048
+        );
         emit CanExecuteSet(keyHash, target, fnSel, can);
     }
 
@@ -408,7 +409,7 @@ abstract contract GuardedExecutor is ERC7821 {
         // check it in `canExecute` before any custom call checker.
 
         EnumerableMapLib.AddressToAddressMap storage checkers =
-        _getGuardedExecutorKeyStorage(keyHash).callCheckers;
+            _getGuardedExecutorKeyStorage(keyHash).callCheckers;
 
         // Impose a max capacity of 2048 for map enumeration, which should be more than enough.
         checkers.update(target, checker, checker != address(0), 2048);
@@ -517,7 +518,12 @@ abstract contract GuardedExecutor is ERC7821 {
     /// @dev Returns an array of packed (`target`, `fnSel`) that `keyHash` is authorized to execute on.
     /// - `target` is in the upper 20 bytes.
     /// - `fnSel` is in the lower 4 bytes.
-    function canExecutePackedInfos(bytes32 keyHash) public view virtual returns (bytes32[] memory) {
+    function canExecutePackedInfos(bytes32 keyHash)
+        public
+        view
+        virtual
+        returns (bytes32[] memory)
+    {
         return _getGuardedExecutorKeyStorage(keyHash).canExecute.values();
     }
 
@@ -561,7 +567,7 @@ abstract contract GuardedExecutor is ERC7821 {
         returns (CallCheckerInfo[] memory results)
     {
         EnumerableMapLib.AddressToAddressMap storage checkers =
-        _getGuardedExecutorKeyStorage(keyHash).callCheckers;
+            _getGuardedExecutorKeyStorage(keyHash).callCheckers;
         results = new CallCheckerInfo[](checkers.length());
         for (uint256 i; i < results.length; ++i) {
             (results[i].target, results[i].checker) = checkers.at(i);

src/IthacaAccount.sol

@@ -274,8 +274,8 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
 
         (bool isValid, bytes32 keyHash) = unwrapAndValidateSignature(digest, signature);
         if (LibBit.and(keyHash != 0, isValid)) {
-            isValid = _isSuperAdmin(keyHash)
-                || _getKeyExtraStorage(keyHash).checkers.contains(msg.sender);
+            isValid =
+                _isSuperAdmin(keyHash) || _getKeyExtraStorage(keyHash).checkers.contains(msg.sender);
         }
         // `bytes4(keccak256("isValidSignature(bytes32,bytes)")) = 0x1626ba7e`.
         // We use `0xffffffff` for invalid, in convention with the reference implementation.
@@ -399,7 +399,12 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
     }
 
     /// @dev Returns arrays of all (non-expired) authorized keys and their hashes.
-    function getKeys() public view virtual returns (Key[] memory keys, bytes32[] memory keyHashes) {
+    function getKeys()
+        public
+        view
+        virtual
+        returns (Key[] memory keys, bytes32[] memory keyHashes)
+    {
         uint256 totalCount = keyCount();
 
         keys = new Key[](totalCount);
@@ -573,8 +578,9 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
         // `keccak256(abi.encode(key.keyType, keccak256(key.publicKey)))`.
         keyHash = hash(key);
         AccountStorage storage $ = _getAccountStorage();
-        $.keyStorage[keyHash]
-        .set(abi.encodePacked(key.publicKey, key.expiry, key.keyType, key.isSuperAdmin));
+        $.keyStorage[keyHash].set(
+            abi.encodePacked(key.publicKey, key.expiry, key.keyType, key.isSuperAdmin)
+        );
         $.keyHashes.add(keyHash);
     }
 
@@ -603,41 +609,28 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
         uint256 paymentAmount,
         bytes32 keyHash,
         bytes32 intentDigest,
-        bytes calldata encodedIntent
+        address eoa,
+        address payer,
+        address paymentToken,
+        address paymentRecipient,
+        bytes calldata paymentSignature
     ) public virtual {
-        Intent calldata intent;
-        // Equivalent Solidity Code: (In the assembly intent is stored in calldata, instead of memory)
-        // Intent memory intent = abi.decode(encodedIntent, (Intent));
-        // Gas Savings:
-        // ~2.5-3k gas for general cases, by avoiding duplicated bounds checks, and avoiding writing the intent to memory.
-        // Extracts the Intent from the calldata bytes, with minimal checks.
-        // NOTE: Only use this implementation if you are sure that the encodedIntent is coming from a trusted source.
-        // We can avoid standard bound checks here, because the Orchestrator already does these checks when it interacts with ALL the fields in the intent using solidity.
-        assembly ("memory-safe") {
-            let t := calldataload(encodedIntent.offset)
-            intent := add(t, encodedIntent.offset)
-            // Bounds check. We don't need to explicitly check the fields here.
-            // In the self call functions, we will use regular Solidity to access the
-            // dynamic fields like `signature`, which generate the implicit bounds checks.
-            if or(shr(64, t), lt(encodedIntent.length, 0x20)) { revert(0x00, 0x00) }
-        }
-
-        if (!LibBit.and(
-                msg.sender == ORCHESTRATOR,
-                LibBit.or(intent.eoa == address(this), intent.payer == address(this))
-            )) {
+        if (
+            !LibBit.and(
+                msg.sender == ORCHESTRATOR, LibBit.or(eoa == address(this), payer == address(this))
+            )
+        ) {
             revert Unauthorized();
         }
 
         // If this account is the paymaster, validate the paymaster signature.
-        if (intent.payer == address(this)) {
+        if (payer == address(this)) {
             if (_getAccountStorage().paymasterNonces[intentDigest]) {
                 revert PaymasterNonceError();
             }
             _getAccountStorage().paymasterNonces[intentDigest] = true;
 
-            (bool isValid, bytes32 k) =
-                unwrapAndValidateSignature(intentDigest, intent.paymentSignature);
+            (bool isValid, bytes32 k) = unwrapAndValidateSignature(intentDigest, paymentSignature);
 
             // Set the target key hash to the payer's.
             keyHash = k;
@@ -654,13 +647,13 @@ contract IthacaAccount is IIthacaAccount, EIP712, GuardedExecutor {
             }
         }
 
-        TokenTransferLib.safeTransfer(intent.paymentToken, intent.paymentRecipient, paymentAmount);
+        TokenTransferLib.safeTransfer(paymentToken, paymentRecipient, paymentAmount);
+
         // Increase spend.
         if (!(keyHash == bytes32(0) || _isSuperAdmin(keyHash))) {
             SpendStorage storage spends = _getGuardedExecutorKeyStorage(keyHash).spends;
-            _incrementSpent(spends.spends[intent.paymentToken], intent.paymentToken, paymentAmount);
+            _incrementSpent(spends.spends[paymentToken], paymentToken, paymentAmount);
         }
-
         // Done to avoid compiler warnings.
         intentDigest = intentDigest;
     }

src/LayerZeroSettler.sol

@@ -102,7 +102,13 @@ contract LayerZeroSettler is OApp, ISettler, EIP712 {
         }
     }
 
-    function _getPeerOrRevert(uint32 /* _eid */) internal view virtual override returns (bytes32) {
+    function _getPeerOrRevert(uint32 /* _eid */ )
+        internal
+        view
+        virtual
+        override
+        returns (bytes32)
+    {
         // The peer address for all chains is automatically set to `address(this)`
         return bytes32(uint256(uint160(address(this))));
     }
@@ -133,10 +139,7 @@ contract LayerZeroSettler is OApp, ISettler, EIP712 {
         bytes calldata _payload,
         address, /*_executor*/
         bytes calldata /*_extraData*/
-    )
-        internal
-        override
-    {
+    ) internal override {
         // Decode the settlement data
         (bytes32 settlementId, address sender, uint256 senderChainId) =
             abi.decode(_payload, (bytes32, address, uint256));