Skip to content

merge feat/new-tokens into develop#189

Merged
dappsar merged 6 commits into
developfrom
feat/new-tokens
Jan 6, 2026
Merged

merge feat/new-tokens into develop#189
dappsar merged 6 commits into
developfrom
feat/new-tokens

Conversation

@TomasDmArg

@TomasDmArg TomasDmArg commented Jan 2, 2026

Copy link
Copy Markdown
Collaborator

Description

  • Minor fix on wallet token whitelist in ChatterPayWalletFactory to properly update stable tokens.
  • Updated makefile, re-organized and improved example_env
  • Updated token whitelist to support the new tokens (wstETH, USX, USDQ, sUSX). Note: SCR and USDC was already whitelisted.
  • Created a solidity script for bulk wallet storage update using upgradeToAndCall.
  • Migrated from etherscan v1 to etherscan v2

Related to:

Comment thread script/uniswap_check_liquidity.sh Outdated
@dappsar dappsar self-assigned this Jan 6, 2026
@dappsar dappsar added the enhancement New feature or request label Jan 6, 2026
@dappsar dappsar merged commit 78f565b into develop Jan 6, 2026
2 checks passed
@dappsar dappsar deleted the feat/new-tokens branch January 6, 2026 15:12
dappsar added a commit that referenced this pull request Jan 12, 2026
* forge install: openzeppelin-foundry-upgrades

v0.3.7

* [refactor] uncomment constructor, and remove unnecesary token approval

* [fix] fixed contract constructor / implementation issues at deploy checks

* [docs] added missing comment

* [feat] uncommented and reinforced paymaster validation

* [feat] updated tests to match paymaster

* [feat] improved paymaster validation to match backend code

* [fix] paymaster test

* [fix] swap test

* [fix] 🐛 fix missing approve in testSwapWithFee

* [revert] ⏪ revert disableInitializers

