Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/adapters/__tests__/decode-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import {
IL2AssetRouterABI,
IBaseTokenABI,
IERC20ABI,
InteropCenterABI,
IInteropCenterABI,
} from '../../core/abi.ts';

const Bridgehub = new Interface(IBridgehubABI as any);
const L2AssetRouter = new Interface(IL2AssetRouterABI as any);
const BaseToken = new Interface(IBaseTokenABI as any);
const IERC20 = new Interface(IERC20ABI as any);
const InteropCenter = new Interface(InteropCenterABI as any);
const InteropCenter = new Interface(IInteropCenterABI as any);
const coder = new AbiCoder();

export function decodeTwoBridgeOuter(data: string) {
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/__tests__/interop/direct.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { createEthersHarness, makeInteropContext } from '../adapter-harness.ts';
import { parseSendBundleTx } from '../decode-helpers.ts';
import { createEthersAttributesResource } from '../../ethers/resources/interop/attributes/resource.ts';
import { interopCodec } from '../../ethers/resources/interop/address.ts';
import { InteropCenterABI, IInteropHandlerABI } from '../../../core/abi.ts';
import { IInteropCenterABI, IInteropHandlerABI } from '../../../core/abi.ts';
import type { BuildCtx } from '../../ethers/resources/interop/context.ts';
import type { Hex, Address } from '../../../core/types/primitives.ts';

Expand All @@ -19,7 +19,7 @@ function makeTestBuildCtx(
const ctx = makeInteropContext(harness);
const attributes = createEthersAttributesResource();

const interopCenterIface = new Interface(InteropCenterABI);
const interopCenterIface = new Interface(IInteropCenterABI);
const interopHandlerIface = new Interface(IInteropHandlerABI);

return {
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/__tests__/interop/indirect.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { parseSendBundleTx } from '../decode-helpers.ts';
import { createEthersAttributesResource } from '../../ethers/resources/interop/attributes/resource.ts';
import { interopCodec } from '../../ethers/resources/interop/address.ts';
import {
InteropCenterABI,
IInteropCenterABI,
IInteropHandlerABI,
IERC20ABI,
L2NativeTokenVaultABI,
Expand All @@ -33,7 +33,7 @@ function makeTestBuildCtx(
const attributes = createEthersAttributesResource();
const tokens = createTokensResource(harness.client);

const interopCenterIface = new Interface(InteropCenterABI);
const interopCenterIface = new Interface(IInteropCenterABI);
const interopHandlerIface = new Interface(IInteropHandlerABI);

return {
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/ethers/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
L2NativeTokenVaultABI,
L1NativeTokenVaultABI,
IBaseTokenABI,
InteropCenterABI,
IInteropCenterABI,
IInteropHandlerABI,
L2MessageVerificationABI,
} from '../../core/abi';
Expand Down Expand Up @@ -262,7 +262,7 @@ export function createEthersClient(args: InitArgs): EthersClient {
l2AssetRouter: new Contract(a.l2AssetRouter, IL2AssetRouterABI, l2),
l2NativeTokenVault: new Contract(a.l2NativeTokenVault, L2NativeTokenVaultABI, l2),
l2BaseTokenSystem: new Contract(a.l2BaseTokenSystem, IBaseTokenABI, l2),
interopCenter: new Contract(a.interopCenter, InteropCenterABI, l2),
interopCenter: new Contract(a.interopCenter, IInteropCenterABI, l2),
interopHandler: new Contract(a.interopHandler, IInteropHandlerABI, l2),
l2MessageVerification: new Contract(a.l2MessageVerification, L2MessageVerificationABI, l2),
};
Expand Down
4 changes: 2 additions & 2 deletions src/adapters/ethers/resources/interop/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { type TxGasOverrides, toGasOverrides } from '../../../../core/types/fees
import type { TokensResource } from '../../../../core/types/flows/token';
import type { AttributesResource } from '../../../../core/resources/interop/attributes/resource';
import type { ContractsResource } from '../contracts';
import { IInteropHandlerABI, InteropCenterABI } from '../../../../core/abi';
import { IInteropHandlerABI, IInteropCenterABI } from '../../../../core/abi';
import { createError } from '../../../../core/errors/factory';
import { OP_INTEROP } from '../../../../core/types/errors';

Expand Down Expand Up @@ -94,7 +94,7 @@ export async function commonCtx(
client.baseToken(dstChainId),
]);

const interopCenterIface = new Interface(InteropCenterABI);
const interopCenterIface = new Interface(IInteropCenterABI);
const interopHandlerIface = new Interface(IInteropHandlerABI);
const baseMatches = srcBaseToken.toLowerCase() === dstBaseToken.toLowerCase();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Address, Hex } from '../../../../../../core/types/primitives';
import type { Log } from '../../../../../../core/types/transactions';
import { createErrorHandlers } from '../../../../errors/error-ops';
import { OP_INTEROP } from '../../../../../../core/types';
import { InteropRootStorageABI } from '../../../../../../core/abi';
import { IInteropRootStorageABI } from '../../../../../../core/abi';
import { L2_INTEROP_ROOT_STORAGE_ADDRESS } from '../../../../../../core/constants';

const { wrap } = createErrorHandlers('interop');
Expand Down Expand Up @@ -125,7 +125,7 @@ export async function getInteropRoot(
async () => {
const rootStorage = new Contract(
L2_INTEROP_ROOT_STORAGE_ADDRESS,
InteropRootStorageABI,
IInteropRootStorageABI,
provider,
);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Interface } from 'ethers';
import type { InteropTopics } from '../../../../../../core/resources/interop/events';
import InteropCenterAbi from '../../../../../../core/internal/abis/InteropCenter';
import InteropCenterAbi from '../../../../../../core/internal/abis/IInteropCenter';
import IInteropHandlerAbi from '../../../../../../core/internal/abis/IInteropHandler';
import type { Hex } from '../../../../../../core';

Expand Down
4 changes: 2 additions & 2 deletions src/core/abi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export { default as IBaseTokenABI } from './internal/abis/IBaseToken';
export { default as IERC20ABI } from './internal/abis/IERC20';
export { default as IERC7786AttributesABI } from './internal/abis/IERC7786Attributes';
export { default as MailboxABI } from './internal/abis/Mailbox';
export { default as InteropCenterABI } from './internal/abis/InteropCenter';
export { default as IInteropCenterABI } from './internal/abis/IInteropCenter';
export { default as IInteropHandlerABI } from './internal/abis/IInteropHandler';
export { default as InteropRootStorageABI } from './internal/abis/InteropRootStorage';
export { default as IInteropRootStorageABI } from './internal/abis/IInteropRootStorage';
export { default as L2MessageVerificationABI } from './internal/abis/L2MessageVerification';
Loading