Simplify

Author: davidcauchi

lib/config/network.go

@@ -44,8 +44,6 @@ type NetworkConfig struct {
 	// RpcWsUrls is the RPC WS endpoints for each network,
 	// key is the network name as declared in selected_networks slice
 	RpcWsUrls map[string][]string `toml:"RpcWsUrls,omitempty"`
-	// ForceHttp, if true, skips validation of WS endpoints, requiring only HTTP endpoints
-	ForceHttp bool `toml:"force_http,omitempty"`
 	// WalletKeys is the private keys for the funding wallets for each network,
 	// key is the network name as declared in selected_networks slice
 	WalletKeys map[string][]string `toml:"WalletKeys,omitempty"`
@@ -144,14 +142,9 @@ func (n *NetworkConfig) Validate() error {
 			}
 		}
 		// if the network is not forked, we need to validate RPC endpoints and private keys
-		if _, ok := n.RpcHttpUrls[network]; !ok {
-			return fmt.Errorf("at least one HTTP RPC endpoint for %s network must be set", network)
-		}
-
-		// Conditionally skip the WebSocket URL check if forceHttp is set to true
-		if !n.ForceHttp {
-			if _, ok := n.RpcWsUrls[network]; !ok {
-				return fmt.Errorf("at least one WS RPC endpoint for %s network must be set", network)
+		if _, httpOk := n.RpcHttpUrls[network]; !httpOk {
+			if _, wsOk := n.RpcWsUrls[network]; !wsOk {
+				return fmt.Errorf("at least one HTTP or WS RPC endpoint for %s network must be set", network)
 			}
 		}
 

lib/networks/known_networks.go

@@ -1104,17 +1104,15 @@ func SetNetworks(networkCfg config.NetworkConfig) ([]blockchain.EVMNetwork, erro
 		// if network is not simulated or forked, use the rpc urls and wallet keys from config
 		if !strings.Contains(networkName, "SIMULATED") && !forked {
 			var ok bool
-			// If we are forcinf htto but also have WSs available add them in case we need them
-			if !networkCfg.ForceHttp || (networkCfg.RpcWsUrls[selectedNetworks[i]] != nil && len(networkCfg.RpcWsUrls[selectedNetworks[i]]) > 0) {
-				wsUrls, ok = networkCfg.RpcWsUrls[selectedNetworks[i]]
-				if !ok {
-					return nil, fmt.Errorf("no rpc ws urls found in config for '%s' network", selectedNetworks[i])
-				}
-			}
-
-			httpUrls, ok = networkCfg.RpcHttpUrls[selectedNetworks[i]]
-			if !ok {
-				return nil, fmt.Errorf("no rpc http urls found in config for '%s' network", selectedNetworks[i])
+			var wsOk, httpOk bool
+			// Check for WS URLs
+			wsUrls, wsOk = networkCfg.RpcWsUrls[selectedNetworks[i]]
+			// Check for HTTP URLs
+			httpUrls, httpOk = networkCfg.RpcHttpUrls[selectedNetworks[i]]
+
+			// Ensure at least one of WS or HTTP URLs is available
+			if !wsOk && !httpOk {
+				return nil, fmt.Errorf("no RPC URLs found for '%s' network; at least one HTTP or WS RPC URL must be set", selectedNetworks[i])
 			}
 
 			walletKeys, ok = networkCfg.WalletKeys[selectedNetworks[i]]

lib/networks/known_networks_test.go

@@ -55,7 +55,6 @@ func TestNewEVMNetwork(t *testing.T) {
 		require.Equal(t, httpUrls, network.HTTPURLs)
 		require.Equal(t, wsUrls, network.URLs)
 		require.Equal(t, walletKeys, network.PrivateKeys)
-		require.Equal(t, walletKeys, network.PrivateKeys)
 	})
 }
 

lib/utils/seth/seth.go

@@ -152,7 +152,11 @@ func MergeSethAndEvmNetworkConfigs(evmNetwork blockchain.EVMNetwork, sethConfig
 	mergeSimulatedNetworks := func(evmNetwork blockchain.EVMNetwork, sethNetwork pkg_seth.Network) *pkg_seth.Network {
 		sethNetwork.PrivateKeys = evmNetwork.PrivateKeys
 		if len(sethNetwork.URLs) == 0 {
-			sethNetwork.URLs = evmNetwork.URLs
+			if len(evmNetwork.URLs) > 0 {
+				sethNetwork.URLs = evmNetwork.URLs
+			} else {
+				sethNetwork.URLs = evmNetwork.HTTPURLs
+			}
 		}
 		// important since Besu doesn't support EIP-1559, but other EVM clients do
 		sethNetwork.EIP1559DynamicFees = evmNetwork.SupportsEIP1559
@@ -174,11 +178,12 @@ func MergeSethAndEvmNetworkConfigs(evmNetwork blockchain.EVMNetwork, sethConfig
 			break
 		} else if isSameNetwork(conf, evmNetwork) {
 			conf.PrivateKeys = evmNetwork.PrivateKeys
-			if sethConfig.ForceHTTP {
-				conf.URLs = evmNetwork.HTTPURLs
-			}
 			if len(conf.URLs) == 0 {
-				conf.URLs = evmNetwork.URLs
+				if len(evmNetwork.URLs) > 0 {
+					conf.URLs = evmNetwork.URLs
+				} else {
+					conf.URLs = evmNetwork.HTTPURLs
+				}
 			}
 
 			sethNetwork = conf