Kinto App Registry

.env.sample

@@ -4,3 +4,4 @@ KINTO_RPC_URL="https://kinto-mainnet.calderachain.xyz/http"
 MAINNET_NETWORK_ID="7887"
 TESTNET_NETWORK_ID="7887000"
 KINTO_EXPLORER_URL="https://kinto-mainnet.calderaexplorer.xyz/"
+LEDGER_ADMIN=""

script/deploy.sol

@@ -105,7 +105,7 @@ contract KintoInitialDeployScript is Create2Helper, ArtifactsReader {
             console.log("Wallet Implementation already deployed at", address(walletImplementationAddr));
         } else {
             // Deploy Wallet Implementation
-            _walletImpl = new KintoWallet{salt: 0}(_entryPoint, _kintoIDv1);
+            _walletImpl = new KintoWallet{salt: 0}(_entryPoint, _kintoIDv1, IKintoAppRegistry(address(0)));
             console.log("Wallet Implementation deployed at", address(_walletImpl));
         }
 

script/migrations/02-upgrade_wallet.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
 import "../../src/wallet/KintoWalletFactory.sol";
-import {KintoWalletV2} from "../../src/wallet/KintoWallet.sol";
+import {KintoWallet} from "../../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";
@@ -12,6 +12,13 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "forge-std/console.sol";
 
+// Upgradeable version of KintoWallet
+contract KintoWalletV2 is KintoWallet {
+    constructor(IEntryPoint _entryPoint, IKintoID _kintoID)
+        KintoWallet(_entryPoint, _kintoID, IKintoAppRegistry(address(0)))
+    {}
+}
+
 contract KintoMigration2DeployScript is Create2Helper, ArtifactsReader {
     using ECDSAUpgradeable for bytes32;
 

script/migrations/04-deploy_admin_wallet.sol

@@ -4,7 +4,6 @@ pragma solidity ^0.8.13;
 import "forge-std/Script.sol";
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/KintoID.sol";
-import {KintoWalletV2} from "../../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";

script/migrations/05-deploy_faucet.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
 import "../../src/Faucet.sol";
-import {KintoWalletV2} from "../../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";

script/migrations/06-counter_advance.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import "forge-std/Script.sol";
 import "../../src/sample/Counter.sol";
-import {KintoWalletV2} from "../../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";

script/migrations/07-deploy_kinto_app.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "../../src/apps/KintoAppRegistry.sol";
+import "../../src/paymasters/SponsorPaymaster.sol";
+import "../../src/interfaces/IKintoWalletFactory.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 KintoMigration7DeployScript is Create2Helper, ArtifactsReader {
+    using ECDSAUpgradeable for bytes32;
+
+    KintoAppRegistry _kintoApp;
+
+    function setUp() public {}
+
+    // 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);
+        console.log("Executing with address", msg.sender);
+        address appAddr = _getChainDeployment("KintoAppRegistry");
+        if (appAddr != address(0)) {
+            console.log("KintoAppRegistry already deployed", appAddr);
+            return;
+        }
+        address walletFactoryAddr = _getChainDeployment("KintoWalletFactory");
+        IKintoWalletFactory _walletFactory = IKintoWalletFactory(walletFactoryAddr);
+        _kintoApp = KintoAppRegistry(
+            _walletFactory.deployContract(
+                msg.sender, 0, abi.encodePacked(type(KintoAppRegistry).creationCode), bytes32(0)
+            )
+        );
+        // 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);
+        vm.stopBroadcast();
+        // Writes the addresses to a file
+        console.log("Add these new addresses to the artifacts file");
+        console.log(string.concat('"KintoAppRegistry": "', vm.toString(address(_kintoApp)), '"'));
+    }
+}

