@inco/lightning 0.6.1 → 0.6.4

package/src/Lib.testnet.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_alphanet_v0_297966649.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_alphanet_v1_725458969.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_demonet_v0_863421733.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_devnet_v0_340846814.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_devnet_v1_904635675.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/libs/incoLightning_testnet_v0_183408998.sol

@@ -388,17 +388,38 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted uint256 assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEuint256(bytes memory ciphertext) internal returns (euint256) {
+        return newEuint256(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted uint256 for the given user.
+    ///  @dev costs the inco fee
     function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted bool assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEbool(bytes memory ciphertext) internal returns (ebool) {
+        return newEbool(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted bool for the given user.
+    ///  @dev costs the inco fee
     function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
-    /// @dev costs the inco fee
+    /// @notice Creates a new encrypted address assuming msg.sender is the user
+    ///  @dev costs the inco fee
+    function newEaddress(bytes memory ciphertext) internal returns (eaddress) {
+        return newEaddress(ciphertext, msg.sender);
+    }
+
+    /// @notice Creates a new encrypted address for the given user.
+    ///  @dev costs the inco fee
     function newEaddress(bytes memory ciphertext, address user) internal returns (eaddress) {
         return inco.newEaddress{value: inco.getFee()}(ciphertext, user);
     }

package/src/lightning-parts/AccessControl/test/TestAdvancedAccessControl.t.sol

@@ -74,7 +74,7 @@ contract TestAdvancedAccessControl is IncoTest {
         super.setUp();
         someContract = new SomeContractWithConfidentialData();
         vm.deal(address(someContract), 100 ether);
-        bytes memory secretCt = fakePrepareEuint256Ciphertext(42);
+        bytes memory secretCt = fakePrepareEuint256Ciphertext(42, alice, address(someContract));
         vm.prank(alice);
         someContract.saveAPersonalSecret(secretCt);
         secretHandle = euint256.unwrap(someContract.secret());

package/src/lightning-parts/EncryptedInput.sol

@@ -8,6 +8,18 @@ import {IEncryptedInput} from "./interfaces/IEncryptedInput.sol";
 import {HandleAlreadyExists} from "../Errors.sol";
 import {Fee} from "./Fee.sol";
 
+// This error ordinarily indicates an unintentional mismatch between the client-side context and the ambient on-chain
+// context
+error ExternalHandleDoesNotMatchComputedHandle(
+    bytes32 externalHandle,
+    bytes32 computedHandle,
+    // These values are provided to help the caller debug a mismatch, they are the inputs to the context of computedHandle
+    uint256 chainId,
+    address aclAddress,
+    address userAddress,
+    address contractAddress
+);
+
 abstract contract EncryptedInput is
     IEncryptedInput,
     BaseAccessControlList,
@@ -18,33 +30,32 @@ abstract contract EncryptedInput is
         bytes32 indexed result,
         address indexed contractAddress,
         address indexed user,
-        ETypes inputType,
         bytes ciphertext,
         uint256 eventId
     );
 
     function newEuint256(
-        bytes memory ciphertext,
+        bytes memory input,
         address user
     ) external payable returns (euint256 newValue) {
-        return euint256.wrap(newInput(ciphertext, user, ETypes.Uint256));
+        return euint256.wrap(newInput(input, user, ETypes.Uint256));
     }
 
     function newEbool(
-        bytes memory ciphertext,
+        bytes memory input,
         address user
     ) external payable returns (ebool newValue) {
-        return ebool.wrap(newInput(ciphertext, user, ETypes.Bool));
+        return ebool.wrap(newInput(input, user, ETypes.Bool));
     }
 
     function newEaddress(
-        bytes memory ciphertext,
+        bytes memory input,
         address user
     ) external payable returns (eaddress newValue) {
         return
             eaddress.wrap(
-                newInput(ciphertext, user, ETypes.AddressOrUint160OrBytes20)
-            );
+            newInput(input, user, ETypes.AddressOrUint160OrBytes20)
+        );
     }
 
     function newInput(
@@ -63,20 +74,45 @@ abstract contract EncryptedInput is
         newHandle = _newInput(ciphertext, user, inputType);
     }
 
+    /// @notice Creates a new input with a prepended handle as a checksum.
+    /// @param input The input that contains the handle prepended to the ciphertext.
+    /// @param user The user address associated with the input.
     function _newInput(
-        bytes memory ciphertext,
+        bytes memory input,
         address user,
         ETypes inputType
-    ) private returns (bytes32 newHandle) {
-        newHandle = getInputHandle(ciphertext, user, msg.sender, inputType);
+    ) private returns (bytes32 handle) {
+        // Since there is no sensible way to handle abi.decode errors (https://github.com/argotorg/solidity/issues/10381)
+        // at least fail early on a conservative minimum length
+        require(input.length >= 64, "Input too short, should be at least 64 bytes");
+        // Remove external handle prepended to input as a checksum
+        (bytes32 externalHandle, bytes memory ciphertext) = abi.decode(input, (bytes32, bytes));
+        handle = getInputHandle(ciphertext, user, msg.sender, inputType);
+        require(
+            handle == externalHandle,
+            ExternalHandleDoesNotMatchComputedHandle({
+                externalHandle: externalHandle,
+                computedHandle: handle,
+                chainId: block.chainid,
+                aclAddress: address(this),
+                userAddress: user,
+                contractAddress: msg.sender
+            })
+        );
         // We assume that providing the same handle (which via HADU implies same plaintext, same context, and same
         // instance of encryption)
-        require(!isAllowed(newHandle, user), HandleAlreadyExists());
+        require(!isAllowed(handle, user), HandleAlreadyExists(handle));
         // We allow to user since this is harmless and it is convenient to use the allow mapping to track existing
-        allowInternal(newHandle, user);
-        allowTransientInternal(newHandle, msg.sender);
+        allowInternal(handle, user);
+        allowTransientInternal(handle, msg.sender);
         uint256 id = getNextEventId();
-        emit NewInput(newHandle, msg.sender, user, inputType, ciphertext, id);
-        setDigest(abi.encodePacked(newHandle, id));
+        emit NewInput({
+            result: handle,
+            contractAddress: msg.sender,
+            user: user,
+            ciphertext: ciphertext,
+            eventId: id
+        });
+        setDigest(abi.encodePacked(handle, id));
     }
 }