From d5a66e6632cec47933d35a7db9544b9db1bb158e Mon Sep 17 00:00:00 2001 From: Eloi Manuel Date: Mon, 9 Oct 2023 16:45:02 +0200 Subject: [PATCH] Style improvements --- contracts/paymaster/BaseOpenfortPaymaster.sol | 2 +- ...eployOpenfortPaymaster.sol => deployOpenfortPaymaster.s.sol} | 2 +- ...yOpenfortPaymasterV2.sol => deployOpenfortPaymasterV2.s.sol} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename script/{deployOpenfortPaymaster.sol => deployOpenfortPaymaster.s.sol} (92%) rename script/{deployOpenfortPaymasterV2.sol => deployOpenfortPaymasterV2.s.sol} (93%) diff --git a/contracts/paymaster/BaseOpenfortPaymaster.sol b/contracts/paymaster/BaseOpenfortPaymaster.sol index ad990d6..1f6d67b 100644 --- a/contracts/paymaster/BaseOpenfortPaymaster.sol +++ b/contracts/paymaster/BaseOpenfortPaymaster.sol @@ -10,7 +10,7 @@ import {OpenfortErrorsAndEvents} from "../interfaces/OpenfortErrorsAndEvents.sol /** * Helper class for creating an Openfort paymaster. * Provides helper methods for staking. - * Validates that the postOp is called only by the EntryPoint + * Validates that the postOp is called only by the EntryPoint. */ abstract contract BaseOpenfortPaymaster is IBaseOpenfortPaymaster, Ownable2Step { uint256 private constant INIT_POST_OP_GAS = 40_000; // Initial value for postOpGas diff --git a/script/deployOpenfortPaymaster.sol b/script/deployOpenfortPaymaster.s.sol similarity index 92% rename from script/deployOpenfortPaymaster.sol rename to script/deployOpenfortPaymaster.s.sol index c49a1e3..b807d46 100644 --- a/script/deployOpenfortPaymaster.sol +++ b/script/deployOpenfortPaymaster.s.sol @@ -7,7 +7,7 @@ import {OpenfortPaymaster} from "../contracts/paymaster/OpenfortPaymaster.sol"; contract OpenfortPaymasterDeploy is Script { uint256 internal deployPrivKey = vm.deriveKey(vm.envString("MNEMONIC_PAYMASTER_OWNER_TESTNET"), 0); - // uint256 internal deployPrivKey = vm.envUint("PK"); + // uint256 internal deployPrivKey = vm.envUint("PK_PAYMASTER_OWNER_TESTNET"); address internal deployAddress = vm.addr(deployPrivKey); IEntryPoint internal entryPoint = IEntryPoint((payable(vm.envAddress("ENTRY_POINT_ADDRESS")))); uint32 internal constant UNSTAKEDELAYSEC = 8600; diff --git a/script/deployOpenfortPaymasterV2.sol b/script/deployOpenfortPaymasterV2.s.sol similarity index 93% rename from script/deployOpenfortPaymasterV2.sol rename to script/deployOpenfortPaymasterV2.s.sol index fee7272..e6c20b7 100644 --- a/script/deployOpenfortPaymasterV2.sol +++ b/script/deployOpenfortPaymasterV2.s.sol @@ -7,7 +7,7 @@ import {OpenfortPaymasterV2} from "../contracts/paymaster/OpenfortPaymasterV2.so contract OpenfortPaymasterV2Deploy is Script { uint256 internal deployPrivKey = vm.deriveKey(vm.envString("MNEMONIC_PAYMASTER_OWNER_TESTNET"), 0); - // uint256 internal deployPrivKey = vm.envUint("PK"); + // uint256 internal deployPrivKey = vm.envUint("PK_PAYMASTER_OWNER_TESTNET"); address internal deployAddress = vm.addr(deployPrivKey); IEntryPoint internal entryPoint = IEntryPoint((payable(vm.envAddress("ENTRY_POINT_ADDRESS")))); uint32 internal constant UNSTAKEDELAYSEC = 8600;