@iexec-nox/nox-protocol-contracts 0.2.2 → 0.2.3

package/contracts/sdk/Nox.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.35;
 
-import {HandleUtils} from "../shared/HandleUtils.sol";
-import {TEEType, TypeUtils} from "../shared/TypeUtils.sol";
+import {HandleUtils} from "../utils/HandleUtils.sol";
+import {TEEType, TypeUtils} from "../utils/TypeUtils.sol";
 import {INoxCompute} from "../interfaces/INoxCompute.sol";
 import "encrypted-types/EncryptedTypes.sol";
 
@@ -19,60 +19,27 @@ library Nox {
 
     /**
      * @dev Returns the NoxCompute contract address for the current chain.
-     *      Supports Arbitrum Mainnet (42161), Arbitrum Sepolia (421614), and local dev chains (31337),
-     *      including local forks of each network.
+     * Supports:
+     * - Hardhat local development chain (31337)
+     * - Arbitrum Sepolia (421614)
+     * - Ethereum Sepolia (11155111)
      */
     function noxComputeContract() internal view returns (address) {
-        // Arbitrum mainnet or its fork
-        if (block.chainid == 42161) {
-            // TODO: Update after mainnet deployment.
-            return address(0);
+        // Hardhat local development chain
+        if (block.chainid == 31337) {
+            return 0x75C6AF4430cc474b1bb9b8540b7E46D6f8e1C685;
         }
-        // Arbitrum Sepolia or its fork
+        // Arbitrum Sepolia
         if (block.chainid == 421614) {
             return 0xd464B198f06756a1d00be223634b85E0a731c229;
         }
-        // Local development chain
-        if (block.chainid == 31337) {
-            return 0x44C00793aD4975617b3B5Fc27D4FB78E772c8236;
+        // Ethereum Sepolia
+        if (block.chainid == 11155111) {
+            return 0x24Ef36Ec5b626D7DCD09a98F3083c2758F0F77bF;
         }
         revert("Nox: Unsupported chain");
     }
 
-    function _noxComputeContract() private view returns (INoxCompute) {
-        return INoxCompute(noxComputeContract());
-    }
-
-    /**
-     * @dev Calls allow on NoxCompute, silently skipping public handles.
-     * Public handles are already accessible by everyone and don't need ACL.
-     */
-    function _allowIfNotPublic(bytes32 handle, address account) private {
-        if (!HandleUtils.isPublicHandle(handle)) {
-            _noxComputeContract().allow(handle, account);
-        }
-    }
-
-    /**
-     * @dev Calls allowTransient on NoxCompute, silently skipping public handles.
-     * Public handles are already accessible by everyone and don't need ACL.
-     */
-    function _allowTransientIfNotPublic(bytes32 handle, address account) private {
-        if (!HandleUtils.isPublicHandle(handle)) {
-            _noxComputeContract().allowTransient(handle, account);
-        }
-    }
-
-    /**
-     * @dev Calls disallowTransient on NoxCompute, silently skipping public handles.
-     * Public handles are already accessible by everyone and don't need ACL.
-     */
-    function _disallowTransientIfNotPublic(bytes32 handle, address account) private {
-        if (!HandleUtils.isPublicHandle(handle)) {
-            _noxComputeContract().disallowTransient(handle, account);
-        }
-    }
-
     // =========== Handle initialization checks ============
 
     /**
@@ -1294,6 +1261,10 @@ library Nox {
 
     // ============ Private helpers ============
 
+    function _noxComputeContract() private view returns (INoxCompute) {
+        return INoxCompute(noxComputeContract());
+    }
+
     /**
      * @dev Resolves an undefined (bytes32(0)) handle to the typed zero handle for the given type.
      * If the handle is already non-zero, returns it unchanged.
@@ -1304,4 +1275,34 @@ library Nox {
     ) private view returns (bytes32) {
         return handle == bytes32(0) ? HandleUtils.zeroHandle(teeType) : handle;
     }
+
+    /**
+     * @dev Calls allow on NoxCompute, silently skipping public handles.
+     * Public handles are already accessible by everyone and don't need ACL.
+     */
+    function _allowIfNotPublic(bytes32 handle, address account) private {
+        if (!HandleUtils.isPublicHandle(handle)) {
+            _noxComputeContract().allow(handle, account);
+        }
+    }
+
+    /**
+     * @dev Calls allowTransient on NoxCompute, silently skipping public handles.
+     * Public handles are already accessible by everyone and don't need ACL.
+     */
+    function _allowTransientIfNotPublic(bytes32 handle, address account) private {
+        if (!HandleUtils.isPublicHandle(handle)) {
+            _noxComputeContract().allowTransient(handle, account);
+        }
+    }
+
+    /**
+     * @dev Calls disallowTransient on NoxCompute, silently skipping public handles.
+     * Public handles are already accessible by everyone and don't need ACL.
+     */
+    function _disallowTransientIfNotPublic(bytes32 handle, address account) private {
+        if (!HandleUtils.isPublicHandle(handle)) {
+            _noxComputeContract().disallowTransient(handle, account);
+        }
+    }
 }

package/contracts/{shared → utils}/HandleUtils.sol

@@ -1,16 +1,28 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.35;
 
 import {TEEType} from "./TypeUtils.sol";
 
 library HandleUtils {
     /// @dev Bit 0 of the attrs byte. When set, the handle is guaranteed unique on-chain.
+    // TODO rename to IS_UNIQUE_HANDLE_ATTRIBUTE
     bytes1 internal constant ATTR_IS_UNIQUE_HANDLE = 0x01;
 
     /**
      * @notice Checks if a handle is a public handle (isUniqueHandle bit == 0).
      * A public handle wraps a plaintext value known on-chain, has no ACL,
      * and is accessible by everyone.
+     *
+     * @dev **Security invariant — public handles bypass all ACL checks.**
+     * Every access-control gate in the system short-circuits on this predicate:
+     *   - `_isAllowed`               → always returns true for public handles
+     *   - `_allowTransient`          → silently skips (no tstore needed)
+     *   - `allow`, `addViewer`...    → ACL mutations are blocked to prevent confusion
+     *   - `isViewer`                 → always returns true for public handles
+     *   - `isPubliclyDecryptable`    → always returns true for public handles
+     * This is intentional: public handles contain no secret, their plaintext
+     * is deterministically derivable from the handle itself.
+     *
      * @param handle The handle to check
      * @return True if the handle is a public handle
      */

package/contracts/{shared → utils}/TypeUtils.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.27;
+pragma solidity ^0.8.35;
 
 /**
  * @notice Enum values MUST NOT be reordered or removed once deployed.
@@ -114,6 +114,7 @@ enum TEEType {
 
 error NonArithmeticType();
 error UnsupportedArithmeticType();
+error IncompatibleTypes();
 
 library TypeUtils {
     /**
@@ -160,4 +161,27 @@ library TypeUtils {
                 teeType == TEEType.Int256;
         require(supportedType, UnsupportedArithmeticType());
     }
+
+    /**
+     * Reverts if handle's TEEType doesn't match the expected type.
+     */
+    function requireType(bytes32 handle, TEEType expected) internal pure {
+        require(typeOf(handle) == expected, IncompatibleTypes());
+    }
+
+    /**
+     * Validates that first and second have the same supported arithmetic type.
+     */
+    function validateOperationTypes(bytes32 first, bytes32 second) internal pure {
+        validateArithmeticType(typeOf(first));
+        requireType(second, typeOf(first));
+    }
+
+    /**
+     * Validates that first, second, and third have the same supported arithmetic type.
+     */
+    function validateOperationTypes(bytes32 first, bytes32 second, bytes32 third) internal pure {
+        validateOperationTypes(first, second);
+        requireType(third, typeOf(first));
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iexec-nox/nox-protocol-contracts",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Nox protocol smart contracts",
   "keywords": [
     "Nox",
@@ -11,11 +11,13 @@
   "packageManager": "pnpm@10.33.0",
   "type": "module",
   "files": [
-    "/contracts/NoxCompute.sol",
-    "/contracts/interfaces/",
-    "/contracts/sdk/",
-    "/contracts/shared/",
-    "/ignition/deployments/arbitrumSepolia/artifacts/"
+    "/contracts/**/*.sol",
+    "/contracts/**/LICENSE",
+    "!/contracts/mock/**",
+    "/artifacts/contracts/**/*.json",
+    "!/artifacts/contracts/mock/**",
+    "/LICENSE-MIT",
+    "/DISCLAIMER"
   ],
   "scripts": {
     "prepare": "husky",
@@ -32,7 +34,8 @@
     "upgrade:production": "bash scripts/upgrade.sh --build-profile production",
     "verify": "pnpm hardhat ignition verify",
     "format": "pnpm prettier --write .",
-    "format:check": "pnpm prettier --check ."
+    "format:check": "pnpm prettier --check .",
+    "update-local-proxy-address": "sh scripts/update-local-proxy-address.sh"
   },
   "lint-staged": {
     "*.{sol,js,ts,json,md,yml,yaml}": [