Stage deployments

.env.sample

@@ -1,16 +1,16 @@
 # RPCs
 EVMX_RPC="https://rpc-evmx-devnet.socket.tech/"
-SEPOLIA_RPC="https://rpc.ankr.com/eth_sepolia/"
-ARBITRUM_SEPOLIA_RPC="https://rpc.ankr.com/arbitrum_sepolia"
-OPTIMISM_SEPOLIA_RPC="https://rpc.ankr.com/optimism_sepolia"
-BASE_SEPOLIA_RPC="https://rpc.ankr.com/base_sepolia"
+SEPOLIA_RPC="https://ethereum-sepolia-rpc.publicnode.com"
+ARBITRUM_SEPOLIA_RPC="https://sepolia-rollup.arbitrum.io/rpc"
+OPTIMISM_SEPOLIA_RPC="https://sepolia.optimism.io"
+BASE_SEPOLIA_RPC="https://sepolia.base.org"
 
 # EVMx key addresses
 # Find the most up to date addresses at:
 # https://github.com/SocketDotTech/socket-protocol/blob/master/deployments/stage_addresses.json
-ADDRESS_RESOLVER="0xf3046B22F98C25305E8040286fB1b33378BA10a1"
-FEES_MANAGER="0x603723100172D30171B7Fd9870ba80F8baf6FaD4"
-ARBITRUM_FEES_PLUG="0x89324F93d852cB4fcDC4Ee202456be466ce096bb"
+ADDRESS_RESOLVER="0x4846430BB142385e581C894AE92a4CF0722aEC21"
+FEES_MANAGER="0x9745623Aaa299500F93d2B1B4Efb7b3EC5e60FFc"
+ARBITRUM_FEES_PLUG="0x9E263f6c7C199d9c147E30764A8cae1175184CB8"
 
 # Add your deployer private key here
 # or remove it from this file if it is already an env var

contracts/interfaces/IWatcherPrecompileConfig.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Unlicense
 pragma solidity ^0.8.21;
 
-import {DigestParams, AppGatewayConfig, ResolvedPromises, PayloadParams, QueuePayloadParams, PayloadSubmitParams} from "../protocol/utils/common/Structs.sol";
+import {AppGatewayConfig, PlugConfig} from "../protocol/utils/common/Structs.sol";
 
 /// @title IWatcherPrecompileConfig
 /// @notice Interface for the Watcher Precompile system that handles payload verification and execution

contracts/protocol/payload-delivery/FeesManager.sol