script/migrations/08-upgrade_wallet_v3.sol

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "../../src/wallet/KintoWalletFactory.sol";
+import {KintoWallet} from "../../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 KintoMigration8DeployScript is Create2Helper, ArtifactsReader {
+    using ECDSAUpgradeable for bytes32;
+
+    KintoWalletFactory _walletFactory;
+    KintoWalletV3 _kintoWalletImpl;
+    UUPSProxy _proxy;
+
+    function setUp() public {}
+
+    // solhint-disable code-complexity
+    function run() public {
+        console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
+        // Execute this script with the ledger admin
+        console.log("Executing with address", msg.sender);
+        vm.startBroadcast();
+        address walletFactoryAddr = _getChainDeployment("KintoWalletFactory");
+        if (walletFactoryAddr == address(0)) {
+            console.log("Need to execute main deploy script first", walletFactoryAddr);
+            return;
+        }
+        address kintoAppAddr = _getChainDeployment("KintoAppRegistry");
+        if (kintoAppAddr == address(0)) {
+            console.log("Need to deploy kinto app registry first", kintoAppAddr);
+            return;
+        }
+        _walletFactory = KintoWalletFactory(payable(walletFactoryAddr));
+
+        bytes memory bytecode = abi.encodePacked(
+            abi.encodePacked(type(KintoWalletV3).creationCode),
+            abi.encode(
+                _getChainDeployment("EntryPoint"),
+                IKintoID(_getChainDeployment("KintoID")),
+                IKintoAppRegistry(_getChainDeployment("KintoAppRegistry"))
+            ) // Encoded constructor arguments
+        );
+
+        // Deploy new wallet implementation
+        _kintoWalletImpl = KintoWalletV3(payable(_walletFactory.deployContract(msg.sender, 0, bytecode, bytes32(0))));
+        // Upgrade all implementations
+        _walletFactory.upgradeAllWalletImplementations(_kintoWalletImpl);
+        vm.stopBroadcast();
+        // Writes the addresses to a file
+        console.log("Add these new addresses to the artifacts file");
+        console.log(string.concat('"KintoWalletV3-impl": "', vm.toString(address(_kintoWalletImpl)), '"'));
+    }
+}

script/migrations/09-upgrade_paymasterv2.sol

@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "../../src/wallet/KintoWalletFactory.sol";
+import "../../src/paymasters/SponsorPaymaster.sol";
+import {KintoWallet} from "../../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 KintoMigration9DeployScript is Create2Helper, ArtifactsReader {
+    using ECDSAUpgradeable for bytes32;
+
+    SponsorPaymaster _paymaster;
+    KintoWalletFactory _walletFactory;
+    SponsorPaymasterV2 _paymasterImpl;
+    UUPSProxy _proxy;
+
+    function setUp() public {}
+
+    // solhint-disable code-complexity
+    function run() public {
+        console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
+        // Execute this script with the ledger admin
+        console.log("Executing with address", msg.sender);
+        vm.startBroadcast();
+        address sponsorAddr = _getChainDeployment("SponsorPaymaster");
+        if (sponsorAddr == address(0)) {
+            console.log("Need to execute main deploy script first", sponsorAddr);
+            return;
+        }
+        _paymaster = SponsorPaymaster(payable(sponsorAddr));
+
+        _walletFactory = KintoWalletFactory(payable(_getChainDeployment("KintoWalletFactory")));
+        bytes memory bytecode = abi.encodePacked(
+            abi.encodePacked(type(SponsorPaymasterV2).creationCode),
+            abi.encode(_getChainDeployment("EntryPoint")) // Encoded constructor arguments
+        );
+
+        // Deploy new paymaster implementation
+        _paymasterImpl = SponsorPaymasterV2(payable(_walletFactory.deployContract(msg.sender, 0, bytecode, bytes32(0))));
+        // Upgrade
+        _paymaster.upgradeTo(address(_paymasterImpl));
+        vm.stopBroadcast();
+        // Writes the addresses to a file
+        console.log("Add these new addresses to the artifacts file");
+        console.log(string.concat('"SponsorPaymasterV2-impl": "', vm.toString(address(_paymasterImpl)), '"'));
+    }
+}

script/migrations/10-upgrade_wallet_factoryv2.sol

