@inco/lightning 0.6.1 → 0.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inco/lightning",
-  "version": "0.6.1",
+  "version": "0.6.5",
   "repository": "https://github.com/Inco-fhevm/inco-monorepo",
   "files": [
     "src/",

package/src/DeployUtils.sol

@@ -159,7 +159,7 @@ contract DeployUtils is Script {
                     IIncoVerifier.initialize.selector,
                     deployer, // owner
                     VERIFIER_NAME,
-                    lightning.getVersion(),
+                    lightning.getMajorVersion(),
                     quoteVerifier
                 )
             })

package/src/Errors.sol

@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: No License
 pragma solidity ^0.8;
 
-error HandleAlreadyExists();
+    error HandleAlreadyExists(bytes32 handle);

package/src/Lib.alphanet.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/Lib.demonet.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/Lib.devnet.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/Lib.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/Lib.template.sol

@@ -51,9 +51,11 @@ library e {
     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));
     }
@@ -61,9 +63,11 @@ library e {
     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));
     }
@@ -71,9 +75,11 @@ library e {
     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));
     }
@@ -81,9 +87,11 @@ library e {
     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));
     }
@@ -91,31 +99,35 @@ library e {
     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(
+                            euint256.wrap(
                 inco.eBitAnd(euint256.unwrap(s(a)), euint256.unwrap(s(b)))
             );
     }
+
     function and(euint256 a, uint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitAnd(
                     euint256.unwrap(s(a)),
                     euint256.unwrap(asEuint256(b))
                 )
             );
     }
+
     function and(uint256 a, euint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitAnd(
                     euint256.unwrap(asEuint256(a)),
                     euint256.unwrap(s(b))
@@ -126,37 +138,41 @@ library e {
     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(
+                            ebool.wrap(
                 inco.eBitAnd(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b)))
             );
     }
+
     function and(bool a, ebool b) internal returns (ebool) {
         return
-            ebool.wrap(
+                            ebool.wrap(
                 inco.eBitAnd(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b)))
             );
     }
 
     function or(euint256 a, euint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitOr(euint256.unwrap(s(a)), euint256.unwrap(s(b)))
             );
     }
+
     function or(euint256 a, uint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitOr(
                     euint256.unwrap(s(a)),
                     euint256.unwrap(asEuint256(b))
                 )
             );
     }
+
     function or(uint256 a, euint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitOr(
                     euint256.unwrap(asEuint256(a)),
                     euint256.unwrap(s(b))
@@ -167,37 +183,41 @@ library e {
     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(
+                            ebool.wrap(
                 inco.eBitOr(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b)))
             );
     }
+
     function or(bool a, ebool b) internal returns (ebool) {
         return
-            ebool.wrap(
+                            ebool.wrap(
                 inco.eBitOr(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b)))
             );
     }
 
     function xor(euint256 a, euint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitXor(euint256.unwrap(s(a)), euint256.unwrap(s(b)))
             );
     }
+
     function xor(euint256 a, uint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitXor(
                     euint256.unwrap(s(a)),
                     euint256.unwrap(asEuint256(b))
                 )
             );
     }
+
     function xor(uint256 a, euint256 b) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eBitXor(
                     euint256.unwrap(asEuint256(a)),
                     euint256.unwrap(s(b))
@@ -208,15 +228,17 @@ library e {
     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(
+                            ebool.wrap(
                 inco.eBitXor(ebool.unwrap(s(a)), ebool.unwrap(asEbool(b)))
             );
     }
+
     function xor(bool a, ebool b) internal returns (ebool) {
         return
-            ebool.wrap(
+                            ebool.wrap(
                 inco.eBitXor(ebool.unwrap(asEbool(a)), ebool.unwrap(s(b)))
             );
     }
@@ -224,9 +246,11 @@ library e {
     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));
     }
@@ -234,9 +258,11 @@ library e {
     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));
     }
@@ -244,9 +270,11 @@ library e {
     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));
     }
@@ -254,9 +282,11 @@ library e {
     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));
     }
