npm - @subsquid/evm-typegen - Versions diffs - 4.5.1 → 4.6.0 - Mend

@subsquid/evm-typegen 4.5.1 → 4.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/lib/chainIds.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+export declare const CHAIN_IDS: Record<string, number>;
+export declare function chainIdOption(chainId?: string): number | undefined;
+//# sourceMappingURL=chainIds.d.ts.map

package/lib/chainIds.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"chainIds.d.ts","sourceRoot":"","sources":["../src/chainIds.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CA+R5C,CAAA;AAED,wBAAgB,aAAa,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAoBlE"}

package/lib/chainIds.js ADDED Viewed

@@ -0,0 +1,268 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CHAIN_IDS = void 0;
+exports.chainIdOption = chainIdOption;
+const fastest_levenshtein_1 = require("fastest-levenshtein");
+const validator = __importStar(require("@subsquid/util-internal-commander"));
+const commander_1 = require("commander");
+// ref: https://docs.etherscan.io/supported-chains
+exports.CHAIN_IDS = {
+    // Ethereum Mainnet
+    'ethereum-mainnet': 1,
+    'mainnet': 1,
+    'ethereum': 1,
+    'eth': 1,
+    // Sepolia Testnet
+    'sepolia-testnet': 11155111,
+    'sepolia': 11155111,
+    // Holesky Testnet
+    'holesky-testnet': 17000,
+    'holesky': 17000,
+    // Hoodi Testnet
+    'hoodi-testnet': 560048,
+    'hoodi': 560048,
+    // BNB Smart Chain Mainnet
+    'bnb-smart-chain-mainnet': 56,
+    'bsc': 56,
+    'bnb': 56,
+    // BNB Smart Chain Testnet
+    'bnb-smart-chain-testnet': 97,
+    'bsc-testnet': 97,
+    // Polygon Mainnet
+    'polygon-mainnet': 137,
+    'polygon': 137,
+    'matic': 137,
+    // Polygon Amoy Testnet
+    'polygon-amoy-testnet': 80002,
+    'amoy': 80002,
+    'polygon-amoy': 80002,
+    // Base Mainnet
+    'base-mainnet': 8453,
+    'base': 8453,
+    // Base Sepolia Testnet
+    'base-sepolia-testnet': 84532,
+    'base-sepolia': 84532,
+    // Arbitrum One Mainnet
+    'arbitrum-one-mainnet': 42161,
+    'arbitrum': 42161,
+    'arb': 42161,
+    'arbitrum-one': 42161,
+    // Arbitrum Nova Mainnet
+    'arbitrum-nova-mainnet': 42170,
+    'arbitrum-nova': 42170,
+    'nova': 42170,
+    // Arbitrum Sepolia Testnet
+    'arbitrum-sepolia-testnet': 421614,
+    'arbitrum-sepolia': 421614,
+    'arb-sepolia': 421614,
+    // Linea Mainnet
+    'linea-mainnet': 59144,
+    'linea': 59144,
+    // Linea Sepolia Testnet
+    'linea-sepolia-testnet': 59141,
+    'linea-sepolia': 59141,
+    // Blast Mainnet
+    'blast-mainnet': 81457,
+    'blast': 81457,
+    // Blast Sepolia Testnet
+    'blast-sepolia-testnet': 168587773,
+    'blast-sepolia': 168587773,
+    // OP Mainnet
+    'op-mainnet': 10,
+    'optimism': 10,
+    'op': 10,
+    // OP Sepolia Testnet
+    'op-sepolia-testnet': 11155420,
+    'op-sepolia': 11155420,
+    'optimism-sepolia': 11155420,
+    // Avalanche C-Chain
+    'avalanche-c-chain': 43114,
+    'avalanche': 43114,
+    'avax': 43114,
+    // Avalanche Fuji Testnet
+    'avalanche-fuji-testnet': 43113,
+    'fuji': 43113,
+    'avalanche-fuji': 43113,
+    // BitTorrent Chain Mainnet
+    'bittorrent-chain-mainnet': 199,
+    'bittorrent': 199,
+    'btt': 199,
+    // BitTorrent Chain Testnet
+    'bittorrent-chain-testnet': 1029,
+    'bittorrent-testnet': 1029,
+    'btt-testnet': 1029,
+    // Celo Mainnet
+    'celo-mainnet': 42220,
+    'celo': 42220,
+    // Celo Sepolia Testnet
+    'celo-sepolia-testnet': 11142220,
+    'celo-sepolia': 11142220,
+    // Fraxtal Mainnet
+    'fraxtal-mainnet': 252,
+    'fraxtal': 252,
+    // Fraxtal Hoodi Testnet
+    'fraxtal-hoodi-testnet': 2523,
+    'fraxtal-hoodi': 2523,
+    // Gnosis
+    'gnosis': 100,
+    'gno': 100,
+    'xdai': 100,
+    // Mantle Mainnet
+    'mantle-mainnet': 5000,
+    'mantle': 5000,
+    // Mantle Sepolia Testnet
+    'mantle-sepolia-testnet': 5003,
+    'mantle-sepolia': 5003,
+    // Memecore Mainnet
+    'memecore-mainnet': 4352,
+    'memecore': 4352,
+    // Memecore Testnet
+    'memecore-testnet': 43521,
+    // Moonbeam Mainnet
+    'moonbeam-mainnet': 1284,
+    'moonbeam': 1284,
+    // Moonriver Mainnet
+    'moonriver-mainnet': 1285,
+    'moonriver': 1285,
+    // Moonbase Alpha Testnet
+    'moonbase-alpha-testnet': 1287,
+    'moonbase': 1287,
+    'moonbase-alpha': 1287,
+    // opBNB Mainnet
+    'opbnb-mainnet': 204,
+    'opbnb': 204,
+    // opBNB Testnet
+    'opbnb-testnet': 5611,
+    // Scroll Mainnet
+    'scroll-mainnet': 534352,
+    'scroll': 534352,
+    // Scroll Sepolia Testnet
+    'scroll-sepolia-testnet': 534351,
+    'scroll-sepolia': 534351,
+    // Taiko Mainnet
+    'taiko-mainnet': 167000,
+    'taiko': 167000,
+    // Taiko Hoodi
+    'taiko-hoodi': 167013,
+    // XDC Mainnet
+    'xdc-mainnet': 50,
+    'xdc': 50,
+    // XDC Apothem Testnet
+    'xdc-apothem-testnet': 51,
+    'xdc-apothem': 51,
+    'apothem': 51,
+    // ApeChain Mainnet
+    'apechain-mainnet': 33139,
+    'apechain': 33139,
+    'ape': 33139,
+    // ApeChain Curtis Testnet
+    'apechain-curtis-testnet': 33111,
+    'apechain-curtis': 33111,
+    'curtis': 33111,
+    // World Mainnet
+    'world-mainnet': 480,
+    'world': 480,
+    // World Sepolia Testnet
+    'world-sepolia-testnet': 4801,
+    'world-sepolia': 4801,
+    // Sonic Mainnet
+    'sonic-mainnet': 146,
+    'sonic': 146,
+    // Sonic Testnet
+    'sonic-testnet': 14601,
+    // Unichain Mainnet
+    'unichain-mainnet': 130,
+    'unichain': 130,
+    // Unichain Sepolia Testnet
+    'unichain-sepolia-testnet': 1301,
+    'unichain-sepolia': 1301,
+    // Abstract Mainnet
+    'abstract-mainnet': 2741,
+    'abstract': 2741,
+    // Abstract Sepolia Testnet
+    'abstract-sepolia-testnet': 11124,
+    'abstract-sepolia': 11124,
+    // Berachain Mainnet
+    'berachain-mainnet': 80094,
+    'berachain': 80094,
+    'bera': 80094,
+    // Berachain Bepolia Testnet
+    'berachain-bepolia-testnet': 80069,
+    'berachain-bepolia': 80069,
+    'bepolia': 80069,
+    // Swellchain Mainnet
+    'swellchain-mainnet': 1923,
+    'swellchain': 1923,
+    'swell': 1923,
+    // Swellchain Testnet
+    'swellchain-testnet': 1924,
+    'swell-testnet': 1924,
+    // Monad Mainnet
+    'monad-mainnet': 143,
+    'monad': 143,
+    // Monad Testnet
+    'monad-testnet': 10143,
+    // HyperEVM Mainnet
+    'hyperevm-mainnet': 999,
+    'hyperevm': 999,
+    // Katana Mainnet
+    'katana-mainnet': 747474,
+    'katana': 747474,
+    // Katana Bokuto
+    'katana-bokuto': 737373,
+    'bokuto': 737373,
+    // Sei Mainnet
+    'sei-mainnet': 1329,
+    'sei': 1329,
+    // Sei Testnet
+    'sei-testnet': 1328,
+    // Stable Mainnet
+    'stable-mainnet': 988,
+    'stable': 988,
+    // Stable Testnet
+    'stable-testnet': 2201,
+    // Plasma Mainnet
+    'plasma-mainnet': 9745,
+    'plasma': 9745,
+    // Plasma Testnet
+    'plasma-testnet': 9746,
+};
+function chainIdOption(chainId) {
+    if (chainId == null) {
+        return undefined;
+    }
+    // @ts-expect-error - chainId is a string
+    if (!isNaN(chainId)) {
+        return validator.positiveInt(chainId);
+    }
+    const normalizedChainId = chainId.toLowerCase();
+    if (normalizedChainId in exports.CHAIN_IDS) {
+        return exports.CHAIN_IDS[normalizedChainId];
+    }
+    const suggestion = (0, fastest_levenshtein_1.closest)(normalizedChainId, Object.keys(exports.CHAIN_IDS));
+    throw new commander_1.InvalidOptionArgumentError(`Unknown chain: "${chainId}". Did you mean "${suggestion}"? Alternatively, provide a numeric chain ID.`);
+}
+//# sourceMappingURL=chainIds.js.map

