chore: update for new devnet

Author: rookmate

.env.sample

@@ -1,17 +1,22 @@
 # RPCs
 EVMX_RPC="https://rpc-evmx-devnet.socket.tech/"
+
 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"
 
+ARBITRUM_RPC="https://arbitrum.drpc.org"
+OPTIMISM_RPC="https://optimism.drpc.org"
+BASE_RPC="https://base.drpc.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="0x21a9AFDfbEb0399D4a12f3AA1324042Be2B57F8e"
-FEES_MANAGER="0x30e07016eB24570629Bc8765CA307394Af90B27C"
-ARBITRUM_FEES_PLUG="0xDfE94B9b14de382Ed13C8A7F387884808D0f7E0b"
-ARBITRUM_TEST_USDC="0xa03Cbf13f331aF7c0fD7F2E28E6Cbc13F879E3F3"
+ADDRESS_RESOLVER="0x935b06902cA5C8bb4C76e18738561c294D377A93"
+FEES_MANAGER="0xA07208F9e7aE243F922317ab6604DC9F86822406"
+ARBITRUM_FEES_PLUG="0xee1Aef0b06f63Aa1c881838794Dd0876462c2B0d"
+ARBITRUM_USDC="0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
 
 # Add your deployer private key here
 # or remove it from this file if it is already an env var

script/counter/WithdrawFeesArbitrumFeesPlug.s.sol

@@ -3,8 +3,7 @@ pragma solidity ^0.8.0;
 
 import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
-import {FeesManager} from "socket-protocol/contracts/evmx/payload-delivery/FeesManager.sol";
-import {TestUSDC} from "socket-protocol/contracts/evmx/helpers/TestUSDC.sol";
+import {FeesManager} from "socket-protocol/contracts/evmx/fees/FeesManager.sol";
 
 import {CounterAppGateway} from "../../src/counter/CounterAppGateway.sol";
 
