Core Contract Improvements & Security Enhancements

.doc/technical-overview/contracts-details.md

@@ -1,6 +1,6 @@
 # ChatterPay Contracts Details
 
-## 1. [**ChatterPay.sol**](../../src/L2/ChatterPay.sol)
+## 1. [**ChatterPay.sol**](../../src/ChatterPay.sol)
 
 ### **High-Level Overview**:
 The `ChatterPay` contract is the core implementation of an account abstraction-based wallet. It allows users to execute transactions, manage token transfers, and interact with a paymaster for fee management. It includes mechanisms for validating user operations, performing token transfers, and interacting with external price feeds.
@@ -24,7 +24,7 @@ The `ChatterPay` contract is the core implementation of an account abstraction-b
 
 ---
 
-## 2. [**ChatterPayPaymaster.sol**](../../src/L2/ChatterPayPaymaster.sol)
+## 2. [**ChatterPayPaymaster.sol**](../../src/ChatterPayPaymaster.sol)
 
 ### **High-Level Overview**:
 The `ChatterPayPaymaster` contract is responsible for handling the payment of transaction fees on behalf of users. It validates and processes user operations by checking the signature and expiration of paymaster data, ensuring only authorized parties can execute the payment logic.
@@ -44,7 +44,7 @@ The `ChatterPayPaymaster` contract is responsible for handling the payment of tr
 
 ---
 
-## 3. [**ChatterPayNFT.sol**](../../src/L2/ChatterPayNFT.sol)
+## 3. [**ChatterPayNFT.sol**](../../src/ChatterPayNFT.sol)
 
 ### **High-Level Overview**:
 The `ChatterPayNFT` contract allows for the creation and management of NFTs associated with the ChatterPay platform. Users can mint original NFTs and create copies of these NFTs, with the ability to set limits on how many copies can be minted.
@@ -65,7 +65,7 @@ The `ChatterPayNFT` contract allows for the creation and management of NFTs asso
 
 ---
 
-## 4. [**ChatterPayVault.sol**](../../src/L2/ChatterPayNFT.sol)
+## 4. [**ChatterPayVault.sol**](../../src/ChatterPayNFT.sol)
 
 ### High-Level Summary:
 The `ChatterPayNFT` contract is an ERC721-based non-fungible token (NFT) contract that supports minting both original tokens and copies of those tokens. The contract uses upgradeable OpenZeppelin contracts and includes functionality to set a base URI for metadata, mint original tokens, mint copies, and set limits on the number of copies that can be minted. It also restricts certain actions, such as changing copy limits, to the original minter of a token.
@@ -101,7 +101,7 @@ The `ChatterPayNFT` contract is an ERC721-based non-fungible token (NFT) contrac
 
 ---
 
-## 5. [**ChatterPayWalletFactory.sol**](../../src/L2/ChatterPayWalletFactory.sol)
+## 5. [**ChatterPayWalletFactory.sol**](../../src/ChatterPayWalletFactory.sol)
 
 ### High-Level Summary:
 The `ChatterPayWalletFactory` contract is responsible for creating and managing `ChatterPayWalletProxy` instances. It enables the deployment of proxy contracts that are initialized with specific wallet implementations. The contract allows for flexible wallet creation with different owners and manages the proxy contracts. It also supports the updating of wallet implementations and tracks the deployed proxies.
@@ -136,7 +136,7 @@ The `ChatterPayWalletFactory` contract is responsible for creating and managing
 
 ---
 
-## 6. [**ChatterPayWalletProxy.sol**](../../src/L2/ChatterPayWalletProxy.sol)
+## 6. [**ChatterPayWalletProxy.sol**](../../src/ChatterPayWalletProxy.sol)
 
 ### High-Level Summary:
 The `ChatterPayWalletProxy` contract is an upgradeable proxy that delegates calls to a logic contract. It uses the [ERC-1967 proxy pattern](https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Proxy), which is a widely used standard for creating upgradeable contracts. The proxy allows the logic of the contract to be upgraded without changing the address that users interact with. This contract includes the necessary functionality to receive Ether and to view the current implementation address.
@@ -162,7 +162,7 @@ The `ChatterPayWalletProxy` contract is an upgradeable proxy that delegates call
 
 ---
 
-## 7. [**SimpleSwap.sol**](../../src/L2/SimpleSwap.sol)
+## 7. [**SimpleSwap.sol**](../../src/SimpleSwap.sol)
 
 ### High-Level Summary:
 The `SimpleSwap` contract allows users to swap between WETH (Wrapped Ether) and USDT (Tether USD). It supports liquidity provision where users can add WETH and USDT to the contract's liquidity pool and facilitate swaps between the two tokens. This contract uses the `SafeERC20` library for safe token transfers and includes a reentrancy guard to prevent reentrancy attacks.