package/lib/chainIds.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"chainIds.js","sourceRoot":"","sources":["../src/chainIds.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAsSA,sCAoBC;AA1TD,6DAA2C;AAC3C,6EAA8D;AAC9D,yCAAoD;AAEpD,kDAAkD;AACrC,QAAA,SAAS,GAA2B;IAC7C,mBAAmB;IACnB,kBAAkB,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC;IACZ,UAAU,EAAE,CAAC;IACb,KAAK,EAAE,CAAC;IAER,kBAAkB;IAClB,iBAAiB,EAAE,QAAQ;IAC3B,SAAS,EAAE,QAAQ;IAEnB,kBAAkB;IAClB,iBAAiB,EAAE,KAAK;IACxB,SAAS,EAAE,KAAK;IAEhB,gBAAgB;IAChB,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE,MAAM;IAEf,0BAA0B;IAC1B,yBAAyB,EAAE,EAAE;IAC7B,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,EAAE;IAET,0BAA0B;IAC1B,yBAAyB,EAAE,EAAE;IAC7B,aAAa,EAAE,EAAE;IAEjB,kBAAkB;IAClB,iBAAiB,EAAE,GAAG;IACtB,SAAS,EAAE,GAAG;IACd,OAAO,EAAE,GAAG;IAEZ,uBAAuB;IACvB,sBAAsB,EAAE,KAAK;IAC7B,MAAM,EAAE,KAAK;IACb,cAAc,EAAE,KAAK;IAErB,eAAe;IACf,cAAc,EAAE,IAAI;IACpB,MAAM,EAAE,IAAI;IAEZ,uBAAuB;IACvB,sBAAsB,EAAE,KAAK;IAC7B,cAAc,EAAE,KAAK;IAErB,uBAAuB;IACvB,sBAAsB,EAAE,KAAK;IAC7B,UAAU,EAAE,KAAK;IACjB,KAAK,EAAE,KAAK;IACZ,cAAc,EAAE,KAAK;IAErB,wBAAwB;IACxB,uBAAuB,EAAE,KAAK;IAC9B,eAAe,EAAE,KAAK;IACtB,MAAM,EAAE,KAAK;IAEb,2BAA2B;IAC3B,0BAA0B,EAAE,MAAM;IAClC,kBAAkB,EAAE,MAAM;IAC1B,aAAa,EAAE,MAAM;IAErB,gBAAgB;IAChB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IAEd,wBAAwB;IACxB,uBAAuB,EAAE,KAAK;IAC9B,eAAe,EAAE,KAAK;IAEtB,gBAAgB;IAChB,eAAe,EAAE,KAAK;IACtB,OAAO,EAAE,KAAK;IAEd,wBAAwB;IACxB,uBAAuB,EAAE,SAAS;IAClC,eAAe,EAAE,SAAS;IAE1B,aAAa;IACb,YAAY,EAAE,EAAE;IAChB,UAAU,EAAE,EAAE;IACd,IAAI,EAAE,EAAE;IAER,qBAAqB;IACrB,oBAAoB,EAAE,QAAQ;IAC9B,YAAY,EAAE,QAAQ;IACtB,kBAAkB,EAAE,QAAQ;IAE5B,oBAAoB;IACpB,mBAAmB,EAAE,KAAK;IAC1B,WAAW,EAAE,KAAK;IAClB,MAAM,EAAE,KAAK;IAEb,yBAAyB;IACzB,wBAAwB,EAAE,KAAK;IAC/B,MAAM,EAAE,KAAK;IACb,gBAAgB,EAAE,KAAK;IAEvB,2BAA2B;IAC3B,0BAA0B,EAAE,GAAG;IAC/B,YAAY,EAAE,GAAG;IACjB,KAAK,EAAE,GAAG;IAEV,2BAA2B;IAC3B,0BAA0B,EAAE,IAAI;IAChC,oBAAoB,EAAE,IAAI;IAC1B,aAAa,EAAE,IAAI;IAEnB,eAAe;IACf,cAAc,EAAE,KAAK;IACrB,MAAM,EAAE,KAAK;IAEb,uBAAuB;IACvB,sBAAsB,EAAE,QAAQ;IAChC,cAAc,EAAE,QAAQ;IAExB,kBAAkB;IAClB,iBAAiB,EAAE,GAAG;IACtB,SAAS,EAAE,GAAG;IAEd,wBAAwB;IACxB,uBAAuB,EAAE,IAAI;IAC7B,eAAe,EAAE,IAAI;IAErB,SAAS;IACT,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;IAEX,iBAAiB;IACjB,gBAAgB,EAAE,IAAI;IACtB,QAAQ,EAAE,IAAI;IAEd,yBAAyB;IACzB,wBAAwB,EAAE,IAAI;IAC9B,gBAAgB,EAAE,IAAI;IAEtB,mBAAmB;IACnB,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,IAAI;IAEhB,mBAAmB;IACnB,kBAAkB,EAAE,KAAK;IAEzB,mBAAmB;IACnB,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,IAAI;IAEhB,oBAAoB;IACpB,mBAAmB,EAAE,IAAI;IACzB,WAAW,EAAE,IAAI;IAEjB,yBAAyB;IACzB,wBAAwB,EAAE,IAAI;IAC9B,UAAU,EAAE,IAAI;IAChB,gBAAgB,EAAE,IAAI;IAEtB,gBAAgB;IAChB,eAAe,EAAE,GAAG;IACpB,OAAO,EAAE,GAAG;IAEZ,gBAAgB;IAChB,eAAe,EAAE,IAAI;IAErB,iBAAiB;IACjB,gBAAgB,EAAE,MAAM;IACxB,QAAQ,EAAE,MAAM;IAEhB,yBAAyB;IACzB,wBAAwB,EAAE,MAAM;IAChC,gBAAgB,EAAE,MAAM;IAExB,gBAAgB;IAChB,eAAe,EAAE,MAAM;IACvB,OAAO,EAAE,MAAM;IAEf,cAAc;IACd,aAAa,EAAE,MAAM;IAErB,cAAc;IACd,aAAa,EAAE,EAAE;IACjB,KAAK,EAAE,EAAE;IAET,sBAAsB;IACtB,qBAAqB,EAAE,EAAE;IACzB,aAAa,EAAE,EAAE;IACjB,SAAS,EAAE,EAAE;IAEb,mBAAmB;IACnB,kBAAkB,EAAE,KAAK;IACzB,UAAU,EAAE,KAAK;IACjB,KAAK,EAAE,KAAK;IAEZ,0BAA0B;IAC1B,yBAAyB,EAAE,KAAK;IAChC,iBAAiB,EAAE,KAAK;IACxB,QAAQ,EAAE,KAAK;IAEf,gBAAgB;IAChB,eAAe,EAAE,GAAG;IACpB,OAAO,EAAE,GAAG;IAEZ,wBAAwB;IACxB,uBAAuB,EAAE,IAAI;IAC7B,eAAe,EAAE,IAAI;IAErB,gBAAgB;IAChB,eAAe,EAAE,GAAG;IACpB,OAAO,EAAE,GAAG;IAEZ,gBAAgB;IAChB,eAAe,EAAE,KAAK;IAEtB,mBAAmB;IACnB,kBAAkB,EAAE,GAAG;IACvB,UAAU,EAAE,GAAG;IAEf,2BAA2B;IAC3B,0BAA0B,EAAE,IAAI;IAChC,kBAAkB,EAAE,IAAI;IAExB,mBAAmB;IACnB,kBAAkB,EAAE,IAAI;IACxB,UAAU,EAAE,IAAI;IAEhB,2BAA2B;IAC3B,0BAA0B,EAAE,KAAK;IACjC,kBAAkB,EAAE,KAAK;IAEzB,oBAAoB;IACpB,mBAAmB,EAAE,KAAK;IAC1B,WAAW,EAAE,KAAK;IAClB,MAAM,EAAE,KAAK;IAEb,4BAA4B;IAC5B,2BAA2B,EAAE,KAAK;IAClC,mBAAmB,EAAE,KAAK;IAC1B,SAAS,EAAE,KAAK;IAEhB,qBAAqB;IACrB,oBAAoB,EAAE,IAAI;IAC1B,YAAY,EAAE,IAAI;IAClB,OAAO,EAAE,IAAI;IAEb,qBAAqB;IACrB,oBAAoB,EAAE,IAAI;IAC1B,eAAe,EAAE,IAAI;IAErB,gBAAgB;IAChB,eAAe,EAAE,GAAG;IACpB,OAAO,EAAE,GAAG;IAEZ,gBAAgB;IAChB,eAAe,EAAE,KAAK;IAEtB,mBAAmB;IACnB,kBAAkB,EAAE,GAAG;IACvB,UAAU,EAAE,GAAG;IAEf,iBAAiB;IACjB,gBAAgB,EAAE,MAAM;IACxB,QAAQ,EAAE,MAAM;IAEhB,gBAAgB;IAChB,eAAe,EAAE,MAAM;IACvB,QAAQ,EAAE,MAAM;IAEhB,cAAc;IACd,aAAa,EAAE,IAAI;IACnB,KAAK,EAAE,IAAI;IAEX,cAAc;IACd,aAAa,EAAE,IAAI;IAEnB,iBAAiB;IACjB,gBAAgB,EAAE,GAAG;IACrB,QAAQ,EAAE,GAAG;IAEb,iBAAiB;IACjB,gBAAgB,EAAE,IAAI;IAEtB,iBAAiB;IACjB,gBAAgB,EAAE,IAAI;IACtB,QAAQ,EAAE,IAAI;IAEd,iBAAiB;IACjB,gBAAgB,EAAE,IAAI;CACzB,CAAA;AAED,SAAgB,aAAa,CAAC,OAAgB;IAC1C,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,SAAS,CAAA;IACpB,CAAC;IAED,yCAAyC;IACzC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,iBAAiB,GAAG,OAAO,CAAC,WAAW,EAAE,CAAA;IAE/C,IAAI,iBAAiB,IAAI,iBAAS,EAAE,CAAC;QACjC,OAAO,iBAAS,CAAC,iBAAiB,CAAC,CAAA;IACvC,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,6BAAO,EAAC,iBAAiB,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,CAAC,CAAA;IACrE,MAAM,IAAI,sCAA0B,CAChC,mBAAmB,OAAO,oBAAoB,UAAU,+CAA+C,CAC1G,CAAA;AACL,CAAC"}

