From c83252b68f4d16aeb29f5802828975d659df3e52 Mon Sep 17 00:00:00 2001
From: Tom Lehman <tom.s.lehman@gmail.com>
Date: Tue, 29 Oct 2024 15:18:47 -0400
Subject: [PATCH] Make L2_RPC optional

---
 src/foundry-utils/FoundryFacetSender.sol | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/foundry-utils/FoundryFacetSender.sol b/src/foundry-utils/FoundryFacetSender.sol
index 32d58bb..c274da2 100644
--- a/src/foundry-utils/FoundryFacetSender.sol
+++ b/src/foundry-utils/FoundryFacetSender.sol
@@ -8,8 +8,7 @@ import { console } from "forge-std/Test.sol";
 import { Script } from "forge-std/Script.sol";
 
 abstract contract FoundryFacetSender is Script {
-    uint256 public deployerNonce;
-    string public l2RpcUrl;
+    int256 public deployerNonce;
     
     modifier broadcast() {
         vm.startBroadcast(msg.sender);
@@ -18,7 +17,6 @@ abstract contract FoundryFacetSender is Script {
     }
 
     function setUp() public virtual {
-        l2RpcUrl = vm.envString("L2_RPC");
         deployerNonce = getL2Nonce();
     }
     
@@ -69,17 +67,27 @@ abstract contract FoundryFacetSender is Script {
     }
     
     function nextL2Address() internal returns (address) {
-        address addr = LibRLP.computeAddress(msg.sender, deployerNonce);
+        require(deployerNonce >= 0, "L2 RPC not set");
+        
+        address addr = LibRLP.computeAddress(msg.sender, uint256(deployerNonce));
         deployerNonce++;
         return addr;
     }
     
-    function getL2Nonce() internal returns (uint256) {
+    function getL2Nonce() internal returns (int256) {
+        // Try to get L2_RPC, returns empty string if not set
+        string memory rpcUrl = vm.envOr("L2_RPC", string(""));
+        
+        // If RPC URL is not set, return 0
+        if (bytes(rpcUrl).length == 0) {
+            return -1;
+        }
+
         // Store the current fork ID
         uint256 originalFork = vm.activeFork();
 
         // Create and select the L2 fork
-        uint256 l2Fork = vm.createFork(l2RpcUrl);
+        uint256 l2Fork = vm.createFork(rpcUrl);
         vm.selectFork(l2Fork);
 
         // Construct the JSON string for the RPC parameters
@@ -106,6 +114,6 @@ abstract contract FoundryFacetSender is Script {
         // Switch back to the original fork
         vm.selectFork(originalFork);
 
-        return nonce;
+        return int256(nonce);
     }
 }