@@ -197,7 +197,7 @@ The `SimpleSwap` contract allows users to swap between WETH (Wrapped Ether) and
 
 ---
 
-## 8. [**USDT.sol**](../../src/L2/USDT.sol)
+## 8. [**USDT.sol**](../../src/USDT.sol)
 
 ### High-Level Summary:
 The `USDT` contract is an ERC20 token representing Tether USD (USDT). It allows for the creation of USDT tokens and provides a minting function for the contract owner to generate more tokens. The contract is based on the ERC20 standard, which is widely used for tokenizing assets in decentralized finance (DeFi) applications. The initial supply is set at 10 million USDT tokens.
@@ -223,7 +223,7 @@ The `USDT` contract is an ERC20 token representing Tether USD (USDT). It allows
 
 ---
 
-## 9. [**WETH.sol**](../../src/L2/WETH.sol)
+## 9. [**WETH.sol**](../../src/WETH.sol)
 
 ### High-Level Summary:
 The `WETH` contract is an ERC20 token that represents Wrapped Ether (WETH). Its purpose is to allow users to mint and transfer WETH tokens, which are commonly used in DeFi applications to wrap Ether (ETH) into a token compatible with the ERC20 standard. The contract is based on the ERC20 standard and allows the owner to mint new tokens. The initial supply is fixed at 10 million tokens.
@@ -249,7 +249,7 @@ The `WETH` contract is an ERC20 token that represents Wrapped Ether (WETH). Its
 
 ---
 
-## 10. [**PackedUserOperation.sol**](../../src/L2/utils/PackedUserOperation.sol)
+## 10. [**PackedUserOperation.sol**](../../src/utils/PackedUserOperation.sol)
 
 ### High-Level Summary:
 The `PackedUserOperation` struct is designed to bundle and pack various data points related to a user operation in a blockchain environment. This data is used in transactions or operations that involve smart contracts, particularly in systems such as account abstraction or meta-transactions. The struct captures necessary information such as the sender's address, the operation's nonce, gas limits, call data, and the user's fee preferences.

.doc/technical-overview/overview.md

@@ -6,34 +6,34 @@ These smart contracts collectively create a robust ecosystem for wallet manageme
 
 ## Contracts List:
 
-1. [**ChatterPay.sol**](../../src/L2/ChatterPay.sol)  
+1. [**ChatterPay.sol**](../../src/ChatterPay.sol)  
 Core wallet contract for ChatterPay, handling user operations, token transfers, and transaction fee management.
 
-2. [**ChatterPayPaymaster.sol**](../../src/L2/ChatterPayPaymaster.sol)  
+2. [**ChatterPayPaymaster.sol**](../../src/ChatterPayPaymaster.sol)  
 Fee manager contract that ensures transaction fees are paid on behalf of users, supporting the account abstraction model of ChatterPay.
 
-3. [**ChatterPayNFT.sol**](../../src/L2/ChatterPayNFT.sol)  
+3. [**ChatterPayNFT.sol**](../../src/ChatterPayNFT.sol)  
 Manages the minting of original NFTs and their associated copies, with controls for copy limits and owner management.
 
-4. [**ChatterPayVault.sol**](../../src/L2/ChatterPayNFT.sol)  
+4. [**ChatterPayVault.sol**](../../src/ChatterPayNFT.sol)  
 Handles secure storage and management of assets within the ChatterPay ecosystem, providing vault services for users.
 
-5. [**ChatterPayWalletFactory.sol**](../../src/L2/ChatterPayWalletFactory.sol)  
+5. [**ChatterPayWalletFactory.sol**](../../src/ChatterPayWalletFactory.sol)  
 A wallet factory contract that creates proxy wallets for users, tracks proxies, and allows for updates to wallet implementations.
 
