Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
update sequencer inbox
  • Loading branch information
spsjvc committed Aug 8, 2024
commit a8dbc82e614920b76d35a424188ab40aaf49f6e4
3 changes: 1 addition & 2 deletions src/abi/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { rollupAdminLogicABI } from './rollupAdminLogicABI';
import { sequencerInboxABI } from './sequencerInboxABI';
import { safeL2ABI } from './safeL2ABI';

export { rollupAdminLogicABI, sequencerInboxABI, safeL2ABI };
export { rollupAdminLogicABI, safeL2ABI };
6 changes: 1 addition & 5 deletions src/contracts.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { parseAbi } from 'viem';

import { sequencerInboxABI, rollupAdminLogicABI } from './abi';
import { rollupAdminLogicABI } from './abi';

export const upgradeExecutor = {
abi: parseAbi([
Expand All @@ -12,10 +12,6 @@ export const upgradeExecutor = {
]),
};

export const sequencerInbox = {
abi: sequencerInboxABI,
};

export const rollupAdminLogic = {
abi: rollupAdminLogicABI,
};
File renamed without changes.
2 changes: 1 addition & 1 deletion src/decorators/sequencerInboxActions.integration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
createRollupHelper,
} from '../testHelpers';
import { sequencerInboxActions } from './sequencerInboxActions';
import { sequencerInboxABI } from '../abi/sequencerInboxABI';
import { sequencerInboxABI } from '../contracts/SequencerInbox';

const { l3RollupOwner, l3TokenBridgeDeployer, deployer } = getNitroTestnodePrivateKeyAccounts();

Expand Down
3 changes: 2 additions & 1 deletion src/getBatchPosters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import {
getFunctionSelector,
} from 'viem';
import { rollupCreatorABI } from './contracts/RollupCreator';
import { sequencerInboxABI } from './contracts/SequencerInbox';
import { upgradeExecutor } from './contracts';
import { safeL2ABI, sequencerInboxABI } from './abi';
import { safeL2ABI } from './abi';
import { createRollupFetchTransactionHash } from './createRollupFetchTransactionHash';

const createRollupABI = getAbiItem({ abi: rollupCreatorABI, name: 'createRollup' });
Expand Down
3 changes: 2 additions & 1 deletion src/getBatchPosters.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import {
} from 'viem';
import { arbitrum, arbitrumSepolia } from 'viem/chains';
import { it, expect, vi, describe } from 'vitest';
import { safeL2ABI, sequencerInboxABI } from './abi';
import { safeL2ABI } from './abi';
import { sequencerInboxABI } from './contracts/SequencerInbox';
import { sequencerInboxPrepareFunctionData } from './sequencerInboxPrepareTransactionRequest';
import { getBatchPosters } from './getBatchPosters';

Expand Down
3 changes: 2 additions & 1 deletion src/getKeysets.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Address, Chain, Hex, PublicClient, Transport, getAbiItem } from 'viem';
import { sequencerInboxABI } from './abi';

import { sequencerInboxABI } from './contracts/SequencerInbox';
import { createRollupFetchTransactionHash } from './createRollupFetchTransactionHash';

const SetValidKeysetEventAbi = getAbiItem({ abi: sequencerInboxABI, name: 'SetValidKeyset' });
Expand Down
6 changes: 3 additions & 3 deletions src/sequencerInboxPrepareTransactionRequest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import {
Chain,
} from 'viem';

import { sequencerInbox } from './contracts';
import { sequencerInboxABI } from './contracts/SequencerInbox';
import { upgradeExecutorEncodeFunctionData } from './upgradeExecutorEncodeFunctionData';
import { GetFunctionName } from './types/utils';
import { validateParentChainPublicClient } from './types/ParentChain';

export type SequencerInboxAbi = typeof sequencerInbox.abi;
export type SequencerInboxAbi = typeof sequencerInboxABI;
export type SequencerInboxFunctionName = GetFunctionName<SequencerInboxAbi>;

type SequencerInboxEncodeFunctionDataParameters<TFunctionName extends SequencerInboxFunctionName> =
Expand Down Expand Up @@ -85,7 +85,7 @@ export async function sequencerInboxPrepareTransactionRequest<
// params is extending SequencerInboxPrepareFunctionDataParameters, it's safe to cast
const { to, data, value } = sequencerInboxPrepareFunctionData({
...params,
abi: sequencerInbox.abi,
abi: sequencerInboxABI,
} as unknown as SequencerInboxPrepareFunctionDataParameters<TFunctionName>);

// @ts-ignore (todo: fix viem type issue)
Expand Down
4 changes: 2 additions & 2 deletions src/sequencerInboxReadContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
Transport,
} from 'viem';

import { sequencerInbox } from './contracts';
import { sequencerInboxABI } from './contracts/SequencerInbox';
import {
SequencerInboxAbi,
SequencerInboxFunctionName,
Expand All @@ -33,7 +33,7 @@ export function sequencerInboxReadContract<
// @ts-ignore (todo: fix viem type issue)
return client.readContract({
address: params.sequencerInbox,
abi: sequencerInbox.abi,
abi: sequencerInboxABI,
functionName: params.functionName,
args: params.args,
});
Expand Down