Merge pull request #66 from zama-ai/feature/default-value

Feature/default value
zama-ai · Jun 30, 2023 · 67131a0 · 67131a0
2 parents 4c9eafd + 83b9e00
commit 67131a0
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 15 deletions.
diff --git a/codegen/codegen.py b/codegen/codegen.py
@@ -908,6 +908,14 @@
         return Impl.reencrypt(euint{i}.unwrap(ciphertext), publicKey);
     }}
 
+    function reencrypt(euint{i} ciphertext, bytes32 publicKey, uint{i} defaultValue) internal view returns (bytes memory reencrypted) {{
+        if (euint{i}.unwrap(ciphertext) != 0) {{
+            return Impl.reencrypt(euint{i}.unwrap(ciphertext), publicKey);
+        }} else {{
+            return Impl.reencrypt(euint{i}.unwrap(asEuint{i}(defaultValue)), publicKey);
+        }}
+    }}
+
     function req(euint{i} ciphertext) internal view {{
         Impl.req(euint{i}.unwrap(ciphertext));
     }}

diff --git a/examples/BlindAuction.sol b/examples/BlindAuction.sol
@@ -98,11 +98,7 @@ contract BlindAuction is EIP712WithModifier {
         onlySignedPublicKey(publicKey, signature)
         returns (bytes memory)
     {
-        if (TFHE.isInitialized(bids[msg.sender])) {
-            return TFHE.reencrypt(bids[msg.sender], publicKey);
-        } else {
-            return TFHE.reencrypt(TFHE.asEuint32(0), publicKey);
-        }
+        return TFHE.reencrypt(bids[msg.sender], publicKey, 0);
     }
 
     // Returns the user bid

diff --git a/examples/EncryptedERC20.sol b/examples/EncryptedERC20.sol
@@ -54,11 +54,7 @@ contract EncryptedERC20 is EIP712WithModifier {
         onlySignedPublicKey(publicKey, signature)
         returns (bytes memory)
     {
-        if (TFHE.isInitialized(totalSupply)) {
-            return TFHE.reencrypt(totalSupply, publicKey);
-        } else {
-            return TFHE.reencrypt(TFHE.asEuint32(0), publicKey);
-        }
+        return TFHE.reencrypt(totalSupply, publicKey, 0);
     }
 
     // Returns the balance of the caller encrypted under the provided public key.
@@ -71,11 +67,7 @@ contract EncryptedERC20 is EIP712WithModifier {
         onlySignedPublicKey(publicKey, signature)
         returns (bytes memory)
     {
-        if (TFHE.isInitialized(balances[msg.sender])) {
-            return TFHE.reencrypt(balances[msg.sender], publicKey);
-        } else {
-            return TFHE.reencrypt(TFHE.asEuint32(0), publicKey);
-        }
+        return TFHE.reencrypt(balances[msg.sender], publicKey, 0);
     }
 
     // Sets the `encryptedAmount` as the allowance of `spender` over the caller's tokens.

diff --git a/lib/TFHE.sol b/lib/TFHE.sol
@@ -2482,6 +2482,22 @@ library TFHE {
         return Impl.reencrypt(euint8.unwrap(ciphertext), publicKey);
     }
 
+    function reencrypt(
+        euint8 ciphertext,
+        bytes32 publicKey,
+        uint8 defaultValue
+    ) internal view returns (bytes memory reencrypted) {
+        if (euint8.unwrap(ciphertext) != 0) {
+            return Impl.reencrypt(euint8.unwrap(ciphertext), publicKey);
+        } else {
+            return
+                Impl.reencrypt(
+                    euint8.unwrap(asEuint8(defaultValue)),
+                    publicKey
+                );
+        }
+    }
+
     function req(euint8 ciphertext) internal view {
         Impl.req(euint8.unwrap(ciphertext));
     }
@@ -2507,6 +2523,22 @@ library TFHE {
         return Impl.reencrypt(euint16.unwrap(ciphertext), publicKey);
     }
 
+    function reencrypt(
+        euint16 ciphertext,
+        bytes32 publicKey,
+        uint16 defaultValue
+    ) internal view returns (bytes memory reencrypted) {
+        if (euint16.unwrap(ciphertext) != 0) {
+            return Impl.reencrypt(euint16.unwrap(ciphertext), publicKey);
+        } else {
+            return
+                Impl.reencrypt(
+                    euint16.unwrap(asEuint16(defaultValue)),
+                    publicKey
+                );
+        }
+    }
+
     function req(euint16 ciphertext) internal view {
         Impl.req(euint16.unwrap(ciphertext));
     }
@@ -2532,6 +2564,22 @@ library TFHE {
         return Impl.reencrypt(euint32.unwrap(ciphertext), publicKey);
     }
 
+    function reencrypt(
+        euint32 ciphertext,
+        bytes32 publicKey,
+        uint32 defaultValue
+    ) internal view returns (bytes memory reencrypted) {
+        if (euint32.unwrap(ciphertext) != 0) {
+            return Impl.reencrypt(euint32.unwrap(ciphertext), publicKey);
+        } else {
+            return
+                Impl.reencrypt(
+                    euint32.unwrap(asEuint32(defaultValue)),
+                    publicKey
+                );
+        }
+    }
+
     function req(euint32 ciphertext) internal view {
         Impl.req(euint32.unwrap(ciphertext));
     }