@hyperlane-xyz/sdk 41.1.0 → 41.3.0

package/dist/router/types.d.ts

@@ -724,6 +724,32 @@ export declare const RouterConfigSchema: z.ZodObject<{
     interchainSecurityModule: z.ZodOptional<z.ZodType<import("../ism/types.js").IsmConfig, z.ZodTypeDef, unknown>>;
 } & {
     foreignDeployment: z.ZodOptional<z.ZodString>;
+} & {
+    timelock: z.ZodOptional<z.ZodObject<{
+        delay: z.ZodEffects<z.ZodNumber, number, number>;
+        roles: z.ZodObject<{
+            executor: z.ZodEffects<z.ZodString, string, string>;
+            proposer: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
+        }, "strip", z.ZodTypeAny, {
+            executor: string;
+            proposer: string;
+        }, {
+            executor: string;
+            proposer: string;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    }, {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    }>>;
 } & {
     remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
         address: z.ZodString;
@@ -972,6 +998,13 @@ export declare const RouterConfigSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     owner: string;
     ownerOverrides?: Record<string, string> | undefined;
+    timelock?: {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    } | undefined;
     mailbox: string;
     hook?: string | import("../hook/types.js").AggregationHookConfig | import("../hook/types.js").AmountRoutingHookConfig | import("../hook/types.js").ArbL2ToL1HookConfig | {
         owner: string;
@@ -1089,6 +1122,13 @@ export declare const RouterConfigSchema: z.ZodObject<{
 }, {
     owner: string;
     ownerOverrides?: Record<string, string> | undefined;
+    timelock?: {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    } | undefined;
     mailbox: string;
     hook?: unknown;
     interchainSecurityModule?: unknown;
@@ -1421,6 +1461,32 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
     interchainSecurityModule: z.ZodOptional<z.ZodType<import("../ism/types.js").IsmConfig, z.ZodTypeDef, unknown>>;
 } & {
     foreignDeployment: z.ZodOptional<z.ZodString>;
+} & {
+    timelock: z.ZodOptional<z.ZodObject<{
+        delay: z.ZodEffects<z.ZodNumber, number, number>;
+        roles: z.ZodObject<{
+            executor: z.ZodEffects<z.ZodString, string, string>;
+            proposer: z.ZodEffects<z.ZodEffects<z.ZodString, string, string>, string, string>;
+        }, "strip", z.ZodTypeAny, {
+            executor: string;
+            proposer: string;
+        }, {
+            executor: string;
+            proposer: string;
+        }>;
+    }, "strip", z.ZodTypeAny, {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    }, {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    }>>;
 } & {
     remoteRouters: z.ZodOptional<z.ZodRecord<z.ZodUnion<[z.ZodString, z.ZodNumber]>, z.ZodObject<{
         address: z.ZodString;
@@ -1673,6 +1739,13 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     owner: string;
     ownerOverrides?: Record<string, string> | undefined;
+    timelock?: {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    } | undefined;
     mailbox: string;
     hook?: string | import("../hook/types.js").AggregationHookConfig | import("../hook/types.js").AmountRoutingHookConfig | import("../hook/types.js").ArbL2ToL1HookConfig | {
         owner: string;
@@ -1793,6 +1866,13 @@ export declare const GasRouterConfigSchema: z.ZodObject<{
 }, {
     owner: string;
     ownerOverrides?: Record<string, string> | undefined;
+    timelock?: {
+        delay: number;
+        roles: {
+            executor: string;
+            proposer: string;
+        };
+    } | undefined;
     mailbox: string;
     hook?: unknown;
     interchainSecurityModule?: unknown;

package/dist/router/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}

package/dist/router/types.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { ProxyAdmin__factory, TimelockController__factory, } from '@hyperlane-xyz/core';
 import { isNumeric } from '@hyperlane-xyz/utils';
+import { UpgradeConfigSchema } from '../deploy/proxy.js';
 import { TokenFeeConfigInputSchema } from '../fee/types.js';
 import { HookConfigSchema } from '../hook/types.js';
 import { IsmConfigSchema } from '../ism/types.js';
@@ -44,7 +45,9 @@ export const RemoteRouterRouter = z.object({
     address: z.string().startsWith('0x'),
 });
 export const RemoteRoutersSchema = z.record(RemoteRouterDomainOrChainNameSchema, RemoteRouterRouter);
-export const RouterConfigSchema = MailboxClientConfigSchema.merge(ForeignDeploymentConfigSchema).merge(z.object({
+export const RouterConfigSchema = MailboxClientConfigSchema.merge(ForeignDeploymentConfigSchema)
+    .merge(UpgradeConfigSchema.partial())
+    .merge(z.object({
     remoteRouters: RemoteRoutersSchema.optional(),
     proxyAdmin: DeployedOwnableSchema.optional(),
     tokenFee: TokenFeeConfigInputSchema.optional(),

package/dist/router/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/router/types.ts"],"names":[],"mappings":"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"}

package/dist/router/types.test.js

@@ -2,6 +2,15 @@ import { expect } from 'chai';
 import { ethers } from 'ethers';
 import { GasRouterConfigSchema } from './types.js';
 const SOME_ADDRESS = ethers.Wallet.createRandom().address;
+const EXECUTOR_ADDRESS = ethers.Wallet.createRandom().address;
+const PROPOSER_ADDRESS = ethers.Wallet.createRandom().address;
+const VALID_TIMELOCK = {
+    delay: 259200,
+    roles: {
+        executor: EXECUTOR_ADDRESS,
+        proposer: PROPOSER_ADDRESS,
+    },
+};
 describe('GasRouterConfigSchema', () => {
     const baseConfig = {
         owner: SOME_ADDRESS,
@@ -28,5 +37,72 @@ describe('GasRouterConfigSchema', () => {
         });
         expect(result.success).to.be.false;
     });
+    it('should accept config with timelock', () => {
+        const result = GasRouterConfigSchema.safeParse({
+            ...baseConfig,
+            timelock: VALID_TIMELOCK,
+        });
+        expect(result.success).to.be.true;
+        if (result.success) {
+            expect(result.data.timelock?.delay).to.equal(259200);
+            expect(result.data.timelock?.roles.executor).to.equal(EXECUTOR_ADDRESS);
+            expect(result.data.timelock?.roles.proposer).to.equal(PROPOSER_ADDRESS);
+        }
+    });
+    for (const [name, timelock] of [
+        [
+            'non-EVM executor hash',
+            {
+                ...VALID_TIMELOCK,
+                roles: {
+                    ...VALID_TIMELOCK.roles,
+                    executor: '0x1111111111111111111111111111111111111111111111111111111111111111',
+                },
+            },
+        ],
+        [
+            'invalid executor checksum',
+            {
+                ...VALID_TIMELOCK,
+                roles: {
+                    ...VALID_TIMELOCK.roles,
+                    executor: '0x8Ba1f109551bD432803012645Ac136ddd64DBA72',
+                },
+            },
+        ],
+        ['unsafe delay', { ...VALID_TIMELOCK, delay: Number.MAX_SAFE_INTEGER + 1 }],
+        [
+            'zero-address proposer',
+            {
+                ...VALID_TIMELOCK,
+                roles: {
+                    ...VALID_TIMELOCK.roles,
+                    proposer: ethers.constants.AddressZero,
+                },
+            },
+        ],
+        ['zero delay', { ...VALID_TIMELOCK, delay: 0 }],
+    ]) {
+        it(`should reject timelock with ${name}`, () => {
+            const result = GasRouterConfigSchema.safeParse({
+                ...baseConfig,
+                timelock,
+            });
+            expect(result.success).to.be.false;
+        });
+    }
+    it('should accept timelock with zero-address executor', () => {
+        const result = GasRouterConfigSchema.safeParse({
+            ...baseConfig,
+            timelock: {
+                ...VALID_TIMELOCK,
+                roles: {
+                    ...VALID_TIMELOCK.roles,
+                    executor: ethers.constants.AddressZero,
+                },
+            },
+        });
+        expect(result.success).to.be.true;
+    });
 });
 //# sourceMappingURL=types.test.js.map

package/dist/router/types.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.test.js","sourceRoot":"","sources":["../../src/router/types.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC;AAE1D,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,YAAY;QACnB,OAAO,EAAE,YAAY;KACtB,CAAC;IAEF,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC;YAC7C,GAAG,UAAU;YACb,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;QAClC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;QACpD,MAAM,MAAM,GAAG,qBAAqB,CAAC,SAAS,CAAC;YAC7C,GAAG,UAAU;YACb,OAAO,EAAE,gBAAgB;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"types.test.js","sourceRoot":"","sources":["../../src/router/types.test.ts"],"names":[],"mappings":"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"}

package/dist/rpc/evm/EvmEventLogsReader.d.ts

@@ -9,6 +9,7 @@ export type EvmEventLogsReaderConfig = {
     chain: ChainNameOrId;
     useRPC?: boolean;
     paginationBlockRange?: number;
+    explorerFallback?: ExplorerFallbackConfig;
 };
 export declare const GetLogByTopicOptionsSchema: z.ZodObject<{
     eventTopic: z.ZodEffects<z.ZodString, string, string>;
@@ -48,6 +49,7 @@ interface IEvmEventLogsReaderStrategy {
     getContractDeploymentBlockNumber(address: Address): Promise<number>;
     getContractLogs(address: RequiredGetLogByTopicOptions): Promise<GetEventLogsResponse[]>;
 }
+export type ExplorerFallbackConfig = Partial<Record<keyof IEvmEventLogsReaderStrategy, boolean>>;
 export declare class EvmEtherscanLikeEventLogsReader implements IEvmEventLogsReaderStrategy {
     protected readonly chain: ChainNameOrId;
     protected readonly config: Awaited<ReturnType<ChainMetadataManager['getExplorerApi']>>;
@@ -68,6 +70,16 @@ export declare class EvmRpcEventLogsReader implements IEvmEventLogsReaderStrateg
     getContractDeploymentBlockNumber(address: string): Promise<number>;
     getContractLogs(options: RequiredGetLogByTopicOptions): Promise<GetEventLogsResponse[]>;
 }
+export declare class FallbackEvmEventLogsReader implements IEvmEventLogsReaderStrategy {
+    protected readonly chain: ChainNameOrId;
+    protected readonly readers: EvmEtherscanLikeEventLogsReader[];
+    protected readonly logger: Logger;
+    protected readonly config: ExplorerFallbackConfig;
+    constructor(chain: ChainNameOrId, readers: EvmEtherscanLikeEventLogsReader[], logger: Logger, config?: ExplorerFallbackConfig);
+    private executeWithFallback;
+    getContractDeploymentBlockNumber(address: Address): Promise<number>;
+    getContractLogs(options: RequiredGetLogByTopicOptions): Promise<GetEventLogsResponse[]>;
+}
 export declare class EvmEventLogsReader {
     protected readonly config: EvmEventLogsReaderConfig;
     protected readonly multiProvider: MultiProvider;
@@ -75,8 +87,10 @@ export declare class EvmEventLogsReader {
     protected readonly logger: Logger;
     protected fallbackLogReaderStrategy?: IEvmEventLogsReaderStrategy | undefined;
     private deploymentBlockCache;
+    private explorerDeploymentBlockCache;
     protected constructor(config: EvmEventLogsReaderConfig, multiProvider: MultiProvider, logReaderStrategy: IEvmEventLogsReaderStrategy, logger: Logger, fallbackLogReaderStrategy?: IEvmEventLogsReaderStrategy | undefined);
     static fromConfig(config: EvmEventLogsReaderConfig, multiProvider: MultiProvider, logger?: Logger): EvmEventLogsReader;
+    getContractDeploymentBlockFromExplorer(contractAddress: Address): Promise<number>;
     getLogsByTopic(options: GetLogByTopicOptions): Promise<GetEventLogsResponse[]>;
     private getDeploymentBlock;
     private getLogsByTopicWithStrategy;

package/dist/rpc/evm/EvmEventLogsReader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EvmEventLogsReader.d.ts","sourceRoot":"","sources":["../../../src/rpc/evm/EvmEventLogsReader.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EvmEventLogsReader.d.ts","sourceRoot":"","sources":["../../../src/rpc/evm/EvmEventLogsReader.ts"],"names":[],"mappings":"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"}

package/dist/rpc/evm/EvmEventLogsReader.hardhat-test.js

@@ -5,10 +5,11 @@ import hre from 'hardhat';
 import sinon from 'sinon';
 import { ERC20Test__factory } from '@hyperlane-xyz/core';
 import { assert } from '@hyperlane-xyz/utils';
-import { KNOWN_ETHEREUM_TIMELOCK_CONTRACT, TestChainName, ethereumTestChain, } from '../../consts/testChains.js';
+import { KNOWN_ETHEREUM_TIMELOCK_CONTRACT, TestChainName, ethereumTestChain, test1, } from '../../consts/testChains.js';
+import { ExplorerFamily } from '../../metadata/chainMetadataTypes.js';
 import { MultiProvider } from '../../providers/MultiProvider.js';
 import { randomAddress, randomInt } from '../../test/testUtils.js';
-import { EvmEtherscanLikeEventLogsReader, EvmEventLogsReader, EvmRpcEventLogsReader, } from './EvmEventLogsReader.js';
+import { EvmEtherscanLikeEventLogsReader, EvmEventLogsReader, EvmRpcEventLogsReader, FallbackEvmEventLogsReader, } from './EvmEventLogsReader.js';
 chai.use(chaiAsPromised);
 describe('EvmEventLogsReader', () => {
     let contractOwner;
@@ -33,6 +34,7 @@ describe('EvmEventLogsReader', () => {
         // Get contract factory for ERC20Test
         erc20Factory = new ERC20Test__factory(contractOwner);
     });
+    afterEach(() => sinon.restore());
     async function deployTestErc20() {
         testContract = await erc20Factory.deploy('TestToken', 'TST', ethers.utils.parseEther('1000000'), 18);
         await testContract.deployed();
@@ -51,7 +53,7 @@ describe('EvmEventLogsReader', () => {
                 chain: TestChainName.test1,
             }, multiProvider);
             // Access the private property indirectly
-            expect(readerWithRpc['logReaderStrategy']).to.be.instanceOf(EvmEtherscanLikeEventLogsReader);
+            expect(readerWithRpc['logReaderStrategy']).to.be.instanceOf(FallbackEvmEventLogsReader);
         });
         it('should initialize with RPC strategy when useRPC is true', async () => {
             const readerWithRpc = EvmEventLogsReader.fromConfig({
@@ -72,6 +74,34 @@ describe('EvmEventLogsReader', () => {
             // Access the private property indirectly
             expect(reader['logReaderStrategy']).to.be.instanceOf(EvmRpcEventLogsReader);
         });
+        it('should allow explorer fallback to be enabled per method', async () => {
+            const firstReader = new EvmEtherscanLikeEventLogsReader(TestChainName.test1, {
+                apiKey: 'first-key',
+                apiUrl: 'https://first.example.com/api',
+                family: ExplorerFamily.Etherscan,
+            }, multiProvider);
+            const secondReader = new EvmEtherscanLikeEventLogsReader(TestChainName.test1, {
+                apiUrl: 'https://second.example.com/api',
+                family: ExplorerFamily.Blockscout,
+            }, multiProvider);
+            const firstGetLogs = sinon
+                .stub(firstReader, 'getContractLogs')
+                .rejects(new Error('first explorer failed'));
+            const secondGetLogs = sinon
+                .stub(secondReader, 'getContractLogs')
+                .resolves([]);
+            const reader = new FallbackEvmEventLogsReader(TestChainName.test1, [firstReader, secondReader], multiProvider.logger, {
+                getContractLogs: true,
+            });
+            expect(await reader.getContractLogs({
+                contractAddress: randomAddress(),
+                eventTopic: ethers.constants.HashZero,
+                fromBlock: 0,
+                toBlock: 0,
+            })).to.deep.equal([]);
+            expect(firstGetLogs.calledOnce).to.be.true;
+            expect(secondGetLogs.calledOnce).to.be.true;
+        });
     });
     describe(`${EvmEventLogsReader.prototype.getLogsByTopic.name} (rpc)`, () => {
         let reader;
@@ -259,6 +289,34 @@ describe('EvmEventLogsReader', () => {
         });
     });
     describe('retry before fallback', () => {
+        it('should keep the explorer deployment block when logs fall back to RPC', async () => {
+            await deployTestErc20();
+            const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1 }, multiProvider);
+            const primaryStrategy = reader['logReaderStrategy'];
+            const fallbackStrategy = reader['fallbackLogReaderStrategy'];
+            assert(primaryStrategy instanceof FallbackEvmEventLogsReader, 'Expected a fallback explorer log reader');
+            assert(fallbackStrategy, 'Expected an RPC fallback log reader');
+            const [explorerReader] = primaryStrategy['readers'];
+            sinon
+                .stub(explorerReader, 'getContractDeploymentBlockNumber')
+                .resolves(deploymentBlockNumber);
+            const explorerGetLogs = sinon
+                .stub(explorerReader, 'getContractLogs')
+                .rejects(Object.assign(new Error('explorer logs unavailable'), {
+                isRecoverable: false,
+            }));
+            const fallbackGetLogs = sinon.spy(fallbackStrategy, 'getContractLogs');
+            const fromBlock = await reader.getContractDeploymentBlockFromExplorer(testContract.address);
+            const logs = await reader.getLogsByTopic({
+                eventTopic: transferTopic,
+                contractAddress: testContract.address,
+                fromBlock,
+            });
+            expect(logs).to.have.length(1);
+            expect(explorerGetLogs.calledOnce).to.be.true;
+            expect(fallbackGetLogs.calledOnce).to.be.true;
+            expect(fallbackGetLogs.firstCall.args[0].fromBlock).to.equal(deploymentBlockNumber);
+        });
         it('should succeed on retry without hitting fallback', async () => {
             await deployTestErc20();
             const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1, useRPC: true }, multiProvider);
@@ -307,8 +365,119 @@ describe('EvmEventLogsReader', () => {
             expect(logs.length).to.be.greaterThan(0);
             expect(fallbackSpy.callCount).to.equal(1);
         });
+        it('should use the same toBlock for primary and fallback reads', async () => {
+            await deployTestErc20();
+            const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1, useRPC: true }, multiProvider);
+            const snapshotBlock = deploymentBlockNumber + 100;
+            const getBlockNumber = sinon
+                .stub(providerChainTest1, 'getBlockNumber')
+                .onFirstCall()
+                .resolves(snapshotBlock)
+                .onSecondCall()
+                .resolves(snapshotBlock + 1);
+            const primaryGetLogs = sinon.stub().rejects(Object.assign(new Error('primary failed'), {
+                isRecoverable: false,
+            }));
+            const fallbackGetLogs = sinon.stub().resolves([]);
+            reader['logReaderStrategy'] = {
+                getContractDeploymentBlockNumber: async () => deploymentBlockNumber,
+                getContractLogs: primaryGetLogs,
+            };
+            reader['fallbackLogReaderStrategy'] = {
+                getContractDeploymentBlockNumber: async () => deploymentBlockNumber,
+                getContractLogs: fallbackGetLogs,
+            };
+            await reader.getLogsByTopic({
+                eventTopic: transferTopic,
+                contractAddress: testContract.address,
+                fromBlock: deploymentBlockNumber,
+            });
+            expect(getBlockNumber.callCount).to.equal(1);
+            expect(primaryGetLogs.firstCall.args[0].toBlock).to.equal(snapshotBlock);
+            expect(fallbackGetLogs.firstCall.args[0].toBlock).to.equal(snapshotBlock);
+        });
     });
     describe('deployment block cache', () => {
+        it('falls back between explorers for deployment blocks and logs', async () => {
+            await deployTestErc20();
+            const multiExplorerProvider = new MultiProvider({
+                [TestChainName.test1]: {
+                    ...test1,
+                    blockExplorers: [
+                        {
+                            apiKey: 'first-key',
+                            apiUrl: 'https://first.example.com/api',
+                            family: ExplorerFamily.Etherscan,
+                            name: 'First explorer',
+                            url: 'https://first.example.com',
+                        },
+                        {
+                            apiUrl: 'https://second.example.com/api',
+                            family: ExplorerFamily.Blockscout,
+                            name: 'Second explorer',
+                            url: 'https://second.example.com',
+                        },
+                    ],
+                },
+            });
+            multiExplorerProvider.setProvider(TestChainName.test1, providerChainTest1);
+            const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1 }, multiExplorerProvider);
+            const fallbackExplorerReader = reader['logReaderStrategy'];
+            assert(fallbackExplorerReader instanceof FallbackEvmEventLogsReader, 'Expected a fallback explorer log reader');
+            const [firstExplorer, secondExplorer] = fallbackExplorerReader['readers'];
+            const firstError = Object.assign(new Error('first explorer failed'), {
+                isRecoverable: false,
+            });
+            const firstLookup = sinon
+                .stub(firstExplorer, 'getContractDeploymentBlockNumber')
+                .rejects(firstError);
+            const secondLookup = sinon
+                .stub(secondExplorer, 'getContractDeploymentBlockNumber')
+                .resolves(deploymentBlockNumber);
+            const firstGetLogs = sinon
+                .stub(firstExplorer, 'getContractLogs')
+                .rejects(firstError);
+            const secondGetLogs = sinon
+                .stub(secondExplorer, 'getContractLogs')
+                .resolves([]);
+            const rpcReader = reader['fallbackLogReaderStrategy'];
+            assert(rpcReader, 'Expected an RPC fallback log reader');
+            const rpcGetLogs = sinon.stub(rpcReader, 'getContractLogs').resolves([]);
+            expect(await reader.getContractDeploymentBlockFromExplorer(testContract.address)).to.equal(deploymentBlockNumber);
+            expect(firstLookup.calledOnce).to.be.true;
+            expect(secondLookup.calledOnce).to.be.true;
+            expect(await reader.getLogsByTopic({
+                contractAddress: testContract.address,
+                eventTopic: transferTopic,
+                fromBlock: deploymentBlockNumber,
+                toBlock: deploymentBlockNumber,
+            })).to.deep.equal([]);
+            expect(firstGetLogs.calledOnce).to.be.true;
+            expect(secondGetLogs.calledOnce).to.be.true;
+            expect(rpcGetLogs.notCalled).to.be.true;
+        });
+        it('should reject an explorer deployment lookup for an RPC-only reader', async () => {
+            await deployTestErc20();
+            const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1, useRPC: true }, multiProvider);
+            const deploymentSpy = sinon.spy(reader['logReaderStrategy'], 'getContractDeploymentBlockNumber');
+            await expect(reader.getContractDeploymentBlockFromExplorer(testContract.address)).to.be.rejectedWith(`No block explorer is configured for chain ${TestChainName.test1}`);
+            expect(deploymentSpy.notCalled).to.be.true;
+        });
+        it('should not use a cached RPC deployment block as an explorer block', async () => {
+            await deployTestErc20();
+            const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1 }, multiProvider);
+            const primaryStrategy = reader['logReaderStrategy'];
+            assert(primaryStrategy instanceof FallbackEvmEventLogsReader, 'Expected a fallback explorer log reader');
+            const [explorerReader] = primaryStrategy['readers'];
+            reader['deploymentBlockCache'].set(testContract.address, deploymentBlockNumber + 1);
+            const deploymentStub = sinon
+                .stub(explorerReader, 'getContractDeploymentBlockNumber')
+                .resolves(deploymentBlockNumber);
+            expect(await reader.getContractDeploymentBlockFromExplorer(testContract.address)).to.equal(deploymentBlockNumber);
+            expect(await reader.getContractDeploymentBlockFromExplorer(testContract.address)).to.equal(deploymentBlockNumber);
+            expect(deploymentStub.calledOnce).to.be.true;
+            expect(reader['deploymentBlockCache'].get(testContract.address)).to.equal(deploymentBlockNumber);
+        });
         it('should only look up deployment block once for the same contract', async () => {
             await deployTestErc20();
             const reader = EvmEventLogsReader.fromConfig({ chain: TestChainName.test1, useRPC: true }, multiProvider);
@@ -377,6 +546,43 @@ describe('EvmEventLogsReader', () => {
                 fromBlock: deploymentBlockNumber,
             })).to.be.rejectedWith();
         });
+        it('should reject a log outside the requested range', async () => {
+            const toBlock = deploymentBlockNumber + 10;
+            const outOfRangeLog = {
+                address: testContract.address,
+                blockNumber: toBlock + 1,
+                data: '0x',
+                logIndex: 0,
+                topics: [transferTopic],
+                transactionHash: ethers.constants.HashZero,
+                transactionIndex: 0,
+            };
+            reader['logReaderStrategy'] = {
+                getContractDeploymentBlockNumber: async () => deploymentBlockNumber,
+                getContractLogs: async () => [outOfRangeLog],
+            };
+            await expect(reader.getLogsByTopic({
+                eventTopic: transferTopic,
+                contractAddress: testContract.address,
+                fromBlock: deploymentBlockNumber,
+                toBlock,
+            })).to.be.rejectedWith(`Log block ${toBlock + 1} is outside requested range ${deploymentBlockNumber}-${toBlock}`);
+        });
+        it('should reject a deployment block above the snapshotted head', async () => {
+            const headBlock = deploymentBlockNumber;
+            const deploymentBlock = headBlock + 1;
+            sinon.stub(providerChainTest1, 'getBlockNumber').resolves(headBlock);
+            const getContractLogs = sinon.stub().resolves([]);
+            reader['logReaderStrategy'] = {
+                getContractDeploymentBlockNumber: async () => deploymentBlock,
+                getContractLogs,
+            };
+            await expect(reader.getLogsByTopic({
+                eventTopic: transferTopic,
+                contractAddress: testContract.address,
+            })).to.be.rejectedWith(`Log range start ${deploymentBlock} exceeds end ${headBlock}`);
+            expect(getContractLogs.notCalled).to.be.true;
+        });
     });
 });
 //# sourceMappingURL=EvmEventLogsReader.hardhat-test.js.map