Skip to content

Fix evmos block range #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OscBacon merged 1 commit into from
Mar 5, 2025
Merged

Fix evmos block range #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions packages/contracts-account-abstraction/src/actions/bundler/getUserOperation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "viem/account-abstraction";
import { getBlockNumber, getLogs, getTransaction } from "viem/actions";
import { getAction } from "viem/utils";
import { sei, seiDevnet, seiTestnet } from "viem/chains";
import { evmos, evmosTestnet, sei, seiDevnet, seiTestnet } from "viem/chains";
import { UserOperationEvent } from "../../artifacts/IEntryPointSimulations.js";
import { PackedUserOperation, toUserOperationEncoded } from "../../models/PackedUserOperation.js";
import { handleOps } from "../../artifacts/IEntryPoint.js";
Expand All @@ -22,7 +22,13 @@ export async function getUserOperation(
//TODO: Parametrize rpc max range
// Certain RPCs enforce a max block range
let rpcMaxRange = 90_000n;
if (chainIdNumber === sei.id || chainIdNumber === seiDevnet.id || chainIdNumber === seiTestnet.id) {
if (
chainIdNumber === sei.id ||
chainIdNumber === seiDevnet.id ||
chainIdNumber === seiTestnet.id ||
chainIdNumber === evmos.id ||
chainIdNumber === evmosTestnet.id
) {
rpcMaxRange = 2_000n;
}

Expand Down
4 changes: 3 additions & 1 deletion packages/contracts-account-abstraction/src/actions/bundler/getUserOperationReceipt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
} from "viem/account-abstraction";
import { getBlockNumber, getLogs, getTransactionReceipt } from "viem/actions";
import { getAction } from "viem/utils";
import { evmos } from "viem/chains";
import { UserOperationEvent } from "../../artifacts/EntryPoint.js";

export async function getUserOperationReceipt(
Expand All @@ -17,7 +18,8 @@ export async function getUserOperationReceipt(
const blockNumber = await getBlockNumber(client);
//TODO: Parametrize rpc max range
// Certain RPCs enforce a max block range
const rpcMaxRange = 90_000n;
let rpcMaxRange = 90_000n;
if (client.chain?.id === evmos.id) rpcMaxRange = 2_000n;

// If rpcMaxRange is less blockNumber, set fromBlock to rpcMaxRange away from blockNumber
const fromBlock = rpcMaxRange < blockNumber ? blockNumber - rpcMaxRange : 0n;
Expand Down
10 changes: 8 additions & 2 deletions packages/contracts-account-abstraction/src/eip1193/bundler/requestGetUserOperationByHash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import { entryPoint07Address, UserOperation } from "viem/account-abstraction";
import { decodeFunctionData } from "viem/utils";

import { sei, seiDevnet, seiTestnet } from "viem/chains";
import { evmos, evmosTestnet, sei, seiDevnet, seiTestnet } from "viem/chains";
import { UserOperationEvent, handleOps } from "../../artifacts/IEntryPoint.js";
import { PackedUserOperation, toUserOperationEncoded } from "../../models/PackedUserOperation.js";

Expand Down Expand Up @@ -51,7 +51,13 @@ export function createRequestGetUserOperationByHash(request: EIP1193RequestFn<Pu
//TODO: Parametrize rpc max range
// Certain RPCs enforce a max block range
let rpcMaxRange = 90_000;
if (chainIdNumber === sei.id || chainIdNumber === seiDevnet.id || chainIdNumber === seiTestnet.id) {
if (
chainIdNumber === sei.id ||
chainIdNumber === seiDevnet.id ||
chainIdNumber === seiTestnet.id ||
chainIdNumber === evmos.id ||
chainIdNumber === evmosTestnet.id
) {
rpcMaxRange = 2_000;
}
const blockNumber = hexToNumber(blockNumberHex);
Expand Down
10 changes: 8 additions & 2 deletions packages/contracts-account-abstraction/src/eip1193/bundler/requestGetUserOperationReceipt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
RpcTransactionReceipt,
} from "viem";
import { entryPoint07Address, UserOperationReceipt } from "viem/account-abstraction";
import { sei, seiDevnet, seiTestnet } from "viem/chains";
import { evmos, evmosTestnet, sei, seiDevnet, seiTestnet } from "viem/chains";
import { UserOperationEvent } from "../../artifacts/IEntryPoint.js";

export type RpcGetUserOperationReceiptReturnType07 = Prettify<
Expand All @@ -35,7 +35,13 @@ export function createRequestGetUserOperationReceipt(request: EIP1193RequestFn<P
//TODO: Parametrize rpc max range
// Certain RPCs enforce a max block range
let rpcMaxRange = 90_000;
if (chainIdNumber === sei.id || chainIdNumber === seiDevnet.id || chainIdNumber === seiTestnet.id) {
if (
chainIdNumber === sei.id ||
chainIdNumber === seiDevnet.id ||
chainIdNumber === seiTestnet.id ||
chainIdNumber === evmos.id ||
chainIdNumber === evmosTestnet.id
) {
rpcMaxRange = 2_000;
}

Expand Down
Loading