@@ -269,7 +269,6 @@ contract FeesManager is FeesManagerStorage, Initializable, Ownable, AddressResol
     }
 
     function unblockFees(uint40 requestCount_) external {
-        RequestParams memory requestParams = watcherPrecompile__().getRequestParams(requestCount_);
         RequestMetadata memory requestMetadata = deliveryHelper__().getRequestMetadata(
             requestCount_
         );

contracts/protocol/watcherPrecompile/WatcherPrecompileConfig.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.21;
 import "./WatcherPrecompileLimits.sol";
 import {ECDSA} from "solady/utils/ECDSA.sol";
 import "solady/utils/Initializable.sol";
-import {IWatcherPrecompileConfig} from "../../interfaces/IWatcherPrecompileConfig.sol";
+import "../../interfaces/IWatcherPrecompileConfig.sol";
 
 /// @title WatcherPrecompileConfig
 /// @notice Configuration contract for the Watcher Precompile system
@@ -79,6 +79,8 @@ contract WatcherPrecompileConfig is
 
     error InvalidGateway();
     error InvalidSwitchboard();
+    error NonceUsed();
+    error InvalidWatcherSignature();
 
     /// @notice Initial initialization (version 1)
     function initialize(

contracts/protocol/watcherPrecompile/WatcherPrecompileLimits.sol

@@ -5,8 +5,9 @@ import {AccessControl} from "../utils/AccessControl.sol";
 import {Gauge} from "../utils/Gauge.sol";
 import {AddressResolverUtil} from "../utils/AddressResolverUtil.sol";
 import {WATCHER_ROLE} from "../utils/common/AccessRoles.sol";
-import {IWatcherPrecompileLimits} from "../../interfaces/IWatcherPrecompileLimits.sol";
+import "../../interfaces/IWatcherPrecompileLimits.sol";
 import "solady/utils/Initializable.sol";
+import {SCHEDULE, QUERY, FINALIZE} from "../utils/common/Constants.sol";
 
 contract WatcherPrecompileLimits is
     IWatcherPrecompileLimits,

deployments/dev_addresses.json

@@ -1,36 +1,28 @@
 {
   "421614": {
-    "ContractFactoryPlug": "0xCE9aF7Fb0Ee31276Ea64Cd7414d54eC57dA9b675",
-    "FastSwitchboard": "0x772088727d003f5A6Cf816E745ba6B8F8dEBbCe9",
-    "FeesPlug": "0xcc38176545fa5f6c2aB970F6d2D62b2D90bBA3Ba",
-    "Socket": "0xdE177c392Ad47377BA944215A944f530F79E1d87",
-    "SocketBatcher": "0x6BF08F11bDA6CD571Bc942F23ec38b8652FFfB2D",
-    "startBlock": 127798344
+    "ContractFactoryPlug": "0x10BFD064258ac890957Ca65A85E7997a923Fb551",
+    "FastSwitchboard": "0xB0feE9136102B99A5722C693C8eb538C8c8d013B",
+    "FeesPlug": "0x0Ae8458F80a50a4ad706680605c88e050AaC8A89",
+    "Socket": "0xA99E6020d973C5956dBD727eDB45cDA5F7C4ca99",
+    "SocketBatcher": "0x3F95273234164329aec7DE66A037a80eb5a8F393",
+    "startBlock": 136387501
   },
   "7625382": {
-    "AddressResolver": "0x403eCBcC4d4bB8Fad09034bf0d197dDC626C832f",
-    "AddressResolverImpl": "0xbAeF84edEae864Ff22Bd9c9912AdfF84aD490d82",
-    "AuctionManager": "0x7dc45C49650e2914e3fA6E194e2080775c58256E",
-    "AuctionManagerImpl": "0xa07e38cAB46eAA358C3653C63219f1009e8F7789",
-    "DeliveryHelper": "0x0861f0888125e5A243C7af2c3E0F80C357c4c0C0",
-    "DeliveryHelperImpl": "0x9F10A0c71178dbD4d049f2C04fD0e34966134b9e",
-    "ERC1967Factory": "0x945e9ab4c08c225C10F178a0bd600BcC2bA7Cc78",
-    "FeesManager": "0x777fAAf1c30Ce8E68262b1cbF0a752d4f1bA652C",
-    "FeesManagerImpl": "0xB423eE3bffc3604F96B59cF419C48AE05b8E9d0b",
-    "startBlock": 73062,
-    "WatcherPrecompile": "0xb84A0a3780d2766b0B610cef851D9CbB1dB9e9EC",
-    "WatcherPrecompileConfig": "0x6D52e71E235be8354e3ce1eC5d3E10DD2B2ad441",
-    "WatcherPrecompileConfigImpl": "0x33fCf171878FBcfc7d4E09354032Bbce4D30c75F",
-    "WatcherPrecompileImpl": "0x7FD88f010b2EDe0BC60AB4eD7475Fe89D60D7483",
-    "WatcherPrecompileLimits": "0x2cC4D88Ac8C795212C754bA481137dD916bE7850",
-    "WatcherPrecompileLimitsImpl": "0xd37c334d02688ae1d552142353136a99bfA6cc0D"
-  },
-  "11155420": {
-    "ContractFactoryPlug": "0x289A0413420f812a7b05F931FB0726168121ae5a",
-    "FastSwitchboard": "0x59D9c8C5515cF9C8A9c83458E3D78C2a246E3e7C",
-    "FeesPlug": "0x285d1b2e93c1c74E141dC37f759B8aFAcD479b2b",
-    "Socket": "0xa347A8475d4d218b22e8b0cc90FF76B3e6c8043c",
-    "SocketBatcher": "0x4a7Ccf2845222172A8B7Fc6E132eDb64cCB4E4a4",
-    "startBlock": 24425961
+    "AddressResolver": "0x491DE197D50aaa4F59090DBDa4b5Aa6C2E14A10D",
+    "AddressResolverImpl": "0x2736Fc0AA0fa5Ca595Ae5F27Ec807B912A5b1D0f",
+    "AuctionManager": "0x7187372e1fF5CB8E8B84Ee02F25033fc42B3D033",
+    "AuctionManagerImpl": "0xaE4624b006D7730f22De1F7df5b1C0b960262AE3",
+    "DeliveryHelper": "0x8b4a6cee33f18D757d7F3613476b135E3B889303",
+    "DeliveryHelperImpl": "0xE693bEc40e39223749AC351156E713b7256541B0",
+    "ERC1967Factory": "0x122beAFCfc2E99D825322a78EAFD8a11fa2d9E0b",
+    "FeesManager": "0x7c0922C2AfaBF9098F55710E8D8E3c8F81bCB8ee",
+    "FeesManagerImpl": "0xc2Ca571f4d4C2008Da4Bd750BaD3d50A5705ffF8",
+    "startBlock": 2491495,
+    "WatcherPrecompile": "0x6E4c1afEcc1AbFF69dF3bC6bFf81eF7A34a343d5",
+    "WatcherPrecompileConfig": "0x95f86089D4015e6874031B3583dE8795C3b217Fd",
+    "WatcherPrecompileConfigImpl": "0xE4a2eBcE3Bdcaa1861c01ddc6465b90311B749e4",
+    "WatcherPrecompileImpl": "0x4894D35BF607BB47099172d42133ffe411a1d4B8",
+    "WatcherPrecompileLimits": "0x34212a2Cf92D2863F35877Ed835B7e28b8287764",
+    "WatcherPrecompileLimitsImpl": "0xdfeA8cb793b84b3f046d2426259e0eC237Ec9bF3"
   }
 }