@inco/lightning 0.2.11 → 0.2.12

package/package.json

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

package/src/DeployUtils.sol

@@ -9,7 +9,6 @@ import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.s
 import {CONTRACT_NAME, MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION} from "../src/version/IncoLightningConfig.sol";
 import {console} from "forge-std/console.sol";
 import {CreateXHelper} from "./CreateXHelper.sol";
-import {IncoLightningPreview} from "@inco/lightning-preview/src/IncoLightningPreview.sol";
 
 // can be set to 0x01 so the inco address can exist on only one chain, we want the same contract at the same address
 // on all chains
@@ -61,23 +60,6 @@ contract DeployUtils is Script {
         );
     }
 
-    /// @dev deploys an CreateX proxy with an IncoLightning implementation
-    /// @param deployer MUST be the signer of the transaction
-    /// @param pepper a value used to avoid address collision on deploying the same contract twice with the same deployer
-    function deployIncoLightningUsingConfig(
-        address deployer,
-        string memory pepper,
-        bool includePreviewFeatures
-    ) internal returns (IncoLightning proxy) {
-        return deployIncoLightningUsingConfig(
-            deployer,
-            pepper,
-            MINOR_VERSION,
-            PATCH_VERSION,
-            includePreviewFeatures
-        );
-    }
-
     /// @dev Computes the address of the IncoLightning contract using CreateX based on the deployer and pepper
     /// @param deployer MUST be the signer of the transaction
     /// @param pepper a value used to avoid address collision on deploying the same contract twice with the same deployer
@@ -111,14 +93,12 @@ contract DeployUtils is Script {
     /// @param pepper a value used to avoid address collision on deploying the same contract twice with the same deployer
     /// @param minorVersionForSalt minor version of the contract to use in the salt
     /// @param patchVersionForSalt patch version of the contract to use in the salt
-    /// @param includePreviewFeatures whether to include preview features in the contract
     function deployIncoLightningUsingConfig(
         address deployer,
         string memory pepper,
     // FIXME: on the next major version (new contract address and state) we should remove these from the salt altogether
         uint8 minorVersionForSalt,
-        uint8 patchVersionForSalt,
-        bool includePreviewFeatures
+        uint8 patchVersionForSalt
     ) internal returns (IncoLightning proxy) {
         bytes32 salt = getSalt(
             CONTRACT_NAME,
@@ -134,11 +114,6 @@ contract DeployUtils is Script {
             vm.toString(salt)
         );
         IncoLightning implementation = new IncoLightning(salt);
-        if (includePreviewFeatures) {
-            IncoLightningPreview preview = new IncoLightningPreview(address(implementation));
-            // FIXME: This is hack, we ought to define an interface IIncoLightning here and use that instead
-            implementation = IncoLightning(address(preview));
-        }
         proxy = IncoLightning(
             deployProxy({
                 deployer: deployer,
@@ -149,49 +124,6 @@ contract DeployUtils is Script {
         );
     }
 
-    /// @dev Upgrades an existing IncoLightning contract whose major version is in IncoLightningConfig.sol but whose
-    /// minor and patch versions can be provided to this function in order to perform an upgrade
-    /// @param deployer MUST be the signer of the transaction
-    /// @param pepper a value used to avoid address collision on deploying the same contract twice with the same deployer
-    /// @param minorVersionForSalt minor version of the contract to use in the salt
-    /// @param patchVersionForSalt patch version of the contract to use in the salt
-    /// @param includePreviewFeatures whether to include preview features in the contract
-    function upgradeIncoLightningUsingConfig(
-        address deployer,
-        string memory pepper,
-    // FIXME: on the next major version (new contract address and state) we should remove these from the salt altogether
-        uint8 minorVersionForSalt,
-        uint8 patchVersionForSalt,
-        bool includePreviewFeatures
-    ) internal returns (IncoLightning proxy) {
-        // Here we hack around the fact that we must use the same salt for an upgrade and currently the salt includes
-        // the minor and patch versions
-        bytes32 salt = getSalt(
-            CONTRACT_NAME,
-            MAJOR_VERSION,
-            minorVersionForSalt,
-            patchVersionForSalt,
-            deployer,
-            pepper
-        );
-        CreateXHelper createX = new CreateXHelper();
-        address proxyAddress = createX.computeCreate3DeployAddress({salt: salt});
-        console.log(
-            "Upgrading Inco with deployerAddress: %s, salt: %s, proxyAddress: %s",
-            vm.toString(deployer),
-            vm.toString(salt),
-            vm.toString(proxyAddress)
-        );
-        proxy = IncoLightning(proxyAddress);
-
-        IncoLightning newImplementation = new IncoLightning(salt);
-        if (includePreviewFeatures) {
-            newImplementation = IncoLightning(address(new IncoLightningPreview(address(newImplementation))));
-        }
-        new IncoLightning(salt);
-        proxy.upgradeToAndCall(address(newImplementation), "");
-        return proxy;
-    }
 
 /// @notice deploys a ERC1967Proxy contract using CreateX (create3 pattern), gives the deployer the ownership of
 ///     the proxy

package/src/test/IncoTest.sol

@@ -30,8 +30,7 @@ contract IncoTest is MockOpHandler, DeployUtils {
         // The highest precedent deployment
             pepper: "testnet",
             minorVersionForSalt: 1,
-            patchVersionForSalt: 29,
-            includePreviewFeatures: false
+            patchVersionForSalt: 29
         });
         proxy.transferOwnership(owner);
         vm.stopPrank();