From e5346e93dcbd791458e6ea7459c20c9f9a26c774 Mon Sep 17 00:00:00 2001 From: "Khang Vo (doublevkay)" <45411113+vovikhangcdv@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:32:49 +0700 Subject: [PATCH 1/2] fix: conflict when multiple api keys provied --- crytic_compile/platform/etherscan.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/crytic_compile/platform/etherscan.py b/crytic_compile/platform/etherscan.py index bcb2491..9d22f10 100644 --- a/crytic_compile/platform/etherscan.py +++ b/crytic_compile/platform/etherscan.py @@ -248,43 +248,43 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None: export_dir = os.path.join( export_dir, kwargs.get("etherscan_export_dir", "etherscan-contracts") ) - - if etherscan_api_key and "etherscan" in etherscan_url: - etherscan_url += f"&apikey={etherscan_api_key}" - etherscan_bytecode_url += f"&apikey={etherscan_api_key}" + if arbiscan_api_key and "arbiscan" in etherscan_url: etherscan_url += f"&apikey={arbiscan_api_key}" etherscan_bytecode_url += f"&apikey={arbiscan_api_key}" - if polygonscan_api_key and "polygonscan" in etherscan_url: + elif polygonscan_api_key and "polygonscan" in etherscan_url: etherscan_url += f"&apikey={polygonscan_api_key}" etherscan_bytecode_url += f"&apikey={polygonscan_api_key}" - if test_polygonscan_api_key and "polygonscan" in etherscan_url: + elif test_polygonscan_api_key and "polygonscan" in etherscan_url: etherscan_url += f"&apikey={test_polygonscan_api_key}" etherscan_bytecode_url += f"&apikey={test_polygonscan_api_key}" - if avax_api_key and "snowtrace" in etherscan_url: + elif avax_api_key and "snowtrace" in etherscan_url: etherscan_url += f"&apikey={avax_api_key}" etherscan_bytecode_url += f"&apikey={avax_api_key}" - if ftmscan_api_key and "ftmscan" in etherscan_url: + elif ftmscan_api_key and "ftmscan" in etherscan_url: etherscan_url += f"&apikey={ftmscan_api_key}" etherscan_bytecode_url += f"&apikey={ftmscan_api_key}" - if bscan_api_key and "bscscan" in etherscan_url: + elif bscan_api_key and "bscscan" in etherscan_url: etherscan_url += f"&apikey={bscan_api_key}" etherscan_bytecode_url += f"&apikey={bscan_api_key}" - if optim_api_key and "optim" in etherscan_url: + elif optim_api_key and "optim" in etherscan_url: etherscan_url += f"&apikey={optim_api_key}" etherscan_bytecode_url += f"&apikey={optim_api_key}" - if base_api_key and "base" in etherscan_url: + elif base_api_key and "base" in etherscan_url: etherscan_url += f"&apikey={base_api_key}" etherscan_bytecode_url += f"&apikey={base_api_key}" - if gno_api_key and "gno" in etherscan_url: + elif gno_api_key and "gno" in etherscan_url: etherscan_url += f"&apikey={gno_api_key}" etherscan_bytecode_url += f"&apikey={gno_api_key}" - if polyzk_api_key and "zkevm" in etherscan_url: + elif polyzk_api_key and "zkevm" in etherscan_url: etherscan_url += f"&apikey={polyzk_api_key}" etherscan_bytecode_url += f"&apikey={polyzk_api_key}" - if blast_api_key and "blast" in etherscan_url: + elif blast_api_key and "blast" in etherscan_url: etherscan_url += f"&apikey={blast_api_key}" etherscan_bytecode_url += f"&apikey={blast_api_key}" + elif etherscan_api_key and "etherscan" in etherscan_url: + etherscan_url += f"&apikey={etherscan_api_key}" + etherscan_bytecode_url += f"&apikey={etherscan_api_key}" source_code: str = "" result: Dict[str, Union[bool, str, int]] = {} From 8a2c69b3a4ea24582fa37d818bcceaf5a8eba5e7 Mon Sep 17 00:00:00 2001 From: "Khang Vo (doublevkay)" Date: Mon, 22 Jul 2024 16:55:36 +0700 Subject: [PATCH 2/2] run linters --- crytic_compile/platform/etherscan.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crytic_compile/platform/etherscan.py b/crytic_compile/platform/etherscan.py index 9d22f10..d176ab9 100644 --- a/crytic_compile/platform/etherscan.py +++ b/crytic_compile/platform/etherscan.py @@ -248,7 +248,7 @@ def compile(self, crytic_compile: "CryticCompile", **kwargs: str) -> None: export_dir = os.path.join( export_dir, kwargs.get("etherscan_export_dir", "etherscan-contracts") ) - + if arbiscan_api_key and "arbiscan" in etherscan_url: etherscan_url += f"&apikey={arbiscan_api_key}" etherscan_bytecode_url += f"&apikey={arbiscan_api_key}"