Moar tests

openfort-xyz · Nov 24, 2023 · 15793d4 · 15793d4
1 parent 7ac0f4f
commit 15793d4
Show file tree

Hide file tree

Showing 5 changed files with 264 additions and 15 deletions.
diff --git a/contracts/core/base/BaseOpenfortAccount.sol b/contracts/core/base/BaseOpenfortAccount.sol
@@ -5,7 +5,6 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
 import {ECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/ECDSAUpgradeable.sol";
 import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";
 import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol";
-import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 import {IERC1271Upgradeable} from "@openzeppelin/contracts-upgradeable/interfaces/IERC1271Upgradeable.sol";
 import {BaseAccount, UserOperation, IEntryPoint, UserOperationLib} from "account-abstraction/core/BaseAccount.sol";
 import {_packValidationData} from "account-abstraction/core/Helpers.sol";
@@ -25,7 +24,6 @@ import {OpenfortErrorsAndEvents} from "../../interfaces/OpenfortErrorsAndEvents.
 abstract contract BaseOpenfortAccount is
     BaseAccount,
     Initializable,
-    ReentrancyGuardUpgradeable,
     EIP712Upgradeable,
     IERC1271Upgradeable,
     TokenCallbackHandler,
@@ -178,7 +176,7 @@ abstract contract BaseOpenfortAccount is
     /**
      * Execute a transaction (called directly from owner, or by entryPoint)
      */
-    function execute(address dest, uint256 value, bytes calldata func) public payable virtual nonReentrant {
+    function execute(address dest, uint256 value, bytes calldata func) public payable virtual {
         _requireFromEntryPointOrOwner();
         _call(dest, value, func);
     }
@@ -190,7 +188,6 @@ abstract contract BaseOpenfortAccount is
         public
         payable
         virtual
-        nonReentrant
     {
         _requireFromEntryPointOrOwner();
         if (_target.length > 9 || _target.length != _calldata.length || _target.length != _value.length) {

diff --git a/contracts/core/base/BaseRecoverableAccount.sol b/contracts/core/base/BaseRecoverableAccount.sol
@@ -106,7 +106,6 @@ abstract contract BaseRecoverableAccount is BaseOpenfortAccount, Ownable2StepUpg
         _transferOwnership(_defaultAdmin);
         entrypointContract = _entrypoint;
         __EIP712_init("Openfort", "0.5");
-        __ReentrancyGuard_init();
 
         recoveryPeriod = _recoveryPeriod;
         lockPeriod = _lockPeriod;

diff --git a/test/foundry/core/OpenfortBaseTest.t.sol b/test/foundry/core/OpenfortBaseTest.t.sol
@@ -7,6 +7,8 @@ import {IERC5267} from "@openzeppelin/contracts/interfaces/IERC5267.sol";
 import {EntryPoint, IEntryPoint, UserOperation} from "account-abstraction/core/EntryPoint.sol";
 import {TestCounter} from "account-abstraction/test/TestCounter.sol";
 import {MockERC20} from "contracts/mock/MockERC20.sol";
+import {MockERC721} from "contracts/mock/MockERC721.sol";
+import {MockERC1155} from "contracts/mock/MockERC1155.sol";
 import {MockV2UpgradeableOpenfortAccount} from "contracts/mock/MockV2UpgradeableOpenfortAccount.sol";
 
 contract OpenfortBaseTest is Test {
@@ -19,6 +21,8 @@ contract OpenfortBaseTest is Test {
     address public accountAddress;
     TestCounter public testCounter;
     MockERC20 public mockERC20;
+    MockERC721 public mockERC721;
+    MockERC1155 public mockERC1155;
 
     // Testing addresses
     address public factoryAdmin;

diff --git a/test/foundry/core/managed/ManagedOpenfortAccountTest.t.sol b/test/foundry/core/managed/ManagedOpenfortAccountTest.t.sol
@@ -6,13 +6,12 @@ import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {IERC5267} from "@openzeppelin/contracts/interfaces/IERC5267.sol";
 import {EntryPoint, UserOperation} from "account-abstraction/core/EntryPoint.sol";
 import {TestCounter} from "account-abstraction/test/TestCounter.sol";
-import {MockERC20} from "contracts/mock/MockERC20.sol";
 import {ManagedOpenfortAccount} from "contracts/core/managed/ManagedOpenfortAccount.sol";
 import {ManagedOpenfortFactory} from "contracts/core/managed/ManagedOpenfortFactory.sol";
 import {ManagedOpenfortProxy} from "contracts/core/managed/ManagedOpenfortProxy.sol";
 import {MockV2ManagedOpenfortAccount} from "contracts/mock/MockV2ManagedOpenfortAccount.sol";
 import {IBaseOpenfortFactory} from "contracts/interfaces/IBaseOpenfortFactory.sol";
-import {OpenfortBaseTest} from "../OpenfortBaseTest.t.sol";
+import {OpenfortBaseTest, MockERC20, MockERC721, MockERC1155} from "../OpenfortBaseTest.t.sol";
 
 contract ManagedOpenfortAccountTest is OpenfortBaseTest {
     using ECDSA for bytes32;
@@ -64,10 +63,13 @@ contract ManagedOpenfortAccountTest is OpenfortBaseTest {
         );
         // Create an managed account wallet and get its address
         accountAddress = openfortFactory.createAccountWithNonce(accountAdmin, "1");
+
         // deploy a new TestCounter
         testCounter = new TestCounter{salt: versionSalt}();
         // deploy a new MockERC20 (ERC20)
         mockERC20 = new MockERC20{salt: versionSalt}();
+        mockERC721 = new MockERC721{salt: versionSalt}();
+        mockERC1155 = new MockERC1155{salt: versionSalt}();
         vm.stopPrank();
     }