Skip to content

Fees manager revert #197

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
Parent: Script and proxy changes
merged 8 commits into from
Oct 13, 2025
Merged

Fees manager revert #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7936901
feat: remove susdc
ameeshaagrawal Oct 2, 2025
e15509d
fix: test and scripts
ameeshaagrawal Oct 2, 2025
f26952b
doc: refactor
ameeshaagrawal Oct 2, 2025
7e0e390
fix: lint
ameeshaagrawal Oct 2, 2025
1ff3fe9
fix: revert temp changes from surge
ameeshaagrawal Oct 2, 2025
dade540
feat: payload revert
ameeshaagrawal Oct 2, 2025
fabdffb
Merge pull request #198 from SocketDotTech/revert-commented-changes
ameeshaagrawal Oct 7, 2025
a72f95e
Merge pull request #199 from SocketDotTech/payload-reverts
ameeshaagrawal Oct 13, 2025
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
42 changes: 13 additions & 29 deletions EventTopics.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,7 @@
| `OwnershipHandoverCanceled` | `(pendingOwner: address)` | `0xfa7b8eab7da67f412cc9575ed43464468f9bfbae89d1675917346ca6d8fe3c92` |
| `OwnershipHandoverRequested` | `(pendingOwner: address)` | `0xdbf36a107da19e49527a7176a1babf963b4b0ff8cde35ee35d6cd8f1f9ac7e1d` |
| `OwnershipTransferred` | `(oldOwner: address, newOwner: address)` | `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0` |
| `SusdcTokenSet` | `(chainSlug: uint32, susdcToken: bytes32)` | `0xa268c0ce0f78082ba676c10a8a79a2785e196d85b3e883f8368f663536189525` |
| `Transfer` | `(from: address, to: address, amount: uint256)` | `0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef` |
| `WhitelistedReceiverSet` | `(receiver: address, isWhitelisted: bool)` | `0x1fc608eb6791d1ef5d49904b6fc17867efb0319743013f69d29403e20741e53b` |
| `WithdrawFailed` | `(payloadId: bytes32)` | `0xea147eb2109f71b4bda9e57528ba08b84821087a31cb43a7851dc6ff743d9be7` |

## FeesPool
Expand Down Expand Up @@ -174,33 +172,18 @@

## FeesPlug

| Event | Arguments | Topic |
| ---------------------------- | ------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------- |
| `ConnectorPlugDisconnected` | `()` | `0xc2af098c82dba3c4b00be8bda596d62d13b98a87b42626fefa67e0bb0e198fdd` |
| `FeesDeposited` | `(token: address, receiver: address, creditAmount: uint256, nativeAmount: uint256, data: bytes)` | `0x91f985f17a8632ae2e0a009d65ae250f373d82359d2389b58ea50ada6436682a` |
| `FeesWithdrawn` | `(token: address, receiver: address, amount: uint256)` | `0x5e110f8bc8a20b65dcc87f224bdf1cc039346e267118bae2739847f07321ffa8` |
| `OwnershipHandoverCanceled` | `(pendingOwner: address)` | `0xfa7b8eab7da67f412cc9575ed43464468f9bfbae89d1675917346ca6d8fe3c92` |
| `OwnershipHandoverRequested` | `(pendingOwner: address)` | `0xdbf36a107da19e49527a7176a1babf963b4b0ff8cde35ee35d6cd8f1f9ac7e1d` |
| `OwnershipTransferred` | `(oldOwner: address, newOwner: address)` | `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0` |
| `RoleGranted` | `(role: bytes32, grantee: address)` | `0x2ae6a113c0ed5b78a53413ffbb7679881f11145ccfba4fb92e863dfcd5a1d2f3` |
| `RoleRevoked` | `(role: bytes32, revokee: address)` | `0x155aaafb6329a2098580462df33ec4b7441b19729b9601c5fc17ae1cf99a8a52` |
| `TokenRemovedFromWhitelist` | `(token: address)` | `0xdd2e6d9f52cbe8f695939d018b7d4a216dc613a669876163ac548b916489d917` |
| `TokenWhitelisted` | `(token: address)` | `0x6a65f90b1a644d2faac467a21e07e50e3f8fa5846e26231d30ae79a417d3d262` |

## SUSDC

