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
2 changes: 1 addition & 1 deletion examples/ethers/deposits/erc20-nonbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { JsonRpcProvider, Wallet, parseUnits } from 'ethers';
import { createEthersClient } from '../../../src/adapters/ethers/client';
import { createEthersSdk } from '../../../src/adapters/ethers/sdk';
import type { Address } from '../../../src/core/types/primitives';
import { IERC20ABI } from '../../../src/core/internal/abi-registry';
import { IERC20ABI } from '../../../src/core/abi';

const L1_RPC = process.env.L1_RPC_URL ?? 'http://localhost:8545';
const L2_RPC = process.env.L2_RPC_URL ?? 'http://localhost:3050';
Expand Down
2 changes: 1 addition & 1 deletion examples/ethers/withdrawals/erc20-nonbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { JsonRpcProvider, Wallet, parseUnits, Contract } from 'ethers';
import { createEthersClient } from '../../../src/adapters/ethers/client';
import { createEthersSdk } from '../../../src/adapters/ethers/sdk';
import type { Address } from '../../../src/core/types/primitives';
import { IERC20ABI } from '../../../src/core/internal/abi-registry';
import { IERC20ABI } from '../../../src/core/abi';

const L1_RPC = 'http://localhost:8545';
const L2_RPC = 'http://localhost:3050';
Expand Down
2 changes: 1 addition & 1 deletion examples/viem/deposits/erc20-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { privateKeyToAccount } from 'viem/accounts';
import { createViemClient } from '../../../src/adapters/viem/client';
import { createViemSdk } from '../../../src/adapters/viem/sdk';
import type { Address } from '../../../src/core/types/primitives';
import { IERC20ABI } from '../../../src/core/internal/abi-registry';
import { IERC20ABI } from '../../../src/core/abi';
import { L1_SOPH_TOKEN_ADDRESS } from '../../../src/core/constants';

// ---- configure your RPCs & key ----
Expand Down
2 changes: 1 addition & 1 deletion examples/viem/deposits/erc20-nonbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { privateKeyToAccount } from 'viem/accounts';
import { createViemClient } from '../../../src/adapters/viem/client';
import { createViemSdk } from '../../../src/adapters/viem/sdk';
import type { Address } from '../../../src/core/types/primitives';
import { IERC20ABI } from '../../../src/core/internal/abi-registry';
import { IERC20ABI } from '../../../src/core/abi';

const L1_RPC = process.env.L1_RPC_URL ?? 'http://localhost:8545';
const L2_RPC = process.env.L2_RPC_URL ?? 'http://localhost:3050';
Expand Down
2 changes: 1 addition & 1 deletion examples/viem/withdrawals/erc20-nonbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { privateKeyToAccount } from 'viem/accounts';
import { createViemClient } from '../../../src/adapters/viem/client';
import { createViemSdk } from '../../../src/adapters/viem/sdk';
import type { Address } from '../../../src/core/types/primitives';
import { IERC20ABI } from '../../../src/core/internal/abi-registry';
import { IERC20ABI } from '../../../src/core/abi';

const L1_RPC = 'http://localhost:8545'; // e.g. https://sepolia.infura.io/v3/XXX
const L2_RPC = 'http://localhost:3050'; // your L2 RPC
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/__tests__/adapter-harness.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
IL1NullifierABI,
IERC20ABI,
L2NativeTokenVaultABI,
} from '../../core/internal/abi-registry.ts';
} from '../../core/abi.ts';
import type { Address } from '../../core/types/primitives';

const IBridgehub = new Interface(IBridgehubABI as any);
Expand Down
7 changes: 1 addition & 6 deletions src/adapters/__tests__/decode-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import { Interface, AbiCoder } from 'ethers';

import {
IBridgehubABI,
IL2AssetRouterABI,
IBaseTokenABI,
IERC20ABI,
} from '../../core/internal/abi-registry.ts';
import { IBridgehubABI, IL2AssetRouterABI, IBaseTokenABI, IERC20ABI } from '../../core/abi.ts';

