diff --git a/.gitignore b/.gitignore index 07c3981..7f2df6a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,8 @@ node_modules .env # Foundry cache -cache_forge/solidity-files-cache.json \ No newline at end of file +cache_forge/solidity-files-cache.json + +# Bash deploy helper logs +scripts/bash-deploy/logs/* +!scripts/bash-deploy/logs/.gitkeep \ No newline at end of file diff --git a/scripts/foundry/DeployGasdaddy.s.sol b/scripts/foundry/DeployGasdaddy.s.sol index dceea17..d726fee 100644 --- a/scripts/foundry/DeployGasdaddy.s.sol +++ b/scripts/foundry/DeployGasdaddy.s.sol @@ -28,13 +28,14 @@ contract DeployGasdaddy is Script { // SALTS bytes32 constant SPONSORSHIP_PAYMASTER_DEPLOYMENT_SALT = 0xc9ec6c618ddf6abc86e028d1ec4b5134220e43bf3077b043e67f191f9eb347e1; // ==> 0x000000f05e956f96bbcbf39012809070da94047c - bytes32 constant TOKEN_PAYMASTER_DEPLOYMENT_SALT = 0x38b3bd986a7d84de00ac8e7a738bec546ee9b15bf26e12af54823d252ba868f7; // ==> 0x000000e5c375f0b44015386c338ce5ddf72d600b + bytes32 constant TOKEN_PAYMASTER_DEPLOYMENT_SALT = 0xacde7b202f0f9becc0dc7d3f759f4c7f3aad958d689fc89cba2de30ac6dcb661; // 0x00000000301515a5410e0d768af4f53c416edf19 + // bytes32 constant TOKEN_PAYMASTER_DEPLOYMENT_SALT = 0x38b3bd986a7d84de00ac8e7a738bec546ee9b15bf26e12af54823d252ba868f7; // ==> 0x000000e5c375f0b44015386c338ce5ddf72d600b // backup salt 0x724dd9b57a6505c7389fa9ee13b55404929a38dda59f440c5f3bd8c24bf05497 ==> 0x0000008e81b7464dcc67669ea8624ab4486553b3 (not used yet) // CONSTRUCTOR ARGS - address constant VERIFYING_PAYMASTER_OWNER = 0x2cf491602ad22944D9047282aBC00D3e52F56B37; + address constant VERIFYING_PAYMASTER_OWNER = 0x129443cA2a9Dec2020808a2868b38dDA457eaCC7; address constant VERIFYING_SIGNER = 0xC6dAB8652E5E9749523bA948F42d5944584E4e73; - address constant FEE_COLLECTOR = 0x2cf491602ad22944D9047282aBC00D3e52F56B37; + address constant FEE_COLLECTOR = 0x129443cA2a9Dec2020808a2868b38dDA457eaCC7; uint256 constant SPONSORSHIP_PM_UNACCOUNTED_GAS = 50_000; uint256 constant TOKEN_PM_UNACCOUNTED_GAS = 95_000; uint256 constant PAYMASTER_ID_WITHDRAWAL_DELAY = 3600; // 1 hour