Refactor import statements to use aliasing and update references to P…

…ackedUserOperation across multiple files.
KintoXYZ · Jun 20, 2024 · b467593 · b467593
1 parent afad61f
commit b467593
Show file tree

Hide file tree

Showing 49 changed files with 171 additions and 153 deletions.
diff --git a/remappings.txt b/remappings.txt
@@ -12,8 +12,7 @@ lib/account-abstraction-0.7.0:@openzeppelin/=lib/openzeppelin-contracts-5.0.1
 @openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 @openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/
 
-@aa/=lib/account-abstraction/contracts/
-@aa-v7/=lib/account-abstraction-0.7.0/contracts
+@aa/=lib/account-abstraction-0.7.0/contracts
 
 
 @openzeppelin-5.0.1/contracts/=lib/openzeppelin-contracts-5.0.1/contracts/

diff --git a/script/actions/deploy.s.sol b/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";
 
 import "@kinto-core/KintoID.sol";
@@ -10,7 +10,7 @@ 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 "@kinto-core/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "@kinto-core/wallet/KintoWallet.sol";
 import "@kinto-core/apps/KintoAppRegistry.sol";
 import "@kinto-core/tokens/EngenCredits.sol";

diff --git a/script/actions/fund-faucet.s.sol b/script/actions/fund-faucet.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "@kinto-core/wallet/KintoWalletFactory.sol";
 import "@kinto-core/wallet/KintoWallet.sol";
-import "@kinto-core/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "@kinto-core-test/helpers/Create2Helper.sol";
 import "@kinto-core-test/helpers/ArtifactsReader.sol";

diff --git a/script/actions/test.s.sol b/script/actions/test.s.sol
@@ -1,15 +1,16 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "@aa/core/EntryPoint.sol";
+import {EntryPoint} from "@aa/core/EntryPoint.sol";
+import {PackedUserOperation} from "@aa/interfaces/PackedUserOperation.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-test/helpers/AASetup.sol";
 import "@kinto-core-test/helpers/SignatureHelper.sol";
@@ -162,7 +163,7 @@ contract KintoDeployTestCounter is AASetup, SignatureHelper, UserOp {
         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);
@@ -270,7 +271,7 @@ contract KintoDeployETHPriceIsRight is AASetup, SignatureHelper, UserOp {
         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);