| Event | Arguments | Topic |
| ---------------------------- | ------------------------------------------------------------ | -------------------------------------------------------------------- |
| `Approval` | `(owner: address, spender: address, amount: uint256)` | `0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925` |
| `ConnectorPlugDisconnected` | `()` | `0xc2af098c82dba3c4b00be8bda596d62d13b98a87b42626fefa67e0bb0e198fdd` |
| `OwnershipHandoverCanceled` | `(pendingOwner: address)` | `0xfa7b8eab7da67f412cc9575ed43464468f9bfbae89d1675917346ca6d8fe3c92` |
| `OwnershipHandoverRequested` | `(pendingOwner: address)` | `0xdbf36a107da19e49527a7176a1babf963b4b0ff8cde35ee35d6cd8f1f9ac7e1d` |
| `OwnershipTransferred` | `(oldOwner: address, newOwner: address)` | `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0` |
| `RoleGranted` | `(role: bytes32, grantee: address)` | `0x2ae6a113c0ed5b78a53413ffbb7679881f11145ccfba4fb92e863dfcd5a1d2f3` |
| `RoleRevoked` | `(role: bytes32, revokee: address)` | `0x155aaafb6329a2098580462df33ec4b7441b19729b9601c5fc17ae1cf99a8a52` |
| `TokensBurned` | `(from: address, to: address, amount: uint256, data: bytes)` | `0x568ab03f32147bb501e2805da5910cb00bfca97231507d615ce5326dcf93eae6` |
| `TokensMinted` | `(to: address, amount: uint256)` | `0x3f2c9d57c068687834f0de942a9babb9e5acab57d516d3480a3c16ee165a4273` |
| `Transfer` | `(from: address, to: address, amount: uint256)` | `0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef` |
| Event | Arguments | Topic |
| ---------------------------- | ----------------------------------------------------------------------------------- | -------------------------------------------------------------------- |
| `ConnectorPlugDisconnected` | `()` | `0xc2af098c82dba3c4b00be8bda596d62d13b98a87b42626fefa67e0bb0e198fdd` |
| `FeesDeposited` | `(token: address, receiver: address, creditAmount: uint256, nativeAmount: uint256)` | `0xeb4e1b24b7fe377de69f80f7380bda5ba4b43176c6a4d300a3be9009c49f4228` |
| `FeesWithdrawn` | `(token: address, receiver: address, amount: uint256)` | `0x5e110f8bc8a20b65dcc87f224bdf1cc039346e267118bae2739847f07321ffa8` |
| `OwnershipHandoverCanceled` | `(pendingOwner: address)` | `0xfa7b8eab7da67f412cc9575ed43464468f9bfbae89d1675917346ca6d8fe3c92` |
| `OwnershipHandoverRequested` | `(pendingOwner: address)` | `0xdbf36a107da19e49527a7176a1babf963b4b0ff8cde35ee35d6cd8f1f9ac7e1d` |
| `OwnershipTransferred` | `(oldOwner: address, newOwner: address)` | `0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0` |
| `RoleGranted` | `(role: bytes32, grantee: address)` | `0x2ae6a113c0ed5b78a53413ffbb7679881f11145ccfba4fb92e863dfcd5a1d2f3` |
| `RoleRevoked` | `(role: bytes32, revokee: address)` | `0x155aaafb6329a2098580462df33ec4b7441b19729b9601c5fc17ae1cf99a8a52` |
| `TokenRemovedFromWhitelist` | `(token: address)` | `0xdd2e6d9f52cbe8f695939d018b7d4a216dc613a669876163ac548b916489d917` |
| `TokenWhitelisted` | `(token: address)` | `0x6a65f90b1a644d2faac467a21e07e50e3f8fa5846e26231d30ae79a417d3d262` |

## Configurations

Expand All @@ -219,6 +202,7 @@

