merge fix/paymaster into develop (#78)

Author: dappsar

.doc/deployment/deployment-guidelines.md

@@ -1,3 +1,45 @@
 # Deployment Guidelines
 
-(TBC)
+## Paymaster Deployment
+
+### Post-Deployment
+
+After deploying a new Paymaster contract, you **MUST** perform the staking process to deposit ETH into the StakeManager of the EntryPoint. This step is essential for security purposes and is validated by the bundler to ensure the proper operation of the Paymaster contract. 🛡️
+
+This is a critical step that you **cannot skip** after deployment. Failure to stake the required ETH will result in the bundler failing to validate the contract, and your transactions may not work correctly! 🚨
+
+#### **How to Stake:**
+
+1. **Run the following command to stake ETH in the Paymaster contract:**
+
+```sh
+cast send paymaster_contract_address "addStake(uint32)" 100000 --value 100000000000000000 --from backend_signer_wallet_address --rpc-url https://arb-sepolia.g.alchemy.com/v2/API_KEY_ALCHEMY --private-key _backend_signer_wallet_private_key
+```
+
+   - `100000` represents the amount of seconds of unstake time.
+   - `100000000000000000` equals **0.1 ETH** to be staked.
+
+   **Important Notes:**
+   - Make sure you have enough ETH in the backend signer wallet to cover the stake.
+   - The staking process is required for security validation and interaction with the EntryPoint.
+
+2. **To check the balance and verify the stake:**
+
+```sh
+cast call entrypoint_contract_address "getDepositInfo(address)(uint112,bool,uint112,uint32,uint48)" paymaster_contract_address --rpc-url https://arb-sepolia.g.alchemy.com/v2/API_KEY_ALCHEMY
+```
+
+   This will return the deposit information, including the amount of staked ETH and other relevant details.
+
+#### **Why Is This Important?**
+
+- **Security:** The bundler validates this stake to ensure that the Paymaster contract can be used safely and securely within the ecosystem. 🛡️
+- **Smooth Operations:** Without this staking, the contract will not pass bundler validation and operations will fail. ⚠️
+
+#### **Additional Notes on StakeManager & Bundler**
+
+The **StakeManager** within the EntryPoint is responsible for managing the ETH deposits that cover gas costs for Paymaster operations. By staking ETH in the StakeManager, you are essentially providing a guarantee that there are sufficient funds to pay for transaction fees. This step is critical for the bundler to validate and process transactions that the Paymaster is handling.
+
+The **bundler** is a service that aggregates multiple transactions and ensures that gas is paid in an efficient manner. Without proper staking, the bundler will not validate the transactions, and the system will fail to function as intended.
+
+Make sure you complete this step right after the Paymaster deployment, as it is a necessary part of the contract initialization. ✅

Makefile

@@ -31,4 +31,19 @@ deploy_arbitrum_sepolia_only_chatterpay :; $(BUILD) && \
 	FOUNDRY_PROFILE=local forge script script/DeployChatterPay.s.sol \
 	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
 	--private-key $(PRIVATE_KEY) \
+	--broadcast
+
+# Deploy only Paymaster contract
+deploy_verify_arbitrum_sepolia_only_paymaster :; $(BUILD) && \
+	FOUNDRY_PROFILE=local forge script script/DeployPaymaster.s.sol \
+	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
+	--private-key $(PRIVATE_KEY) \
+	--verify \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--broadcast
+
+deploy_arbitrum_sepolia_only_paymaster :; $(BUILD) && \
+	FOUNDRY_PROFILE=local forge script script/DeployPaymaster.s.sol \
+	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
+	--private-key $(PRIVATE_KEY) \
 	--broadcast

example_env

@@ -8,10 +8,17 @@ ETHERSCAN_API_KEY=Your etherscan api key, if you want to verify contracts
 ROUTER_ADDRESS=Uniswap SwapRouter02 address
 ARBISCAN_API_KEY=Your Aribtrum api key, if you want to verify contracts
 NFT_BASE_URI=https://dev.back.chatterpay.net/nft/metadata/opensea/
+DEPLOYED_PAYMASTER_ADDRESS=Address of an existing Paymaster to avoid creating a new one in the deployment script
 
-# Uniswap V3 Addresses
-UNISWAP_FACTORY=0x1F98431c8aD98523631AE4a59f267346ea31F984
-POSITION_MANAGER=0xC36442b4a4522E871399CD717aBDD847Ab11FE88
+# Uniswap V3 Addresses (arbitrum)
+# https://docs.uniswap.org/contracts/v3/reference/deployments/arbitrum-deployments
+# UNISWAP_FACTORY=0x1F98431c8aD98523631AE4a59f267346ea31F984
+# POSITION_MANAGER=0xC36442b4a4522E871399CD717aBDD847Ab11FE88
+
+# Uniswap V3 Addresses (arbitrum-sepolia)
+# https://docs.uniswap.org/contracts/v3/reference/deployments/arbitrum-deployments
+UNISWAP_FACTORY=0x248AB79Bbb9bC29bB72f7Cd42F17e054Fc40188e
+POSITION_MANAGER=0x6b2937Bde17889EDCf8fbD8dE31C3C2a70Bc4d65
 
 # Tokens and their respective Price Feeds (ensure the order matches between tokens[i] and price_feeds[i])
 TOKENS=0xe6B817E31421929403040c3e42A6a5C5D2958b4A,0xE9C723D01393a437bac13CE8f925A5bc8E1c335c

lib/forge-std

@@ -9,6 +9,7 @@
         "test:prod": "FOUNDRY_PROFILE=production bash test/run_all_tests.sh",
         "test:gas": "REPORT_GAS=true FOUNDRY_PROFILE=production bash test/run_all_tests.sh",
         "test:coverage:local": "FOUNDRY_PROFILE=local bash test/run_tests_coverage.sh",
+        "test:one:local": "FOUNDRY_PROFILE=local bash test/run_one_contract_tests.sh",
         "clean": "forge clean",
         "clean:full": "forge clean && rm -rf cache .forge-cache",
         "deploy:arbitrum-sepolia": "make deploy_arbitrum_sepolia_all",