@@ -35,10 +34,10 @@ contract WithdrawFees is Script {
         vm.createSelectFork(vm.envString("EVMX_RPC"));
         FeesManager feesManager = FeesManager(payable(vm.envAddress("FEES_MANAGER")));
         address appGatewayAddress = vm.envAddress("APP_GATEWAY");
-        TestUSDC testUSDCContract = TestUSDC(vm.envAddress("ARBITRUM_TEST_USDC"));
+        address token = vm.envAddress("USDC");
 
         CounterAppGateway appGateway = CounterAppGateway(appGatewayAddress);
-        uint256 availableFees = feesManager.getMaxCreditsAvailableForWithdraw(appGatewayAddress);
+        uint256 availableFees = feesManager.getAvailableCredits(appGatewayAddress);
         console.log("Available fees:", availableFees);
 
         if (availableFees > 0) {
@@ -49,7 +48,7 @@ contract WithdrawFees is Script {
 
             // Gas price from Arbitrum
             uint256 arbitrumGasPrice = block.basefee + 0.1 gwei; // With buffer
-            uint256 gasLimit = 50_000_000_000; // Estimate
+            uint256 gasLimit = 5_000_000; // Estimate
             uint256 estimatedGasCost = gasLimit * arbitrumGasPrice;
 
             console.log("Arbitrum gas price (wei):", arbitrumGasPrice);
@@ -64,7 +63,7 @@ contract WithdrawFees is Script {
                 vm.createSelectFork(vm.envString("EVMX_RPC"));
                 vm.startBroadcast(privateKey);
                 console.log("Withdrawing amount:", amountToWithdraw);
-                appGateway.withdrawFeeTokens(421614, address(testUSDCContract), amountToWithdraw, sender);
+                appGateway.withdrawCredits(421614, token, amountToWithdraw, sender);
                 vm.stopBroadcast();
             } else {
                 console.log("Available fees less than estimated gas cost");

script/helpers/AppGatewayFeeBalance.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 import {Script} from "forge-std/Script.sol";
 import {console} from "forge-std/console.sol";
-import {FeesManager} from "socket-protocol/contracts/evmx/payload-delivery/FeesManager.sol";
+import {FeesManager} from "socket-protocol/contracts/evmx/fees/FeesManager.sol";
 
 contract CheckDepositedFees is Script {
     function run() external {

src/counter/CounterAppGateway.sol

@@ -29,10 +29,11 @@ contract CounterAppGateway is AppGatewayBase, Ownable {
      * @param addressResolver_ Address of the SOCKET Protocol's AddressResolver contract
      * @param fees_ Fee configuration for multi-chain operations
      */
-    constructor(address addressResolver_, uint256 fees_) AppGatewayBase(addressResolver_) {
+    constructor(address addressResolver_, uint256 fees_) {
         creationCodeWithArgs[counter] = abi.encodePacked(type(Counter).creationCode);
         _setMaxFees(fees_);
         _initializeOwner(msg.sender);
+        _initializeAppGateway(addressResolver_);
     }
 
     /**
@@ -42,7 +43,7 @@ contract CounterAppGateway is AppGatewayBase, Ownable {
      * https://docs.socket.tech/writing-apps#onchain-contract-deployment-with-the-appgateway-contract
      * @param chainSlug_ The identifier of the target chain
      */
-    function deployContracts(uint32 chainSlug_) external async(bytes("")) {
+    function deployContracts(uint32 chainSlug_) external async {
         _deploy(counter, chainSlug_, IsPlug.YES);
     }
 
@@ -53,7 +54,7 @@ contract CounterAppGateway is AppGatewayBase, Ownable {
      *      For more information on the initialize function, see:
      *      https://docs.socket.tech/deploy#initialize
      */
-    function initialize(uint32 /* chainSlug_ */ ) public pure override {
+    function initializeOnChain(uint32 /* chainSlug_ */ ) public pure override {
         return;
     }
 
@@ -62,7 +63,7 @@ contract CounterAppGateway is AppGatewayBase, Ownable {
      * @dev Calls the increase function on each counter instance provided
      * @param instances_ Array of counter contract addresses to increment
      */
-    function incrementCounters(address[] memory instances_) public async(bytes("")) {
+    function incrementCounters(address[] memory instances_) public async {
         for (uint256 i = 0; i < instances_.length; i++) {
             ICounter(instances_[i]).increase();
         }
@@ -85,7 +86,7 @@ contract CounterAppGateway is AppGatewayBase, Ownable {
      * @param amount_ The amount to withdraw
      * @param receiver_ The address that will receive the withdrawn fees
      */
-    function withdrawFeeTokens(uint32 chainSlug_, address token_, uint256 amount_, address receiver_) external {
-        _withdrawFeeTokens(chainSlug_, token_, amount_, receiver_);
+    function withdrawCredits(uint32 chainSlug_, address token_, uint256 amount_, address receiver_) external {
+        _withdrawCredits(chainSlug_, token_, amount_, receiver_);
     }
 }

test/apps/Counter.t.sol

@@ -3,35 +3,32 @@ pragma solidity ^0.8.21;
 
 import {CounterAppGateway} from "../../src/counter/CounterAppGateway.sol";
 import {Counter} from "../../src/counter/Counter.sol";
-import "socket-protocol/test/DeliveryHelper.t.sol";
+import "socket-protocol/test/SetupTest.t.sol";
 
-contract CounterTest is DeliveryHelperTest {
+contract CounterTest is AppGatewayBaseSetup {
     uint256 feesAmount = 0.01 ether;
 
     bytes32 counterId;
     bytes32[] contractIds = new bytes32[](1);
-
     CounterAppGateway counterGateway;
 
-    function deploySetup() internal {
-        setUpDeliveryHelper();
+    event CounterScheduleResolved(uint256 creationTimestamp, uint256 executionTimestamp);
 
-        counterGateway = new CounterAppGateway(address(addressResolver), feesAmount);
-        depositUSDCFees(
-            address(counterGateway),
-            OnChainFees({chainSlug: arbChainSlug, token: address(arbConfig.feesTokenUSDC), amount: 1 ether})
-        );
+    function setUp() public {
+        deploy();
 
+        counterGateway = new CounterAppGateway(address(addressResolver), feesAmount);
+        depositNativeAndCredits(arbChainSlug, 1 ether, 0, address(counterGateway));
         counterId = counterGateway.counter();
         contractIds[0] = counterId;
     }
 
     function deployCounterApp(uint32 chainSlug) internal returns (uint40 requestCount) {
-        requestCount = _deploy(chainSlug, counterGateway, contractIds);
+        counterGateway.deployContracts(chainSlug);
+        requestCount = executeDeploy(counterGateway, chainSlug, contractIds);
     }
 
     function testCounterDeployment() external {
-        deploySetup();
         deployCounterApp(arbChainSlug);
 
         (address onChain, address forwarder) = getOnChainAndForwarderAddresses(arbChainSlug, counterId, counterGateway);
@@ -41,7 +38,6 @@ contract CounterTest is DeliveryHelperTest {
     }
 
     function testCounterIncrement() external {
-        deploySetup();
         deployCounterApp(arbChainSlug);
 
         (address arbCounter, address arbCounterForwarder) =
@@ -52,13 +48,12 @@ contract CounterTest is DeliveryHelperTest {
         address[] memory instances = new address[](1);
         instances[0] = arbCounterForwarder;
         counterGateway.incrementCounters(instances);
-        executeRequest(new bytes[](0));
+        executeRequest();
 
         assertEq(Counter(arbCounter).counter(), arbCounterBefore + 1);
     }
 
     function testCounterIncrementMultipleChains() public {
-        deploySetup();
         deployCounterApp(arbChainSlug);
         deployCounterApp(optChainSlug);
 
@@ -79,7 +74,7 @@ contract CounterTest is DeliveryHelperTest {
         chains[0] = arbChainSlug;
         chains[1] = optChainSlug;
 
-        executeRequest(new bytes[](0));
+        executeRequest();
         assertEq(Counter(arbCounter).counter(), arbCounterBefore + 1);
         assertEq(Counter(optCounter).counter(), optCounterBefore + 1);
     }