Develop and Main DIFF (DO NOT MERGE)

.env.example

@@ -10,6 +10,7 @@ PAYMASTER_OWNER_ADDRESS_DEV=
 PAYMASTER_OWNER_ADDRESS_PROD=
 PAYMASTER_SIGNER_ADDRESS_DEV=
 PAYMASTER_SIGNER_ADDRESS_PROD=
+SPONSORSHIP_FEE_COLLECTOR_ADDRESS_PROD=
 TOKEN_PAYMASTER_OWNER_ADDRESS_DEV=
 TOKEN_PAYMASTER_OWNER_ADDRESS_PROD=
 TOKEN_PAYMASTER_SIGNER_ADDRESS_DEV=

.gas-snapshot

@@ -1,14 +1,24 @@
-TokenPaymasterTest:test2TokenPaymasterFailInvalidPaymasteDataLength() (gas: 278584)
-TokenPaymasterTest:testCall() (gas: 313171)
-TokenPaymasterTest:testCheckStates() (gas: 18600)
-TokenPaymasterTest:testDeploy() (gas: 1604349)
-TokenPaymasterTest:testOwnershipTransfer() (gas: 23443)
-TokenPaymasterTest:testParsePaymasterData() (gas: 621)
-TokenPaymasterTest:testTokenPaymasterFailHighPriceMarkup() (gas: 300775)
-TokenPaymasterTest:testTokenPaymasterFailInvalidPMSignature() (gas: 283184)
-TokenPaymasterTest:testTokenPaymasterFailInvalidPMSignatureLength() (gas: 283496)
-TokenPaymasterTest:testTokenPaymasterFailInvalidPaymasteDataLength() (gas: 221406)
-TokenPaymasterTest:testTokenPaymasterFailWrongPMSignature() (gas: 295014)
-TokenPaymasterTest:testTokenPaymasterRefund() (gas: 399655)
-TokenPaymasterTest:testWithdrawERC20(uint256) (runs: 256, μ: 61802, ~: 64060)
-TokenPaymasterTest:testWithdrawERC20FailNotOwner(uint256) (runs: 256, μ: 48871, ~: 51000)
+TokenPaymasterMumbaiTest:test2TokenPaymasterFailInvalidPaymasteDataLength() (gas: 506028)
+TokenPaymasterMumbaiTest:testCall() (gas: 164706)
+TokenPaymasterMumbaiTest:testCheckStates() (gas: 18809)
+TokenPaymasterMumbaiTest:testDeploy() (gas: 1761558)
+TokenPaymasterMumbaiTest:testOwnershipTransfer() (gas: 23623)
+TokenPaymasterMumbaiTest:testTokenPaymasterFailHighPriceMarkup() (gas: 521192)
+TokenPaymasterMumbaiTest:testTokenPaymasterFailInvalidPMSignature() (gas: 509672)
+TokenPaymasterMumbaiTest:testTokenPaymasterFailInvalidPaymasteDataLength() (gas: 460199)
+TokenPaymasterMumbaiTest:testTokenPaymasterFailWrongPMSignature() (gas: 515316)
+TokenPaymasterMumbaiTest:testTokenPaymasterRefund() (gas: 470153)
+TokenPaymasterMumbaiTest:testWithdrawERC20(uint256) (runs: 256, μ: 202488, ~: 203918)
+TokenPaymasterMumbaiTest:testWithdrawERC20FailNotOwner(uint256) (runs: 256, μ: 173830, ~: 173830)
+TokenPaymasterTest:test2TokenPaymasterFailInvalidPaymasteDataLength() (gas: 290853)
+TokenPaymasterTest:testCall() (gas: 166515)
+TokenPaymasterTest:testCheckStates() (gas: 18787)
+TokenPaymasterTest:testDeploy() (gas: 1761536)
+TokenPaymasterTest:testOwnershipTransfer() (gas: 23579)
+TokenPaymasterTest:testTokenPaymasterFailHighPriceMarkup() (gas: 309758)
+TokenPaymasterTest:testTokenPaymasterFailInvalidPMSignature() (gas: 295496)
+TokenPaymasterTest:testTokenPaymasterFailInvalidPaymasteDataLength() (gas: 231031)
+TokenPaymasterTest:testTokenPaymasterFailWrongPMSignature() (gas: 302475)
+TokenPaymasterTest:testTokenPaymasterRefund() (gas: 255197)
+TokenPaymasterTest:testWithdrawERC20(uint256) (runs: 256, μ: 61632, ~: 63985)
+TokenPaymasterTest:testWithdrawERC20FailNotOwner(uint256) (runs: 256, μ: 48656, ~: 50873)

.github/pull_request_template.md

@@ -29,5 +29,5 @@ Related Issue: # (issue number)
 <!-- Any additional information or context about the PR. -->
 
 # Branch Naming
-<!-- Make sure your branch name follows the pattern: `features/`, `fixes/`, or `releases/`. -->
+<!-- Make sure your branch name follows the pattern: `feat/`, `fix/`, `chore/` or `release/`. -->
 <!-- **Note**: The person creating the PR is responsible for merging and deleting the branch. Ensure the code has been tested, commented, linted, and documents updated if needed. -->

.github/workflows/check_branch_name.yml