const Bridgehub = new Interface(IBridgehubABI as any);
const L2AssetRouter = new Interface(IL2AssetRouterABI as any);
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/__tests__/withdrawals/erc20-nonbase.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
setL2TokenRegistration,
describeForAdapters,
} from '../adapter-harness.ts';
import { L2NativeTokenVaultABI, IL2AssetRouterABI } from '../../../core/internal/abi-registry.ts';
import { L2NativeTokenVaultABI, IL2AssetRouterABI } from '../../../core/abi.ts';
import { isZKsyncError } from '../../../core/types/errors.ts';
import { decodeAssetRouterWithdraw } from '../decode-helpers.ts';

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/__tests__/withdrawals/eth-nonbase.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { describe, it, expect } from 'bun:test';
import { routeEthNonBase as routeEthers } from '../../ethers/resources/withdrawals/routes/eth-nonbase.ts';
import { routeEthNonBase as routeViem } from '../../viem/resources/withdrawals/routes/eth-nonbase.ts';
import { makeWithdrawalContext, describeForAdapters } from '../adapter-harness.ts';
import { IBaseTokenABI } from '../../../core/internal/abi-registry.ts';
import { IBaseTokenABI } from '../../../core/abi.ts';
import { L2_BASE_TOKEN_ADDRESS } from '../../../core/constants.ts';
import { isZKsyncError } from '../../../core/types/errors.ts';
import { decodeBaseTokenWithdraw } from '../decode-helpers.ts';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/__tests__/withdrawals/eth.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
makeWithdrawalContext,
describeForAdapters,
} from '../adapter-harness.ts';
import { IBaseTokenABI } from '../../../core/internal/abi-registry.ts';
import { IBaseTokenABI } from '../../../core/abi.ts';
import { L2_BASE_TOKEN_ADDRESS } from '../../../core/constants.ts';
import { isZKsyncError } from '../../../core/types/errors.ts';
import { decodeBaseTokenWithdraw } from '../decode-helpers.ts';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
L2NativeTokenVaultABI,
L1NativeTokenVaultABI,
IBaseTokenABI,
} from '../../core/internal/abi-registry';
} from '../../core/abi';
import { createError } from '../../core/errors/factory';

export interface ResolvedAddresses {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/errors/revert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
L1NativeTokenVaultABI,
MailboxABI,
IERC20ABI,
} from '../../../core/internal/abi-registry';
} from '../../../core/abi';

// TODO: refactor as lots of duplication here
export interface DecodedRevert {
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/resources/deposits/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import type { Address, Hex } from '../../../../core/types/primitives.ts';
import { extractL2TxHashFromL1Logs, waitForL2ExecutionFromL1Tx } from './services/verification.ts';

import { Contract, type TransactionRequest, type TransactionReceipt, NonceManager } from 'ethers';
import { IERC20ABI } from '../../../../core/internal/abi-registry.ts';
import { IERC20ABI } from '../../../../core/abi.ts';

import { commonCtx } from './context';
import { routeEthDirect } from './routes/eth';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { DepositRouteStrategy } from './types';
import { Contract } from 'ethers';
import type { TransactionRequest } from 'ethers';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/abi.ts';
import { buildDirectRequestStruct } from '../../utils';
import type { ApprovalNeed, PlanStep } from '../../../../../core/types/flows/base';
import { createErrorHandlers } from '../../../errors/error-ops';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { DepositRouteStrategy } from './types';
import { Contract } from 'ethers';
import type { TransactionRequest } from 'ethers';
import { encodeSecondBridgeErc20Args } from '../../utils';
import { IERC20ABI, IBridgehubABI } from '../../../../../core/internal/abi-registry.ts';
import { IERC20ABI, IBridgehubABI } from '../../../../../core/abi.ts';
import type { ApprovalNeed, PlanStep } from '../../../../../core/types/flows/base';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type { DepositRouteStrategy } from './types';
import { Contract } from 'ethers';
import type { TransactionRequest } from 'ethers';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/abi.ts';
import { encodeSecondBridgeEthArgs } from '../../utils';
import type { ApprovalNeed, PlanStep } from '../../../../../core/types/flows/base';
import { createErrorHandlers } from '../../../errors/error-ops';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/resources/deposits/routes/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { DepositRouteStrategy } from './types';
import { Contract } from 'ethers';
import type { TransactionRequest } from 'ethers';
import { buildDirectRequestStruct } from '../../utils';
import { IBridgehubABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI } from '../../../../../core/abi.ts';
import type { PlanStep } from '../../../../../core/types/flows/base';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/resources/token-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { Contract, type Provider } from 'ethers';
import type { Address } from '../../../core/types/primitives';
import { L2NativeTokenVaultABI } from '../../../core/internal/abi-registry';
import { L2NativeTokenVaultABI } from '../../../core/abi';
import { encodeNativeTokenVaultAssetId } from '../resources/utils'; // ethers version
import {
ETH_ADDRESS as ETH_ADDRESS_IN_CONTRACTS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
import { AbiCoder, Contract, type TransactionRequest } from 'ethers';
import type { WithdrawRouteStrategy } from './types';
import type { PlanStep, ApprovalNeed } from '../../../../../core/types/flows/base';
import {
IL2AssetRouterABI,
L2NativeTokenVaultABI,
IERC20ABI,
} from '../../../../../core/internal/abi-registry';
import { IL2AssetRouterABI, L2NativeTokenVaultABI, IERC20ABI } from '../../../../../core/abi';

import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_WITHDRAWALS } from '../../../../../core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Interface, type TransactionRequest } from 'ethers';
import type { WithdrawRouteStrategy } from './types';
import type { PlanStep } from '../../../../../core/types/flows/base';
import { L2_BASE_TOKEN_ADDRESS } from '../../../../../core/constants';
import { IBaseTokenABI } from '../../../../../core/internal/abi-registry.ts';
import { IBaseTokenABI } from '../../../../../core/abi.ts';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_WITHDRAWALS } from '../../../../../core/types';

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/ethers/resources/withdrawals/routes/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Contract, Interface, type TransactionRequest } from 'ethers';
import type { WithdrawRouteStrategy } from './types';
import type { PlanStep } from '../../../../../core/types/flows/base';
import { L2_BASE_TOKEN_ADDRESS } from '../../../../../core/constants';
import { IBaseTokenABI } from '../../../../../core/internal/abi-registry.ts';
import { IBaseTokenABI } from '../../../../../core/abi.ts';

