From 4816ccbd41ca0602783d449584136526f5c9e648 Mon Sep 17 00:00:00 2001
From: Kyle Thornton <kyle@cowrie.io>
Date: Fri, 22 Nov 2024 14:04:58 -0800
Subject: [PATCH] Adding EtherscanV2

---
 src/loaders.ts | 38 +++++++++++++++++++++++++++++++-------
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/loaders.ts b/src/loaders.ts
index e14a5ff..7e50b37 100644
--- a/src/loaders.ts
+++ b/src/loaders.ts
@@ -157,7 +157,7 @@ export class MultiABILoaderError extends errors.LoaderError { };
 
 
 export class EtherscanABILoader implements ABILoader {
-    readonly name = "EtherscanABILoader";
+    readonly name: string = "EtherscanABILoader";
 
     apiKey?: string;
     baseURL: string;
@@ -189,11 +189,19 @@ export class EtherscanABILoader implements ABILoader {
     }
 
     async getContract(address: string): Promise<ContractResult> {
-        let url = this.baseURL + '?module=contract&action=getsourcecode&address=' + address;
-        if (this.apiKey) url += "&apikey=" + this.apiKey;
+        const url = new URL(this.baseURL)
+        const params = {
+            module: "contract",
+            action: "getsourcecode",
+            address: address,
+            ...(this.apiKey && { apikey: this.apiKey }),
+          };
+
+        // Using .set() to overwrite any default values that may be present in baseURL
+        Object.entries(params).forEach(([key, value]) => url.searchParams.set(key, value));
 
         try {
-            const r = await fetchJSON(url);
+            const r = await fetchJSON(url.toString());
             if (r.status === "0") {
                 if (r.result === "Contract source code not verified") return emptyContractResult;
                 throw new Error(r.result);    // This gets wrapped below
@@ -236,11 +244,19 @@ export class EtherscanABILoader implements ABILoader {
     }
 
     async loadABI(address: string): Promise<any[]> {
-        let url = this.baseURL + '?module=contract&action=getabi&address=' + address;
-        if (this.apiKey) url += "&apikey=" + this.apiKey;
+        const url = new URL(this.baseURL)
+        const params = {
+            module: "contract",
+            action: "getabi",
+            address: address,
+            ...(this.apiKey && { apikey: this.apiKey }),
+          };
+
+        // Using .set() to overwrite any default values that may be present in baseURL
+        Object.entries(params).forEach(([key, value]) => url.searchParams.set(key, value));
 
         try {
-            const r = await fetchJSON(url);
+            const r = await fetchJSON(url.toString());
 
             if (r.status === "0") {
                 if (r.result === "Contract source code not verified") return [];
@@ -277,6 +293,14 @@ export type EtherscanContractResult = {
   SwarmSource: string;
 }
 
+export class EtherscanV2ABILoader extends EtherscanABILoader {
+    readonly name: string = "EtherscanV2ABILoader";
+    constructor(config: { apiKey: string, chainId?: number }) {
+        // chainId is a required parameter in v2, as is an API key
+        super({ apiKey: config.apiKey, baseURL: `https://api.etherscan.io/v2/api?chainid=${config?.chainId ?? 1}` });
+    }
+}
+
 
 function isSourcifyNotFound(error: any): boolean {
     return (