| Event | Arguments | Topic |
| -------------------- | ------------------------------------------------ | -------------------------------------------------------------------- |
| `Initialized` | `(version: uint64)` | `0xc7f505b2f371ae2175ee4913f4499e1f2633a7b5936321eed1cdaeb6115181d2` |
| `MarkedRevert` | `(payloadId: bytes32, isRevertingOnchain: bool)` | `0xcf1fd844cb4d32cbebb5ca6ce4ac834fe98da3ddac44deb77fffd22ad933824c` |
| `PromiseNotResolved` | `(payloadId: bytes32, asyncPromise: address)` | `0xbcf0d0c678940566e9e64f0c871439395bd5fb5c39bca3547b126fe6ee467937` |
| `PromiseResolved` | `(payloadId: bytes32, asyncPromise: address)` | `0x1b1b5810494fb3e17f7c46547e6e67cd6ad3e6001ea6fb7d12ea0241ba13c4ba` |
Expand Down
66 changes: 59 additions & 7 deletions FunctionSignatures.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,57 +115,77 @@

| Function | Signature |
| ---------------------------- | ------------ |
| `DOMAIN_SEPARATOR` | `0x3644e515` |
| `addressResolver__` | `0x6a750469` |
| `approve` | `0xa3b53d8b` |
| `approveWithSignature` | `0x94b649ec` |
| `approveAppGateways` | `0x86d23ab2` |
| `allowance` | `0xdd62ed3e` |
| `approve` | `0x095ea7b3` |
| `approveWithSignature` | `0xf65de26c` |
| `asyncDeployer__` | `0x2a39e801` |
| `auctionManager` | `0xb0192f9a` |
| `balanceOf` | `0x70a08231` |
| `batchApprove` | `0x525b3861` |
| `blockCredits` | `0x9e434307` |
| `cancelOwnershipHandover` | `0x54d1f13d` |
| `completeOwnershipHandover` | `0xf04e283e` |
| `consumeFrom` | `0x40dd78be` |
| `creationCodeWithArgs` | `0xc126dcc4` |
| `decimals` | `0x313ce567` |
| `deployForwarder__` | `0xd4e3b034` |
| `deposit` | `0x5671d329` |
| `deprecated2` | `0x9897ed76` |
| `deprecated3` | `0x690e4d24` |
| `deprecated4` | `0xefe1358a` |
| `deprecatedSbType` | `0x5a783900` |
| `evmxSlug` | `0x8bae77c2` |
| `feesManager__` | `0x70568b58` |
| `feesPlugs` | `0x23f5ee8a` |
| `feesPool` | `0x6b259690` |
| `forwarderAddresses` | `0x5390fdcb` |
| `balanceOf` | `0xb065a8e5` |
| `getBlockedCredits` | `0x7987deca` |
| `getChainMaxFees` | `0xd26d8bf2` |
| `getMaxFees` | `0x64fe97fa` |
| `getOnChainAddress` | `0xb6abffd7` |
| `getOverrideParams` | `0x54f0a866` |
| `handleRevert` | `0x44792f25` |
| `initialize` | `0xbf2c8539` |
| `increaseFees` | `0xe9b304da` |
| `initialize` | `0xc13547c5` |
| `initializeOnChain` | `0x86f01739` |
| `isApproved` | `0xa389783e` |
| `isAsyncModifierSet` | `0xb69e0c4a` |
| `isCreditSpendable` | `0x4f8990fd` |
| `isNonceUsed` | `0xcab7e8eb` |
| `isValidPromise` | `0xb690b962` |
| `maxFees` | `0xe83e34b1` |
| `maxFeesPerChainSlug` | `0xe06340d4` |
| `name` | `0x06fdde03` |
| `nonces` | `0x7ecebe00` |
| `onCompleteData` | `0xb52fa926` |
| `onDeployComplete` | `0xfa3dbd1e` |
| `overrideParams` | `0xec5490fe` |
| `owner` | `0x8da5cb5b` |
| `ownershipHandoverExpiresAt` | `0xfee81cf4` |
| `permit` | `0xd505accf` |
| `renounceOwnership` | `0x715018a6` |
| `requestBlockedCredits` | `0xb62d25ac` |
| `requestOwnershipHandover` | `0x25692962` |
| `rescueFunds` | `0x6ccae054` |
| `sbType` | `0x745de344` |
| `setAddress` | `0x85bf312c` |
| `setChainMaxFees` | `0x7a3c3970` |
| `setFeesPlug` | `0xd6a9a8b7` |
| `setFeesPool` | `0xd6684588` |
| `setMaxFees` | `0xd865104d` |
| `symbol` | `0x95d89b41` |
| `tokenOnChainBalances` | `0x3b27866d` |
| `transferFrom` | `0xf1686c89` |
| `totalBalanceOf` | `0x4b0ee02a` |
| `totalSupply` | `0x18160ddd` |
| `transfer` | `0xa9059cbb` |
| `transferFrom` | `0x23b872dd` |
| `transferOwnership` | `0xf2fde38b` |
| `unblockAndAssignCredits` | `0x01958181` |
| `unblockCredits` | `0xa0b32314` |
| `unwrap` | `0x7647691d` |
| `userCredits` | `0x20babb92` |
| `userBlockedCredits` | `0x17fa5fb9` |
| `watcher__` | `0x300bb063` |
| `withdrawCredits` | `0xcfc6dbd9` |
| `wrap` | `0x023276f0` |
Expand Down Expand Up @@ -361,6 +381,36 @@
| `socket__` | `0xc6a261d2` |
| `transferOwnership` | `0xf2fde38b` |

