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
7 changes: 7 additions & 0 deletions packages/mock-l1-to-l2-relayer/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
import { config, FIRESTORE_DOCUMENT_EVENTS } from "@intmax2-function/shared";

// batch
export const MAX_RELAYER_BATCH_SIZE = 450;

// db
export const relayerDBName = config.MOCK_L1_SENDER_EVENT_DECODE_ENABLED
? FIRESTORE_DOCUMENT_EVENTS.MOCK_MESSENGER_RELAYER
: FIRESTORE_DOCUMENT_EVENTS.MOCK_MESSENGER_RELAYER_UNDECODED;
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ export const generateDepositsCalldata = async (
ethereumClient: PublicClient,
l1SentMessageEvent: SentMessageEvent,
) => {
if (!config.MOCK_L1_SENDER_EVENT_DECODE_ENABLED) {
return [
{ ...l1SentMessageEvent.args, encodedCalldata: l1SentMessageEvent.args.message },
] as BatchedCalldata[];
}

const { lastProcessedDepositId, depositHashes } = decodeL1SentMessage(l1SentMessageEvent);

const rejectedIds = await fetchLatestRejectedIds(
Expand Down
4 changes: 4 additions & 0 deletions packages/mock-l1-to-l2-relayer/src/service/event.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
fetchEvents,
l1SentMessageEvent,
MOCK_L1_SCROLL_MESSENGER_CONTRACT_ADDRESS,
MOCK_L1_SENDER_CONTRACT_ADDRESS,
type SentMessageEvent,
} from "@intmax2-function/shared";
import type { PublicClient } from "viem";
Expand All @@ -18,6 +19,9 @@ export const fetchSentMessages = async (
blockRange: BLOCK_RANGE_MINIMUM,
contractAddress: MOCK_L1_SCROLL_MESSENGER_CONTRACT_ADDRESS,
eventInterface: l1SentMessageEvent,
args: {
sender: MOCK_L1_SENDER_CONTRACT_ADDRESS,
},
});

return l1SentMessageEvents;
Expand Down
4 changes: 2 additions & 2 deletions packages/mock-l1-to-l2-relayer/src/service/job.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import {
createNetworkClient,
Event,
type EventData,
FIRESTORE_DOCUMENT_EVENTS,
getStartBlockNumber,
logger,
MOCK_L1_SCROLL_MESSENGER_CONTRACT_DEPLOYED_BLOCK,
validateBlockRange,
} from "@intmax2-function/shared";
import { relayerDBName } from "../constants";
import { generateDepositsCalldata } from "./decode.service";
import { fetchSentMessages } from "./event.service";
import { submitRelayMessagesToL2MockMessenger } from "./submit.service";

export const performJob = async (): Promise<void> => {
const ethereumClient = createNetworkClient("ethereum");
const scrollClient = createNetworkClient("scroll");
const event = new Event(FIRESTORE_DOCUMENT_EVENTS.MOCK_MESSENGER_RELAYER);
const event = new Event(relayerDBName);

const [currentBlockNumber, lastProcessedEvent] = await Promise.all([
ethereumClient.getBlockNumber(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ export const submitRelayMessagesToL2MockMessenger = async (
continue;
}

// if non decode event, we will skip this revert
if (!config.MOCK_L1_SENDER_EVENT_DECODE_ENABLED) {
return;
}

throw error;
}
}
Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/config/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ export const config = cleanEnv(process.env, {
MOCK_L1_SCROLL_MESSENGER_CONTRACT_DEPLOYED_BLOCK: num({ default: 0 }),
MOCK_L2_SCROLL_MESSENGER_CONTRACT_ADDRESS: str({ default: "0x" }),
MOCK_L2_SCROLL_MESSENGER_CONTRACT_DEPLOYED_BLOCK: num({ default: 0 }),
MOCK_L1_SENDER_CONTRACT_ADDRESS: str({ default: "0x" }),
MOCK_L1_SENDER_EVENT_DECODE_ENABLED: bool({ default: true }),
// private key
INTMAX2_OWNER_MNEMONIC: str({ devDefault: "", desc: "Owner mnemonic for Intmax2" }),
MOCK_MESSENGER_PRIVATE_KEY: str({
Expand Down
3 changes: 3 additions & 0 deletions packages/shared/src/constants/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export const FIRESTORE_DOCUMENT_EVENTS = {
DEPOSITED: "deposited",
DEPOSITS_RELAYED_TOKEN_MAPS: "depositsRelayedTokenMaps",
MOCK_MESSENGER_RELAYER: "mockMessengerRelayer",
MOCK_MESSENGER_RELAYER_UNDECODED: "mockMessengerRelayerUndecoded",
MOCK_L2_SENT_MESSAGE: "mockL2SentMessage",
BLOCK_BUILDER_HEART_BEAT: "blockBuilderHeartBeat",
MINTER: "minter",
Expand Down Expand Up @@ -76,6 +77,8 @@ export const MOCK_L2_SCROLL_MESSENGER_CONTRACT_ADDRESS =
config.MOCK_L2_SCROLL_MESSENGER_CONTRACT_ADDRESS as `0x${string}`;
export const MOCK_L2_SCROLL_MESSENGER_CONTRACT_DEPLOYED_BLOCK =
config.MOCK_L2_SCROLL_MESSENGER_CONTRACT_DEPLOYED_BLOCK;
export const MOCK_L1_SENDER_CONTRACT_ADDRESS =
config.MOCK_L1_SENDER_CONTRACT_ADDRESS as `0x${string}`;

// token
export const ETH_SYMBOL = "ETH";
Expand Down