SocketDotTech · tHeMaskedMan981 · May 2, 2025 · May 2, 2025 · May 2, 2025 · May 2, 2025
diff --git a/EventTopics.md b/EventTopics.md
@@ -94,18 +94,18 @@
 
 ## FeesPlug
 
-| Event                        | Arguments                                                                        | Topic                                                                |
-| ---------------------------- | -------------------------------------------------------------------------------- | -------------------------------------------------------------------- |
-| `ConnectorPlugDisconnected`  | `()`                                                                             | `0xc2af098c82dba3c4b00be8bda596d62d13b98a87b42626fefa67e0bb0e198fdd` |
-| `FeesDeposited`              | `(token: address, receiver: address, feeAmount: 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` |
+| 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` |
 
 ## Socket
 

diff --git a/FunctionSignatures.md b/FunctionSignatures.md
@@ -441,14 +441,13 @@
 | `appGatewayCalled`            | `0xc6767cf1` |
 | `appGatewayCaller`            | `0x712b193a` |
 | `batchPayloadIds`             | `0x02b74f98` |
-| `callAppGateways`             | `0xaef0b33d` |
+| `callAppGateways`             | `0x5c38ded5` |
 | `cancelOwnershipHandover`     | `0x54d1f13d` |
 | `cancelRequest`               | `0x50ad0779` |
 | `completeOwnershipHandover`   | `0xf04e283e` |
 | `deliveryHelper__`            | `0xc031dfb4` |
 | `evmxSlug`                    | `0x8bae77c2` |
 | `expiryTime`                  | `0x99bc0aea` |
-| `finalize`                    | `0x7ffecf2e` |
 | `finalized`                   | `0x81c051de` |
 | `getBatchPayloadIds`          | `0xfd83cd1f` |
 | `getBatches`                  | `0xcb95b7b3` |

diff --git a/contracts/interfaces/IWatcherPrecompile.sol b/contracts/interfaces/IWatcherPrecompile.sol
@@ -132,11 +132,6 @@ interface IWatcherPrecompile {
         bytes calldata signature_
     ) external;
 
-    function finalize(
-        PayloadParams memory params_,
-        address transmitter_
-    ) external returns (bytes32 digest);
-
     function query(PayloadParams memory params_) external;
 
     function finalized(

diff --git a/contracts/protocol/payload-delivery/FeesPlug.sol b/contracts/protocol/payload-delivery/FeesPlug.sol
@@ -27,7 +27,12 @@ contract FeesPlug is IFeesPlug, PlugBase, AccessControl {
     error TokenNotWhitelisted(address token_);
 
     /// @notice Event emitted when fees are deposited
-    event FeesDeposited(address token, address receiver, uint256 feeAmount, uint256 nativeAmount);
+    event FeesDeposited(
+        address token,
+        address receiver,
+        uint256 creditAmount,
+        uint256 nativeAmount
+    );
     /// @notice Event emitted when fees are withdrawn
     event FeesWithdrawn(address token, address receiver, uint256 amount);
     /// @notice Event emitted when a token is whitelisted
@@ -73,8 +78,8 @@ contract FeesPlug is IFeesPlug, PlugBase, AccessControl {
         uint256 amount_
     ) external override {
         uint256 nativeAmount_ = amount_ / 10;
-        uint256 feeAmount_ = amount_ - nativeAmount_;
-        _deposit(token_, receiver_, feeAmount_, nativeAmount_);
+        uint256 creditAmount_ = amount_ - nativeAmount_;
+        _deposit(token_, receiver_, creditAmount_, nativeAmount_);
     }
 
     function depositToNative(address token_, address receiver_, uint256 amount_) external override {
@@ -83,19 +88,19 @@ contract FeesPlug is IFeesPlug, PlugBase, AccessControl {
 
     /// @notice Deposits funds
     /// @param token_ The token address
-    /// @param feeAmount_ The amount of fees
+    /// @param creditAmount_ The amount of fees
     /// @param nativeAmount_ The amount of native tokens
     /// @param receiver_ The receiver address
     function _deposit(
         address token_,
         address receiver_,
-        uint256 feeAmount_,
+        uint256 creditAmount_,
         uint256 nativeAmount_
     ) internal {
-        uint256 totalAmount_ = feeAmount_ + nativeAmount_;
+        uint256 totalAmount_ = creditAmount_ + nativeAmount_;
         if (!whitelistedTokens[token_]) revert TokenNotWhitelisted(token_);
         SafeTransferLib.safeTransferFrom(token_, msg.sender, address(this), totalAmount_);
-        emit FeesDeposited(receiver_, token_, feeAmount_, nativeAmount_);
+        emit FeesDeposited(token_, receiver_, creditAmount_, nativeAmount_);
     }
 
     /// @notice Adds a token to the whitelist

diff --git a/contracts/protocol/utils/common/Structs.sol b/contracts/protocol/utils/common/Structs.sol
@@ -95,10 +95,10 @@ struct PlugConfig {
 //trigger:
 struct TriggerParams {
     bytes32 triggerId;
-    bytes32 overrides;
     address plug;
     bytes32 appGatewayId;
     uint32 chainSlug;
+    bytes overrides;
     bytes payload;
 }
 // timeout:

diff --git a/contracts/protocol/watcherPrecompile/core/WatcherPrecompile.sol b/contracts/protocol/watcherPrecompile/core/WatcherPrecompile.sol
@@ -99,20 +99,6 @@ contract WatcherPrecompile is RequestHandler {
         );
     }
 
-    // ================== Finalize functions ==================
-
-    /// @notice Finalizes a payload request, requests the watcher to release the proofs to execute on chain
-    /// @param params_ The payload parameters
-    /// @param transmitter_ The address of the transmitter
-    /// @return The digest hash of the finalized payload
-    /// @dev This function finalizes a payload request and requests the watcher to release the proofs
-    function finalize(
-        PayloadParams memory params_,
-        address transmitter_
-    ) external returns (bytes32) {
-        return _finalize(params_, transmitter_);
-    }
-
     // ================== Query functions ==================
 
     /// @notice Creates a new query request

diff --git a/deployments/dev_addresses.json b/deployments/dev_addresses.json
@@ -2,7 +2,7 @@
   "421614": {
     "ContractFactoryPlug": "0x9dEa956E863a44a24c1CE068460E6190EA438602",
     "FastSwitchboard": "0xb4C5A231614639801F421Ca386388f65576F3c81",
-    "FeesPlug": "0xFF3639fD99515b40d8f6bC02AC1Fead65CAd93fD",
+    "FeesPlug": "0x2fc70A464588b3f692D5C500Bfe3A2F2165911aD",
     "Socket": "0xBd0436A6E0dee11e9359767142Ed6bD7B48ba258",
     "SocketBatcher": "0x1683c3AB4954852f71f400AbDeF98112a066ee44",
     "startBlock": 148461456,
@@ -19,17 +19,17 @@
     "FeesManager": "0xBf9529b5aA4a6a047Ff65CfAE9613A274C479143",
     "FeesManagerImpl": "0xB577c29F7Cbb1bBB314dD8E74059Aa5BF72838b0",
     "startBlock": 5537530,
-    "WatcherPrecompile": "0x68430a7f22125dd8b566f774AED05e868CA70fEA",
+    "WatcherPrecompile": "0xB0CC4C4a6706E265306daCa279Ce60D1052b2782",
     "WatcherPrecompileConfig": "0xD0F77272a5F0208f20c836bB4eeddbCE1e4aef9d",
     "WatcherPrecompileConfigImpl": "0x060b4a50EcCC9Cf329005c94406dd2886676F759",
-    "WatcherPrecompileImpl": "0x1BCe40d84499Db8E7Bc65277A32f0abd56588CC7",
+    "WatcherPrecompileImpl": "0xe1CA4da421C52161B4EecCE6F5Cb2937554e2958",
     "WatcherPrecompileLimits": "0x4A645F050166FaBdA7ce44BE90B0A61073C19696",
     "WatcherPrecompileLimitsImpl": "0x4Fd04B0D4903e630F169BB228be52750E6B5331a"
   },
   "11155420": {
     "ContractFactoryPlug": "0x95Be4D8500e3e5C970802c64b0755027d4Fc5C9F",
     "FastSwitchboard": "0xe7858f1dc202f5E9C9B3ee6db052F45164a88534",
-    "FeesPlug": "0x01bDCAB43c423D08BaCe87ED716280536dAB3eF3",
+    "FeesPlug": "0x29b77ecEf2D163528d1F4A235c0795daDD2DA1Bf",
     "Socket": "0xE09CC429e77EE5DBeF68f3796b2A33BBDF39C03C",
     "SocketBatcher": "0x9175d90706a2b17f0aE025ce5A6C76e64850c2f5",
     "startBlock": 27158986,

diff --git a/deployments/dev_verification.json b/deployments/dev_verification.json
@@ -41,15 +41,36 @@
       "0x89e66357C5F101C56b4F9F97cf378Cc32A21438a",
       "Socket",
       "contracts/protocol/socket/Socket.sol",
+      [84532, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
+    ]
+  ],
+  "421614": [
+    [
+      "0x092194e4Cd90d950ED91bD216472A18cCA7cd8F7",
+      "FeesPlug",
+      "contracts/protocol/payload-delivery/FeesPlug.sol",
       [
-        84532,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
+        "0xBd0436A6E0dee11e9359767142Ed6bD7B48ba258",
+        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
+      ]
+    ],
+    [
+      "0x44f182553Ccdd82f95b592a935Bd7Dd90FF7F292",
+      "FeesPlug",
+      "contracts/protocol/payload-delivery/FeesPlug.sol",
+      [
+        "0xBd0436A6E0dee11e9359767142Ed6bD7B48ba258",
+        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
       ]
     ]
   ],
-  "421614": [],
   "7625382": [
+    [
+      "0xe1CA4da421C52161B4EecCE6F5Cb2937554e2958",
+      "WatcherPrecompile",
+      "contracts/protocol/watcherPrecompile/core/WatcherPrecompile.sol",
+      []
+    ],
     [
       "0x23364acdd298EBB3Dfd3c1835C5ACd7f77E3E2bD",
       "AuctionManager",
@@ -207,12 +228,27 @@
       "0xF86B89B5c689c170BfD2734254228D6d2db5a672",
       "Socket",
       "contracts/protocol/socket/Socket.sol",
+      [11155111, "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18", "EVMX"]
+    ]
+  ],
+  "11155420": [
+    [
+      "0x78775DCd56fBdb903e4d83AE51924797a74AD49d",
+      "FeesPlug",
+      "contracts/protocol/payload-delivery/FeesPlug.sol",
       [
-        11155111,
-        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18",
-        "EVMX"
+        "0xE09CC429e77EE5DBeF68f3796b2A33BBDF39C03C",
+        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
+      ]
+    ],
+    [
+      "0x8eD0cebe57236Bf85b0a74951CeE74357B1d381D",
+      "FeesPlug",
+      "contracts/protocol/payload-delivery/FeesPlug.sol",
+      [
+        "0xE09CC429e77EE5DBeF68f3796b2A33BBDF39C03C",
+        "0x3339Cf48f1F9cf31b6F8c2664d144c7444eBBB18"
       ]
     ]
-  ],
-  "11155420": []
+  ]
 }
diff --git a/deployments/stage_addresses.json b/deployments/stage_addresses.json
@@ -1,52 +1,54 @@
 {
   "43": {
-    "AddressResolver": "0x4846430BB142385e581C894AE92a4CF0722aEC21",
-    "AddressResolverImpl": "0x0F13F50f7dED1da9A4845366C2AB5120a1A17549",
-    "AuctionManager": "0x222574Dab9bb404Cb49a9445CD4d9555e8B52Cf5",
-    "AuctionManagerImpl": "0xbe1b573aa1B6ddD1A7a27aE0Aa6A38FA5d26fc67",
-    "DeliveryHelper": "0x436Ea32C3198500d113B006dBdc6fF1Bebd10769",
-    "DeliveryHelperImpl": "0x40f7fdE05bFa9F7c9B55a582B0783352856BCd03",
-    "ERC1967Factory": "0xF362fdCAbbd1f58AAd998d4c7Aef4020365092C8",
-    "FeesManager": "0x9745623Aaa299500F93d2B1B4Efb7b3EC5e60FFc",
-    "FeesManagerImpl": "0x71956F006Ec5434581D3Fd5E7224BB3bae231907",
-    "startBlock": 2368668,
-    "WatcherPrecompile": "0xEbdA834fAc9ca4B86AdD442083c1650f8497EdCb",
-    "WatcherPrecompileConfig": "0x4D38091442c78B4cb2bB22AFF61552bc72d4BF8e",
-    "WatcherPrecompileConfigImpl": "0xDf9d7b339Db52Fc58f2c72ffAd3a87201FB16b30",
-    "WatcherPrecompileImpl": "0xbAeF84edEae864Ff22Bd9c9912AdfF84aD490d82",
-    "WatcherPrecompileLimits": "0x0CF9B01E7d1ef769D160F53289244f74197B4149",
-    "WatcherPrecompileLimitsImpl": "0x0bA474851A0703eC69964FB8264304AF357cd16D"
+    "AddressResolver": "0x21a9AFDfbEb0399D4a12f3AA1324042Be2B57F8e",
+    "AddressResolverImpl": "0x794b92C2Ade7D33Fb34d138B13014C63aB27CBC0",
+    "AuctionManager": "0x87E15a6f9Cbe482f67683Ec3f7294f12d221C8bA",
+    "AuctionManagerImpl": "0xfddb38811a0774E66ABD5F3Ae960bFB7E7415029",
+    "DeliveryHelper": "0xb399b60C22A32512a24F01C4401f43BfF979A49F",
+    "DeliveryHelperImpl": "0xa07e38cAB46eAA358C3653C63219f1009e8F7789",
+    "ERC1967Factory": "0x98ea7A5601f203DE56d86BDCA69fC3019377D6B1",
+    "FeesManager": "0x30e07016eB24570629Bc8765CA307394Af90B27C",
+    "FeesManagerImpl": "0x9F10A0c71178dbD4d049f2C04fD0e34966134b9e",
+    "startBlock": 5480301,
+    "WatcherPrecompile": "0x426509517074E0fBf15F8aAB2472711FB456C58C",
+    "WatcherPrecompileConfig": "0x49094ECAF26d8295BcBD73b0Ff17215348E7b253",
+    "WatcherPrecompileConfigImpl": "0xd69E17Ce715f49Cd2B16C64cf75201A56Ce0E90d",
+    "WatcherPrecompileImpl": "0xB423eE3bffc3604F96B59cF419C48AE05b8E9d0b",
+    "WatcherPrecompileLimits": "0x54B315eC6c7059b19164BC0e5335643d5bBAad4f",
+    "WatcherPrecompileLimitsImpl": "0x0e26C8CFCABC04c642696A625664553e2C183bbe"
   },
   "84532": {
-    "ContractFactoryPlug": "0x5AF9cA0Ce2Bc991FcE955f8c993fb0A5464B289F",
-    "FastSwitchboard": "0x0594497C89ECF66bC67204EE89770C4e799De3f9",
-    "FeesPlug": "0x0EBC6E395503eF135b7a45FfC7d42C2A2bc56D54",
-    "Socket": "0x92562Ae6526aB8B4fFF9Fa8ECAb6db67f0753693",
-    "SocketBatcher": "0xE4036898F51842E7DdFD36Dc8eAa7D4B207c5DEe",
-    "startBlock": 23664081
+    "ContractFactoryPlug": "0x8e51D99Bf353Ebba50080D0452546fd2EBAd86A4",
+    "FastSwitchboard": "0x4C114115755c39dB81a06fBfEb4b08302Abe7beE",
+    "FeesPlug": "0x9161a99deD597fe519E03D319053CA1669118dDA",
+    "Socket": "0x36Ae239a92faee6aFF4df9749d592dA7c00717Be",
+    "SocketBatcher": "0x8fa361816874a11a66D02EC84b28E1A931B4035e",
+    "startBlock": 25218634,
+    "TestUSDC": "0xfD51918C0572512901fFA79F822c99A475d22BB4"
   },
   "421614": {
-    "ContractFactoryPlug": "0x5F710Ac554DD22819F9411fa554265EEf827247d",
-    "FastSwitchboard": "0xBD0158415Eb99B5e1dBA1e4E534f916ba82380f9",
-    "FeesPlug": "0x9E263f6c7C199d9c147E30764A8cae1175184CB8",
-    "Socket": "0x22c1275677E600e2b049B69D929E2ccAAf4B880E",
-    "SocketBatcher": "0x92f85fe2CbB2D9ab577E4D167E629095497325b9",
-    "startBlock": 136470235
+    "ContractFactoryPlug": "0x65C066BE05CB4622393fADc1Bf3dE8eEdEcB3817",
+    "FastSwitchboard": "0xF121f4B97F7C902eeD4b188B08052Da9A1FD5aBe",
+    "FeesPlug": "0xDfE94B9b14de382Ed13C8A7F387884808D0f7E0b",
+    "Socket": "0xDAB25fB82cc1b1611Fb9016FB50222dBFcD1BCf5",
+    "SocketBatcher": "0x4e7163Ce9F7F335138fB32827d6f99f174060897",
+    "startBlock": 148801970,
+    "TestUSDC": "0xa03Cbf13f331aF7c0fD7F2E28E6Cbc13F879E3F3"
   },
   "11155111": {
-    "ContractFactoryPlug": "0xd36C1Dcb65CB09b7fCFABf153D7cdd42312C782E",
-    "FastSwitchboard": "0x36AC527afA283c95EA7dD11c8E93225d9F139028",
-    "FeesPlug": "0xc4008CCB59413cC2745d33549e5BE16A2d1DD061",
-    "Socket": "0x899AE7770eFb9714aF717d03c0d577e41d78ed48",
-    "SocketBatcher": "0xE90649F3BA488D91c7e8E3025F639F435Fa85243",
-    "startBlock": 23664095
+    "FastSwitchboard": "0x1eFD3AF2317B9E6E7492718878f69De747C9e7c3",
+    "FeesPlug": "0xfE555AD869ac24305471F0755976c556425E8D23",
+    "Socket": "0xae59BA0Bd0D92232B3B6304185448C9Fe5445f4d",
+    "SocketBatcher": "0xdaE4538FbbEf41B2Feb5c79DD2fFC9720AF13d7b",
+    "TestUSDC": "0xbcaDE56f86a819994d0F66b98e921C484bE6FE4e"
   },
   "11155420": {
-    "ContractFactoryPlug": "0x6320Ff773a4E01Cb8EB849EA906F17Cf6c48Ff9c",
-    "FastSwitchboard": "0xd94741a4654953817faEe228739a6d10C0683839",
-    "FeesPlug": "0x89634ecFea933aFaD5d3D6557b13cb8D466313d2",
-    "Socket": "0x2420B85D7e126d1948a4602f0c78a685655292Bd",
-    "SocketBatcher": "0xBD6770182fB47DD77924aDf3F200246Ab851f9c2",
-    "startBlock": 25646940
+    "ContractFactoryPlug": "0x469B536c5Df15948c8759FEEE5DB1c17790d4152",
+    "FastSwitchboard": "0xd8bCd4b4Bc4b0f5cb279B6FAdCEd733614f34F51",
+    "FeesPlug": "0x6734a30B8f2d210faefa5aeD4E11b674C59641F1",
+    "Socket": "0x11fbd3a7031b28607973fc44d4d24B26DEfac886",
+    "SocketBatcher": "0x2c2060f5586751676fC2Af96cc8bE9BF0c7A8770",
+    "startBlock": 27201458,
+    "TestUSDC": "0xa0E1738a9Fc0698789866e09d7A335d30128C5C5"
   }
 }