Modifies migration

Author: rrecuero

script/migrations/07-deploy_kinto_app.sol

@@ -23,14 +23,11 @@ contract KintoMigration7DeployScript is Create2Helper, ArtifactsReader {
     // solhint-disable code-complexity
     function run() public {
         console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
-        // Execute this script with the hot wallet, not with ledger
-        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
-        address admin = vm.envAddress("LEDGER_ADMIN");
-        if (admin == address(0)) {
-            console.log("Admin key not set", admin);
-            return;
-        }
-        vm.startBroadcast(deployerPrivateKey);
+        // If not using ledger, replace
+        // Execute this script with the admin
+        // uint256 deployerPrivateKey = vm.envUint('PRIVATE_KEY');
+        // vm.startBroadcast(deployerPrivateKey);
+        vm.startBroadcast();
         console.log("Executing with address", msg.sender);
         address appAddr = _getChainDeployment("KintoAppRegistry");
         if (appAddr != address(0)) {
@@ -44,12 +41,7 @@ contract KintoMigration7DeployScript is Create2Helper, ArtifactsReader {
                 msg.sender, 0, abi.encodePacked(type(KintoAppRegistry).creationCode), bytes32(0)
             )
         );
-        _kintoApp.setWalletFactory(_walletFactory);
-        // Give ownership to admin
-        _kintoApp.transferOwnership(admin);
         address credits = _getChainDeployment("EngenCredits");
-        // Create Engen App
-        _kintoApp.registerApp("Engen", credits, new address[](0), [uint256(0), uint256(0), uint256(0), uint256(0)]);
         // Fund in the paymaster
         SponsorPaymaster _paymaster = SponsorPaymaster(payable(_getChainDeployment("SponsorPaymaster")));
         _paymaster.addDepositFor{value: 1e17}(credits);

script/migrations/11-create_engen_app.sol

@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "../../src/wallet/KintoWalletFactory.sol";
+import "../../src/KintoID.sol";
+import "../../src/wallet/KintoWallet.sol";
+import {Create2Helper} from "../../test/helpers/Create2Helper.sol";
+import {ArtifactsReader} from "../../test/helpers/ArtifactsReader.sol";
+import {UUPSProxy} from "../../test/helpers/UUPSProxy.sol";
+import "@openzeppelin/contracts-upgradeable/utils/cryptography/ECDSAUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
+import "forge-std/console.sol";
+
+contract KintoMigration11DeployScript is Create2Helper, ArtifactsReader {
+    using ECDSAUpgradeable for bytes32;
+
+    KintoWalletFactory _walletFactory;
+    KintoWallet _kintoWalletv1;
+    KintoID _kintoIDv1;
+    UUPSProxy _proxy;
+
+    function setUp() public {}
+
+    // solhint-disable code-complexity
+    function run() public {
+        console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
+        // If not using ledger, replace
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        address deployer = vm.rememberKey(deployerPrivateKey);
+        vm.startBroadcast(deployerPrivateKey);
+        console.log("Executing with address", deployer);
+        address walletFactoryAddr = _getChainDeployment("KintoWalletFactory");
+        if (walletFactoryAddr == address(0)) {
+            console.log("Need to execute main deploy script first", walletFactoryAddr);
+            return;
+        }
+        address credits = _getChainDeployment("EngenCredits");
+        IKintoAppRegistry _kintoApp = IKintoAppRegistry(_getChainDeployment("KintoAppRegistry"));
+        
+        // TODO: This needs to go through the entry point
+        _kintoApp.setWalletFactory(_walletFactory);
+        // // Create Engen App
+        _kintoApp.registerApp("Engen", credits, new address[](0), [uint256(0), uint256(0), uint256(0), uint256(0)]);
+        
+        vm.stopBroadcast();
+
+        // Writes the addresses to a file
+        console.log("Engen APP created and minted");
+    }
+}