Fix rebaseOptIn selector and test setup ordering

Author: nirholas

contracts/foundry.toml

@@ -15,14 +15,6 @@ remappings = [
     "forge-std/=lib/forge-std/src/"
 ]
 
-# Exclude certora and test directories from compilation
-exclude = [
-    "lib/openzeppelin-contracts/certora",
-    "lib/openzeppelin-contracts-upgradeable/certora",
-    "lib/openzeppelin-contracts-upgradeable/lib",
-    "lib/openzeppelin-contracts-upgradeable/test"
-]
-
 # Arbitrum specific settings
 gas_limit = 1099511627775
 block_gas_limit = 1125899906842624

contracts/src/X402RevenueSplitter.sol

@@ -115,7 +115,7 @@ contract X402RevenueSplitter is Ownable, ReentrancyGuard {
 
         // Opt into USDs rebase for auto-yield
         if (_usds != address(0)) {
-            try IUSDs(_usds).optInRebase() {} catch {}
+            try IUSDs(_usds).rebaseOptIn() {} catch {}
         }
     }
 

contracts/test/CreditSystem.t.sol

@@ -41,9 +41,10 @@ contract CreditSystemTest is Test {
 
     function setUp() public {
         // Mock USDs
+        // Use explicit selector for rebaseOptIn() - no params version
         vm.mockCall(
             USDS,
-            abi.encodeWithSelector(IUSDs.rebaseOptIn.selector),
+            abi.encodeWithSelector(bytes4(keccak256("rebaseOptIn()"))),
             abi.encode()
         );
 

contracts/test/PaymentChannel.t.sol

@@ -46,6 +46,13 @@ contract PaymentChannelTest is Test {
         sender = vm.addr(senderPrivateKey);
         recipient = vm.addr(recipientPrivateKey);
 
+        // Mock USDs rebaseOptIn - must happen before proxy deployment
+        vm.mockCall(
+            USDS,
+            abi.encodeWithSelector(bytes4(keccak256("rebaseOptIn()"))),
+            abi.encode()
+        );
+
         // Deploy implementation
         channelImpl = new X402PaymentChannel();
 
@@ -54,13 +61,6 @@ contract PaymentChannelTest is Test {
         ERC1967Proxy proxy = new ERC1967Proxy(address(channelImpl), initData);
         channel = X402PaymentChannel(address(proxy));
 
-        // Mock USDs rebaseOptIn
-        vm.mockCall(
-            USDS,
-            abi.encodeWithSelector(IUSDs.rebaseOptIn.selector),
-            abi.encode()
-        );
-
         // Fund sender
         vm.deal(sender, 100 ether);
     }

contracts/test/Subscription.t.sol

@@ -44,23 +44,23 @@ contract SubscriptionTest is Test {
     event Withdrawn(address indexed subscriber, uint256 amount);
 
     function setUp() public {
+        // Mock USDs - must happen before proxy deployment
+        _mockUSDs();
+
         // Deploy implementation
         subscriptionImpl = new X402Subscription();
 
         // Deploy proxy
         bytes memory initData = abi.encodeWithSelector(X402Subscription.initialize.selector);
         ERC1967Proxy proxy = new ERC1967Proxy(address(subscriptionImpl), initData);
         subscription = X402Subscription(address(proxy));
-
-        // Mock USDs
-        _mockUSDs();
     }
 
     function _mockUSDs() internal {
-        // Mock rebaseOptIn
+        // Mock rebaseOptIn - use explicit selector for no-params version
         vm.mockCall(
             USDS,
-            abi.encodeWithSelector(IUSDs.rebaseOptIn.selector),
+            abi.encodeWithSelector(bytes4(keccak256("rebaseOptIn()"))),
             abi.encode()
         );
 

contracts/test/ToolRegistry.t.sol

@@ -45,6 +45,13 @@ contract ToolRegistryTest is Test {
         // Uncomment for integration tests:
         // vm.createSelectFork(vm.envString("ARBITRUM_RPC_URL"));
 
+        // Mock USDs for unit tests - must happen before proxy deployment
+        vm.mockCall(
+            USDS,
+            abi.encodeWithSelector(bytes4(keccak256("rebaseOptIn()"))),
+            abi.encode()
+        );
+
         // Deploy implementation
         registryImpl = new ToolRegistry();
 
@@ -56,13 +63,6 @@ contract ToolRegistryTest is Test {
         );
         ERC1967Proxy proxy = new ERC1967Proxy(address(registryImpl), initData);
         registry = ToolRegistry(address(proxy));
-
-        // Mock USDs for unit tests
-        vm.mockCall(
-            USDS,
-            abi.encodeWithSelector(IUSDs.rebaseOptIn.selector),
-            abi.encode()
-        );
     }
 
     /*//////////////////////////////////////////////////////////////