refactor: pr comments

rsksmart · Feb 16, 2024 · f279b30 · f279b30
1 parent a553f58
commit f279b30
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 24 deletions.
diff --git a/contracts/factory/BaseSmartWalletFactory.sol b/contracts/factory/BaseSmartWalletFactory.sol
@@ -3,7 +3,6 @@ pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/cryptography/ECDSA.sol";
-import "../interfaces/IWalletFactory.sol";
 import "../interfaces/ISmartWalletFactory.sol";
 import "../utils/RSKAddrValidator.sol";
 
@@ -72,10 +71,7 @@ PC | OPCODE| Mnemonic | Stack [top, bottom] | Comm
 
 /** Factory of Proxies to the SmartWallet (Forwarder)
  */
-abstract contract BaseSmartWalletFactory is
- IWalletFactory,
- ISmartWalletFactory
-{
+abstract contract BaseSmartWalletFactory is ISmartWalletFactory {
  using ECDSA for bytes32;
 
  bytes11 private constant _RUNTIME_START = hex"363D3D373D3D3D3D363D73";

diff --git a/contracts/factory/BoltzSmartWalletFactory.sol b/contracts/factory/BoltzSmartWalletFactory.sol
@@ -2,17 +2,17 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../interfaces/ISmartWalletCreator.sol";
-import "../interfaces/ISmartWalletRelayer.sol";
+import "../interfaces/ICreateSmartWalletFactory.sol";
+import "../interfaces/IRelayerSmartWalletFactory.sol";
 import "./BaseSmartWalletFactory.sol";
 
 /* solhint-disable no-inline-assembly */
 /* solhint-disable avoid-low-level-calls */
 
 contract BoltzSmartWalletFactory is
  BaseSmartWalletFactory,
- ISmartWalletCreator,
- ISmartWalletRelayer
+ ICreateSmartWalletFactory,
+ IRelayerSmartWalletFactory
 {
  /* solhint-disable no-empty-blocks */
  /**

diff --git a/contracts/factory/CustomSmartWalletFactory.sol b/contracts/factory/CustomSmartWalletFactory.sol
@@ -4,8 +4,8 @@ pragma experimental ABIEncoderV2;
 
 import "@openzeppelin/contracts/cryptography/ECDSA.sol";
 import "../interfaces/ICustomSmartWalletFactory.sol";
-import "../interfaces/ICustomSmartWalletCreator.sol";
-import "../interfaces/ISmartWalletRelayer.sol";
+import "../interfaces/ICreateCustomSmartWalletFactory.sol";
+import "../interfaces/IRelayerSmartWalletFactory.sol";
 import "../utils/RSKAddrValidator.sol";
 
 /* solhint-disable no-inline-assembly */
@@ -75,8 +75,8 @@ PC | OPCODE| Mnemonic | Stack [top, bottom] | Comm
 The Forwarder itself is a Template with portions delegated to a custom logic (it is also a proxy) */
 contract CustomSmartWalletFactory is
  ICustomSmartWalletFactory,
- ICustomSmartWalletCreator,
- ISmartWalletRelayer
+ ICreateCustomSmartWalletFactory,
+ IRelayerSmartWalletFactory
 {
  using ECDSA for bytes32;
 

diff --git a/contracts/factory/MinimalBoltzSmartWalletFactory.sol b/contracts/factory/MinimalBoltzSmartWalletFactory.sol
@@ -2,15 +2,15 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../interfaces/ISmartWalletRelayer.sol";
+import "../interfaces/IRelayerSmartWalletFactory.sol";
 import "./BaseSmartWalletFactory.sol";
 
 /* solhint-disable no-inline-assembly */
 /* solhint-disable avoid-low-level-calls */
 
 contract MinimalBoltzSmartWalletFactory is
  BaseSmartWalletFactory,
- ISmartWalletRelayer
+ IRelayerSmartWalletFactory
 {
  /* solhint-disable no-empty-blocks */
  /**

diff --git a/contracts/factory/SmartWalletFactory.sol b/contracts/factory/SmartWalletFactory.sol
@@ -2,17 +2,17 @@
 pragma solidity ^0.6.12;
 pragma experimental ABIEncoderV2;
 
-import "../interfaces/ISmartWalletCreator.sol";
-import "../interfaces/ISmartWalletRelayer.sol";
+import "../interfaces/ICreateSmartWalletFactory.sol";
+import "../interfaces/IRelayerSmartWalletFactory.sol";
 import "./BaseSmartWalletFactory.sol";
 
 /* solhint-disable no-inline-assembly */
 /* solhint-disable avoid-low-level-calls */
 
 contract SmartWalletFactory is
  BaseSmartWalletFactory,
- ISmartWalletCreator,
- ISmartWalletRelayer
+ ICreateSmartWalletFactory,
+ IRelayerSmartWalletFactory
 {
  /* solhint-disable no-empty-blocks */
  /**

diff --git a/.../interfaces/ICustomSmartWalletCreator.sol → ...faces/ICreateCustomSmartWalletFactory.sol b/.../interfaces/ICustomSmartWalletCreator.sol → ...faces/ICreateCustomSmartWalletFactory.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 import "./IWalletFactory.sol";
 
-interface ICustomSmartWalletCreator is IWalletFactory {
+interface ICreateCustomSmartWalletFactory is IWalletFactory {
  function createUserSmartWallet(
  address owner,
  address recoverer,

diff --git a/contracts/interfaces/ISmartWalletCreator.sol → .../interfaces/ICreateSmartWalletFactory.sol b/contracts/interfaces/ISmartWalletCreator.sol → .../interfaces/ICreateSmartWalletFactory.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 import "./IWalletFactory.sol";
 
-interface ISmartWalletCreator is IWalletFactory {
+interface ICreateSmartWalletFactory is IWalletFactory {
  function createUserSmartWallet(
  address owner,
  address recoverer,

diff --git a/contracts/interfaces/ISmartWalletRelayer.sol → ...interfaces/IRelayerSmartWalletFactory.sol b/contracts/interfaces/ISmartWalletRelayer.sol → ...interfaces/IRelayerSmartWalletFactory.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 import "./IWalletFactory.sol";
 
-interface ISmartWalletRelayer is IWalletFactory {
+interface IRelayerSmartWalletFactory is IWalletFactory {
  function relayedUserSmartWalletCreation(
  IForwarder.DeployRequest memory req,
  bytes32 suffixData,

diff --git a/contracts/utils/Eip712Library.sol b/contracts/utils/Eip712Library.sol
@@ -4,7 +4,7 @@ pragma experimental ABIEncoderV2;
 
 import "../interfaces/EnvelopingTypes.sol";
 import "../interfaces/IForwarder.sol";
-import "../interfaces/ISmartWalletRelayer.sol";
+import "../interfaces/IRelayerSmartWalletFactory.sol";
 import "./MinLibBytes.sol";
 
 /**
@@ -22,7 +22,9 @@ library Eip712Library {
  /* solhint-disable-next-line avoid-low-level-calls */
  (deploySuccess, ret) = relayRequest.relayData.callForwarder.call(
  abi.encodeWithSelector(
- ISmartWalletRelayer.relayedUserSmartWalletCreation.selector,
+ IRelayerSmartWalletFactory
+ .relayedUserSmartWalletCreation
+ .selector,
  relayRequest.request,
  hashRelayData(relayRequest.relayData),
  relayRequest.relayData.feesReceiver,