## FeesPlug

| Function | Signature |
| ---------------------------- | ------------ |
| `appGatewayId` | `0x1c335f49` |
| `cancelOwnershipHandover` | `0x54d1f13d` |
| `completeOwnershipHandover` | `0xf04e283e` |
| `connectSocket` | `0x943103c3` |
| `depositCredit` | `0x34d83f58` |
| `depositCreditAndNative` | `0x9d55f674` |
| `depositToNative` | `0xe2665889` |
| `disconnectSocket` | `0xe90e5cc1` |
| `grantRole` | `0x2f2ff15d` |
| `hasRole` | `0x91d14854` |
| `initSocket` | `0x18b7ff72` |
| `isSocketInitialized` | `0x9a7d9a9b` |
| `overrides` | `0x4a85f041` |
| `owner` | `0x8da5cb5b` |
| `ownershipHandoverExpiresAt` | `0xfee81cf4` |
| `removeTokenFromWhitelist` | `0x306275be` |
| `renounceOwnership` | `0x715018a6` |
| `requestOwnershipHandover` | `0x25692962` |
| `rescueFunds` | `0x6ccae054` |
| `revokeRole` | `0xd547741f` |
| `socket__` | `0xc6a261d2` |
| `transferOwnership` | `0xf2fde38b` |
| `whitelistToken` | `0x6247f6f2` |
| `whitelistedTokens` | `0xdaf9c210` |
| `withdrawFees` | `0xe55dc4e6` |

## Configurations

| Function | Signature |
Expand Down Expand Up @@ -389,6 +439,7 @@

| Function | Signature |
| ----------------- | ------------ |
| `initialize` | `0xc4d66de8` |
| `markRevert` | `0x56501015` |
| `rescueFunds` | `0x6ccae054` |
| `resolvePromises` | `0xbf8484b8` |
Expand Down Expand Up @@ -467,6 +518,7 @@
| `requestHandler__` | `0x55184561` |
| `requestOwnershipHandover` | `0x25692962` |
| `rescueFunds` | `0xa58c6fc5` |
| `resetIsAppGatewayCalled` | `0xd19cd269` |
| `setCoreContracts` | `0xefa891c4` |
| `setIsValidPlug` | `0x06c0a40a` |
| `setTriggerFees` | `0xaeb30511` |
Expand Down
3 changes: 2 additions & 1 deletion contracts/evmx/base/AppGatewayBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "../helpers/AddressResolverUtil.sol";
import "../interfaces/IAppGateway.sol";
import "../interfaces/IForwarder.sol";
import "../interfaces/IPromise.sol";
import "../interfaces/IERC20.sol";

import {InvalidPromise, AsyncModifierNotSet} from "../../utils/common/Errors.sol";
import {FAST, READ, WRITE, SCHEDULE} from "../../utils/common/Constants.sol";
Expand Down Expand Up @@ -242,7 +243,7 @@ abstract contract AppGatewayBase is AddressResolverUtil, IAppGateway {
uint256 amount_,
address receiver_
) internal {
feesManager__().approve(address(feesManager__()), true);
IERC20(address(feesManager__())).approve(address(feesManager__()), type(uint256).max);
feesManager__().withdrawCredits(chainSlug_, token_, amount_, maxFees, receiver_);
}

Expand Down
Loading