@iexec-nox/nox-protocol-contracts 0.1.0-beta.6 → 0.1.0-beta.7

package/README.md

@@ -55,6 +55,14 @@ The default network is a local EDR simulation. For external networks, configure
 pnpm run deploy
 ```
 
+## Verify
+
+Verify deployed contracts on Etherscan. Requires `ETHERSCAN_API_KEY`
+
+```bash
+pnpm run verify arbitrumSepolia --network arbitrumSepolia
+```
+
 ## Configuration notes
 
 - Create2 salt is defined in [config/config.ts](config/config.ts).

package/contracts/interfaces/INoxCompute.sol

@@ -19,6 +19,7 @@ interface INoxCompute {
     error InvalidProof(bytes proof, string reason);
     error UnsupportedType();
     error IncompatibleTypes();
+    error NotPubliclyDecryptable(bytes32 handle);
 
     /// Emitted when admin role is granted
     event Allowed(address indexed sender, address indexed account, bytes32 indexed handle);
@@ -268,19 +269,30 @@ interface INoxCompute {
     function plaintextToEncrypted(bytes32 value, TEEType teeType) external returns (bytes32);
 
     /**
-     * @notice Validates a handle proof for a given owner and type.
+     * @notice Validates an input handle proof for a given owner and type.
      * @param handle handle to validate
      * @param owner owner of the provided handle
      * @param proof proof data
      * @param teeType expected handle type
      */
-    function validateProof(
+    function validateInputProof(
         bytes32 handle,
         address owner,
         bytes calldata proof,
         TEEType teeType
     ) external;
 
+    /**
+     * @notice Validates a decryption proof issued by the gateway for a publicly decryptable handle.
+     * @param handle Handle to decrypt
+     * @param decryptionProof Serialized decryption proof (signature + decrypted value)
+     * @return The decrypted value (variable length)
+     */
+    function validateDecryptionProof(
+        bytes32 handle,
+        bytes calldata decryptionProof
+    ) external view returns (bytes memory);
+
     /**
      * @notice Performs an addition between two encrypted values without overflow check.
      * @param leftHandOperand Left-hand side operand handle

package/contracts/sdk/Nox.sol

@@ -29,11 +29,11 @@ library Nox {
         }
         // Arbitrum Sepolia or its fork
         if (block.chainid == 421614) {
-            return 0x5633472D35E18464CA24Ab974954fB3b1B122eA6;
+            return 0xE4622fbFCd0bDd482775bBf5b3e72382C0D99208;
         }
         // Local development chain
         if (block.chainid == 31337) {
-            return 0x9cF45FFE48126380cFCC40215a1d6D7fffbffb05;
+            return 0x9bdef3F9fEc61eE7cDfE84BDE8398595c6E0b22d;
         }
         revert("Nox: Unsupported chain");
     }
@@ -169,7 +169,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (ebool) {
         bytes32 handle = externalEbool.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Bool);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Bool);
         return ebool.wrap(handle);
     }
 
@@ -178,7 +178,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (eaddress) {
         bytes32 handle = externalEaddress.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Address);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Address);
         return eaddress.wrap(handle);
     }
 
@@ -187,7 +187,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (euint16) {
         bytes32 handle = externalEuint16.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Uint16);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Uint16);
         return euint16.wrap(handle);
     }
 
@@ -196,7 +196,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (euint256) {
         bytes32 handle = externalEuint256.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Uint256);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Uint256);
         return euint256.wrap(handle);
     }
 
@@ -205,7 +205,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (eint16) {
         bytes32 handle = externalEint16.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Int16);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Int16);
         return eint16.wrap(handle);
     }
 
@@ -214,7 +214,7 @@ library Nox {
         bytes calldata handleProof
     ) internal returns (eint256) {
         bytes32 handle = externalEint256.unwrap(externalHandle);
-        _noxComputeContract().validateProof(handle, msg.sender, handleProof, TEEType.Int256);
+        _noxComputeContract().validateInputProof(handle, msg.sender, handleProof, TEEType.Int256);
         return eint256.wrap(handle);
     }
 
@@ -896,6 +896,86 @@ library Nox {
         return _noxComputeContract().isPubliclyDecryptable(eint256.unwrap(handle));
     }
 
+    // ============ Public decryption proof verification ============
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted boolean value.
+     */
+    function publicDecrypt(ebool handle, bytes calldata decryptionProof) internal returns (bool) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            ebool.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (bool));
+    }
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted address value.
+     */
+    function publicDecrypt(
+        eaddress handle,
+        bytes calldata decryptionProof
+    ) internal returns (address) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            eaddress.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (address));
+    }
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted uint16 value.
+     */
+    function publicDecrypt(
+        euint16 handle,
+        bytes calldata decryptionProof
+    ) internal returns (uint16) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            euint16.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (uint16));
+    }
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted uint256 value.
+     */
+    function publicDecrypt(
+        euint256 handle,
+        bytes calldata decryptionProof
+    ) internal returns (uint256) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            euint256.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (uint256));
+    }
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted int16 value.
+     */
+    function publicDecrypt(eint16 handle, bytes calldata decryptionProof) internal returns (int16) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            eint16.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (int16));
+    }
+
+    /**
+     * @dev Verifies a decryption proof and returns the decrypted int256 value.
+     */
+    function publicDecrypt(
+        eint256 handle,
+        bytes calldata decryptionProof
+    ) internal returns (int256) {
+        bytes memory result = _noxComputeContract().validateDecryptionProof(
+            eint256.unwrap(handle),
+            decryptionProof
+        );
+        return abi.decode(result, (int256));
+    }
+
     // ============ Private helpers ============
 
     function _assertInitialized(bytes32 handle) private pure {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec-nox/nox-protocol-contracts",
-  "version": "0.1.0-beta.6",
+  "version": "0.1.0-beta.7",
   "description": "Nox protocol smart contracts",
   "keywords": [
     "Nox",
@@ -26,6 +26,7 @@
     "set-gateway": "pnpm hardhat run scripts/set-gateway.ts",
     "set-kms-public-key": "pnpm hardhat run scripts/set-kms-public-key.ts",
     "upgrade": "pnpm hardhat run scripts/upgrade.ts",
+    "verify": "pnpm hardhat ignition verify",
     "format": "pnpm prettier --write .",
     "format:check": "pnpm prettier --check ."
   },
@@ -35,16 +36,16 @@
     ]
   },
   "dependencies": {
-    "@openzeppelin/contracts": "^5.4.0",
-    "@openzeppelin/contracts-upgradeable": "^5.4.0",
+    "@openzeppelin/contracts": "^5.6.1",
+    "@openzeppelin/contracts-upgradeable": "^5.6.1",
     "encrypted-types": "^0.0.4"
   },
   "devDependencies": {
-    "@nomicfoundation/hardhat-ignition": "^3.0.8",
+    "@nomicfoundation/hardhat-ignition": "^3.0.9",
     "@nomicfoundation/hardhat-toolbox-viem": "^5.0.2",
     "@types/node": "^22.19.13",
     "forge-std": "github:foundry-rs/forge-std#v1.9.4",
-    "hardhat": "^3.1.10",
+    "hardhat": "^3.1.11",
     "husky": "^9.1.7",
     "lint-staged": "^16.3.1",
     "prettier": "^3.8.1",