@inco/lightning 0.10.0-devnet-3 → 0.11.0-demonet-2

package/src/test/IncoTest.sol

@@ -12,6 +12,7 @@ import {FakeQuoteVerifier} from "./FakeIncoInfra/FakeQuoteVerifier.sol";
 import {IOwnable} from "../../src/shared/IOwnable.sol";
 import {MockRemoteAttestation} from "./FakeIncoInfra/MockRemoteAttestation.sol";
 import {BootstrapResult} from "../lightning-parts/TEELifecycle.types.sol";
+import {AllowanceProof, AllowanceVoucher} from "../lightning-parts/AccessControl/AdvancedAccessControl.sol";
 import {Safe} from "safe-smart-account/Safe.sol";
 import {SafeProxyFactory} from "safe-smart-account/proxies/SafeProxyFactory.sol";
 
@@ -60,9 +61,8 @@ contract IncoTest is MockOpHandler, DeployUtils, FakeDecryptionAttester, MockRem
         (IIncoLightning proxy,) = deployIncoLightningUsingConfig({
             deployer: testDeployer,
             owner: owner,
-            // The highest precedent deployment
-            // We select the pepper that will be used that will be generated in the lib.sol (usually "testnet"), but currently "alphanet" has higher major version
-            pepper: "devnet",
+            // The highest precedent deployment pepper
+            pepper: "testnet",
             quoteVerifier: new FakeQuoteVerifier()
         });
         vm.stopPrank();
@@ -83,4 +83,20 @@ contract IncoTest is MockOpHandler, DeployUtils, FakeDecryptionAttester, MockRem
         vm.recordLogs();
     }
 
+    /// @dev Creates an empty AllowanceProof (no proof required when sharer is address(0))
+    function _emptyAllowanceProof() internal pure returns (AllowanceProof memory) {
+        return AllowanceProof({
+            sharer: address(0),
+            voucher: AllowanceVoucher({
+                sessionNonce: bytes32(0),
+                verifyingContract: address(0),
+                callFunction: bytes4(0),
+                sharerArgData: "",
+                warning: ""
+            }),
+            voucherSignature: "",
+            requesterArgData: ""
+        });
+    }
+
 }

package/src/test/TestLib.t.sol

