Merge 8f934a3 into bd848da

certora/conf/KintoID_Generic.conf

@@ -7,7 +7,7 @@
     "verify": "KintoIDHarness:certora/spec/Generic.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/KintoID_Monitor1.conf

@@ -7,7 +7,7 @@
     "verify": "KintoIDHarness:certora/spec/KintoID/Monitor.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/KintoID_Monitor2.conf

@@ -7,7 +7,7 @@
     "verify": "KintoIDHarness:certora/spec/KintoID/Monitor.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/KintoID_SanctionsTraits.conf

@@ -7,7 +7,7 @@
     "verify": "KintoIDHarness:certora/spec/KintoID/SanctionsTraits.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/KintoID_Viewer.conf

@@ -7,7 +7,7 @@
     "verify":"KintoIDHarness:certora/spec/KintoID/Viewer.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/KintoWallet.conf

@@ -13,7 +13,7 @@
     ],
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src',
       'forge-std/=node_modules/forge-std/src',

certora/conf/KintoWalletFactory.conf

@@ -6,7 +6,7 @@
     "verify":"KintoWalletFactory:certora/spec/KintoWalletFactory/Factory.spec",
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/SponsorPaymaster.conf

@@ -16,7 +16,7 @@
     ],
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

certora/conf/SponsorPaymaster_additional.conf

