diff --git a/packages/executor/src/modules/eth.ts b/packages/executor/src/modules/eth.ts index 417b729e..32b3859a 100644 --- a/packages/executor/src/modules/eth.ts +++ b/packages/executor/src/modules/eth.ts @@ -114,7 +114,7 @@ export class Eth { entryPoint, userOp, blockNumber.toString(), - serializeMempoolId(canonicalMempoolId) + canonicalMempoolId ); this.metrics?.useropsSent?.inc(); } diff --git a/packages/node/src/api/publishVerifiedUserOperation.ts b/packages/node/src/api/publishVerifiedUserOperation.ts index 122d7232..22073f64 100644 --- a/packages/node/src/api/publishVerifiedUserOperation.ts +++ b/packages/node/src/api/publishVerifiedUserOperation.ts @@ -4,7 +4,7 @@ import { NodeAPIModules } from "./types"; export default function api(modules: NodeAPIModules) { return async function publishVerifiedUserOperation( userOp: ts.VerifiedUserOperation, - mempool: Uint8Array + mempool: string ): Promise { await modules.network.publishVerifiedUserOperation(userOp, mempool); }; diff --git a/packages/node/src/api/publishVerifiedUserOperationJSON.ts b/packages/node/src/api/publishVerifiedUserOperationJSON.ts index face33a6..36188fee 100644 --- a/packages/node/src/api/publishVerifiedUserOperationJSON.ts +++ b/packages/node/src/api/publishVerifiedUserOperationJSON.ts @@ -7,7 +7,7 @@ export default function api(modules: NodeAPIModules) { entryPoint: string, userOp: UserOperationStruct, blockHash: string, - mempool: Uint8Array + mempool: string ): Promise { const VerifiedUserOperation = toVerifiedUserOperation( entryPoint, diff --git a/packages/node/src/network/gossip/handler.ts b/packages/node/src/network/gossip/handler.ts index 40790c10..e8f9f605 100644 --- a/packages/node/src/network/gossip/handler.ts +++ b/packages/node/src/network/gossip/handler.ts @@ -107,13 +107,13 @@ export class BundlerGossipsub extends GossipSub { async publishVerifiedUserOperation( userOpsWithEP: ts.VerifiedUserOperation, - mempool: Uint8Array + mempool: string ): Promise { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion await this.publishObject( { type: GossipType.user_operations, - mempool: deserializeMempoolId(mempool), + mempool: mempool, }, userOpsWithEP ); diff --git a/packages/node/src/network/interface.ts b/packages/node/src/network/interface.ts index 8e31b50b..bd3f3bb2 100644 --- a/packages/node/src/network/interface.ts +++ b/packages/node/src/network/interface.ts @@ -36,7 +36,7 @@ export interface INetwork { /* List of p2p functions supported by Bundler */ publishVerifiedUserOperation( userOp: ts.VerifiedUserOperation, - mempool: Uint8Array + mempool: string ): Promise; pooledUserOpHashes( peerId: PeerId, diff --git a/packages/node/src/network/network.ts b/packages/node/src/network/network.ts index 2d1bc89e..32124b70 100644 --- a/packages/node/src/network/network.ts +++ b/packages/node/src/network/network.ts @@ -258,7 +258,7 @@ export class Network implements INetwork { /* List of p2p functions supported by Bundler */ async publishVerifiedUserOperation( userOp: ts.VerifiedUserOperation, - mempool: Uint8Array + mempool: string ): Promise { await this.gossip.publishVerifiedUserOperation(userOp, mempool); } diff --git a/packages/types/src/node/api.ts b/packages/types/src/node/api.ts index c4f71f64..9e89dedf 100644 --- a/packages/types/src/node/api.ts +++ b/packages/types/src/node/api.ts @@ -4,12 +4,12 @@ import { UserOperationStruct } from "../executor/contracts/EntryPoint"; export interface INodeAPI { publishVerifiedUserOperation( userOpWithEP: ts.VerifiedUserOperation, - mempool: Uint8Array + mempool: string ): Promise; publishVerifiedUserOperationJSON( entryPoint: string, userOp: UserOperationStruct, blockHash: string, - mempool: Uint8Array + mempool: string ): Promise; }