refactor: remove DeploymentRefunder

Activations are included as a `paymasterFee`, improving UX and reducing complexity

Author: hbriese

contracts/contracts/Account.sol

@@ -19,7 +19,6 @@ import {ERC721Receiver} from './standards/ERC721Receiver.sol';
 import {SignatureValidator} from './base/SignatureValidator.sol';
 import {TransactionUtil} from './TransactionUtil.sol';
 import {PaymasterUtil} from './paymaster/PaymasterUtil.sol';
-import {DeploymentRefunder} from './base/DeploymentRefunder.sol';
 
 contract Account is
   IAccount,
@@ -29,8 +28,7 @@ contract Account is
   Executor,
   ERC165,
   ERC721Receiver,
-  SignatureValidator,
-  DeploymentRefunder
+  SignatureValidator
 {
   using TransactionHelper for Transaction;
   using TransactionUtil for Transaction;
@@ -50,15 +48,14 @@ contract Account is
                              INITIALIZATION
   //////////////////////////////////////////////////////////////*/
 
-  constructor() DeploymentRefunder(_isValidSignature) {
+  constructor() {
     // Disable initializing the implementation contract; avoiding any potential nonsense (e.g. selfdestruct)
     _disableInitializers();
   }
 
   function initialize(Policy[] calldata policies) external initializer {
     // _initializeArbitraryNonceOrdering();
     _addPolicies(policies);
-    _initializeDeployRefunder();
   }
 
   /*//////////////////////////////////////////////////////////////

contracts/contracts/Factory.sol

@@ -5,14 +5,6 @@ import {DEPLOYER_SYSTEM_CONTRACT} from '@matterlabs/zksync-contracts/l2/system-c
 import {IContractDeployer} from '@matterlabs/zksync-contracts/l2/system-contracts/interfaces/IContractDeployer.sol';
 import {SystemContractsCaller} from '@matterlabs/zksync-contracts/l2/system-contracts/libraries/SystemContractsCaller.sol';
 
-import {IDeploymentRefunder, DeploymentRefundMessage} from './base/IDeploymentRefunder.sol';
-
-struct RefundDeploymentArgs {
-  DeploymentRefundMessage message;
-  bytes signature;
-  uint256 amount;
-}
-
 contract Factory {
   IContractDeployer.AccountAbstractionVersion private constant AA_VERSION =
     IContractDeployer.AccountAbstractionVersion.Version1;
@@ -47,13 +39,4 @@ contract Factory {
 
     (account) = abi.decode(data, (address));
   }
-
-  function deployWithRefund(
-    bytes calldata constructorArgsData,
-    bytes32 salt,
-    RefundDeploymentArgs calldata refund
-  ) external payable returns (address account) {
-    account = deploy(constructorArgsData, salt);
-    IDeploymentRefunder(account).refundDeployment(refund.message, refund.signature, refund.amount);
-  }
 }