import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_WITHDRAWALS } from '../../../../../core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
type FinalizationEstimate,
} from '../../../../../core/types/flows/withdrawals';

import { IL1NullifierABI } from '../../../../../core/internal/abi-registry.ts';
import { IL1NullifierABI } from '../../../../../core/abi.ts';

import { L2_ASSET_ROUTER_ADDRESS, L1_MESSENGER_ADDRESS } from '../../../../../core/constants';
import { findL1MessageSentLog } from '../../../../../core/resources/withdrawals/events';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
L2NativeTokenVaultABI,
L1NativeTokenVaultABI,
IBaseTokenABI,
} from '../../core/internal/abi-registry';
} from '../../core/abi';

export interface ResolvedAddresses {
bridgehub: Address;
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/errors/revert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
L1NativeTokenVaultABI,
MailboxABI,
IERC20ABI,
} from '../../../core/internal/abi-registry';
} from '../../../core/abi';

import { REVERT_TO_READINESS } from '../../../core/errors/withdrawal-revert-map';
import type { FinalizeReadiness } from '../../../core/types/flows/withdrawals';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/deposits/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import type {
TransactionReceipt,
WriteContractParameters,
} from 'viem';
import { IERC20ABI } from '../../../../core/internal/abi-registry.ts';
import { IERC20ABI } from '../../../../core/abi.ts';

import { commonCtx } from './context';
import { routeEthDirect } from './routes/eth';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/deposits/routes/erc20-base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import type { DepositRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep, ApprovalNeed } from '../../../../../core/types/flows/base';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/abi.ts';
import { buildDirectRequestStruct, buildViemFeeOverrides } from '../../utils';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { DepositRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep, ApprovalNeed } from '../../../../../core/types/flows/base';
import { encodeSecondBridgeErc20Args, buildViemFeeOverrides } from '../../utils';
import { IERC20ABI, IBridgehubABI } from '../../../../../core/internal/abi-registry.ts';
import { IERC20ABI, IBridgehubABI } from '../../../../../core/abi.ts';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';
import { isETH, normalizeAddrEq } from '../../../../../core/utils/addr';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/deposits/routes/eth-nonbase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import type { DepositRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep, ApprovalNeed } from '../../../../../core/types/flows/base';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI, IERC20ABI } from '../../../../../core/abi.ts';
import { encodeSecondBridgeEthArgs, buildViemFeeOverrides } from '../../utils';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/deposits/routes/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type { DepositRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep } from '../../../../../core/types/flows/base';
import { buildDirectRequestStruct, buildViemFeeOverrides } from '../../utils';
import { IBridgehubABI } from '../../../../../core/internal/abi-registry.ts';
import { IBridgehubABI } from '../../../../../core/abi.ts';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_DEPOSITS } from '../../../../../core/types';

Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/token-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Abi, PublicClient } from 'viem';
export type L2Reader = { readContract: PublicClient['readContract'] };