* [revert] ⏪ uncomment _disableInitializers in chatterpay.sol (#88)

* [fix] 🐛 remove direct initialization  in baseTest due to _disableInitializers (#88)

* [refactor] ♻️ remove unused vault contract

* [build] 👷 remove deployVault call from deploy script

* [build] 👷 add slither config

* [docs] 📝 add social media links, arch and bot info to README

* [docs] 📝 fix auditors links in readme

* [docs] 📝 fix typo in arch diagram in readme.md

* [refactor] 🔥 remove unused function is _isBTCToken (#106)

* [feat] ✨ add dynamic stable token managemnt (#106)

* [style] 🎨 apply solidity formatting with forge fmt

* [feat] 🚧 add public isStableToken getter for testing purposes (#106)

* [test] ✅ add tests for stable token management (#106)

* [refactor] 🔨 document intentional success ignore in _payPrefund (ERC-4337)

* [feat] ✨ move fee & slippage constants to vars (#109)

* [feat] ✨ add getters/setters to use with slippage & uniswap vars (#109)

* [test] ✨ call addStableToken in each test setup (#106)

* [fix] 🐛 correct minAmountOut calculation en swapModule (#109)

* [feat] 🗃️ add TOKENS_ARE_STABLE to example_env (#106)

* [build] 🔧 enable via_ir in foundry.toml to fix 'stack too deep' error (#106)

* [test] 🧪 add empty stable tokens array to factory deployment in BaseTest (#106)

* [build] 🚀 add tokensStableFlags handling to ChatterPay factory deployment scripts (#106)

* [feat] 🚧 add tokensStableFlags parameter to ChatterPay initialize function (#106)

* [feat] 🚧 add tokensStableFlags parameter to ChatterPayWalletFactory  (#106)

* [docs] 📝 fix contracts deployment documentation

* [docs] 📝 add chainlink documentation

* [docs] 📝 add scroll  documentation

* [feat] ✨ update USDC address with Manteca address

* [feat] :sparkles update scroll config in HelperConfig (#121)

* [docs] 🌐 translate Arbitrum mainnet config comment to English

* [docs] 📝 add scroll tokens adrs in example_env (#121)

* [docs] 📝 translate header comments  of getArbitrumOneConfig

* [build] 👷 add Scroll Sepolia deployment targets to Makefile (#121)

* [build] 👷 add Scroll Sepolia deployment scripts in package.json (#121)

* [feat] ✨ add getTokenFee function to expose calculation fee (#122)

* [build] 🥅 skip Uniswap pool configuration when DEPLOY_NETWORK_ENV is set to PROD

* [feat] 🗃️ add DEPLOY_NETWORK_ENV to example_env

* [feat] 🙈 ignore all env* files in .gitignore

* [docs] 📝 add uniswap contracts addresses for scroll ntwk (#121)

* [build] 🔧 set solc_version in foundry.toml for consistent Solidity compilation

* [refactor] 💬 clarify console log message for Wallet Factory implementation

* [docs] 📝 add another circle info in deploy-doc

* [revert] ⏪ move fee & slippage constants to vars (#109)

* [build] 🔧 add DEPLOYED_NFT_ADDRESS env to skip NFT deployment if already deployed and address is set

* [refactor] ♻️ rename router to uniswapRouter

* [refactor] ♻️ update references after router -> uniswapRouter rename

* [refactor] ♻️ skip uniswap pool config on anvil (chainId 31337)

* [build] 🔧 update optimizer runs from 50 to 200 in local

* [refactor] ♻️ remove harcoded entryPoint address in deploy script

* [refactor] ♻️ rename account by backendSigner in helperConfig

* [fix] 🐛 correct case in scroll tokens addresses

* [refactor] ♻️ unify token config into tokensConfig array with priceFeed and isStable across networks

* [refactor] ♻️ adapt SendPackedUserOp script to new HelperConfig structure

* [refactor] ♻️ adapt DeployAllContracts  script to new HelperConfig structure

* [refactor] ♻️ move uniswap config from env to HelperConfig

* [refactor] ♻️ move uniswapRouter inside uniswapConfig

* [refactor] ♻️ move nftBaseUri inside HelperConfig

* [refactor] ♻️ rafactor network config env vars

* [test] 🐛 add via_ir in default profile and github workflow

* [docs] 📝 replace components interactions image url

* [refactor] ♻️ replace manual ecrecover with OpenZeppelin ECDSA.recover (#99)

* [fix] 🐛 correct poo_fee_medium value (#109)

* [test] 🧪 add tests for ChatterPayNFT minting logic (#98)

* [feat] 🔒 add basic URI sanitization to prevent metadata injection (#98)

* [refactor] 🔒 replace transfer with secure ether transfer pattern (#104)

* [revert] ⏪ revert update of poo_fee_medium (#109)

* [feat] ✨ move fee & slippage constants to vars (#109)

* [feat] ✨ replace feeAdmin by owner in mmain contracts (#92)

* [feat] ✨ replace feeAdmin by owner in tests (#92)

* [feat] ✨ replace feeAdmin by owner in deploy scripts (#92)

* [refactor] 🔒 restrict upgrade and fee update to chatterpay admin (#92)

* [feat] ✨ add getChatterPayOwner function (#92)

* [test] 🧪 update admin tests to reflect new ChatterPay admin access control (#92)

* [fix] 🐛 use safe gas forwarding in _payPrefund (#102)

* [refactor] 🔥 remove unused DummyAggregator.sol

* [feat] ✨ add custom errors for invalid decimals and fee overflow (#107)

* [refactor] 🔒 add overflow-safe fee calculation with token price validation (#107)

* [refactor] 🔒 add chainlink price freshness and round validation to _getTokenPrice (#107)

* [test] 🧪 disable price freshness check in test setup for reliability (#107)

* [refactor] ♻️ unify swap test structure and logging with consistent format

* [refactor] 🔥 remove unused _-gap storage slot in chatterpay (#39)

* [refactor] ♻️ refactor chatteray state struct and storage access (#93)

* [test] 🧪 add test to verify state is preserved after upgrade (#93)

* [fix] 🐛 correct uniswap pool fee low (#109)

* [test] 🧪 sync pool fee between tests and contract (#109)

* [refactor] 🔥 remove commented-out legacy pool fee logic

* [docs] 📝 update documentation

* [test] 📝 update documentation in nft test

* [refactor] ♻️ refactor chatterpay.sol code structure for better readability (#96)

* [refactor] ♻️ refactor chatterpayNft.sol code structure for better readability (#96)

* [refactor] ♻️ refactor chatterpayPaymaster.sol code structure for better readability (#96)

* [refactor] ♻️ refactor chatterpayWalletFactory.sol code structure for better readability (#96)

* [refactor] ♻️ refactor chatterpayWalletProxy.sol code structure for better readability (#96)

* [refactor] ♻️ refactor chatterpay interfaces code structure for better readability (#96)

* [refactor] 🔒 add zero address validation in paymaster and wallet factory (#39)

* [refactor] ♻️ update price freshness threshold to 100 hours

* [feat] ✨ add detailed parameters to proce-related custom errors

* [refactor] ♻️ add manteca USDC token address in BaseConstants

* [refactor] ♻️ replace harcoded usdc address by BaseConstants variable in securityModule

* [refactor] ♻️ add utility function to top up ERC20 balances during tests

* [test] ♻️ allow multiple networks in tests

* [chore] 🔊 update log in BaseTest

* merge feature/20250428 into develop (#146)

* [build] 🔨 add arbitrum one (mainnet) contract addresses

* [fix] 🐛 correct address literal to use checksum format

* [build] 🔨 add arbitrum and scroll mainnet functions

* merge Fix/scroll-swap-error into develop (#149)

* custom-uniswap

* [fix] ⚡ update uniswapPoolFeeLow to 500 for Scroll liquidity compatibility (#148)

* [fix] 🐛 update uniswap addresses for Scroll in config (#148)

* merge feature/adjust-uniswap-script into develop (#150)

[chore] 🔨 adjust uniswap check liquidity script

* merge feature/eip-712 into develop (#152)

* temp code

* [feat] ✨ add EIP-712 signature validation with EIP-191 fallback support (#100)

* [test] ⏪ restore all version of entryPoint test module

* merge feat/scr-mainnet-addresses into develop (#156)

[feat] updated uni and tokens addresses

* merge feature/157-default-fee into develop (#159)

[feat] ✨ reduce default fee to 20 cents (#157)

* merge feature/doc-uniswap into develop (#160)

[docs] 📝 add uniswap scroll documentation

* merge fix/test-default-fee in develop (#161)

[fix] 🐛 update fee in cents for tests (#157)

* [fix] 🐛 add correct uniswap router for scroll (#158)

* merge feature/163-wbtc into develop (#164)

* [feat] ✨ add wbtc token in scroll-sepolia config (#163)

* [chore] 🔊 update logs

* merge feature/163-wbtc into develop (#165)

[fix] 🐛 correct array size in scroll tokens config (#163)

* merge feature/20250607 into develop (#168)

* [test] ♻️ use dynamic chain ID in BaseTest setup (#167)

* [fix] 🐛 fix fee transfer to use chatterpay owner (#166)

* merge feature/169-script-upgrade-chatterpay into develop (#171)

* [refactor] 🔥 remove old scripts

* [docs] 📝 add header comments in deployAllContracts script

* [feat] ✨ add script to deploy new chatterpay implementation & upgrade factory (#169)

* [feat] ✨ update dev scripts to allow run new deploy script (#169)

* [docs] 📝 update example_env with new DEPLOYED_FACTORY variable (#169)

* [fix] 🐛 fix typo in usdc in arbitrum-sepolia config

* merge feature/update-version into develop (#172)

[build] 🔖 increase chatterpay version

* merge feat/fee-update into develop (#177)

* [feat] added script to facilitate fee updates

* [feat] added factory fee update

* [fix] paymaster withdraw test

* [chore] update default fee in ChatterPay.sol

* [chore] 🙈 ignore log files in repository (#178)

* [chore] 🔥 remove exe and log files (#178)

* [chore] 📦 restore lib files

* [revert] 📦 restore package.json and yarn (#178)

* [refactor] ⚰️ remove dead code

* [refactor] 🔥 move script to backend project (#178)

* [fix] 🩹 fix scroll-sepolia contracts addresses

* [chore] 🚨 prettier stuff

* [chore] 🔊 add developer logs

* [test] 🐛 aligh liquidity amounts in tests with token0/token1 ordering

---------

Co-authored-by: dappsar <dapps.ar@gmail.com>

* merge feature/180-override-dependencies into develop (#181)

* [chore] 🙈 add .vscode and .wage to gitignore

* [fix] 🔒 fix security issue related to some dependencies (#180)

* merge feature/security-doc into develop (#184)

* [docs] 📝 add security policy file

* [docs] 📝 fix security tab link

* merge feature/funding to develop (#186)

[chore] 💸 add funding file

* merge feature/policy-doc into develop (#187)

* [docs] 📝 add security policy file

* [docs] 📝 fix security tab link

* [docs] 📝 update policy document (#183)

* [build] 🔨 remove old data

* Feat: Added scripts for token whitelist updates (#189)

* [feat] added wallet token list update script using upgradeToAndCall

* [chore] updated and improved example_env, added makefile commands for updating tokens

* [feat] improved stable tokens logic in ChatterPayWalletFactory, updated deploy config w new tokens

* [chore] address checksum fix, improved logging for debug

* [chore] improved wallet migration script

* [feat] ✨ add usx testnet addresses (#190)

---------

Co-authored-by: dappsar <dapps.ar@gmail.com>

* [chore] 🔀 merge develop into release branch prioritizing develop

* [chore] 🔀 merge develop into release branch prioritizing develop

---------

Co-authored-by: Tomas <info@tmdm.com.ar>
Co-authored-by: Tomas Di Mauro <tomas@tdm.ar>
@dappsar dappsar changed the title Feat: Added scripts for token whitelist updates merge feat/new-tokens into develop Jan 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Implement Token Whitelist Migration System for Existing ChatterPay Wallets

2 participants