@inco/lightning 0.8.0-devnet-22 → 0.8.0-devnet-24

package/src/test/TestLib.t.sol

@@ -13,6 +13,7 @@ import {
     UnsupportedListType,
     UnsupportedType
 } from "../Types.sol";
+import {EncryptedOperations} from "../lightning-parts/EncryptedOperations.sol";
 import {DecryptionAttestation, ElementAttestationWithProof} from "../lightning-parts/DecryptionAttester.types.sol";
 import {AllowanceProof, AllowanceVoucher} from "../lightning-parts/AccessControl/AdvancedAccessControl.sol";
 
@@ -36,8 +37,8 @@ contract TestLib is IncoTest {
 
     // ============ ELIST FEE HELPERS ============
 
-    function _listRange(uint16 start, uint16 end) internal returns (elist) {
-        return inco.listRange{value: inco.getEListFee(end - start, ETypes.Uint256)}(start, end);
+    function _listRange(uint16 start, uint16 end, ETypes listType) internal returns (elist) {
+        return inco.listRange{value: inco.getEListFee(end - start, listType)}(start, end, listType);
     }
 
     function _newEList(bytes32[] memory handles, ETypes listType) internal returns (elist) {
@@ -759,15 +760,19 @@ contract TestLib is IncoTest {
         ebool.wrap(inco.eCast(ebool.unwrap(a), ETypes.Bool));
     }
 
-    function testCastEuint256ToEuint256() public {
+    function testCastEuint256ToEuint256Revert() public {
         euint256 a = e.asEuint256(10);
         processAllOperations();
+        vm.expectRevert(abi.encodeWithSelector(EncryptedOperations.SameTypeCast.selector, ETypes.Uint256));
         euint256.wrap(inco.eCast(euint256.unwrap(a), ETypes.Uint256));
     }
 
-    function testCastEaddressToEaddress() public {
+    function testCastEaddressToEaddressRevert() public {
         eaddress a = e.asEaddress(alice);
         processAllOperations();
+        vm.expectRevert(
+            abi.encodeWithSelector(EncryptedOperations.SameTypeCast.selector, ETypes.AddressOrUint160OrBytes20)
+        );
         eaddress.wrap(inco.eCast(eaddress.unwrap(a), ETypes.AddressOrUint160OrBytes20));
     }
 
@@ -924,7 +929,7 @@ contract TestLib is IncoTest {
     // Note: Most EList functions in Lib.sol are thin wrappers around inco.* calls.
 
     function testEList_ListTypeOf_Uint256() public {
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
 
         // Test listTypeOf - this is a pure function that extracts type from handle
         ETypes listType = e.listTypeOf(list);
@@ -940,7 +945,7 @@ contract TestLib is IncoTest {
     }
 
     function testEList_Length_NonEmpty() public {
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
 
         // Test length function
         uint16 len = e.length(list);
@@ -948,7 +953,7 @@ contract TestLib is IncoTest {
     }
 
     function testEList_Length_AfterAppend() public {
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
 
         // Get a handle to append
         bytes32 valueHandle = inco.listGet(list, 0);
@@ -959,8 +964,8 @@ contract TestLib is IncoTest {
     }
 
     function testEList_Length_AfterConcat() public {
-        elist list1 = _listRange(0, 3);
-        elist list2 = _listRange(10, 15);
+        elist list1 = _listRange(0, 3, ETypes.Uint256);
+        elist list2 = _listRange(10, 15, ETypes.Uint256);
 
         elist combined = _listConcat(list1, list2);
 
@@ -969,7 +974,7 @@ contract TestLib is IncoTest {
 
     function testEList_Length_AfterReverse() public {
         // Create a list
-        elist list = _listRange(0, 7);
+        elist list = _listRange(0, 7, ETypes.Uint256);
 
         // Reverse using inco directly
         elist reversed = _listReverse(list);
@@ -1006,7 +1011,7 @@ contract TestLib is IncoTest {
     function testEListWrapper_NewEListFromHandles() public {
         _setupEListHelper();
 
-        elist rangeList = _listRange(0, 3);
+        elist rangeList = _listRange(0, 3, ETypes.Uint256);
         bytes32[] memory handles = new bytes32[](3);
         handles[0] = inco.listGet(rangeList, 0);
         handles[1] = inco.listGet(rangeList, 1);
@@ -1043,7 +1048,7 @@ contract TestLib is IncoTest {
     function testEListWrapper_AppendEuint256() public {
         _setupEListHelper();
         // Create a list and get a handle
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         bytes32 valueHandle = inco.listGet(list, 0);
         euint256 value = euint256.wrap(valueHandle);
         // Grant permissions
@@ -1056,7 +1061,7 @@ contract TestLib is IncoTest {
     function testEListWrapper_AppendEbool() public {
         _setupEListHelper();
         // Create a list and get a handle
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         bytes32 valueHandle = inco.listGet(list, 0);
         ebool value = ebool.wrap(valueHandle);
         // Grant permissions
@@ -1068,7 +1073,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetHiddenIndexEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 0)); // Use element as index
         euint256 value = euint256.wrap(inco.listGet(list, 1));
@@ -1079,7 +1084,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetHiddenIndexEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 0));
         ebool value = ebool.wrap(inco.listGet(list, 1));
@@ -1090,7 +1095,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetPlaintextIndexEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 value = euint256.wrap(inco.listGet(list, 1));
 
@@ -1100,7 +1105,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetPlaintextIndexEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         ebool value = ebool.wrap(inco.listGet(list, 1));
 
@@ -1110,7 +1115,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_GetOrEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 1));
         euint256 defaultValue = euint256.wrap(inco.listGet(list, 0));
@@ -1121,7 +1126,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_GetOrEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 1));
         ebool defaultValue = ebool.wrap(inco.listGet(list, 0));
@@ -1132,7 +1137,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_GetEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
 
         euint256 result = elistHelper.callGetEuint256(list, 2);
@@ -1141,7 +1146,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_GetEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
 
         ebool result = elistHelper.callGetEbool(list, 2);
@@ -1150,7 +1155,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertHiddenIndexEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 0));
         euint256 value = euint256.wrap(inco.listGet(list, 1));
@@ -1161,7 +1166,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertHiddenIndexEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 idx = euint256.wrap(inco.listGet(list, 0));
         ebool value = ebool.wrap(inco.listGet(list, 1));
@@ -1172,7 +1177,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertPlaintextIndexEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 value = euint256.wrap(inco.listGet(list, 1));
 
@@ -1182,7 +1187,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertPlaintextIndexEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         ebool value = ebool.wrap(inco.listGet(list, 1));
 
@@ -1192,8 +1197,8 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Concat() public {
         _setupEListHelper();
-        elist list1 = _listRange(0, 3);
-        elist list2 = _listRange(10, 13);
+        elist list1 = _listRange(0, 3, ETypes.Uint256);
+        elist list2 = _listRange(10, 13, ETypes.Uint256);
         _allowHelperForList(list1);
         _allowHelperForList(list2);
 
@@ -1203,7 +1208,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Slice() public {
         _setupEListHelper();
-        elist list = _listRange(0, 10);
+        elist list = _listRange(0, 10, ETypes.Uint256);
         _allowHelperForList(list);
 
         elist sliced = elistHelper.callSlice(list, 2, 7);
@@ -1212,7 +1217,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SliceLenEuint256() public {
         _setupEListHelper();
-        elist list = _listRange(0, 10);
+        elist list = _listRange(0, 10, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 start = euint256.wrap(inco.listGet(list, 1));
         euint256 defaultValue = euint256.wrap(inco.listGet(list, 0));
@@ -1223,7 +1228,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SliceLenEbool() public {
         _setupEListHelper();
-        elist list = _listRange(0, 10);
+        elist list = _listRange(0, 10, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 start = euint256.wrap(inco.listGet(list, 1));
         ebool defaultValue = ebool.wrap(inco.listGet(list, 0));
@@ -1240,7 +1245,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Reverse() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
 
         elist reversed = elistHelper.callReverse(list);
@@ -1249,7 +1254,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Shuffle() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         _allowHelperForList(list);
 
         elist shuffled = elistHelper.callShuffle(list);
@@ -1264,13 +1269,13 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Length() public {
         _setupEListHelper();
-        elist list = _listRange(0, 7);
+        elist list = _listRange(0, 7, ETypes.Uint256);
         assertEq(elistHelper.callLength(list), 7);
     }
 
     function testEListWrapper_ListTypeOf() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5);
+        elist list = _listRange(0, 5, ETypes.Uint256);
         assertEq(uint8(elistHelper.callListTypeOf(list)), uint8(ETypes.Uint256));
     }
 
@@ -1278,7 +1283,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetPlaintextIndexEuint256_RevertsOnOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3); // length 3, valid indices 0-2
+        elist list = _listRange(0, 3, ETypes.Uint256); // length 3, valid indices 0-2
         _allowHelperForList(list);
         euint256 value = euint256.wrap(inco.listGet(list, 0));
 
@@ -1289,7 +1294,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_SetPlaintextIndexEbool_RevertsOnOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         ebool value = ebool.wrap(inco.listGet(list, 0));
 
@@ -1299,7 +1304,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertPlaintextIndexEbool_RevertsOnOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         ebool value = ebool.wrap(inco.listGet(list, 0));
 
@@ -1309,7 +1314,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_InsertPlaintextIndexEuint256_RevertsOnOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
         _allowHelperForList(list);
         euint256 value = euint256.wrap(inco.listGet(list, 0));
 
@@ -1319,7 +1324,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Slice_RevertsOnInvalidRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 10);
+        elist list = _listRange(0, 10, ETypes.Uint256);
         _allowHelperForList(list);
 
         // end < start is invalid
@@ -1329,7 +1334,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Slice_RevertsOnEndOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5); // length 5
+        elist list = _listRange(0, 5, ETypes.Uint256); // length 5
         _allowHelperForList(list);
 
         // end > length is out of range
@@ -1339,7 +1344,7 @@ contract TestLib is IncoTest {
 
     function testEListWrapper_Slice_RevertsOnStartOutOfRange() public {
         _setupEListHelper();
-        elist list = _listRange(0, 5); // length 5
+        elist list = _listRange(0, 5, ETypes.Uint256); // length 5
         _allowHelperForList(list);
 
         // start >= length is out of range
@@ -1400,7 +1405,7 @@ contract TestLib is IncoTest {
     function testEListWrapper_VerifyEListDecryption() public {
         _setupEListHelper();
 
-        elist list = _listRange(0, 3);
+        elist list = _listRange(0, 3, ETypes.Uint256);
 
         // Create empty proof elements (for basic verification test)
         ElementAttestationWithProof[] memory proofElements = new ElementAttestationWithProof[](0);
@@ -1576,7 +1581,7 @@ contract LibEListHelper {
     }
 
     function callRange(uint16 start, uint16 end) external returns (elist) {
-        storedList = e.range(start, end);
+        storedList = e.range(start, end, ETypes.Uint256);
         return storedList;
     }
 
@@ -1586,7 +1591,7 @@ contract LibEListHelper {
     }
 
     function callShuffledRange(uint16 start, uint16 end) external returns (elist) {
-        storedList = e.shuffledRange(start, end);
+        storedList = e.shuffledRange(start, end, ETypes.Uint256);
         return storedList;
     }