From 7ff222538fbc997013fd41940176759d694f3b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ernesto=20Garc=C3=ADa?= <ernestognw@gmail.com>
Date: Tue, 17 Dec 2024 15:23:53 -0600
Subject: [PATCH] Make AccountSignerERC7702 draft and adjust mocks (#41)

* Make AccountERC7702 draft and adjust mocks

* Fix compilation
---
 ...ccountSignerERC7702.sol => draft-AccountSignerERC7702.sol} | 0
 contracts/mocks/account/AccountERC7702Mock.sol                | 2 +-
 .../{docs => }/utils/cryptography/ERC7739SignerECDSAMock.sol  | 4 ++--
 .../{docs => }/utils/cryptography/ERC7739SignerP256Mock.sol   | 4 ++--
 .../{docs => }/utils/cryptography/ERC7739SignerRSAMock.sol    | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename contracts/account/extensions/{AccountSignerERC7702.sol => draft-AccountSignerERC7702.sol} (100%)
 rename contracts/mocks/{docs => }/utils/cryptography/ERC7739SignerECDSAMock.sol (71%)
 rename contracts/mocks/{docs => }/utils/cryptography/ERC7739SignerP256Mock.sol (66%)
 rename contracts/mocks/{docs => }/utils/cryptography/ERC7739SignerRSAMock.sol (67%)

diff --git a/contracts/account/extensions/AccountSignerERC7702.sol b/contracts/account/extensions/draft-AccountSignerERC7702.sol
similarity index 100%
rename from contracts/account/extensions/AccountSignerERC7702.sol
rename to contracts/account/extensions/draft-AccountSignerERC7702.sol
diff --git a/contracts/mocks/account/AccountERC7702Mock.sol b/contracts/mocks/account/AccountERC7702Mock.sol
index fa17fdcc..12779efa 100644
--- a/contracts/mocks/account/AccountERC7702Mock.sol
+++ b/contracts/mocks/account/AccountERC7702Mock.sol
@@ -3,6 +3,6 @@
 pragma solidity ^0.8.20;
 
 import {Account} from "../../account/draft-Account.sol";
-import {AccountSignerERC7702} from "../../account/extensions/AccountSignerERC7702.sol";
+import {AccountSignerERC7702} from "../../account/extensions/draft-AccountSignerERC7702.sol";
 
 abstract contract AccountERC7702Mock is Account, AccountSignerERC7702 {}
diff --git a/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSAMock.sol b/contracts/mocks/utils/cryptography/ERC7739SignerECDSAMock.sol
similarity index 71%
rename from contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSAMock.sol
rename to contracts/mocks/utils/cryptography/ERC7739SignerECDSAMock.sol
index 3cb2dcbb..b8fbb78d 100644
--- a/contracts/mocks/docs/utils/cryptography/ERC7739SignerECDSAMock.sol
+++ b/contracts/mocks/utils/cryptography/ERC7739SignerECDSAMock.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.20;
 
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
-import {ERC7739Signer} from "../../../../utils/cryptography/draft-ERC7739Signer.sol";
-import {SignerECDSA} from "../../../../utils/cryptography/SignerECDSA.sol";
+import {ERC7739Signer} from "../../../utils/cryptography/draft-ERC7739Signer.sol";
+import {SignerECDSA} from "../../../utils/cryptography/SignerECDSA.sol";
 
 contract ERC7739SignerECDSAMock is ERC7739Signer, SignerECDSA {
     constructor(address signerAddr) EIP712("ERC7739SignerECDSA", "1") {
diff --git a/contracts/mocks/docs/utils/cryptography/ERC7739SignerP256Mock.sol b/contracts/mocks/utils/cryptography/ERC7739SignerP256Mock.sol
similarity index 66%
rename from contracts/mocks/docs/utils/cryptography/ERC7739SignerP256Mock.sol
rename to contracts/mocks/utils/cryptography/ERC7739SignerP256Mock.sol
index c2adb71f..5b473ace 100644
--- a/contracts/mocks/docs/utils/cryptography/ERC7739SignerP256Mock.sol
+++ b/contracts/mocks/utils/cryptography/ERC7739SignerP256Mock.sol
@@ -3,8 +3,8 @@
 pragma solidity ^0.8.20;
 
 import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
-import {ERC7739Signer} from "../../../../utils/cryptography/draft-ERC7739Signer.sol";
-import {SignerP256} from "../../../../utils/cryptography/SignerP256.sol";
+import {ERC7739Signer} from "../../../utils/cryptography/draft-ERC7739Signer.sol";
+import {SignerP256} from "../../../utils/cryptography/SignerP256.sol";
 
 contract ERC7739SignerP256Mock is ERC7739Signer, SignerP256 {
     constructor(bytes32 qx, bytes32 qy) EIP712("ERC7739SignerP256", "1") {
diff --git a/contracts/mocks/docs/utils/cryptography/ERC7739SignerRSAMock.sol b/contracts/mocks/utils/cryptography/ERC7739SignerRSAMock.sol
similarity index 67%
rename from contracts/mocks/docs/utils/cryptography/ERC7739SignerRSAMock.sol
rename to contracts/mocks/utils/cryptography/ERC7739SignerRSAMock.sol
index 5b95834d..3f9a1583 100644
--- a/contracts/mocks/docs/utils/cryptography/ERC7739SignerRSAMock.sol
+++ b/contracts/mocks/utils/cryptography/ERC7739SignerRSAMock.sol
@@ -3,8 +3,8 @@
 pragma solidity ^0.8.20;
 
 import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
-import {ERC7739Signer} from "../../../../utils/cryptography/draft-ERC7739Signer.sol";
-import {SignerRSA} from "../../../../utils/cryptography/SignerRSA.sol";
+import {ERC7739Signer} from "../../../utils/cryptography/draft-ERC7739Signer.sol";
+import {SignerRSA} from "../../../utils/cryptography/SignerRSA.sol";
 
 contract ERC7739SignerRSAMock is ERC7739Signer, SignerRSA {
     constructor(bytes memory e, bytes memory n) EIP712("ERC7739SignerRSA", "1") {