@@ -16,7 +16,7 @@
     ],
     "packages": [
       'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-      '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+      '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
       'ds-test/=node_modules/forge-std/lib/ds-test/src/',
       'forge-std/=node_modules/forge-std/src/',

foundry.toml

@@ -11,7 +11,7 @@ ffi = true
 solc_version = "0.8.24"
 remappings = [
     'node_modules/account-abstraction-0.7.0:@openzeppelin/contracts/=node_modules/openzeppelin-contracts-5.0.1',
-    '@aa-v7/=node_modules/account-abstraction-0.7.0/contracts/',
+    '@aa/=node_modules/account-abstraction-0.7.0/contracts/',
 
     'ds-test/=node_modules/forge-std/lib/ds-test/src/',
     'forge-std/=node_modules/forge-std/src/',
@@ -28,7 +28,6 @@ remappings = [
     '@openzeppelin/contracts-upgradeable/=node_modules/openzeppelin-contracts-upgradeable/',
 
     'node_modules/account-abstraction:@openzeppelin/contracts/=node_modules/openzeppelin-contracts',
-    '@aa/=node_modules/account-abstraction/contracts/',
 
     '@solady/=node_modules/solady/src/',
     'solady/=node_modules/solady/src/',

package.json

@@ -26,7 +26,6 @@
   },
   "dependencies": {
     "@pimlico/alto": "^0.0.4",
-    "account-abstraction": "https://github.com/KintoXYZ/account-abstraction.git#61f677923ad7ed0ed5b87d2c20100a7079dba63a",
     "account-abstraction-0.7.0": "https://github.com/eth-infinitism/account-abstraction.git#7af70c8993a6f42973f520ae0752386a5032abe7",
     "forge-std": "https://github.com/foundry-rs/forge-std.git#bb4ceea94d6f10eeb5b41dc2391c6c8bf8e734ef",
     "nitro-contracts": "npm:@arbitrum/nitro-contracts@1.2.1",

script/actions/deploy.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "@aa/core/EntryPoint.sol";
+import {EntryPoint} from "@aa/core/EntryPoint.sol";
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 
@@ -13,8 +13,9 @@ import "@kinto-core/viewers/KYCViewer.sol";
 import "@kinto-core/viewers/WalletViewer.sol";
 import "@kinto-core/wallet/KintoWallet.sol";
 import "@kinto-core/wallet/KintoWalletFactory.sol";
+import {BridgedKinto} from "@kinto-core/tokens/bridged/BridgedKinto.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import {RewardsDistributor} from "@kinto-core/liquidity-mining/RewardsDistributor.sol";
-import "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "@kinto-core/wallet/KintoWallet.sol";
 import "@kinto-core/apps/KintoAppRegistry.sol";
 import "@kinto-core/tokens/EngenCredits.sol";
@@ -23,10 +24,10 @@ import "@kinto-core/Faucet.sol";
 import "@kinto-core/inflators/KintoInflator.sol";
 import "@kinto-core/inflators/BundleBulker.sol";
 import "@kinto-core/governance/EngenGovernance.sol";
+
 import "@kinto-core-test/helpers/Create2Helper.sol";
 import "@kinto-core-test/helpers/ArtifactsReader.sol";
 import "@kinto-core-test/helpers/UUPSProxy.sol";
-import {BridgedKinto} from "@kinto-core/tokens/bridged/BridgedKinto.sol";
 
 import {DeployerHelper} from "@kinto-core-script/utils/DeployerHelper.sol";
 
@@ -302,11 +303,6 @@ contract DeployerScript is Create2Helper, DeployerHelper {
 
         privateKey > 0 ? vm.broadcast(privateKey) : vm.broadcast();
         _walletFactory.initialize();
-
-        // set wallet factory in EntryPoint
-        if (log) console.log("Setting wallet factory in entry point to: ", address(_walletFactory));
-        privateKey > 0 ? vm.broadcast(privateKey) : vm.broadcast();
-        entryPoint.setWalletFactory(address(_walletFactory));
     }
 
     function deployKintoWallet() public returns (KintoWallet _kintoWallet) {

script/actions/fund-faucet.s.sol

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.18;
+
+import "@kinto-core/wallet/KintoWalletFactory.sol";
+import "@kinto-core/wallet/KintoWallet.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
+
+import "@kinto-core-test/helpers/Create2Helper.sol";
+import "@kinto-core-test/helpers/ArtifactsReader.sol";
+import "@kinto-core-test/helpers/UUPSProxy.sol";
+
+import "forge-std/Script.sol";
+import "forge-std/console.sol";
+
+contract FundFaucetScript is Create2Helper, ArtifactsReader {
+    function setUp() public {}
+
+    // NOTE: this migration must be run from the ledger admin
+    function run() public {
+        console.log("RUNNING ON CHAIN WITH ID", vm.toString(block.chainid));
+        // Execute this script with the ledger admin but first we use the hot wallet
+        console.log("Executing with address", msg.sender, vm.envAddress("LEDGER_ADMIN"));
+        address factoryAddr = _getChainDeployment("KintoWalletFactory");
+        if (factoryAddr == address(0)) {
+            console.log("Need to execute main deploy script first", factoryAddr);
+            return;
+        }
+        // Start admin
+        vm.startBroadcast();
+        uint256 AMOUNT_TO_SEND = 0.1 ether;
+        KintoWalletFactory(address(factoryAddr)).sendMoneyToAccount{value: AMOUNT_TO_SEND}(
+            0xb539019776eF803E89EC062Ad54cA24D1Fdb008a
+        );
+        vm.stopBroadcast();
+        require(address(0xb539019776eF803E89EC062Ad54cA24D1Fdb008a).balance >= AMOUNT_TO_SEND, "amount was not sent");
+        // writes the addresses to a file
+        console.log("Faucet amount sent");
+    }
+}

script/actions/send-user-operation.s.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {IEntryPoint, UserOperation} from "@aa/core/BaseAccount.sol";
+import {IEntryPoint} from "@aa/core/BaseAccount.sol";
+import {PackedUserOperation} from "@aa/interfaces/PackedUserOperation.sol";
 
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 
@@ -21,25 +22,21 @@ contract SendUserOperationScript is MigrationHelper {
         uint256 nonce = json.readUint(".inflatedOp.nonce");
         bytes memory callData = json.readBytes(".inflatedOp.callData");
         bytes memory initCode = json.readBytes(".inflatedOp.initCode ");
-        uint256 callGasLimit = json.readUint(".inflatedOp.callGasLimit");
-        uint256 verificationGasLimit = json.readUint(".inflatedOp.verificationGasLimit");
+        bytes32 accountGasLimits = json.readBytes32(".inflatedOp.accountGasLimits");
+        bytes32 gasFees = json.readBytes32(".inflatedOp.gasFees");
         uint256 preVerificationGas = json.readUint(".inflatedOp.preVerificationGas");
-        uint256 maxFeePerGas = json.readUint(".inflatedOp.maxFeePerGas");
-        uint256 maxPriorityFeePerGas = json.readUint(".inflatedOp.maxPriorityFeePerGas");
         bytes memory paymasterAndData = json.readBytes(".inflatedOp.paymasterAndData");
         bytes memory signature = json.readBytes(".inflatedOp.signature");
 
-        UserOperation[] memory userOps = new UserOperation[](1);
-        userOps[0] = UserOperation({
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
+        userOps[0] = PackedUserOperation({
             sender: sender,
             nonce: nonce,
             initCode: initCode,
             callData: callData,
-            callGasLimit: callGasLimit,
-            verificationGasLimit: verificationGasLimit,
             preVerificationGas: preVerificationGas,
-            maxFeePerGas: maxFeePerGas,
-            maxPriorityFeePerGas: maxPriorityFeePerGas,
+            accountGasLimits: accountGasLimits,
+            gasFees: gasFees,
             paymasterAndData: paymasterAndData,
             signature: signature
         });

script/actions/test.s.sol

@@ -1,17 +1,17 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
+import {EntryPoint} from "@aa/core/EntryPoint.sol";
+import {PackedUserOperation} from "@aa/interfaces/PackedUserOperation.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
-import "@aa/core/EntryPoint.sol";
-
 import "@kinto-core/KintoID.sol";
 import "@kinto-core/interfaces/IKintoID.sol";
 import "@kinto-core/sample/Counter.sol";
 import "@kinto-core/sample/ETHPriceIsRight.sol";
 import "@kinto-core/interfaces/IKintoWallet.sol";
 import "@kinto-core/wallet/KintoWalletFactory.sol";
-import "@kinto-core/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "@kinto-core-script/utils/MigrationHelper.sol";
 
@@ -137,7 +137,7 @@ contract KintoDeployTestCounter is MigrationHelper {
         uint256[] memory privateKeys = new uint256[](1);
         privateKeys[0] = deployerPrivateKey;
 
-        UserOperation[] memory userOps = new UserOperation[](2);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](2);
 
         // whitelist counter contract in the wallet
         address[] memory targets = new address[](1);
@@ -235,7 +235,7 @@ contract KintoDeployETHPriceIsRight is MigrationHelper {
         uint256 nonce = _newWallet.getNonce();
         uint256[] memory privateKeys = new uint256[](1);
         privateKeys[0] = deployerPrivateKey;
-        UserOperation[] memory userOps = new UserOperation[](2);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](2);
 
         // whitelist ETHPriceIsRight contract in the wallet
         address[] memory targets = new address[](1);
@@ -307,7 +307,7 @@ contract SendHanldeOps is MigrationHelper {
         uint256[] memory privateKeys = new uint256[](1);
         privateKeys[0] = deployerPrivateKey;
 
-        UserOperation[] memory userOps = new UserOperation[](1);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
 
         userOps[0] = _createUserOperation(
             block.chainid,

script/migrations/12-create_engen_app.s.sol

@@ -9,7 +9,7 @@ import "../../src/wallet/KintoWallet.sol";
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/tokens/EngenCredits.sol";
 import "../../src/apps/KintoAppRegistry.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "../../test/helpers/ArtifactsReader.sol";
 import "../../test/helpers/UUPSProxy.sol";
@@ -64,7 +64,7 @@ contract KintoMigration12DeployScript is ArtifactsReader, UserOp {
         privateKeys[0] = deployerPrivateKey;
         uint256 nonce = _kintoWallet.getNonce();
 
-        UserOperation[] memory userOps = new UserOperation[](3);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](3);
 
         // whitelist Engen Credits & Registry
         address[] memory apps = new address[](2);

script/migrations/121-upgrade_access_protocol.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {IEntryPoint} from "@aa-v7/interfaces/IEntryPoint.sol";
+import {IEntryPoint} from "@aa/interfaces/IEntryPoint.sol";
 import {IBridger} from "@kinto-core/interfaces/bridger/IBridger.sol";
 
 import {UpgradeableBeacon} from "@openzeppelin-5.0.1/contracts/proxy/beacon/UpgradeableBeacon.sol";

script/migrations/126-deploy-cross-chain-swap.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {IEntryPoint} from "@aa-v7/interfaces/IEntryPoint.sol";
+import {IEntryPoint} from "@aa/interfaces/IEntryPoint.sol";
 import {IBridger} from "@kinto-core/interfaces/bridger/IBridger.sol";
 
 import {UpgradeableBeacon} from "@openzeppelin-5.0.1/contracts/proxy/beacon/UpgradeableBeacon.sol";

script/migrations/137-upgrade_wallet_factory.s.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWallet.sol";
 import {KintoWalletFactory} from "../../src/wallet/KintoWalletFactory.sol";
+import {RewardsDistributor} from "@kinto-core/liquidity-mining/RewardsDistributor.sol";
 
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 

script/migrations/145-upgrade_access_protocol.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {IEntryPoint} from "@aa-v7/interfaces/IEntryPoint.sol";
+import {IEntryPoint} from "@aa/interfaces/IEntryPoint.sol";
 import {IBridger} from "@kinto-core/interfaces/bridger/IBridger.sol";
 
 import {UpgradeableBeacon} from "@openzeppelin-5.0.1/contracts/proxy/beacon/UpgradeableBeacon.sol";

script/migrations/148-transfer-access-registry-ownership.s.sol

@@ -8,7 +8,7 @@ import {AccessManager} from "@openzeppelin-5.0.1/contracts/access/manager/Access
 import {Ownable} from "@openzeppelin-5.0.1/contracts/access/Ownable.sol";
 import {UUPSUpgradeable} from "@openzeppelin-5.0.1/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import {IAccessPoint} from "@kinto-core/interfaces/IAccessPoint.sol";
-import {IEntryPoint} from "@aa-v7/interfaces/IEntryPoint.sol";
+import {IEntryPoint} from "@aa/interfaces/IEntryPoint.sol";
 
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 

script/migrations/26-deploy_paymaster_v7.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 
 contract KintoMigration26DeployScript is MigrationHelper {

script/migrations/27-deploy_registry-v4.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {IKintoAppRegistry} from "@kinto-core/interfaces/IKintoAppRegistry.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 import {KintoAppRegistry} from "@kinto-core/apps/KintoAppRegistry.sol";
 

script/migrations/29-multiple_upgrade_3.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 import "../../src/apps/KintoAppRegistry.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/tokens/EngenCredits.sol";
 import "../../src/viewers/KYCViewer.sol";
 import "../../src/wallet/KintoWallet.sol";

script/migrations/30-deploy_paymaster_v9.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 
 contract KintoMigration30DeployScript is MigrationHelper {

script/migrations/62-upgrade-wallet-claim.s.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 import "../../src/apps/KintoAppRegistry.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/tokens/EngenCredits.sol";
 import "../../src/viewers/KYCViewer.sol";
 import "../../src/wallet/KintoWallet.sol";

script/migrations/69-upgrde_paymaster.s.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 
 contract KintoMigration69DeployScript is MigrationHelper {