@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import "forge-std/Script.sol";
+import "../../src/wallet/KintoWalletFactory.sol";
+import {KintoWallet} from "../../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 KintoMigration9DeployScript is Create2Helper, ArtifactsReader {
+    using ECDSAUpgradeable for bytes32;
+
+    KintoWalletFactory _walletFactory;
+    KintoWalletFactoryV2 _factoryImpl;
+    UUPSProxy _proxy;
+
+    function setUp() public {}
+
+    // solhint-disable code-complexity
+    function run() public {
+        console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
+        // Execute this script with the ledger admin
+        console.log("Executing with address", msg.sender);
+        vm.startBroadcast();
+        address factoryAddr = _getChainDeployment("KintoWalletFactory");
+        if (factoryAddr == address(0)) {
+            console.log("Need to execute main deploy script first", factoryAddr);
+            return;
+        }
+        _walletFactory = KintoWalletFactory(payable(_getChainDeployment("KintoWalletFactory")));
+
+        address newImpl = _getChainDeployment("KintoWalletV3-impl");
+        if (newImpl == address(0)) {
+            console.log("Need to deploy the new wallet first", newImpl);
+            return;
+        }
+        bytes memory bytecode = abi.encodePacked(
+            abi.encodePacked(type(KintoWalletFactoryV2).creationCode),
+            abi.encode(_getChainDeployment("KintoWalletV3-impl")) // Encoded constructor arguments
+        );
+
+        // Deploy new paymaster implementation
+        _factoryImpl = KintoWalletFactoryV2(payable(_walletFactory.deployContract(msg.sender, 0, bytecode, bytes32(0))));
+        // Upgrade
+        _walletFactory.upgradeTo(address(_factoryImpl));
+        vm.stopBroadcast();
+        // Writes the addresses to a file
+        console.log("Add these new addresses to the artifacts file");
+        console.log(string.concat('"KintoWalletFactoryV2-impl": "', vm.toString(address(_factoryImpl)), '"'));
+    }
+}

script/upgrade.sol

@@ -22,7 +22,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import "forge-std/console.sol";
 
-contract KintoWalletFactoryV2 is KintoWalletFactory {
+contract KintoWalletFactoryV999 is KintoWalletFactory {
     constructor(KintoWallet _impl) KintoWalletFactory(_impl) {}
 }
 
@@ -39,16 +39,18 @@ contract KintoWalletFactoryUpgradeScript is ArtifactsReader {
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
         vm.startBroadcast(deployerPrivateKey);
         _oldKintoWalletFactory = KintoWalletFactory(payable(_getChainDeployment("KintoWalletFactory")));
-        KintoWalletFactoryV2 _implementationV2 =
-            new KintoWalletFactoryV2(KintoWallet(payable(_getChainDeployment("KintoWallet-impl"))));
-        _oldKintoWalletFactory.upgradeTo(address(_implementationV2));
-        console.log("KintoWalletFactory Upgraded to implementation", address(_implementationV2));
+        KintoWalletFactoryV999 _implementationV999 =
+            new KintoWalletFactoryV999(KintoWallet(payable(_getChainDeployment("KintoWallet-impl"))));
+        _oldKintoWalletFactory.upgradeTo(address(_implementationV999));
+        console.log("KintoWalletFactory Upgraded to implementation", address(_implementationV999));
         vm.stopBroadcast();
     }
 }
 
-contract KintoWalletV3 is KintoWallet {
-    constructor(IEntryPoint _entryPoint, IKintoID _kintoIDv1) KintoWallet(_entryPoint, _kintoIDv1) {}
+contract KintoWalletVTest is KintoWallet {
+    constructor(IEntryPoint _entryPoint, IKintoID _kintoIDv1, IKintoAppRegistry _kintoApp)
+        KintoWallet(_entryPoint, _kintoIDv1, _kintoApp)
+    {}
 }
 
 contract KintoWalletsUpgradeScript is ArtifactsReader {
@@ -66,8 +68,11 @@ contract KintoWalletsUpgradeScript is ArtifactsReader {
 
         _walletFactory = KintoWalletFactory(payable(_getChainDeployment("KintoWalletFactory")));
         // Deploy new wallet implementation
-        _kintoWalletImpl =
-            new KintoWalletV3(IEntryPoint(_getChainDeployment("EntryPoint")), IKintoID(_getChainDeployment("KintoID")));
+        _kintoWalletImpl = new KintoWalletVTest(
+            IEntryPoint(_getChainDeployment("EntryPoint")),
+            IKintoID(_getChainDeployment("KintoID")),
+            IKintoAppRegistry(_getChainDeployment("IKintoAppRegistry"))
+        );
         // // Upgrade all implementations
         _walletFactory.upgradeAllWalletImplementations(_kintoWalletImpl);
         vm.stopBroadcast();