@inco/lightning 0.2.14 → 0.2.16

package/src/test/FakeIncoInfra/FakeIncoInfraBase.sol

@@ -44,6 +44,18 @@ contract FakeIncoInfraBase is TestUtils, KVStore {
         value = abi.decode(ciphertext, (uint256));
     }
 
+    function fakePrepareEuint160Ciphertext(
+        uint160 value
+    ) internal pure returns (bytes memory ciphertext) {
+        ciphertext = abi.encode(value);
+    }
+
+    function fakeDecryptEuint160Ciphertext(
+        bytes memory ciphertext
+    ) internal pure returns (uint160 value) {
+        value = abi.decode(ciphertext, (uint160));
+    }
+
     function fakePrepareEboolCiphertext(
         bool value
     ) internal pure returns (bytes memory ciphertext) {

package/src/test/FakeIncoInfra/KVStore.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8;
 
 import {HandleMetadata} from "../../lightning-parts/primitives/HandleMetadata.sol";
-import {ETypes, euint256, ebool} from "../../Types.sol";
+import {ETypes, euint256, ebool, eaddress} from "../../Types.sol";
 import {asBool} from "@inco/shared/src/TypeUtils.sol";
 
 /// @notice key-value store, knows the value behind each handle
@@ -29,6 +29,12 @@ contract KVStore is HandleMetadata {
         return asBool(get(handle));
     }
 
+    function getAddressValue(eaddress input) internal view returns (address) {
+        bytes32 handle = eaddress.unwrap(input);
+        checkType(handle, ETypes.AddressOrUint160OrBytes20);
+        return address(uint160(uint256(get(handle))));
+    }
+
     function checkType(bytes32 handle, ETypes requiredType) private pure {
         assert(typeOf(handle) == requiredType);
     }

package/src/test/FakeIncoInfra/MockOpHandler.sol

@@ -89,6 +89,8 @@ contract MockOpHandler is FakeIncoInfraBase, FakeComputeServer {
             set(result, bytes32(fakeDecryptEuint256Ciphertext(ciphertext)));
         } else if (inputType == ETypes.Bool) {
             set(result, asBytes32(fakeDecryptEboolCiphertext(ciphertext)));
+        } else if (inputType == ETypes.AddressOrUint160OrBytes20) {
+            set(result, bytes32(uint256(fakeDecryptEuint160Ciphertext(ciphertext))));
         } else {
             revert UnsupportedTypeInput(inputType);
         }
@@ -124,7 +126,7 @@ contract MockOpHandler is FakeIncoInfraBase, FakeComputeServer {
 
     function handleECast(bytes32 handle, uint8 toType, bytes32 result) private {
         ETypes _toType = ETypes(toType);
-        if (_toType == ETypes.Bool || _toType == ETypes.Uint256) {
+        if (_toType == ETypes.Bool || _toType == ETypes.Uint256 || _toType == ETypes.AddressOrUint160OrBytes20) {
             set(result, get(handle));
         } else {
             revert UnsupportedTypeInput(ETypes(toType));

package/src/test/TestFakeInfra.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8;
 
 import {IncoTest} from "./IncoTest.sol";
-import {e, euint256, ebool} from "../Lib.sol";
+import {e, euint256, ebool, eaddress} from "../Lib.sol";
 import {SenderNotAllowedForHandle} from "../Types.sol";
 
 contract TakesEInput {
@@ -41,6 +41,8 @@ contract TestFakeInfra is IncoTest {
     using e for ebool;
     using e for uint256;
     using e for bool;
+    using e for address;
+    using e for eaddress;
 
     function testTrivialEncrypt() public {
         euint256 a = e.asEuint256(3);
@@ -50,6 +52,9 @@ contract TestFakeInfra is IncoTest {
         ebool b = e.asEbool(true);
         processAllOperations();
         assertEq(getBoolValue(b), true);
+        eaddress c = e.asEaddress(address(0xdeadbeef));
+        processAllOperations();
+        assertEq(getAddressValue(c), address(0xdeadbeef));
     }
 
     function testEAdd() public {

package/src/version/IncoLightningConfig.sol

@@ -10,4 +10,4 @@ pragma solidity ^0.8;
 string constant CONTRACT_NAME = "incoLightning";
 uint8 constant MAJOR_VERSION = 0;
 uint8 constant MINOR_VERSION = 2;
-uint8 constant PATCH_VERSION = 0;
+uint8 constant PATCH_VERSION = 1;

package/src/libs/incoLightning_junknet3_v0_495844717.sol

@@ -1,389 +0,0 @@
-// AUTOGENERATED FILE. DO NOT EDIT.
-// This file was generated by the IncoLightning library generator.
-// The original template is located at Lib.template.sol
-
-/// SPDX-License-Identifier: No License
-pragma solidity ^0.8;
-
-import "../IncoLightning.sol";
-import { ebool, euint256, ETypes } from "../Types.sol";
-
-IncoLightning constant inco = IncoLightning(0x5Db4068769783837bFFc070A703B29f44Ba16f98);
-address constant deployedBy = 0x8202D2D747784Cb7D48868E44C42C4bf162a70BC;
-uint256 constant defaultDecryptionDelayLimit = 2 hours;
-
-library e {
-    function sanitize(euint256 a) internal returns (euint256) {
-        if (euint256.unwrap(a) == bytes32(0)) {
-            return asEuint256(0);
-        }
-        return a;
-    }
-
-    function sanitize(ebool a) internal returns (ebool) {
-        if (ebool.unwrap(a) == bytes32(0)) {
-            return asEbool(false);
-        }
-        return a;
-    }
-
-    function s(euint256 a) internal returns (euint256) {
-        return sanitize(a);
-    }
-
-    function s(ebool a) internal returns (ebool) {
-        return sanitize(a);
-    }
-
-    function add(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eAdd(s(a), s(b));
-    }
-
-    function add(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eAdd(s(a), asEuint256(b));
-    }
-
-    function add(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eAdd(asEuint256(a), s(b));
-    }
-
-    function sub(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eSub(s(a), s(b));
-    }
-
-    function sub(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eSub(s(a), asEuint256(b));
-    }
-
-    function sub(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eSub(asEuint256(a), s(b));
-    }
-
-    function mul(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMul(s(a), s(b));
-    }
-
-    function mul(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eMul(s(a), asEuint256(b));
-    }
-
-    function mul(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMul(asEuint256(a), s(b));
-    }
-
-    function div(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eDiv(s(a), s(b));
-    }
-
-    function div(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eDiv(s(a), asEuint256(b));
-    }
-
-    function div(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eDiv(asEuint256(a), s(b));
-    }
-
-    function rem(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRem(s(a), s(b));
-    }
-
-    function rem(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eRem(s(a), asEuint256(b));
-    }
-
-    function rem(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRem(asEuint256(a), s(b));
-    }
-
-    function and(euint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitAnd(euint256.unwrap(s(a)), euint256.unwrap(s(b))));
-    }
-
-    function and(euint256 a, uint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitAnd(euint256.unwrap(s(a)), euint256.unwrap(asEuint256(b))));
-    }
-
-    function and(uint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitAnd(euint256.unwrap(asEuint256(a)), euint256.unwrap(s(b))));
-    }
-
-    function and(ebool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitAnd(ebool.unwrap(s(a)), ebool.unwrap(s(b))));
-    }
-
-    function and(ebool a, bool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitAnd(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b))));
-    }
-
-    function and(bool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitAnd(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b))));
-    }
-
-    function or(euint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitOr(euint256.unwrap(s(a)), euint256.unwrap(s(b))));
-    }
-
-    function or(euint256 a, uint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitOr(euint256.unwrap(s(a)), euint256.unwrap(asEuint256(b))));
-    }
-
-    function or(uint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitOr(euint256.unwrap(asEuint256(a)), euint256.unwrap(s(b))));
-    }
-
-    function or(ebool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitOr(ebool.unwrap(s(a)), ebool.unwrap(s(b))));
-    }
-
-    function or(ebool a, bool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitOr(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b))));
-    }
-
-    function or(bool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitOr(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b))));
-    }
-
-    function xor(euint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitXor(euint256.unwrap(s(a)), euint256.unwrap(s(b))));
-    }
-
-    function xor(euint256 a, uint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitXor(euint256.unwrap(s(a)), euint256.unwrap(asEuint256(b))));
-    }
-
-    function xor(uint256 a, euint256 b) internal returns (euint256) {
-        return euint256.wrap(inco.eBitXor(euint256.unwrap(asEuint256(a)), euint256.unwrap(s(b))));
-    }
-
-    function xor(ebool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitXor(ebool.unwrap(s(a)), ebool.unwrap(s(b))));
-    }
-
-    function xor(ebool a, bool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitXor(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b))));
-    }
-
-    function xor(bool a, ebool b) internal returns (ebool) {
-        return ebool.wrap(inco.eBitXor(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b))));
-    }
-
-    function shl(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eShl(s(a), s(b));
-    }
-
-    function shl(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eShl(s(a), asEuint256(b));
-    }
-
-    function shl(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eShl(asEuint256(a), s(b));
-    }
-
-    function shr(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eShr(s(a), s(b));
-    }
-
-    function shr(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eShr(s(a), asEuint256(b));
-    }
-
-    function shr(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eShr(asEuint256(a), s(b));
-    }
-
-    function rotl(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRotl(s(a), s(b));
-    }
-
-    function rotl(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eRotl(s(a), asEuint256(b));
-    }
-
-    function rotl(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRotl(asEuint256(a), s(b));
-    }
-
-    function rotr(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRotr(s(a), s(b));
-    }
-
-    function rotr(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eRotr(s(a), asEuint256(b));
-    }
-
-    function rotr(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eRotr(asEuint256(a), s(b));
-    }
-
-    function eq(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eEq(s(a), s(b));
-    }
-
-    function eq(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eEq(s(a), asEuint256(b));
-    }
-
-    function eq(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eEq(asEuint256(a), s(b));
-    }
-
-    function ne(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eNe(s(a), s(b));
-    }
-
-    function ne(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eNe(s(a), asEuint256(b));
-    }
-
-    function ne(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eNe(asEuint256(a), s(b));
-    }
-
-    function ge(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eGe(s(a), s(b));
-    }
-
-    function ge(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eGe(s(a), asEuint256(b));
-    }
-
-    function ge(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eGe(asEuint256(a), s(b));
-    }
-
-    function gt(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eGt(s(a), s(b));
-    }
-
-    function gt(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eGt(s(a), asEuint256(b));
-    }
-
-    function gt(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eGt(asEuint256(a), s(b));
-    }
-
-    function le(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eLe(s(a), s(b));
-    }
-
-    function le(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eLe(s(a), asEuint256(b));
-    }
-
-    function le(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eLe(asEuint256(a), s(b));
-    }
-
-    function lt(euint256 a, euint256 b) internal returns (ebool) {
-        return inco.eLt(s(a), s(b));
-    }
-
-    function lt(euint256 a, uint256 b) internal returns (ebool) {
-        return inco.eLt(s(a), asEuint256(b));
-    }
-
-    function lt(uint256 a, euint256 b) internal returns (ebool) {
-        return inco.eLt(asEuint256(a), s(b));
-    }
-
-    function min(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMin(s(a), s(b));
-    }
-
-    function min(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eMin(s(a), asEuint256(b));
-    }
-
-    function min(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMin(asEuint256(a), s(b));
-    }
-
-    function max(euint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMax(s(a), s(b));
-    }
-
-    function max(euint256 a, uint256 b) internal returns (euint256) {
-        return inco.eMax(s(a), asEuint256(b));
-    }
-
-    function max(uint256 a, euint256 b) internal returns (euint256) {
-        return inco.eMax(asEuint256(a), s(b));
-    }
-
-    function not(ebool a) internal returns (ebool) {
-        return inco.eNot(s(a));
-    }
-
-    function rand() internal returns (euint256) {
-        return euint256.wrap(inco.eRand(ETypes.Uint256));
-    }
-
-    function randBounded(uint256 upperBound) internal returns (euint256) {
-        return euint256.wrap(inco.eRandBounded(euint256.unwrap(asEuint256(upperBound)), ETypes.Uint256));
-    }
-
-    function randBounded(euint256 upperBound) internal returns (euint256) {
-        return euint256.wrap(inco.eRandBounded(euint256.unwrap(s(upperBound)), ETypes.Uint256));
-    }
-
-    function asEuint256(uint256 a) internal returns (euint256) {
-        return inco.asEuint256(a);
-    }
-
-    function asEbool(bool a) internal returns (ebool) {
-        return inco.asEbool(a);
-    }
-
-    function asEbool(euint256 a) internal returns (ebool) {
-        return ebool.wrap(inco.eCast(euint256.unwrap(a), ETypes.Bool));
-    }
-
-    function asEuint256(ebool a) internal returns (euint256) {
-        return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
-    }
-
-    function newEuint256(bytes memory ciphertext, address user) internal returns (euint256) {
-        return inco.newEuint256(ciphertext, user);
-    }
-
-    function newEbool(bytes memory ciphertext, address user) internal returns (ebool) {
-        return inco.newEbool(ciphertext, user);
-    }
-
-    function allow(euint256 a, address to) internal {
-        inco.allow(euint256.unwrap(a), to);
-    }
-
-    function allow(ebool a, address to) internal {
-        inco.allow(ebool.unwrap(a), to);
-    }
-
-    function allowThis(euint256 a) internal {
-        allow(a, address(this));
-    }
-
-    function allowThis(ebool a) internal {
-        allow(a, address(this));
-    }
-
-    function isAllowed(address user, euint256 a) internal view returns (bool) {
-        return inco.isAllowed(euint256.unwrap(a), user);
-    }
-
-    function select(ebool control, euint256 ifTrue, euint256 ifFalse) internal returns (euint256) {
-        return euint256.wrap(inco.eIfThenElse(s(control), euint256.unwrap(s(ifTrue)), euint256.unwrap(s(ifFalse))));
-    }
-
-    function select(ebool control, ebool ifTrue, ebool ifFalse) internal returns (ebool) {
-        return ebool.wrap(inco.eIfThenElse(s(control), ebool.unwrap(s(ifTrue)), ebool.unwrap(s(ifFalse))));
-    }
-
-    function requestDecryption(euint256 a, bytes4 callbackSelector, bytes memory callbackData) internal returns (uint256 requestId) {
-        requestId = inco.requestDecryption(callbackSelector, block.timestamp + defaultDecryptionDelayLimit, euint256.unwrap(s(a)), callbackData);
-    }
-
-    function requestDecryption(ebool a, bytes4 callbackSelector, bytes memory callbackData) internal returns (uint256 requestId) {
-        requestId = inco.requestDecryption(callbackSelector, block.timestamp + defaultDecryptionDelayLimit, ebool.unwrap(s(a)), callbackData);
-    }
-}