@@ -350,7 +351,7 @@ contract SendHanldeOps is AASetup, SignatureHelper, UserOp {
         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,

diff --git a/script/migrations/08-deploy_kinto_app.s.sol b/script/migrations/08-deploy_kinto_app.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/interfaces/IKintoWalletFactory.sol";
 import "../../test/helpers/Create2Helper.sol";
 import "../../test/helpers/ArtifactsReader.sol";

diff --git a/script/migrations/09-deploy_registry_proxy.s.sol b/script/migrations/09-deploy_registry_proxy.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "forge-std/Script.sol";
 import "../../src/apps/KintoAppRegistry.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/wallet/KintoWalletFactory.sol";
 import {Create2Helper} from "../../test/helpers/Create2Helper.sol";
 import {ArtifactsReader} from "../../test/helpers/ArtifactsReader.sol";

diff --git a/script/migrations/10-upgrade_wallet_v3.s.sol b/script/migrations/10-upgrade_wallet_v3.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "../../test/helpers/Create2Helper.sol";
 import "../../test/helpers/ArtifactsReader.sol";

diff --git a/script/migrations/11-upgrade_paymasterv2.s.sol b/script/migrations/11-upgrade_paymasterv2.s.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "../../test/helpers/Create2Helper.sol";
 import "../../test/helpers/ArtifactsReader.sol";

diff --git a/script/migrations/12-create_engen_app.s.sol b/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";

diff --git a/script/migrations/13-upgrade_id_paymasterv3.s.sol b/script/migrations/13-upgrade_id_paymasterv3.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/KintoID.sol";
 
 import "../../test/helpers/Create2Helper.sol";

diff --git a/script/migrations/14-factory_v3.s.sol b/script/migrations/14-factory_v3.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/KintoID.sol";
 
 import "../../test/helpers/Create2Helper.sol";

diff --git a/script/migrations/16-factory_v4.s.sol b/script/migrations/16-factory_v4.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/KintoID.sol";
 
 import "../../test/helpers/Create2Helper.sol";

diff --git a/script/migrations/17-faucet_v3.s.sol b/script/migrations/17-faucet_v3.s.sol
@@ -5,7 +5,7 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 import "../../src/interfaces/IKintoWalletFactory.sol";
 import "../../src/interfaces/IKintoWallet.sol";
-import "../../src/interfaces/ISponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "../../src/Faucet.sol";
 

diff --git a/script/migrations/19-fund2.s.sol b/script/migrations/19-fund2.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/KintoID.sol";
 
 import "../../test/helpers/Create2Helper.sol";

diff --git a/script/migrations/20-faucet_fund_fix.s.sol b/script/migrations/20-faucet_fund_fix.s.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.18;
 
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/KintoID.sol";
 
 import "../../test/helpers/Create2Helper.sol";

diff --git a/script/migrations/21-multiple_upgrade.s.sol b/script/migrations/21-multiple_upgrade.s.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.18;
 import "../../src/wallet/KintoWalletFactory.sol";
 import "../../src/wallet/KintoWallet.sol";
 import "../../src/apps/KintoAppRegistry.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 import "../../src/viewers/KYCViewer.sol";
 import "../../src/KintoID.sol";
 

diff --git a/script/migrations/26-deploy_paymaster_v7.s.sol b/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 {

diff --git a/script/migrations/27-deploy_registry-v4.s.sol b/script/migrations/27-deploy_registry-v4.s.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "../../src/paymasters/SponsorPaymaster.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
 import {KintoAppRegistry} from "@kinto-core/apps/KintoAppRegistry.sol";
 

diff --git a/script/migrations/29-multiple_upgrade_3.s.sol b/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";

diff --git a/script/migrations/30-deploy_paymaster_v9.s.sol b/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 {

diff --git a/script/migrations/62-upgrade-wallet-claim.s.sol b/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";

diff --git a/script/migrations/69-upgrde_paymaster.s.sol b/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 {

diff --git a/script/samples/counter.s.sol b/script/samples/counter.s.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "@aa/core/EntryPoint.sol";
+import {EntryPoint} from "@aa/core/EntryPoint.sol";
 
 import "../../src/sample/Counter.sol";
 import "../../src/interfaces/IKintoWallet.sol";
 import "../../src/interfaces/IKintoWalletFactory.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "../../src/paymasters/SponsorPaymaster.sol";
 
 import "../../test/helpers/AASetup.sol";
 import "../../test/helpers/UserOp.sol";

diff --git a/script/samples/createWallet.s.sol b/script/samples/createWallet.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 "../../src/KintoID.sol";
 import "../../test/helpers/AASetup.sol";

diff --git a/script/samples/guesser.s.sol b/script/samples/guesser.s.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "@aa/core/EntryPoint.sol";
+import {EntryPoint} from "@aa/core/EntryPoint.sol";
 
 import "../../src/sample/ETHPriceIsRight.sol";
 import "../../src/interfaces/IKintoWallet.sol";
-import "../../src/paymasters/SponsorPaymaster.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
 
 import "../../test/helpers/AASetup.sol";
 import "../../test/helpers/UserOp.sol";

diff --git a/script/samples/monitor.s.sol b/script/samples/monitor.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 "../../src/KintoID.sol";
 import "../../test/helpers/AASetup.sol";

diff --git a/script/utils/MigrationHelper.sol b/script/utils/MigrationHelper.sol
@@ -5,18 +5,25 @@ import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import {UUPSUpgradeable as UUPSUpgradeable5} from
     "@openzeppelin-5.0.1/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
+import {ECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/ECDSAUpgradeable.sol";
 
-import "@kinto-core/wallet/KintoWalletFactory.sol";
-import "@kinto-core/paymasters/SponsorPaymaster.sol";
-import "@kinto-core/apps/KintoAppRegistry.sol";
+import {KintoWalletFactory} from "@kinto-core/wallet/KintoWalletFactory.sol";
+import {SponsorPaymaster} from "@kinto-core/paymasters/SponsorPaymaster.sol";
+import {KintoAppRegistry} from "@kinto-core/apps/KintoAppRegistry.sol";
 
-import "@kinto-core/interfaces/ISponsorPaymaster.sol";
-import "@kinto-core/interfaces/IKintoWallet.sol";
+import {PackedUserOperation} from "@aa/interfaces/PackedUserOperation.sol";
+import {IEntryPoint} from "@aa/core/BaseAccount.sol";
 
-import "@kinto-core-test/helpers/Create2Helper.sol";
-import "@kinto-core-test/helpers/ArtifactsReader.sol";
-import "@kinto-core-test/helpers/UserOp.sol";
-import "@kinto-core-test/helpers/UUPSProxy.sol";
+import {ISponsorPaymaster} from "@kinto-core/interfaces/ISponsorPaymaster.sol";
+import {IKintoWallet} from "@kinto-core/interfaces/IKintoWallet.sol";
+import {IKintoID} from "@kinto-core/interfaces/IKintoID.sol";
+import {IKintoAppRegistry} from "@kinto-core/interfaces/IKintoAppRegistry.sol";
+import {KintoWallet} from "@kinto-core/wallet/KintoWallet.sol";
+
+import {Create2Helper} from "@kinto-core-test/helpers/Create2Helper.sol";
+import {ArtifactsReader} from "@kinto-core-test/helpers/ArtifactsReader.sol";
+import {UserOp} from "@kinto-core-test/helpers/UserOp.sol";
+import {UUPSProxy} from "@kinto-core-test/helpers/UUPSProxy.sol";
 import {DeployerHelper} from "@kinto-core/libraries/DeployerHelper.sol";
 
 import {Constants} from "@kinto-core-script/migrations/const.sol";
@@ -70,7 +77,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
         vm.broadcast(deployerPrivateKey);
         _proxy = address(new UUPSProxy{salt: salt}(address(implementation), ""));
 
-        console.log(string.concat(contractName, ": ", vm.toString(address(_proxy))));
+        console2.log(string.concat(contractName, ": ", vm.toString(address(_proxy))));
     }
 
     function _deployProxy(string memory contractName, address implementation) internal returns (address _proxy) {
@@ -90,7 +97,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
         vm.broadcast(deployerPrivateKey);
         _impl = factory.deployContract(msg.sender, 0, bytecode, salt);
 
-        console.log(string.concat(contractName, version, "-impl: ", vm.toString(address(_impl))));
+        console2.log(string.concat(contractName, version, "-impl: ", vm.toString(address(_impl))));
     }
 
     function _deployImplementation(string memory contractName, string memory version, bytes memory bytecode)
@@ -121,7 +128,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
             } else {
                 try Ownable(proxy).owner() returns (address owner) {
                     if (owner != _getChainDeployment("KintoWallet-admin")) {
-                        console.log(
+                        console2.log(
                             "%s contract is not owned by the KintoWallet-admin, its owner is %s",
                             contractName,
                             vm.toString(owner)
@@ -263,7 +270,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
         address _sponsorPaymaster,
         uint256[] memory _privateKeys
     ) internal {
-        UserOperation[] memory userOps = new UserOperation[](1);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](1);
         userOps[0] = _createUserOperation(
             block.chainid,
             _from,
@@ -310,7 +317,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
         uint256[] memory privateKeys = new uint256[](1);
         privateKeys[0] = _signerPk;
 
-        UserOperation[] memory userOps = new UserOperation[](_selectorAndParams.length);
+        PackedUserOperation[] memory userOps = new PackedUserOperation[](_selectorAndParams.length);
         uint256 nonce = IKintoWallet(_from).getNonce();
         for (uint256 i = 0; i < _selectorAndParams.length; i++) {
             userOps[i] = _createUserOperation(
@@ -358,7 +365,7 @@ contract MigrationHelper is Script, DeployerHelper, UserOp, SaltHelper, Constant
     }
 
     function etchWallet(address wallet) internal {
-        console.log("etching wallet:", vm.toString(wallet));
+        console2.log("etching wallet:", vm.toString(wallet));
         KintoWallet impl = new KintoWallet(
             IEntryPoint(_getChainDeployment("EntryPoint")),
             IKintoID(_getChainDeployment("KintoID")),

diff --git a/src/access/AccessPoint.sol b/src/access/AccessPoint.sol
@@ -7,12 +7,12 @@ import "@openzeppelin-5.0.1/contracts/utils/cryptography/MessageHashUtils.sol";
 import "@openzeppelin-5.0.1/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "@openzeppelin-5.0.1/contracts/interfaces/IERC20.sol";
 
-import {BaseAccount} from "@aa-v7/core/BaseAccount.sol";
-import {UserOperationLib} from "@aa-v7/core/UserOperationLib.sol";
-import {SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS} from "@aa-v7/core/Helpers.sol";
-import {PackedUserOperation} from "@aa-v7/interfaces/PackedUserOperation.sol";
-import {IEntryPoint} from "@aa-v7/interfaces/IEntryPoint.sol";
-import {TokenCallbackHandler} from "@aa-v7/samples/callback/TokenCallbackHandler.sol";
+import {BaseAccount} from "@aa/core/BaseAccount.sol";
+import {UserOperationLib} from "@aa/core/UserOperationLib.sol";
+import {SIG_VALIDATION_FAILED, SIG_VALIDATION_SUCCESS} from "@aa/core/Helpers.sol";
+import {PackedUserOperation} from "@aa/interfaces/PackedUserOperation.sol";
+import {IEntryPoint} from "@aa/interfaces/IEntryPoint.sol";
+import {TokenCallbackHandler} from "@aa/samples/callback/TokenCallbackHandler.sol";
 
 import {ByteSignature} from "@kinto-core/libraries/ByteSignature.sol";
 import {IAccessPoint} from "@kinto-core/interfaces/IAccessPoint.sol";