feat: use prematched bundle

package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "author": "",
   "dependencies": {
-    "@flashbots/mev-share-client": "^0.7.10",
+    "@reinis_frp/mev-share-client": "^0.7.10",
     "@types/axios": "^0.14.0",
     "@types/body-parser": "^1.19.4",
     "@types/express": "^4.17.20",

src/index.ts

@@ -5,11 +5,10 @@ import morgan from "morgan";
 
 dotenv.config();
 
-import { keccak256, Wallet, TransactionRequest, Interface, Transaction } from "ethers";
+import { Wallet, TransactionRequest, Interface, Transaction } from "ethers";
 import { FlashbotsBundleProvider } from "flashbots-ethers-v6-provider-bundle";
 import { createJSONRPCErrorResponse, createJSONRPCSuccessResponse, isJSONRPCRequest, isJSONRPCID } from "json-rpc-2.0";
-import { BundleParams } from "@flashbots/mev-share-client";
-import MevShareClient from "@flashbots/mev-share-client";
+import { BundleParams } from "@reinis_frp/mev-share-client";
 
 import {
   getProvider,
@@ -100,18 +99,16 @@ app.post("/", async (req, res, next) => {
 
       Logger.debug(`Found valid unlock at ${unlock.ovalAddress}. Sending unlock tx bundle and backrun bundle...`);
 
-      // Send the call to Oval to unlock the latest value.
-      await sendUnlockLatestValue(
+      // Construct the inner bundle with call to Oval to unlock the latest value.
+      const unlockBundle = createUnlockLatestValueBundle(
         unlock.signedUnlockTx,
         ovalConfigs[unlock.ovalAddress].refundAddress,
-        adjustedRefundPercent,
-        mevshare,
         targetBlock,
       );
 
-      // Construct the bundle with the modified payload to backrun the UnlockLatestValue call.
+      // Construct the outer bundle with the modified payload to backrun the UnlockLatestValue call.
       const bundle: BundleParams["body"] = [
-        { hash: unlock.unlockBundleHash },
+        { bundle: unlockBundle },
         ...backrunTxs.map((tx): { tx: string; canRevert: boolean } => {
           return { tx, canRevert: false };
         }),
@@ -126,6 +123,9 @@ app.post("/", async (req, res, next) => {
         privacy: {
           builders: env.builders,
         },
+        validity: {
+          refund: [{ bodyIdx: 0, percent: adjustedRefundPercent }],
+        },
       };
 
       const backrunResult = await mevshare.sendBundle(bundleParams);
@@ -243,10 +243,7 @@ const findUnlock = async (
 
       const simulationResponse = await flashbotsBundleProvider.simulate([signedUnlockTx, ...backrunTxs], targetBlock);
 
-      // MEV-Share is now referencing bundle hash as double hash of the transaction.
-      const unlockBundleHash = keccak256(unlockTxHash);
-
-      return { ovalAddress, unlockBundleHash, unlockTxHash, signedUnlockTx, simulationResponse };
+      return { ovalAddress, unlockTxHash, signedUnlockTx, simulationResponse };
     }),
   );
 
@@ -264,14 +261,8 @@ const findUnlock = async (
   return undefined;
 };
 
-const sendUnlockLatestValue = async (
-  signedUnlockTx: string,
-  refundAddress: string,
-  refundPercent: number,
-  mevshare: MevShareClient,
-  targetBlock: number,
-) => {
-  // Send this as a bundle. Define the max share hints and share kickback to configured refund address.
+const createUnlockLatestValueBundle = (signedUnlockTx: string, refundAddress: string, targetBlock: number) => {
+  // Create this as a bundle. Define the max share hints and share kickback to configured refund address.
   const bundleParams: ExtendedBundleParams = {
     inclusion: { block: targetBlock, maxBlock: targetBlock },
     body: [{ tx: signedUnlockTx, canRevert: false }],
@@ -292,12 +283,10 @@ const sendUnlockLatestValue = async (
         txHash: true,
       },
       builders: env.builders,
-      wantRefund: refundPercent,
     },
   };
 
-  Logger.debug("Unlock Latest Call bundle", { bundleParams });
-  await mevshare.sendBundle(bundleParams);
+  return bundleParams;
 };
 
 // Adjusts refund percent to ensure that net builder captured value reaches the minimum configured amount.

src/lib/helpers.ts

@@ -1,5 +1,5 @@
 import { JsonRpcProvider, Network, Wallet, Provider, isAddress, isHexString, Transaction, ethers } from "ethers";
-import MevShareClient from "@flashbots/mev-share-client";
+import MevShareClient from "@reinis_frp/mev-share-client";
 import { FlashbotsBundleProvider } from "flashbots-ethers-v6-provider-bundle";
 import { env } from "./env";
 import { Logger } from "./logging";

src/lib/types.ts

@@ -1,4 +1,4 @@
-import { BundleParams, HintPreferences } from "@flashbots/mev-share-client";
+import { BundleParams, HintPreferences } from "@reinis_frp/mev-share-client";
 
 // Extend BundleParams to include undocumented wantRefund required for precise kickback to work.
 export interface ExtendedBundleParams extends BundleParams {

yarn.lock

@@ -322,15 +322,6 @@
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.0.tgz#0709e9f4cb252351c609c6e6d8d6779a8d25edff"
   integrity sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==
 
-"@flashbots/mev-share-client@^0.7.10":
-  version "0.7.10"
-  resolved "https://registry.yarnpkg.com/@flashbots/mev-share-client/-/mev-share-client-0.7.10.tgz#f86383dd91bf3bb6d6451456ce418229814009eb"
-  integrity sha512-jK2ZejfPzNY4du4pKnu9PTxMikbgHOKhfpXgAe6g/QeDyzz1yzfGLIffxa6CaqM0ygyyUMIPs3h2pgL3MzA4tg==
-  dependencies:
-    async-mutex "^0.4.0"
-    axios "^1.3.4"
-    eventsource "^2.0.2"
-
 "@gar/promisify@^1.0.1":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
@@ -752,6 +743,15 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
+"@reinis_frp/mev-share-client@^0.7.10":
+  version "0.7.10"
+  resolved "https://registry.yarnpkg.com/@reinis_frp/mev-share-client/-/mev-share-client-0.7.10.tgz#e5627199b538e084e1eb720f53ceaa491fa47924"
+  integrity sha512-aOVfk8nJudMCwWVd+VZS1qpC86tmRk+PlBNXDvX30iD96AB0GylwnDYos51oN480YZOCQSF2H18rMtOFwtSJ9w==
+  dependencies:
+    async-mutex "^0.4.0"
+    axios "^1.3.4"
+    eventsource "^2.0.2"
+
 "@sapphire/async-queue@^1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.0.tgz#2f255a3f186635c4fb5a2381e375d3dfbc5312d8"