@inco/lightning 1.0.0-devnet-9 → 1.0.0-rc-2

package/manifest.yaml

@@ -1,3 +1,29 @@
+incoLightning_testnet_v12_687186260:
+  executor:
+    name: incoLightning_testnet_v12_687186260
+    majorVersion: 12
+    deployer: "0x9eb3483532302Ab76290BACf9D6DC4efD3fa0d1B"
+    owner: "0x9eb3483532302Ab76290BACf9D6DC4efD3fa0d1B"
+    pepper: testnet
+    executorAddress: "0xe9CB49A5b16C6D4a093E5900AA8b450FD40541B6"
+    salt: "0x9eb3483532302ab76290bacf9d6dc4efd3fa0d1b00a56971525153062e0ab754"
+    verifierAddress: "0x0DF77d5803c09BB073e94fDCe6534851F2B3b638"
+  deployments:
+    - name: incoLightning_12_0_2__687186260
+      chainId: "84532"
+      chainName: Base Sepolia
+      version:
+        major: 12
+        minor: 0
+        patch: 2
+        shortSalt: "687186260"
+      blockNumber: "42021377"
+      deployDate: 2026-05-26T15:57:28.732Z
+      commit: v0.11.0-demonet-7-27-g60c6c4e7
+      active: true
+      includesPreviewFeatures: false
+      executorImpl: "0x7985Ab8B0231dd202ca9123f19C600edC4de562e"
+      verifierImpl: "0xf971532c7f7558416f2CED8a0B44B2D7388d883B"
 incoLightning_devnet_v12_873394282:
   executor:
     name: incoLightning_devnet_v12_873394282

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inco/lightning",
-  "version": "1.0.0-devnet-9",
+  "version": "1.0.0-rc-2",
   "repository": "https://github.com/Inco-fhevm/inco-monorepo",
   "files": [
     "src/",

package/src/DeployUtils.sol

@@ -6,17 +6,19 @@ import {Script} from "forge-std/Script.sol";
 import {IIncoLightning} from "./interfaces/IIncoLightning.sol";
 import {CreateX, CREATE_X_ADDRESS, CREATE_X_DEPLOYER} from "./pasted-dependencies/CreateX.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-import {CONTRACT_NAME, MAJOR_VERSION, VERIFIER_NAME} from "./version/IncoLightningConfig.sol";
+import {
+    CONTRACT_NAME,
+    MAJOR_VERSION,
+    MINOR_VERSION,
+    PATCH_VERSION,
+    VERIFIER_NAME
+} from "./version/IncoLightningConfig.sol";
 import {IncoVerifier} from "./IncoVerifier.sol";
 import {IIncoVerifier} from "./interfaces/IIncoVerifier.sol";
 import {console} from "forge-std/console.sol";
 import {CreateXHelper} from "./CreateXHelper.sol";
 import {IQuoteVerifier} from "./interfaces/automata-interfaces/IQuoteVerifier.sol";
-
-/// @dev Flag controlling cross-chain deployment authorization.
-///      Set to 0x00 to allow same contract at same address on all chains.
-///      Set to 0x01 to restrict to single chain deployment.
-bytes1 constant CROSS_CHAIN_DEPLOY_AUTHORIZED_FLAG = 0x00;
+import {Salt} from "./periphery/SaltLib.sol";
 
 // GLOSSARY
 // Pepper: a deployment-time string mixed into the salt hash function, used to avoid address collision on deploying
@@ -54,30 +56,6 @@ contract DeployUtils is Script {
         return createX;
     }
 
-    /// @notice Computes a deployment salt from contract metadata
-    /// @dev The salt incorporates:
-    ///      - Deployer address (first 20 bytes)
-    ///      - Cross-chain flag (1 byte)
-    ///      - Hash of name, version, and pepper (last 11 bytes)
-    /// @param name The contract name (e.g., "IncoLightning")
-    /// @param majorVersionNumber The major version number
-    /// @param deployer The address that will deploy the contract
-    /// @param pepper Additional entropy to avoid address collisions
-    /// @return The 32-byte salt for CreateX deployment
-    function getSalt(string memory name, uint8 majorVersionNumber, address deployer, string memory pepper)
-        internal
-        pure
-        returns (bytes32)
-    {
-        return bytes32(
-            abi.encodePacked(
-                deployer,
-                CROSS_CHAIN_DEPLOY_AUTHORIZED_FLAG,
-                bytes11(keccak256(abi.encodePacked(name, majorVersionNumber, pepper)))
-            )
-        );
-    }
-
     /// @notice Computes the address a contract will be deployed to using CreateX
     /// @dev Uses CREATE3 address derivation. The address is deterministic based only on salt.
     /// @param salt The salt value that will be passed to CreateX
@@ -87,9 +65,10 @@ contract DeployUtils is Script {
         return createX.computeCreate3DeployAddress({salt: salt});
     }
 
-    /// @notice Full deployment of IncoLightning and IncoVerifier using configuration
-    /// @dev Computes salts from deployer and pepper, then deploys both contracts.
-    ///      Should be wrapped in prank (testing) or broadcast (production).
+    /// @notice Full EOA-broadcast deployment of IncoLightning and IncoVerifier.
+    /// @dev Computes salts from deployer and pepper, then deploys both contracts via CreateX.
+    ///      Should be wrapped in prank (testing) or broadcast (production). For the Gnosis Safe
+    ///      path, callers should invoke `SafeDeployUtils.proposeAll(...)` directly instead.
     /// @param deployer The deployer address used in salt for CreateX permissioned deploy protection
     /// @param owner The address that will own both deployed proxies (can be a multisig)
     /// @param pepper Entropy string to avoid address collision with previous deployments
@@ -105,6 +84,7 @@ contract DeployUtils is Script {
         (bytes32 lightningSalt, bytes32 verifierSalt) = getIncoSalts(deployer, pepper);
         lightningProxy = deployLightning(lightningSalt, verifierSalt, owner);
         verifierProxy = deployVerifier(verifierSalt, lightningProxy, owner, quoteVerifier);
+
         console.log(
             "Deploying Inco with executor: %s, owner: %s, lightning salt: %s",
             vm.toString(address(lightningProxy)),
@@ -124,8 +104,8 @@ contract DeployUtils is Script {
         pure
         returns (bytes32 lightningSalt, bytes32 verifierSalt)
     {
-        lightningSalt = getSalt(CONTRACT_NAME, MAJOR_VERSION, deployer, pepper);
-        verifierSalt = getSalt(VERIFIER_NAME, MAJOR_VERSION, deployer, pepper);
+        lightningSalt = Salt.getSalt(CONTRACT_NAME, MAJOR_VERSION, deployer, pepper);
+        verifierSalt = Salt.getSalt(VERIFIER_NAME, MAJOR_VERSION, deployer, pepper);
     }
 
     /// @notice Deploys the IncoLightning contract with proxy
@@ -140,11 +120,18 @@ contract DeployUtils is Script {
         returns (IIncoLightning lightningProxy)
     {
         address verifierAddress = computeAddressFromSalt(verifierSalt);
-        IncoLightning lightningImplem = new IncoLightning(lightningSalt, IIncoVerifier(verifierAddress));
+        bytes32 implSalt = Salt.getImplSalt(lightningSalt, MINOR_VERSION, PATCH_VERSION);
+        address lightningImplem = CreateX(CREATE_X_ADDRESS)
+            .deployCreate3(
+                implSalt,
+                abi.encodePacked(
+                    type(IncoLightning).creationCode, abi.encode(lightningSalt, IIncoVerifier(verifierAddress))
+                )
+            );
         lightningProxy = IIncoLightning(
             deployProxy({
                 salt: lightningSalt,
-                implem: address(lightningImplem),
+                implem: lightningImplem,
                 initCall: abi.encodeWithSelector(IIncoLightning.initialize.selector, owner)
             })
         );
@@ -162,11 +149,13 @@ contract DeployUtils is Script {
         internal
         returns (IIncoVerifier verifierProxy)
     {
-        IncoVerifier verifierImplem = new IncoVerifier(address(lightning));
+        bytes32 implSalt = Salt.getImplSalt(verifierSalt, MINOR_VERSION, PATCH_VERSION);
+        address verifierImplem = CreateX(CREATE_X_ADDRESS)
+            .deployCreate3(implSalt, abi.encodePacked(type(IncoVerifier).creationCode, abi.encode(address(lightning))));
         verifierProxy = IIncoVerifier(
             deployProxy({
                 salt: verifierSalt,
-                implem: address(verifierImplem),
+                implem: verifierImplem,
                 initCall: abi.encodeWithSelector(
                     IIncoVerifier.initialize.selector, owner, VERIFIER_NAME, lightning.getMajorVersion(), quoteVerifier
                 )

package/src/Lib.sol

@@ -10,8 +10,8 @@ import { ebool, euint256, eaddress, ETypes, elist, IndexOutOfRange, InvalidRange
 import { asBool } from "./shared/TypeUtils.sol";
 import { DecryptionAttestation, ElementAttestationWithProof } from "./lightning-parts/DecryptionAttester.types.sol";
 
-IncoLightning constant inco = IncoLightning(payable(0xB3C06f0Ed967a7E366ba31C67927DDf93d7c1154));
-address constant deployedBy = 0x8202D2D747784Cb7D48868E44C42C4bf162a70BC;
+IncoLightning constant inco = IncoLightning(payable(0xe9CB49A5b16C6D4a093E5900AA8b450FD40541B6));
+address constant deployedBy = 0x9eb3483532302Ab76290BACf9D6DC4efD3fa0d1B;
 
 /// @notice Returns the ETypes enum value encoded in a handle
 ///  @param handle The handle to decode

package/src/Lib.testnet.sol

@@ -10,8 +10,8 @@ import { ebool, euint256, eaddress, ETypes, elist, IndexOutOfRange, InvalidRange
 import { asBool } from "./shared/TypeUtils.sol";
 import { DecryptionAttestation, ElementAttestationWithProof } from "./lightning-parts/DecryptionAttester.types.sol";
 
-IncoLightning constant inco = IncoLightning(payable(0x3cC345Eaa5bEe457AF9C0C3183335a67b62b0066));
-address constant deployedBy = 0x8202D2D747784Cb7D48868E44C42C4bf162a70BC;
+IncoLightning constant inco = IncoLightning(payable(0xe9CB49A5b16C6D4a093E5900AA8b450FD40541B6));
+address constant deployedBy = 0x9eb3483532302Ab76290BACf9D6DC4efD3fa0d1B;
 
 /// @notice Returns the ETypes enum value encoded in a handle
 ///  @param handle The handle to decode