package/lib/main.js CHANGED Viewed

@@ -35,7 +35,10 @@ const validator = __importStar(require("@subsquid/util-internal-commander"));
 const typegen_1 = require("./typegen");
 const fetch_1 = require("./util/fetch");
 const util_internal_code_printer_1 = require("@subsquid/util-internal-code-printer");
+const chainIds_1 = require("./chainIds");
 const LOG = (0, logger_1.createLogger)('sqd:evm-typegen');
+const PROXY_ETHERSCAN = 'https://cloud.sqd.dev/chains/api/v1/evm/abi';
+const ORIGIN_ETHERSCAN = 'https://api.etherscan.io/v2/api';
 (0, util_internal_1.runProgram)(async function () {
     commander_1.program
         .description(`
@@ -47,9 +50,10 @@ The generated facades are assumed to be used by "squids" indexing EVM data.
         .argument('<output-dir>', 'output directory for generated definitions')
         .argument('[abi...]', 'ABI file', specArgument)
         .option('--multicall', 'generate facade for MakerDAO multicall contract')
-        .option('--etherscan-api <url>', 'etherscan API to fetch contract ABI by a known address', validator.Url(['http:', 'https:']), 'https://api.etherscan.io/v2')
+        .option('--etherscan-api <url>', 'etherscan API to fetch contract ABI by a known address\n(if no API token is provided, the default value equals to SQD Proxy service, otherwise equals to Etherscan API)', validator.Url(['http:', 'https:']))
         .option('--etherscan-api-key <key>', 'etherscan API key')
-        .option('--etherscan-chain-id <id>', 'the id of the chain to fetch the contract from', validator.positiveInt)
+        .option('--chain-id <id>', 'chain ID (numeric or named, e.g., "1" or "ethereum") to fetch the contract from', chainIds_1.chainIdOption, 1)
+        .option('--etherscan-chain-id <id>', 'DEPRECATED: use --chain-id instead. Chain ID (numeric or named, e.g., "1" or "ethereum") to fetch the contract from', chainIds_1.chainIdOption)
         .option('--clean', 'delete output directory before run')
         .addHelpText('afterAll', `
 ABI file can be specified in three ways:
@@ -75,6 +79,14 @@ squid-evm-typegen src/abi 0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413#contract
     let opts = commander_1.program.opts();
     let dest = new util_internal_code_printer_1.OutDir(commander_1.program.processedArgs[0]);
     let specs = commander_1.program.processedArgs[1];
+    if (opts.etherscanChainId) {
+        LOG.warn('Option --etherscan-chain-id is deprecated. Please use --chain-id instead');
+        if (opts.chainId) {
+            throw new commander_1.InvalidOptionArgumentError('Option --chain-id and --etherscan-chain-id cannot be used together');
+        }
+        opts.chainId = opts.etherscanChainId;
+        delete opts.etherscanChainId;
+    }
     if (opts.clean && dest.exists()) {
         LOG.info(`deleting ${dest.path()}`);
         dest.del();
@@ -115,16 +127,13 @@ async function read(spec, options) {
     }
 }
 async function fetchFromEtherscan(address, config) {
-    let api = config.api + (config.api.endsWith('/') ? '' : '/') + 'api';
-    let url = new URL(api);
+    let url = new URL(config.api);
     let params = new URLSearchParams({
         module: 'contract',
         action: 'getabi',
         address,
+        chainid: config.chainId.toString(),
     });
-    if (config.chainId) {
-        params.set('chainid', config.chainId);
-    }
     if (config.apiKey) {
         params.set('apiKey', config.apiKey);
     }
@@ -205,10 +214,26 @@ function basename(file) {
     throw new commander_1.InvalidArgumentError(`Can't derive target basename for output files. Use url fragment to specify it, e.g. #erc20`);
 }
 function getEtherscanAPIConfig(options) {
+    let api;
+    if (options.etherscanApi != null) {
+        api = normalizeEtherscanAPIUrl(options.etherscanApi);
+    }
+    else if (options.etherscanApiKey != null) {
+        api = ORIGIN_ETHERSCAN;
+    }
+    else {
+        api = PROXY_ETHERSCAN;
+    }
     return {
-        api: options.etherscanApi || 'https://api.etherscan.io/v2',
+        api,
         apiKey: options.etherscanApiKey || undefined,
-        chainId: options.etherscanChainId || (options.etherscanApi ? undefined : '1'),
+        chainId: options.chainId ?? 1,
     };
 }
+function normalizeEtherscanAPIUrl(url) {
+    if (url.endsWith('/api')) {
+        return url;
+    }
+    return url.endsWith('/') ? url + 'api' : url + '/api';
+}
 //# sourceMappingURL=main.js.map

package/lib/main.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,gDAAuB;AACvB,~~yCAAyD~~;~~AACzD~~,6CAA+C;AAC/C,2DAA0D;AAC1D,6EAA8D;AAC9D,uCAAmC;AACnC,wCAAkC;AAClC,qFAA6D;~~AAE7D~~,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,iBAAiB,CAAC,CAAA;~~AAE3C~~,IAAA,0BAAU,EACR,KAAK;IACH,mBAAO;SACJ,WAAW,CACV;;;;KAIH,CAAC,IAAI,EAAE,CACL;SACA,IAAI,CAAC,mBAAmB,CAAC;SACzB,QAAQ,CAAC,cAAc,EAAE,4CAA4C,CAAC;SACtE,QAAQ,CAAC,UAAU,EAAE,UAAU,EAAE,YAAY,CAAC;SAC9C,MAAM,CAAC,aAAa,EAAE,iDAAiD,CAAC;SACxE,MAAM,CACL,uBAAuB,EACvB,~~wDAAwD~~,~~EACxD~~,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,~~EAClC,6BAA6B,CAC9B~~;SACA,MAAM,CAAC,2BAA2B,EAAE,mBAAmB,CAAC;SACxD,MAAM,CACL,~~2BAA2B~~,~~EAC3B~~,~~gDAAgD~~,~~EAChD~~,~~SAAS~~,CAAC,~~WAAW~~,~~CACtB~~;SACA,MAAM,CAAC,SAAS,EAAE,oCAAoC,CAAC;SACvD,WAAW,CACV,UAAU,EACV;;;;;;;;;;;;;;;;;;;SAmBC,CACF,CAAA;IAEH,mBAAO,CAAC,KAAK,EAAE,CAAA;IAEf,IAAI,IAAI,GAAG,mBAAO,CAAC,IAAI,~~EAMtB~~,CAAA;IACD,IAAI,IAAI,GAAG,IAAI,mCAAM,CAAC,mBAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/C,IAAI,KAAK,GAAG,mBAAO,CAAC,aAAa,CAAC,CAAC,CAAW,CAAA;IAE9C,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACnC,IAAI,CAAC,GAAG,EAAE,CAAA;IACZ,CAAC;IAED,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QACzC,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAA;QACnD,OAAM;IACR,CAAC;IAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAA;QAC5D,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IAChD,CAAC;IAED,KAAK,IAAI,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QAClC,IAAI,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACrC,MAAM,IAAI,iBAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;IAC9D,CAAC;AACH,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CACxB,CAAA;AAED,KAAK,UAAU,IAAI,CACjB,IAAU,EACV,OAIC;IAED,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;QAC3B,OAAO,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAA;IACrE,CAAC;IACD,IAAI,GAAQ,CAAA;IACZ,IAAI,IAAI,CAAC,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,MAAM,IAAA,WAAG,EAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3B,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACtD,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,GAAG,CAAA;IACZ,CAAC;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;QACnC,OAAO,GAAG,CAAC,GAAG,CAAA;IAChB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;IAC5C,CAAC;AACH,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,OAAe,EACf,MAA0B;IAE1B,IAAI,GAAG,GAAG,~~MAAM~~,~~CAAC,~~GAAG,~~GAAG,~~CAAC,MAAM,CAAC,GAAG,CAAC,~~QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,~~CAAA;~~IACpE~~,IAAI,~~GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;IAEtB,IAAI,~~MAAM,GAAG,IAAI,eAAe,CAAC;QAC/B,MAAM,EAAE,UAAU;QAClB,MAAM,EAAE,QAAQ;QAChB,OAAO;~~KACR~~,~~CAAC,CAAA;IACF,IAAI,MAAM,CAAC,~~OAAO,EAAE,~~CAAC;QACnB,~~MAAM,CAAC,~~GAAG~~,CAAC,~~SAAS~~,EAAE,~~MAAM,~~CAAC,~~OAAO,CAAC,CAAC~~;~~IACxC~~,~~CAAC;IACD,~~IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;~~IACD~~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~~QACH~~,GAAG,~~EAAE~~,OAAO,CAAC,YAAY,IAAI,~~6BAA6B~~;~~QAC1D~~,MAAM,EAAE,OAAO,CAAC,eAAe,IAAI,SAAS;QAC5C,OAAO,EAAE,OAAO,CAAC,~~gBAAgB~~,IAAI,CAAC,~~OAAO~~,CAAC,~~YAAY~~,~~CAAC~~,CAAC,CAAC,~~SAAS~~,CAAC,CAAC,CAAC,GAAG,CAAC;~~KAChF~~,CAAA;~~AACL~~,CAAC"}
1	+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@subsquid/evm-typegen",
-  "version": "4.5.1",
+  "version": "4.6.0",
   "description": "CLI for generating typescript types and decode implementations for evm logs",
   "license": "GPL-3.0-or-later",
   "repository": "git@github.com:subsquid/squid.git",
@@ -23,7 +23,8 @@
     "@subsquid/util-internal-commander": "^1.4.0",
     "@subsquid/evm-codec": "^0.3.0",
     "@subsquid/evm-abi": "^0.3.1",
-    "commander": "^11.1.0"
+    "commander": "^11.1.0",
+    "fastest-levenshtein": "^1.0.16"
   },
   "devDependencies": {
     "@types/node": "^18.18.14",

package/src/chainIds.ts ADDED Viewed

@@ -0,0 +1,315 @@
+import {closest} from 'fastest-levenshtein'
+import * as validator from '@subsquid/util-internal-commander'
+import {InvalidOptionArgumentError} from 'commander'
+// ref: https://docs.etherscan.io/supported-chains
+export const CHAIN_IDS: Record<string, number> = {
+    // Ethereum Mainnet
+    'ethereum-mainnet': 1,
+    'mainnet': 1,
+    'ethereum': 1,
+    'eth': 1,
+    // Sepolia Testnet
+    'sepolia-testnet': 11155111,
+    'sepolia': 11155111,
+    // Holesky Testnet
+    'holesky-testnet': 17000,
+    'holesky': 17000,
+    // Hoodi Testnet
+    'hoodi-testnet': 560048,
+    'hoodi': 560048,
+    // BNB Smart Chain Mainnet
+    'bnb-smart-chain-mainnet': 56,
+    'bsc': 56,
+    'bnb': 56,
+    // BNB Smart Chain Testnet
+    'bnb-smart-chain-testnet': 97,
+    'bsc-testnet': 97,
+    // Polygon Mainnet
+    'polygon-mainnet': 137,
+    'polygon': 137,
+    'matic': 137,
+    // Polygon Amoy Testnet
+    'polygon-amoy-testnet': 80002,
+    'amoy': 80002,
+    'polygon-amoy': 80002,
+    // Base Mainnet
+    'base-mainnet': 8453,
+    'base': 8453,
+    // Base Sepolia Testnet
+    'base-sepolia-testnet': 84532,
+    'base-sepolia': 84532,
+    // Arbitrum One Mainnet
+    'arbitrum-one-mainnet': 42161,
+    'arbitrum': 42161,
+    'arb': 42161,
+    'arbitrum-one': 42161,
+    // Arbitrum Nova Mainnet
+    'arbitrum-nova-mainnet': 42170,
+    'arbitrum-nova': 42170,
+    'nova': 42170,
+    // Arbitrum Sepolia Testnet
+    'arbitrum-sepolia-testnet': 421614,
+    'arbitrum-sepolia': 421614,
+    'arb-sepolia': 421614,
+    // Linea Mainnet
+    'linea-mainnet': 59144,
+    'linea': 59144,
+    // Linea Sepolia Testnet
+    'linea-sepolia-testnet': 59141,
+    'linea-sepolia': 59141,
+    // Blast Mainnet
+    'blast-mainnet': 81457,
+    'blast': 81457,
+    // Blast Sepolia Testnet
+    'blast-sepolia-testnet': 168587773,
+    'blast-sepolia': 168587773,
+    // OP Mainnet
+    'op-mainnet': 10,
+    'optimism': 10,
+    'op': 10,
+    // OP Sepolia Testnet
+    'op-sepolia-testnet': 11155420,
+    'op-sepolia': 11155420,
+    'optimism-sepolia': 11155420,
+    // Avalanche C-Chain
+    'avalanche-c-chain': 43114,
+    'avalanche': 43114,
+    'avax': 43114,
+    // Avalanche Fuji Testnet
+    'avalanche-fuji-testnet': 43113,
+    'fuji': 43113,
+    'avalanche-fuji': 43113,
+    // BitTorrent Chain Mainnet
+    'bittorrent-chain-mainnet': 199,
+    'bittorrent': 199,
+    'btt': 199,
+    // BitTorrent Chain Testnet
+    'bittorrent-chain-testnet': 1029,
+    'bittorrent-testnet': 1029,
+    'btt-testnet': 1029,
+    // Celo Mainnet
+    'celo-mainnet': 42220,
+    'celo': 42220,
+    // Celo Sepolia Testnet
+    'celo-sepolia-testnet': 11142220,
+    'celo-sepolia': 11142220,
+    // Fraxtal Mainnet
+    'fraxtal-mainnet': 252,
+    'fraxtal': 252,
+    // Fraxtal Hoodi Testnet
+    'fraxtal-hoodi-testnet': 2523,
+    'fraxtal-hoodi': 2523,
+    // Gnosis
+    'gnosis': 100,
+    'gno': 100,
+    'xdai': 100,
+    // Mantle Mainnet
+    'mantle-mainnet': 5000,
+    'mantle': 5000,
+    // Mantle Sepolia Testnet
+    'mantle-sepolia-testnet': 5003,
+    'mantle-sepolia': 5003,
+    // Memecore Mainnet
+    'memecore-mainnet': 4352,
+    'memecore': 4352,
+    // Memecore Testnet
+    'memecore-testnet': 43521,
+    // Moonbeam Mainnet
+    'moonbeam-mainnet': 1284,
+    'moonbeam': 1284,
+    // Moonriver Mainnet
+    'moonriver-mainnet': 1285,
+    'moonriver': 1285,
+    // Moonbase Alpha Testnet
+    'moonbase-alpha-testnet': 1287,
+    'moonbase': 1287,
+    'moonbase-alpha': 1287,
+    // opBNB Mainnet
+    'opbnb-mainnet': 204,
+    'opbnb': 204,
+    // opBNB Testnet
+    'opbnb-testnet': 5611,
+    // Scroll Mainnet
+    'scroll-mainnet': 534352,
+    'scroll': 534352,
+    // Scroll Sepolia Testnet
+    'scroll-sepolia-testnet': 534351,
+    'scroll-sepolia': 534351,
+    // Taiko Mainnet
+    'taiko-mainnet': 167000,
+    'taiko': 167000,
+    // Taiko Hoodi
+    'taiko-hoodi': 167013,
+    // XDC Mainnet
+    'xdc-mainnet': 50,
+    'xdc': 50,
+    // XDC Apothem Testnet
+    'xdc-apothem-testnet': 51,
+    'xdc-apothem': 51,
+    'apothem': 51,
+    // ApeChain Mainnet
+    'apechain-mainnet': 33139,
+    'apechain': 33139,
+    'ape': 33139,
+    // ApeChain Curtis Testnet
+    'apechain-curtis-testnet': 33111,
+    'apechain-curtis': 33111,
+    'curtis': 33111,
+    // World Mainnet
+    'world-mainnet': 480,
+    'world': 480,
+    // World Sepolia Testnet
+    'world-sepolia-testnet': 4801,
+    'world-sepolia': 4801,
+    // Sonic Mainnet
+    'sonic-mainnet': 146,
+    'sonic': 146,
+    // Sonic Testnet
+    'sonic-testnet': 14601,
+    // Unichain Mainnet
+    'unichain-mainnet': 130,
+    'unichain': 130,
+    // Unichain Sepolia Testnet
+    'unichain-sepolia-testnet': 1301,
+    'unichain-sepolia': 1301,
+    // Abstract Mainnet
+    'abstract-mainnet': 2741,
+    'abstract': 2741,
+    // Abstract Sepolia Testnet
+    'abstract-sepolia-testnet': 11124,
+    'abstract-sepolia': 11124,
+    // Berachain Mainnet
+    'berachain-mainnet': 80094,
+    'berachain': 80094,
+    'bera': 80094,
+    // Berachain Bepolia Testnet
+    'berachain-bepolia-testnet': 80069,
+    'berachain-bepolia': 80069,
+    'bepolia': 80069,
+    // Swellchain Mainnet
+    'swellchain-mainnet': 1923,
+    'swellchain': 1923,
+    'swell': 1923,
+    // Swellchain Testnet
+    'swellchain-testnet': 1924,
+    'swell-testnet': 1924,
+    // Monad Mainnet
+    'monad-mainnet': 143,
+    'monad': 143,
+    // Monad Testnet
+    'monad-testnet': 10143,
+    // HyperEVM Mainnet
+    'hyperevm-mainnet': 999,
+    'hyperevm': 999,
+    // Katana Mainnet
+    'katana-mainnet': 747474,
+    'katana': 747474,
+    // Katana Bokuto
+    'katana-bokuto': 737373,
+    'bokuto': 737373,
+    // Sei Mainnet
+    'sei-mainnet': 1329,
+    'sei': 1329,
+    // Sei Testnet
+    'sei-testnet': 1328,
+    // Stable Mainnet
+    'stable-mainnet': 988,
+    'stable': 988,
+    // Stable Testnet
+    'stable-testnet': 2201,
+    // Plasma Mainnet
+    'plasma-mainnet': 9745,
+    'plasma': 9745,
+    // Plasma Testnet
+    'plasma-testnet': 9746,
+}
+export function chainIdOption(chainId?: string): number | undefined {
+    if (chainId == null) {
+        return undefined
+    }
+    // @ts-expect-error - chainId is a string
+    if (!isNaN(chainId)) {
+        return validator.positiveInt(chainId)
+    }
+    const normalizedChainId = chainId.toLowerCase()
+    if (normalizedChainId in CHAIN_IDS) {
+        return CHAIN_IDS[normalizedChainId]
+    }
+    const suggestion = closest(normalizedChainId, Object.keys(CHAIN_IDS))
+    throw new InvalidOptionArgumentError(
+        `Unknown chain: "${chainId}". Did you mean "${suggestion}"? Alternatively, provide a numeric chain ID.`
+    )
+}

package/src/main.ts CHANGED Viewed

@@ -1,14 +1,17 @@
 import * as fs from 'fs'
 import path from 'path'
-import { InvalidArgumentError, program } from 'commander'
+import { InvalidArgumentError, InvalidOptionArgumentError, program } from 'commander'
 import { createLogger } from '@subsquid/logger'
 import { runProgram, wait } from '@subsquid/util-internal'
 import * as validator from '@subsquid/util-internal-commander'
 import { Typegen } from './typegen'
 import { GET } from './util/fetch'
 import { OutDir } from '@subsquid/util-internal-code-printer'
+import {chainIdOption} from './chainIds'
 const LOG = createLogger('sqd:evm-typegen')
+const PROXY_ETHERSCAN = 'https://cloud.sqd.dev/chains/api/v1/evm/abi'
+const ORIGIN_ETHERSCAN = 'https://api.etherscan.io/v2/api'
 runProgram(
   async function () {
@@ -26,15 +29,20 @@ The generated facades are assumed to be used by "squids" indexing EVM data.
       .option('--multicall', 'generate facade for MakerDAO multicall contract')
       .option(
         '--etherscan-api <url>',
-        'etherscan API to fetch contract ABI by a known address',
+        'etherscan API to fetch contract ABI by a known address\n(if no API token is provided, the default value equals to SQD Proxy service, otherwise equals to Etherscan API)',
         validator.Url(['http:', 'https:']),
-        'https://api.etherscan.io/v2'
       )
       .option('--etherscan-api-key <key>', 'etherscan API key')
       .option(
-        '--etherscan-chain-id <id>',
-        'the id of the chain to fetch the contract from',
-        validator.positiveInt,
+        '--chain-id <id>',
+        'chain ID (numeric or named, e.g., "1" or "ethereum") to fetch the contract from',
+        chainIdOption,
+        1,
+      )
+      .option(
+        '--etherscan-chain-id <id>',
+        'DEPRECATED: use --chain-id instead. Chain ID (numeric or named, e.g., "1" or "ethereum") to fetch the contract from',
+        chainIdOption,
       )
       .option('--clean', 'delete output directory before run')
       .addHelpText(
@@ -66,13 +74,23 @@ squid-evm-typegen src/abi 0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413#contract
     let opts = program.opts() as {
       clean?: boolean
       multicall?: boolean
-      etherscanApi: string
+      etherscanApi?: string
       etherscanApiKey?: string
-      etherscanChainId?: string
+      chainId?: number
+      etherscanChainId?: number
     }
     let dest = new OutDir(program.processedArgs[0])
     let specs = program.processedArgs[1] as Spec[]
+    if (opts.etherscanChainId) {
+      LOG.warn('Option --etherscan-chain-id is deprecated. Please use --chain-id instead')
+      if (opts.chainId) {
+        throw new InvalidOptionArgumentError('Option --chain-id and --etherscan-chain-id cannot be used together')
+      }
+      opts.chainId = opts.etherscanChainId
+      delete opts.etherscanChainId
+    }
     if (opts.clean && dest.exists()) {
       LOG.info(`deleting ${dest.path()}`)
       dest.del()
@@ -100,8 +118,8 @@ squid-evm-typegen src/abi 0xBB9bc244D798123fDe783fCc1C72d3Bb8C189413#contract
 async function read(
   spec: Spec,
   options: {
-    etherscanApi: string;
-    etherscanChainId?: string
+    etherscanApi?: string;
+    chainId?: number
     etherscanApiKey?: string,
   },
 ): Promise<any> {
@@ -127,20 +145,19 @@ async function fetchFromEtherscan(
   address: string,
   config: EtherscanAPIConfig,
 ): Promise<any> {
-  let api = config.api + (config.api.endsWith('/') ? '' : '/') + 'api'
-  let url = new URL(api)
+  let url = new URL(config.api)
   let params = new URLSearchParams({
     module: 'contract',
     action: 'getabi',
     address,
+    chainid: config.chainId.toString(),
   })
-  if (config.chainId) {
-    params.set('chainid', config.chainId);
-  }
   if (config.apiKey) {
     params.set('apiKey', config.apiKey);
   }
   url.search = params.toString()
   let response: { status: string; result: string }
@@ -234,18 +251,35 @@ function basename(file: string): string {
 interface EtherscanAPIConfig {
     api: string
+    chainId: number
     apiKey?: string
-    chainId?: string
 }
 function getEtherscanAPIConfig(options: {
-    etherscanApi: string
+    etherscanApi?: string
     etherscanApiKey?: string
-    etherscanChainId?: string
+    chainId?: number
 }): EtherscanAPIConfig {
+    let api: string
+    if (options.etherscanApi != null) {
+      api = normalizeEtherscanAPIUrl(options.etherscanApi)
+    }  else if (options.etherscanApiKey != null) {
+      api = ORIGIN_ETHERSCAN
+    } else {
+      api = PROXY_ETHERSCAN
+    }
     return {
-        api: options.etherscanApi || 'https://api.etherscan.io/v2',
+        api,
         apiKey: options.etherscanApiKey || undefined,
-        chainId: options.etherscanChainId || (options.etherscanApi ? undefined : '1'),
+        chainId: options.chainId ?? 1,
     }
+}
+function normalizeEtherscanAPIUrl(url: string) {
+  if (url.endsWith('/api')) {
+    return url
+  }
+  return url.endsWith('/') ? url + 'api' : url + '/api'
 }