@@ -0,0 +1,18 @@
+name: Check Branch Name
+on:
+  create:
+
+jobs:
+  check-branch-name:
+    runs-on: ubuntu-latest
+    if: github.event.ref_type == 'branch' && !contains(github.ref, 'refs/heads/main')
+    steps:
+      - name: Check Branch Name
+        run: |
+          BRANCH_PREFIX_REGEX="^(feat/|fix/|release/|chore/).+"
+          BRANCH_NAME=${GITHUB_REF#refs/heads/}
+          if [[ ! $BRANCH_NAME =~ $BRANCH_PREFIX_REGEX ]]; then
+            echo "Invalid branch name: $BRANCH_NAME"
+            echo "Branch name must start with 'feat/', 'fix/', 'chore/', or 'release/'."
+            exit 1
+          fi

.gitignore

@@ -11,6 +11,7 @@ forge-cache/
 typechain-types
 typechain
 typings
+yarn-error.log
 
 #Hardhat files
 cache
@@ -19,3 +20,5 @@ artifacts-filtered
 account-abstraction
 scw-contracts
 
+.DS_Store
+yarn-error.log

.gitmodules

@@ -1,9 +1,11 @@
-[submodule "lib/account-abstraction"]
-	path = lib/account-abstraction
-	url = https://github.com/eth-infinitism/account-abstraction
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
 [submodule "lib/scw-contracts"]
 	path = lib/scw-contracts
 	url = https://github.com/bcnmy/scw-contracts
+	branch = develop
+[submodule "lib/account-abstraction"]
+	path = lib/account-abstraction
+	url = https://github.com/eth-infinitism/account-abstraction
+	tag = v0.6.0

.husky/pre-commit

@@ -1,2 +1,4 @@
 #!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn lint:sol

.solhint.json

@@ -1,7 +1,7 @@
 {
   "extends": "solhint:recommended",
   "rules": {
-    "compiler-version": ["error", "0.8.17"],
+    "compiler-version": ["error", "0.8.23"],
     "func-visibility": ["warn", { "ignoreConstructors": true }],
     "reentrancy": "error",
     "state-visibility": "error",

CONTRIBUTING.md

@@ -0,0 +1,67 @@
+# Contributing to Biconomy Projects 🚀
+
+First off, thank you for considering contributing to Biconomy! We truly appreciate your effort. 
+Contributions from the community are what make Biconomy awesome. 🙌
+
+Your contributions are valued and will help in driving the decentralized web forward.
+
+> If you're passionate about our mission but can't contribute directly, there are other ways to support:
+>
+> - ⭐ Star our projects on GitHub
+> - 🐦 [Tweet about Biconomy](https://twitter.com/biconomy/)
+> - 📌 Reference Biconomy in your project's readme
+> - 🗣️ Share about Biconomy at meetups or with peers
+
+## Table of Contents
+
+- [Contributing to Biconomy Projects 🚀](#contributing-to-biconomy-projects-)
+  - [Table of Contents](#table-of-contents)
+  - [Have a Question?](#have-a-question)
+  - [Ready to Contribute?](#ready-to-contribute)
+    - [Legal Notice 📜](#legal-notice-)
+    - [Reporting Bugs 🐛](#reporting-bugs-)
+    - [Suggesting Enhancements 💡](#suggesting-enhancements-)
+    - [First Time Contributing? 🌱](#first-time-contributing-)
+    - [Improving Documentation 📚](#improving-documentation-)
+    - [Commit Messages 📝](#commit-messages-)
+  - [Join Biconomy's Team! 🚀](#join-biconomys-team-)
+
+## Have a Question?
+
+Before reaching out, please ensure you've gone through our [Documentation](https://docs.biconomy.io/). If you still have questions:
+
+1. Search for existing [Issues](https://github.com/bcnmy/biconomy-paymasters/issues) that might answer your question.
+2. Check out our [Forum](https://forum.biconomy.io/).
+3. Join our [Discord](https://discord.com/invite/biconomy) or [Telegram](https://t.me/biconomy) communities.
+
+If you still need assistance, feel free to open an [Issue](https://github.com/bcnmy/biconomy-paymasters/issues/new) with your question.
+
+## Ready to Contribute?
+
+### Legal Notice 📜
+
+By contributing, you agree that you've authored your contribution and that it can be provided under the project's license.
+
+### Reporting Bugs 🐛
+
+Before submitting a bug report, ensure you're using the latest version and that you've read our [documentation](https://docs.biconomy.io/). If you've identified a bug that hasn't been reported, open a new [Issue](https://github.com/bcnmy/biconomy-paymasters/issues/new) detailing the bug.
+
+### Suggesting Enhancements 💡
+
+Have a feature in mind? First, ensure it aligns with Biconomy's mission and hasn't been suggested before. Then, open an [Issue](https://github.com/bcnmy/biconomy-paymasters/issues/new) to discuss your enhancement.
+
+### First Time Contributing? 🌱
+
+Welcome! We're thrilled to have you. If you're unsure where to start, look for issues labeled `good first issue`.
+
+### Improving Documentation 📚
+
+Good documentation is key! If you spot areas for improvement or errors in our documentation, we'd love your input. If you wish to suggest changes, feel free to raise a PR on our [documentation repository](https://github.com/bcnmy/docs).
+
+### Commit Messages 📝
+
+Ensure your commit messages are clear and descriptive.
+
+## Join Biconomy's Team! 🚀
+
+Interested in joining our mission full-time? Check out our [current job openings](https://jobs.lever.co/biconomy).

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Biconomy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.