import type { Address } from '../../../core/types/primitives';
import { L2NativeTokenVaultABI } from '../../../core/internal/abi-registry';
import { L2NativeTokenVaultABI } from '../../../core/abi';
import { encodeNativeTokenVaultAssetId } from '../resources/utils';
import {
ETH_ADDRESS as ETH_ADDRESS_IN_CONTRACTS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import type { WithdrawRouteStrategy, ViemPlanWriteRequest } from './types.ts';
import type { PlanStep, ApprovalNeed } from '../../../../../core/types/flows/base.ts';
import {
IERC20ABI,
L2NativeTokenVaultABI,
IL2AssetRouterABI,
} from '../../../../../core/internal/abi-registry.ts';
import { IERC20ABI, L2NativeTokenVaultABI, IL2AssetRouterABI } from '../../../../../core/abi.ts';

import { type Abi, encodeAbiParameters } from 'viem';
import { createErrorHandlers } from '../../../errors/error-ops.ts';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { WithdrawRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep } from '../../../../../core/types/flows/base';
import { L2_BASE_TOKEN_ADDRESS } from '../../../../../core/constants';
import { IBaseTokenABI } from '../../../../../core/internal/abi-registry';
import { IBaseTokenABI } from '../../../../../core/abi';
import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_WITHDRAWALS } from '../../../../../core/types';
import { buildViemFeeOverrides } from '../../utils';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/resources/withdrawals/routes/eth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { WithdrawRouteStrategy, ViemPlanWriteRequest } from './types';
import type { PlanStep } from '../../../../../core/types/flows/base';

import { L2_BASE_TOKEN_ADDRESS } from '../../../../../core/constants';
import { IBaseTokenABI } from '../../../../../core/internal/abi-registry.ts';
import { IBaseTokenABI } from '../../../../../core/abi.ts';

import { createErrorHandlers } from '../../../errors/error-ops';
import { OP_WITHDRAWALS } from '../../../../../core/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
type FinalizationEstimate,
} from '../../../../../core/types/flows/withdrawals';

import { IL1NullifierABI } from '../../../../../core/internal/abi-registry.ts';
import { IL1NullifierABI } from '../../../../../core/abi.ts';
import { L2_ASSET_ROUTER_ADDRESS, L1_MESSENGER_ADDRESS } from '../../../../../core/constants';
import { findL1MessageSentLog } from '../../../../../core/resources/withdrawals/events';
import { messengerLogIndex } from '../../../../../core/resources/withdrawals/logs';
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/viem/sdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import type {
L2NativeTokenVaultABI,
L1NativeTokenVaultABI,
IBaseTokenABI,
} from '../../core/internal/abi-registry';
} from '../../core/abi';

// Helpers to express the contracts() return type
type ViemContracts = {
Expand Down
11 changes: 11 additions & 0 deletions src/core/abi.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// src/core/abi-registry.ts

export { default as IBridgehubABI } from './internal/abis/IBridgehub';
export { default as IL1AssetRouterABI } from './internal/abis/IL1AssetRouter';
export { default as IL1NullifierABI } from './internal/abis/IL1Nullifier';
export { default as IL2AssetRouterABI } from './internal/abis/IL2AssetRouter';
export { default as L1NativeTokenVaultABI } from './internal/abis/L1NativeTokenVault';
export { default as L2NativeTokenVaultABI } from './internal/abis/L2NativeTokenVault';
export { default as IBaseTokenABI } from './internal/abis/IBaseToken';
export { default as IERC20ABI } from './internal/abis/IERC20';
export { default as MailboxABI } from './internal/abis/Mailbox';
2 changes: 2 additions & 0 deletions src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export {
L1_SOPH_TOKEN_ADDRESS,
} from './constants';

export * as abi from './abi';

export * as errors from './errors/factory';
export { formatEnvelopePretty } from './errors/formatter';

Expand Down
10 changes: 0 additions & 10 deletions src/core/internal/abi-registry.ts

This file was deleted.

2 changes: 2 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

export * as constants from './core/constants';

export * as abi from './core/abi';

export * as errors from './core/errors/factory';
export { formatEnvelopePretty } from './core/errors/formatter';

Expand Down