fix: use rpc url as alias when resolving etherscan (#3341)

Author: mattsse

cli/src/cmd/forge/script/mod.rs

@@ -683,7 +683,7 @@ mod tests {
                 [profile.default]
 
                 [rpc_endpoints]
-                polygonMumbai = "https://polygon-mumbai.g.alchemy.com/v2/${_EXTRACT_RPC_ALIAS}"
+                polygonMumbai = "https://polygon-mumbai.g.alchemy.com/v2/${_CAN_EXTRACT_RPC_ALIAS}"
             "#;
 
         let toml_file = root.join(Config::FILE_NAME);
@@ -701,7 +701,7 @@ mod tests {
 
         assert!(err.downcast::<UnresolvedEnvVarError>().is_ok());
 
-        std::env::set_var("_EXTRACT_RPC_ALIAS", "123456");
+        std::env::set_var("_CAN_EXTRACT_RPC_ALIAS", "123456");
         let (config, evm_opts) = args.load_config_and_evm_opts().unwrap();
         assert_eq!(config.eth_rpc_url, Some("polygonMumbai".to_string()));
         assert_eq!(
@@ -754,4 +754,46 @@ mod tests {
         let etherscan = config.get_etherscan_api_key(Option::<u64>::None);
         assert_eq!(etherscan, Some("polygonkey".to_string()));
     }
+
+    #[test]
+    fn can_extract_script_rpc_and_sole_etherscan_alias() {
+        let temp = tempdir().unwrap();
+        let root = temp.path();
+
+        let config = r#"
+                [profile.default]
+
+               [rpc_endpoints]
+                mumbai = "https://polygon-mumbai.g.alchemy.com/v2/${_SOLE_EXTRACT_RPC_ALIAS}"
+
+                [etherscan]
+                mumbai = { key = "${_SOLE_POLYSCAN_API_KEY}" }
+            "#;
+
+        let toml_file = root.join(Config::FILE_NAME);
+        fs::write(toml_file, config).unwrap();
+        let args: ScriptArgs = ScriptArgs::parse_from([
+            "foundry-cli",
+            "DeployV1",
+            "--rpc-url",
+            "mumbai",
+            "--root",
+            root.as_os_str().to_str().unwrap(),
+        ]);
+        let err = args.load_config_and_evm_opts().unwrap_err();
+
+        assert!(err.downcast::<UnresolvedEnvVarError>().is_ok());
+
+        std::env::set_var("_SOLE_EXTRACT_RPC_ALIAS", "123456");
+        std::env::set_var("_SOLE_POLYSCAN_API_KEY", "polygonkey");
+        let (config, evm_opts) = args.load_config_and_evm_opts().unwrap();
+        assert_eq!(
+            evm_opts.fork_url,
+            Some("https://polygon-mumbai.g.alchemy.com/v2/123456".to_string())
+        );
+        let etherscan = config.get_etherscan_api_key(Some(80001u64));
+        assert_eq!(etherscan, Some("polygonkey".to_string()));
+        let etherscan = config.get_etherscan_api_key(Option::<u64>::None);
+        assert_eq!(etherscan, Some("polygonkey".to_string()));
+    }
 }

config/src/lib.rs

@@ -739,7 +739,7 @@ impl Config {
     /// # }
     /// ```
     pub fn get_rpc_url(&self) -> Option<Result<Cow<str>, UnresolvedEnvVarError>> {
-        let eth_rpc_url = self.eth_rpc_url.as_ref()?;
+        let eth_rpc_url = self.eth_rpc_url.as_ref().or(self.etherscan_api_key.as_ref())?;
         let mut endpoints = self.rpc_endpoints.clone().resolved();
         if let Some(alias) = endpoints.remove(eth_rpc_url) {
             Some(alias.map(Cow::Owned))
@@ -808,7 +808,7 @@ impl Config {
     pub fn get_etherscan_config(
         &self,
     ) -> Option<Result<ResolvedEtherscanConfig, EtherscanConfigError>> {
-        let maybe_alias = self.etherscan_api_key.as_ref()?;
+        let maybe_alias = self.etherscan_api_key.as_ref().or(self.eth_rpc_url.as_ref())?;
         if self.etherscan.contains_key(maybe_alias) {
             // etherscan points to an alias in the `etherscan` table, so we try to resolve
             // that
@@ -831,7 +831,7 @@ impl Config {
         chain: Option<impl Into<Chain>>,
     ) -> Result<Option<ResolvedEtherscanConfig>, EtherscanConfigError> {
         let chain = chain.map(Into::into);
-        if let Some(maybe_alias) = self.etherscan_api_key.as_ref() {
+        if let Some(maybe_alias) = self.etherscan_api_key.as_ref().or(self.eth_rpc_url.as_ref()) {
             if self.etherscan.contains_key(maybe_alias) {
                 let mut resolved = self.etherscan.clone().resolved();
                 return resolved.remove(maybe_alias).transpose()
@@ -2998,6 +2998,35 @@ mod tests {
         });
     }
 
+    #[test]
+    fn test_extract_etherscan_config_by_chain_and_alias() {
+        figment::Jail::expect_with(|jail| {
+            jail.create_file(
+                "foundry.toml",
+                r#"
+                [profile.default]
+                eth_rpc_url = "mumbai"
+
+                [etherscan]
+                mumbai = { key = "https://etherscan-mumbai.com/" }
+
+                [rpc_endpoints]
+                mumbai = "https://polygon-mumbai.g.alchemy.com/v2/mumbai"
+            "#,
+            )?;
+
+            let config = Config::load();
+
+            let mumbai =
+                config.get_etherscan_config_with_chain(Option::<u64>::None).unwrap().unwrap();
+            assert_eq!(mumbai.key, "https://etherscan-mumbai.com/".to_string());
+
+            let mumbai_rpc = config.get_rpc_url().unwrap().unwrap();
+            assert_eq!(mumbai_rpc, "https://polygon-mumbai.g.alchemy.com/v2/mumbai");
+            Ok(())
+        });
+    }
+
     #[test]
     fn test_toml_file() {
         figment::Jail::expect_with(|jail| {