-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
fb203bb
commit fb897eb
Showing
8 changed files
with
233 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
packages/executor/src/services/BundlingService/relayers/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| export * from "./classic"; | ||
| export * from "./flashbots"; | ||
| export * from "./merkle"; |
194 changes: 194 additions & 0 deletions
194
packages/executor/src/services/BundlingService/relayers/merkle.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| import path from "node:path"; | ||
| import { providers } from "ethers"; | ||
| import { PerChainMetrics } from "monitoring/lib"; | ||
| import { Logger, NetworkName } from "types/lib"; | ||
| import { IEntryPoint__factory } from "types/lib/executor/contracts"; | ||
| import { AccessList, fetchJson } from "ethers/lib/utils"; | ||
| import { MempoolEntryStatus } from "types/lib/executor"; | ||
| import { Config } from "../../../config"; | ||
| import { Bundle, NetworkConfig } from "../../../interfaces"; | ||
| import { MempoolService } from "../../MempoolService"; | ||
| import { ReputationService } from "../../ReputationService"; | ||
| import { estimateBundleGasLimit } from "../utils"; | ||
| import { now } from "../../../utils"; | ||
| import { BaseRelayer } from "./base"; | ||
|
|
||
| export class MerkleRelayer extends BaseRelayer { | ||
| private submitTimeout = 2 * 60 * 1000; // 2 minutes | ||
|
|
||
| constructor( | ||
| logger: Logger, | ||
| chainId: number, | ||
| network: NetworkName, | ||
| provider: providers.JsonRpcProvider, | ||
| config: Config, | ||
| networkConfig: NetworkConfig, | ||
| mempoolService: MempoolService, | ||
| reputationService: ReputationService, | ||
| metrics: PerChainMetrics | null | ||
| ) { | ||
| super( | ||
| logger, | ||
| chainId, | ||
| network, | ||
| provider, | ||
| config, | ||
| networkConfig, | ||
| mempoolService, | ||
| reputationService, | ||
| metrics | ||
| ); | ||
| } | ||
|
|
||
| async sendBundle(bundle: Bundle): Promise<void> { | ||
| const availableIndex = this.getAvailableRelayerIndex(); | ||
| if (availableIndex == null) return; | ||
|
|
||
| const relayer = this.relayers[availableIndex]; | ||
| const mutex = this.mutexes[availableIndex]; | ||
|
|
||
| const { entries, storageMap } = bundle; | ||
| if (!bundle.entries.length) return; | ||
|
|
||
| await mutex.runExclusive(async () => { | ||
| const beneficiary = await this.selectBeneficiary(relayer); | ||
| const entryPoint = entries[0]!.entryPoint; | ||
| const entryPointContract = IEntryPoint__factory.connect( | ||
| entryPoint, | ||
| this.provider | ||
| ); | ||
|
|
||
| const txRequest = entryPointContract.interface.encodeFunctionData( | ||
| "handleOps", | ||
| [entries.map((entry) => entry.userOp), beneficiary] | ||
| ); | ||
|
|
||
| const transactionRequest: providers.TransactionRequest = { | ||
| to: entryPoint, | ||
| data: txRequest, | ||
| type: 2, | ||
| maxPriorityFeePerGas: bundle.maxPriorityFeePerGas, | ||
| maxFeePerGas: bundle.maxFeePerGas, | ||
| gasLimit: estimateBundleGasLimit( | ||
| this.networkConfig.bundleGasLimitMarkup, | ||
| bundle.entries | ||
| ), | ||
| chainId: this.provider._network.chainId, | ||
| nonce: await relayer.getTransactionCount(), | ||
| }; | ||
|
|
||
| if (this.networkConfig.eip2930) { | ||
| const { storageMap } = bundle; | ||
| const addresses = Object.keys(storageMap); | ||
| if (addresses.length) { | ||
| const accessList: AccessList = []; | ||
| for (const address of addresses) { | ||
| const storageKeys = storageMap[address]; | ||
| if (typeof storageKeys == "object") { | ||
| accessList.push({ | ||
| address, | ||
| storageKeys: Object.keys(storageKeys), | ||
| }); | ||
| } | ||
| } | ||
| transactionRequest.accessList = accessList; | ||
| } | ||
| } | ||
|
|
||
| try { | ||
| // checking for tx revert | ||
| await relayer.estimateGas(transactionRequest); | ||
| } catch (err) { | ||
| this.logger.error(err); | ||
| await this.mempoolService.removeAll(entries); | ||
| return; | ||
| } | ||
|
|
||
| this.logger.debug(transactionRequest, "Merkle: Submitting"); | ||
| const merkleProvider = new providers.JsonRpcProvider( | ||
| this.networkConfig.rpcEndpointSubmit | ||
| ); | ||
| const signedRawTx = await relayer.signTransaction(transactionRequest); | ||
| const params = !this.networkConfig.conditionalTransactions | ||
| ? [signedRawTx] | ||
| : [signedRawTx, { knownAccounts: storageMap }]; | ||
| try { | ||
| const hash = await merkleProvider.send( | ||
| "eth_sendRawTransaction", | ||
| params | ||
| ); | ||
| this.logger.debug(`Bundle submitted: ${hash}`); | ||
| this.logger.debug( | ||
| `User op hashes ${entries.map((entry) => entry.userOpHash)}` | ||
| ); | ||
| await this.mempoolService.setStatus( | ||
| entries, | ||
| MempoolEntryStatus.Submitted, | ||
| hash | ||
| ); | ||
| await this.waitForTransaction(hash); | ||
| } catch (err) { | ||
| await this.mempoolService.setStatus(entries, MempoolEntryStatus.New); | ||
| await this.handleUserOpFail(entries, err); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| async waitForTransaction(hash: string): Promise<boolean> { | ||
| const txStatusUrl = new URL( | ||
| path.join("transaction", hash), | ||
| this.networkConfig.merkleApiURL | ||
| ).toString(); | ||
| const submitStart = now(); | ||
| return new Promise<boolean>((resolve, reject) => { | ||
| let lock = false; | ||
| const handler = async (): Promise<void> => { | ||
| this.logger.debug("Merkle: Fetching tx status"); | ||
| if (now() - submitStart > this.submitTimeout) return reject("timeout"); | ||
| if (lock) return; | ||
| lock = true; | ||
| try { | ||
| // https://docs.merkle.io/private-pool/wallets/transaction-status | ||
| const status = await fetchJson(txStatusUrl); | ||
| this.logger.debug(status, `Merkle: ${hash}`); | ||
| switch (status.status) { | ||
| case "nonce_too_low": | ||
| case "not_enough_funds": | ||
| case "base_fee_low": | ||
| case "low_priority_fee": | ||
| case "not_enough_gas": | ||
| case "sanctioned": | ||
| case "gas_limit_too_high": | ||
| case "invalid_signature": | ||
| case "nonce_gapped": | ||
| reject("rebundle"); // the bundle can be submitted again, no need to delete userops | ||
| break; | ||
| default: { | ||
| const response = await this.provider.getTransaction(hash); | ||
| if (response == null) { | ||
| this.logger.debug( | ||
| "Transaction not found yet. Trying again in 2 seconds" | ||
| ); | ||
| setTimeout(() => handler(), 2000); // fetch status again in 2 seconds | ||
| lock = false; | ||
| return; | ||
| } | ||
| this.logger.debug("Transaction is found"); | ||
| resolve(true); // transaction is found | ||
| } | ||
| } | ||
| } catch (err: any) { | ||
| this.logger.debug(err, "Could not fetch transaction status"); | ||
| // transaction is not found, but not necessarily failed | ||
| if (err.status === 400) { | ||
| setTimeout(() => handler(), 2000); // fetch status again in 2 seconds | ||
| lock = false; | ||
| return; | ||
| } | ||
| reject(err); | ||
| } | ||
| }; | ||
| void handler(); | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters