Skip to content

Enable paymaster to cover gas for whitelist admin too and update swarm specification #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aliXsed merged 5 commits into from
Mar 26, 2026
Merged

Enable paymaster to cover gas for whitelist admin too and update swarm specification #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
48b9c93
Increase gap slots for ServiceProvider
aliXsed Mar 25, 2026
686f038
Update swarm specification: add UUID_ONLY tag type, FleetTreasuryPaym…
aliXsed Mar 26, 2026
4afc4bc
fix spelling
aliXsed Mar 26, 2026
38d5ec0
feat: allow whitelist admin to sponsor gas for admin operations
aliXsed Mar 26, 2026
49f5de5
update doc
aliXsed Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/paymasters/FleetTreasuryPaymaster.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,13 @@ contract FleetTreasuryPaymaster is BasePaymaster, QuotaControl {
// ──────────────────────────────────────────────

function _validateAndPayGeneralFlow(address from, address to, uint256 requiredETH) internal view override {
if (to != fleetIdentity) revert DestinationNotAllowed();
if (!isWhitelistedUser[from]) revert UserIsNotWhitelisted();
if (to == fleetIdentity) {
if (!isWhitelistedUser[from]) revert UserIsNotWhitelisted();
} else if (to == address(this)) {
if (!hasRole(WHITELIST_ADMIN_ROLE, from)) revert DestinationNotAllowed();
} else {
revert DestinationNotAllowed();
}
if (address(this).balance < requiredETH) revert PaymasterBalanceTooLow();
}

Expand Down
9 changes: 2 additions & 7 deletions src/swarms/ServiceProviderUpgradeable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,7 @@ import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Ini
* - Future versions can add new storage variables at the end.
* - Use `reinitializer(n)` for version-specific initialization.
*/
contract ServiceProviderUpgradeable is
Initializable,
ERC721Upgradeable,
Ownable2StepUpgradeable,
UUPSUpgradeable
{
contract ServiceProviderUpgradeable is Initializable, ERC721Upgradeable, Ownable2StepUpgradeable, UUPSUpgradeable {
// ──────────────────────────────────────────────
// Errors
// ──────────────────────────────────────────────
Expand All @@ -49,7 +44,7 @@ contract ServiceProviderUpgradeable is
/// When adding new storage in V2+, reduce this gap accordingly.
/// Example: Adding 1 new storage variable → change to __gap[48]
// solhint-disable-next-line var-name-mixedcase
uint256[49] private __gap;
uint256[50] private __gap;

// ──────────────────────────────────────────────
// Events
Expand Down
Loading
Loading