-6. [**ChatterPayWalletProxy.sol**](../../src/L2/ChatterPayWalletProxy.sol)  
+6. [**ChatterPayWalletProxy.sol**](../../src/ChatterPayWalletProxy.sol)  
 A proxy contract for ChatterPay wallets, allowing for upgradeable wallet functionality using [ERC-1967 Proxy](https://docs.openzeppelin.com/contracts/4.x/api/proxy#ERC1967Proxy), and providing a method to retrieve the current wallet implementation.
 
-7. [**SimpleSwap.sol**](../../src/L2/SimpleSwap.sol)  
+7. [**SimpleSwap.sol**](../../src/SimpleSwap.sol)  
 Implements a simple token swapping mechanism, allowing users to swap between supported tokens within the ChatterPay ecosystem.
 
-8. [**USDT.sol**](../../src/L2/USDT.sol)  
+8. [**USDT.sol**](../../src/USDT.sol)  
 A contract representing the USDT (Tether) token on Layer 2, enabling stablecoin transactions within the ChatterPay platform.
 
-9. [**WETH.sol**](../../src/L2/WETH.sol)  
+9. [**WETH.sol**](../../src/WETH.sol)  
 A contract for wrapping and unwrapping ETH as WETH (Wrapped Ether), allowing users to interact with ETH as an ERC-20 token in the ChatterPay ecosystem.
 
-10. [**PackedUserOperation.sol**](../../src/L2/utils/PackedUserOperation.sol)  
+10. [**PackedUserOperation.sol**](../../src/utils/PackedUserOperation.sol)  
 Defines the structure for user operations, including details like gas limits, fees, and operation signatures, enabling flexible interaction with the wallet system.
 
 11. [**L1Keystore.sol**](../../src/Ethereum/L1Keystore.sol)  

.github/workflows/test.yml

@@ -16,6 +16,7 @@ env:
   BACKEND_EOA: ${{ secrets.BACKEND_EOA }}
   BACKEND_PK: ${{ secrets.BACKEND_PK }}
   NFT_BASE_URI: https://dev.back.chatterpay.net/nft/metadata/opensea/
+  FOUNDRY_DISABLE_NIGHTLY_WARNING: 1
 
 jobs:
   check:
@@ -29,6 +30,15 @@ jobs:
         with:
           submodules: recursive
 
+    - name: Set up cache for Foundry
+        uses: actions/cache@v3
+        with:
+          path: |
+            .forge-cache
+            lib
+          key: ${{ runner.os }}-forge-cache-${{ hashFiles('**/*.sol') }}
+          restore-keys: |
+
       - name: Initialize and update submodules
         run: |
           git submodule update --init --recursive
@@ -46,5 +56,5 @@ jobs:
 
       - name: Run Forge tests
         run: |
-          forge test -vvv
+          yarn test:local
         id: test

.gitignore

@@ -19,3 +19,9 @@ node_modules
 
 #lock
 package-lock.json
+
+#abis
+abi
+
+# cache
+.forge-cache

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "lib/account-abstraction"]
     path = lib/account-abstraction
     url = https://github.com/eth-infinitism/account-abstraction.git
+[submodule "lib/solidity-stringutils"]
+	path = lib/solidity-stringutils
+	url = https://github.com/Arachnid/solidity-stringutils

Makefile

@@ -1,6 +1,34 @@
 -include .env
 
-deploy_verify_arbitrum_sepolia_all :;  forge clean && forge build; forge script script/DeployAllContracts.s.sol --rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) --private-key $(PRIVATE_KEY) --verify --etherscan-api-key $(ARBISCAN_API_KEY) --broadcast
-deploy_arbitrum_sepolia_all :;  forge clean && forge build; forge script script/DeployAllContracts.s.sol --rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) --private-key $(PRIVATE_KEY) --broadcast
-deploy_verify_arbitrum_sepolia_only_chatterpay :;  forge clean && forge build; forge script script/DeployChatterPay.s.sol --rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) --private-key $(PRIVATE_KEY) --verify --etherscan-api-key $(ARBISCAN_API_KEY) --broadcast
-deploy_arbitrum_sepolia_only_chatterpay :;  forge clean && forge build; forge script script/DeployChatterPay.s.sol --rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) --private-key $(PRIVATE_KEY) --broadcast
+# Common build command with local profile to ensure AST generation
+BUILD = FOUNDRY_PROFILE=local forge clean && FOUNDRY_PROFILE=local forge build
+
+# Deploy all contracts
+deploy_verify_arbitrum_sepolia_all :; $(BUILD) && \
+	FOUNDRY_PROFILE=local forge script script/DeployAllContracts.s.sol \
+	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
+	--private-key $(PRIVATE_KEY) \
+	--verify \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--broadcast
+
+deploy_arbitrum_sepolia_all :; $(BUILD) && \
+	FOUNDRY_PROFILE=local forge script script/DeployAllContracts.s.sol \
+	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
+	--private-key $(PRIVATE_KEY) \
+	--broadcast
+
+# Deploy only ChatterPay contract
+deploy_verify_arbitrum_sepolia_only_chatterpay :; $(BUILD) && \
+	FOUNDRY_PROFILE=local forge script script/DeployChatterPay.s.sol \
+	--rpc-url $(ARBITRUM_SEPOLIA_RPC_URL) \
+	--private-key $(PRIVATE_KEY) \
+	--verify \
+	--etherscan-api-key $(ARBISCAN_API_KEY) \
+	--broadcast
+
+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