@@ -264,9 +294,11 @@ library e {
     function eq(euint256 a, euint256 b) internal returns (ebool) {
         return inco.eEq(euint256.unwrap(s(a)), euint256.unwrap(s(b)));
     }
+
     function eq(euint256 a, uint256 b) internal returns (ebool) {
         return inco.eEq(euint256.unwrap(s(a)), euint256.unwrap(asEuint256(b)));
     }
+
     function eq(uint256 a, euint256 b) internal returns (ebool) {
         return inco.eEq(euint256.unwrap(asEuint256(a)), euint256.unwrap(s(b)));
     }
@@ -274,9 +306,11 @@ library e {
     function eq(eaddress a, address b) internal returns (ebool) {
         return inco.eEq(eaddress.unwrap(s(a)), eaddress.unwrap(asEaddress(b)));
     }
+
     function eq(eaddress a, eaddress b) internal returns (ebool) {
         return inco.eEq(eaddress.unwrap(s(a)), eaddress.unwrap(s(b)));
     }
+
     function eq(address a, eaddress b) internal returns (ebool) {
         return inco.eEq(eaddress.unwrap(asEaddress(a)), eaddress.unwrap(s(b)));
     }
@@ -284,9 +318,11 @@ library e {
     function ne(euint256 a, euint256 b) internal returns (ebool) {
         return inco.eNe(euint256.unwrap(s(a)), euint256.unwrap(s(b)));
     }
+
     function ne(euint256 a, uint256 b) internal returns (ebool) {
         return inco.eNe(euint256.unwrap(s(a)), euint256.unwrap(asEuint256(b)));
     }
+
     function ne(uint256 a, euint256 b) internal returns (ebool) {
         return inco.eNe(euint256.unwrap(asEuint256(a)), euint256.unwrap(s(b)));
     }
@@ -294,9 +330,11 @@ library e {
     function ne(eaddress a, eaddress b) internal returns (ebool) {
         return inco.eNe(eaddress.unwrap(s(a)), eaddress.unwrap(s(b)));
     }
+
     function ne(eaddress a, address b) internal returns (ebool) {
         return inco.eNe(eaddress.unwrap(s(a)), eaddress.unwrap(asEaddress(b)));
     }
+
     function ne(address a, eaddress b) internal returns (ebool) {
         return inco.eNe(eaddress.unwrap(asEaddress(a)), eaddress.unwrap(s(b)));
     }
@@ -304,9 +342,11 @@ library e {
     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));
     }
@@ -314,9 +354,11 @@ library e {
     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));
     }
@@ -324,9 +366,11 @@ library e {
     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));
     }
@@ -334,9 +378,11 @@ library e {
     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));
     }
@@ -344,9 +390,11 @@ library e {
     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));
     }
@@ -354,9 +402,11 @@ library e {
     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));
     }
@@ -373,7 +423,7 @@ library e {
     /// @dev costs the inco fee
     function randBounded(uint256 upperBound) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eRandBounded{value: inco.getFee()}(
                     euint256.unwrap(asEuint256(upperBound)),
                     ETypes.Uint256
@@ -384,7 +434,7 @@ library e {
     /// @dev costs the inco fee
     function randBounded(euint256 upperBound) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eRandBounded{value: inco.getFee()}(
                     euint256.unwrap(s(upperBound)),
                     ETypes.Uint256
@@ -412,6 +462,15 @@ library e {
         return euint256.wrap(inco.eCast(ebool.unwrap(a), ETypes.Uint256));
     }
 
+    /// @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,
@@ -420,6 +479,15 @@ library e {
         return inco.newEuint256{value: inco.getFee()}(ciphertext, user);
     }
 
+    /// @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,
@@ -428,6 +496,15 @@ library e {
         return inco.newEbool{value: inco.getFee()}(ciphertext, user);
     }
 
+    /// @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,
@@ -482,7 +559,7 @@ library e {
         euint256 ifFalse
     ) internal returns (euint256) {
         return
-            euint256.wrap(
+                            euint256.wrap(
                 inco.eIfThenElse(
                     s(control),
                     euint256.unwrap(s(ifTrue)),
@@ -497,7 +574,7 @@ library e {
         ebool ifFalse
     ) internal returns (ebool) {
         return
-            ebool.wrap(
+                            ebool.wrap(
                 inco.eIfThenElse(
                     s(control),
                     ebool.unwrap(s(ifTrue)),
@@ -512,7 +589,7 @@ library e {
         eaddress ifFalse
     ) internal returns (eaddress) {
         return
-            eaddress.wrap(
+                            eaddress.wrap(
                 inco.eIfThenElse(
                     s(control),
                     eaddress.unwrap(s(ifTrue)),