@@ -18,7 +18,6 @@ import {
 } 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";
 
 /// @notice Wrapper to expose internal requireEqual as an external call so vm.expectRevert works
 contract RequireEqualCaller {
@@ -644,6 +643,27 @@ contract TestLib is IncoTest {
         assertTrue(inco.persistAllowed(eaddress.unwrap(a), address(this)));
     }
 
+    function testAllowElist() public {
+        elist list = _listRange(0, 3, ETypes.Uint256);
+        assertFalse(inco.persistAllowed(elist.unwrap(list), alice));
+        e.allow(list, alice);
+        assertTrue(inco.persistAllowed(elist.unwrap(list), alice));
+    }
+
+    function testRevealElist() public {
+        elist list = _listRange(0, 3, ETypes.Uint256);
+        assertFalse(inco.isRevealed(elist.unwrap(list)));
+        e.reveal(list);
+        assertTrue(inco.isRevealed(elist.unwrap(list)));
+    }
+
+    function testAllowThisElist() public {
+        elist list = _listRange(0, 3, ETypes.Uint256);
+        assertFalse(inco.persistAllowed(elist.unwrap(list), address(this)));
+        e.allowThis(list);
+        assertTrue(inco.persistAllowed(elist.unwrap(list), address(this)));
+    }
+
     function testIsAllowed() public {
         euint256 a = e.asEuint256(42);
         processAllOperations();
@@ -937,18 +957,6 @@ contract TestLib is IncoTest {
         assertFalse(isValid, "Invalid bool value should return false");
     }
 
-    /// @dev Creates an empty AllowanceProof (no proof required when sharer is address(0))
-    function _emptyAllowanceProof() internal pure returns (AllowanceProof memory) {
-        return AllowanceProof({
-            sharer: address(0),
-            voucher: AllowanceVoucher({
-                sessionNonce: bytes32(0), verifyingContract: address(0), callFunction: bytes4(0), sharerArgData: ""
-            }),
-            voucherSignature: "",
-            requesterArgData: ""
-        });
-    }
-
     // ============ REQUIRE EQUAL TESTS ============
 
     function testRequireEqual_Ebool_ValidAttestation_True() public {
@@ -1558,6 +1566,36 @@ contract TestLib is IncoTest {
         assertFalse(result, "Empty proof should fail verification");
     }
 
+    // ============ ELIST ALLOW / REVEAL / ALLOWTHIS WRAPPER TESTS ============
+
+    function testEListWrapper_Allow() public {
+        _setupEListHelper();
+        elist list = elistHelper.callRange(0, 3);
+
+        assertFalse(inco.persistAllowed(elist.unwrap(list), alice));
+        elistHelper.callAllowElist(list, alice);
+        assertTrue(inco.persistAllowed(elist.unwrap(list), alice));
+    }
+
+    function testEListWrapper_Reveal() public {
+        _setupEListHelper();
+        elist list = elistHelper.callRange(0, 3);
+
+        assertFalse(inco.isRevealed(elist.unwrap(list)));
+        elistHelper.callRevealElist(list);
+        assertTrue(inco.isRevealed(elist.unwrap(list)));
+    }
+
+    function testEListWrapper_AllowThis() public {
+        _setupEListHelper();
+        // elistHelper must create the list so it has transient access, which is required to call allow
+        elist list = elistHelper.callRange(0, 3);
+
+        assertFalse(inco.persistAllowed(elist.unwrap(list), address(elistHelper)));
+        elistHelper.callAllowThisElist(list);
+        assertTrue(inco.persistAllowed(elist.unwrap(list), address(elistHelper)));
+    }
+
 }
 
 /// @notice Helper contract for testing msg.sender variants
@@ -1758,4 +1796,18 @@ contract LibEListHelper {
         return e.verifyEListDecryption(elistHandle, proofElements, proof, signatures);
     }
 
+    // ============ allow / reveal / allowThis wrappers ============
+
+    function callAllowElist(elist list, address to) external {
+        e.allow(list, to);
+    }
+
+    function callRevealElist(elist list) external {
+        e.reveal(list);
+    }
+
+    function callAllowThisElist(elist list) external {
+        e.allowThis(list);
+    }
+
 }

package/src/test/TestUpgrade.t.sol

@@ -277,7 +277,7 @@ contract TestUpgrade is IncoTest {
 
     // Helpers
     function _deploySessionVerifierProxy(address proxyOwner) private returns (SessionVerifier) {
-        SessionVerifier impl = new SessionVerifier("");
+        SessionVerifier impl = new SessionVerifier(bytes32(0));
         ERC1967Proxy proxy = new ERC1967Proxy(address(impl), abi.encodeCall(SessionVerifier.initialize, (proxyOwner)));
         return SessionVerifier(address(proxy));
     }

package/src/version/IncoLightningConfig.sol

@@ -7,12 +7,12 @@ pragma solidity ^0.8;
 // UPDATE the CHANGELOG on new versions
 
 string constant CONTRACT_NAME = "incoLightning";
-uint8 constant MAJOR_VERSION = 10;
+uint8 constant MAJOR_VERSION = 11;
 uint8 constant MINOR_VERSION = 0;
 // whenever a new version is deployed, we need to pump this up
 // otherwise make test_upgrade will fail
 // consequently, when we do a patch release, we don't need to pump it as it's already pumped
 // when the previous release was done
-uint8 constant PATCH_VERSION = 1;
+uint8 constant PATCH_VERSION = 2;
 
 string constant VERIFIER_NAME = "incoVerifier";