More bug fixes

Author: danyalprout

crates/ingress/src/main.rs

@@ -1,10 +1,10 @@
 use alloy_provider::{ProviderBuilder, RootProvider};
 use clap::Parser;
 use jsonrpsee::server::Server;
+use op_alloy_network::Optimism;
 use rdkafka::ClientConfig;
 use rdkafka::producer::FutureProducer;
 use std::net::IpAddr;
-use op_alloy_network::Optimism;
 use tips_audit::KafkaMempoolEventPublisher;
 use tracing::{info, warn};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

crates/maintenance/src/main.rs

@@ -3,10 +3,10 @@ use alloy_provider::network::primitives::BlockTransactions;
 use alloy_provider::{Provider, ProviderBuilder, RootProvider};
 use anyhow::Result;
 use clap::Parser;
+use op_alloy_network::Optimism;
 use rdkafka::ClientConfig;
 use rdkafka::producer::FutureProducer;
 use std::time::Duration;
-use op_alloy_network::Optimism;
 use tips_audit::{KafkaMempoolEventPublisher, MempoolEvent, MempoolEventPublisher};
 use tips_datastore::{BundleDatastore, PostgresDatastore};
 use tokio::time::sleep;

ui/src/app/api/bundles/all/route.ts

@@ -0,0 +1,15 @@
+import { NextResponse } from "next/server";
+import { listAllBundleKeys } from "@/lib/s3";
+
+export async function GET() {
+  try {
+    const bundleKeys = await listAllBundleKeys();
+    return NextResponse.json(bundleKeys);
+  } catch (error) {
+    console.error("Error fetching all bundle keys:", error);
+    return NextResponse.json(
+      { error: "Internal server error" },
+      { status: 500 },
+    );
+  }
+}

ui/src/app/bundle/[uuid]/page.tsx ui/src/app/bundles/[uuid]/page.tsxui/src/app/bundle/[uuid]/page.tsx renamed to ui/src/app/bundles/[uuid]/page.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import Link from "next/link";
 import { useEffect, useState } from "react";
 import type { BundleHistoryResponse } from "@/app/api/bundle/[uuid]/route";
 
@@ -126,14 +125,10 @@ export default function BundlePage({ params }: PageProps) {
 
             return uniqueTransactions.length > 0 ? (
               <div className="border rounded-lg p-4 bg-white/5">
-                <h2 className="text-xl font-semibold mb-3">
-                  Transactions
-                </h2>
+                <h2 className="text-xl font-semibold mb-3">Transactions</h2>
                 <ul className="space-y-2">
                   {uniqueTransactions.map((tx) => (
-                    <li key={tx}>
-                        {tx}
-                    </li>
+                    <li key={tx}>{tx}</li>
                   ))}
                 </ul>
               </div>
@@ -169,72 +164,6 @@ export default function BundlePage({ params }: PageProps) {
                           Event #{index + 1}
                         </span>
                       </div>
-
-                      <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-sm">
-                        {event.builder && (
-                          <div>
-                            <span className="font-medium">Builder:</span>{" "}
-                            {event.builder}
-                          </div>
-                        )}
-                        {event.blockNumber && (
-                          <div>
-                            <span className="font-medium">Block Number:</span>{" "}
-                            {event.blockNumber}
-                          </div>
-                        )}
-                        {event.flashblockIndex && (
-                          <div>
-                            <span className="font-medium">
-                              Flashblock Index:
-                            </span>{" "}
-                            {event.flashblockIndex}
-                          </div>
-                        )}
-                        {event.blockHash && (
-                          <div>
-                            <span className="font-medium">Block Hash:</span>{" "}
-                            <span className="font-mono text-xs">
-                              {event.blockHash}
-                            </span>
-                          </div>
-                        )}
-                        {event.reason && (
-                          <div>
-                            <span className="font-medium">Reason:</span>{" "}
-                            {event.reason}
-                          </div>
-                        )}
-                        {event.bundle?.transactions && (
-                          <div className="md:col-span-2">
-                            <span className="font-medium">Transactions:</span>{" "}
-                            {event.bundle.transactions.length}
-                            <div className="mt-2 space-y-1">
-                              {event.bundle.transactions
-                                .slice(0, 3)
-                                .map((tx, _txIndex) => (
-                                  <div
-                                    key={tx.hash}
-                                    className="flex items-center gap-2"
-                                  >
-                                    <Link
-                                      href={`/txn/${tx.hash}`}
-                                      className="font-mono text-xs text-blue-600 hover:text-blue-800 underline"
-                                    >
-                                      {tx.hash}
-                                    </Link>
-                                  </div>
-                                ))}
-                              {event.bundle.transactions.length > 3 && (
-                                <div className="text-xs text-gray-500">
-                                  ... and {event.bundle.transactions.length - 3}{" "}
-                                  more
-                                </div>
-                              )}
-                            </div>
-                          </div>
-                        )}
-                      </div>
                     </div>
                   );
                 })}

ui/src/app/bundles/page.tsx

@@ -5,78 +5,125 @@ import { useEffect, useState } from "react";
 import type { Bundle } from "@/app/api/bundles/route";
 
 export default function BundlesPage() {
-  const [bundles, setBundles] = useState<Bundle[]>([]);
+  const [liveBundles, setLiveBundles] = useState<Bundle[]>([]);
+  const [allBundles, setAllBundles] = useState<string[]>([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
 
   useEffect(() => {
-    const fetchBundles = async () => {
+    const fetchLiveBundles = async () => {
       try {
         const response = await fetch("/api/bundles");
         if (!response.ok) {
-          setError("Failed to fetch bundles");
-          setBundles([]);
+          setError("Failed to fetch live bundles");
+          setLiveBundles([]);
           return;
         }
         const result = await response.json();
-        setBundles(result);
+        setLiveBundles(result);
         setError(null);
       } catch (_err) {
-        setError("Failed to fetch bundles");
-        setBundles([]);
-      } finally {
-        setLoading(false);
+        setError("Failed to fetch live bundles");
+        setLiveBundles([]);
       }
     };
 
-    fetchBundles();
+    const fetchAllBundles = async () => {
+      try {
+        const response = await fetch("/api/bundles/all");
+        if (!response.ok) {
+          console.error("Failed to fetch all bundles from S3");
+          setAllBundles([]);
+          return;
+        }
+        const result = await response.json();
+        setAllBundles(result);
+      } catch (_err) {
+        console.error("Failed to fetch all bundles from S3");
+        setAllBundles([]);
+      }
+    };
+
+    const fetchData = async () => {
+      await Promise.all([fetchLiveBundles(), fetchAllBundles()]);
+      setLoading(false);
+    };
 
-    const interval = setInterval(fetchBundles, 400);
+    fetchData();
+
+    const interval = setInterval(fetchLiveBundles, 400);
 
     return () => clearInterval(interval);
   }, []);
 
   if (loading) {
     return (
       <div className="flex flex-col gap-4 p-8">
-        <h1 className="text-2xl font-bold">Bundles</h1>
+        <h1 className="text-2xl font-bold">BundleStore (fka Mempool)</h1>
         <div className="animate-pulse">Loading bundles...</div>
       </div>
     );
   }
 
   return (
-    <div className="flex flex-col gap-6 p-8">
+    <div className="flex flex-col gap-8 p-8">
       <div className="flex flex-col gap-2">
-        <h1 className="text-2xl font-bold">Bundles</h1>
+        <h1 className="text-2xl font-bold">BundleStore (fka Mempool)</h1>
         {error && (
           <div className="text-sm text-red-600 dark:text-red-400">{error}</div>
         )}
       </div>
 
-      {bundles.length > 0 ? (
-        <ul className="space-y-2">
-          {bundles.map((bundle) => (
-            <li key={bundle.id}>
-              <Link
-                href={`/bundle/${bundle.id}`}
-                className="block p-3 border rounded-lg bg-white/5 hover:bg-white/10 transition-colors"
-              >
-                <span className="font-mono text-sm">
-                  {bundle.id}
-                  {" ("}
-                  {bundle.txnHashes?.join(", ") || "No transactions"}
-                  {")"}
-                </span>
-              </Link>
-            </li>
-          ))}
-        </ul>
-      ) : (
-        <p className="text-gray-600 dark:text-gray-400">
-          {loading ? "Loading bundles..." : "No bundles found."}
-        </p>
-      )}
+      <div className="flex flex-col gap-6">
+        <section>
+          <h2 className="text-xl font-semibold mb-4">Live Bundles</h2>
+          {liveBundles.length > 0 ? (
+            <ul className="space-y-2">
+              {liveBundles.map((bundle) => (
+                <li key={bundle.id}>
+                  <Link
+                    href={`/bundles/${bundle.id}`}
+                    className="block p-3 border rounded-lg bg-white/5 hover:bg-white/10 transition-colors"
+                  >
+                    <span className="font-mono text-sm">
+                      {bundle.id}
+                      {" ("}
+                      {bundle.txnHashes?.join(", ") || "No transactions"}
+                      {")"}
+                    </span>
+                  </Link>
+                </li>
+              ))}
+            </ul>
+          ) : (
+            <p className="text-gray-600 dark:text-gray-400">
+              No live bundles found.
+            </p>
+          )}
+        </section>
+
+        <section>
+          <h2 className="text-xl font-semibold mb-4">All Bundles</h2>
+          {allBundles.length > 0 ? (
+            <ul className="space-y-2">
+              {allBundles.map((bundleId) => (
+                <li key={bundleId}>
+                  <Link
+                    href={`/bundles/${bundleId}`}
+                    className="block p-3 border rounded-lg bg-white/5 hover:bg-white/10 transition-colors"
+                  >
+                    <span className="font-mono text-sm">{bundleId}</span>
+                  </Link>
+                </li>
+              ))}
+            </ul>
+          ) : (
+            <p className="text-gray-600 dark:text-gray-400">
+              No bundles found in S3.
+            </p>
+          )}
+        </section>
+      </div>
     </div>
   );
 }

ui/src/app/page.tsx

@@ -1,19 +1,5 @@
-"use client";
-
-import { useRouter } from "next/navigation";
+import { redirect } from "next/navigation";
 
 export default function Home() {
-  const _router = useRouter();
-
-  return (
-    <div>
-      <main className="flex flex-col gap-[32px] row-start-2 items-center sm:items-start">
-        <div className="w-full max-w-4xl">
-          <h1 className="text-2xl font-bold mb-8">
-            Tips - Transaction Inclusion Pipeline Services
-          </h1>
-        </div>
-      </main>
-    </div>
-  );
+  redirect("/bundles");
 }

ui/src/app/txn/[hash]/page.tsx

@@ -39,7 +39,7 @@ export default function TransactionRedirectPage({ params }: PageProps) {
         const result: TransactionHistoryResponse = await response.json();
 
         if (result.bundle_ids && result.bundle_ids.length > 0) {
-          router.push(`/bundle/${result.bundle_ids[0]}`);
+          router.push(`/bundles/${result.bundle_ids[0]}`);
         } else {
           setError("No bundle found for this transaction");
         }

ui/src/lib/s3.ts

@@ -1,5 +1,6 @@
 import {
   GetObjectCommand,
+  ListObjectsV2Command,
   S3Client,
   type S3ClientConfig,
 } from "@aws-sdk/client-s3";
@@ -96,7 +97,7 @@ export interface BundleEvent {
     };
     key: string;
     timestamp: number;
-  }
+  };
 }
 
 export interface BundleHistory {
@@ -123,3 +124,31 @@ export async function getBundleHistory(
     return null;
   }
 }
+
+export async function listAllBundleKeys(): Promise<string[]> {
+  try {
+    const command = new ListObjectsV2Command({
+      Bucket: BUCKET_NAME,
+      Prefix: "bundles/",
+    });
+
+    const response = await s3Client.send(command);
+    const bundleKeys: string[] = [];
+
+    if (response.Contents) {
+      for (const object of response.Contents) {
+        if (object.Key?.startsWith("bundles/")) {
+          const bundleId = object.Key.replace("bundles/", "");
+          if (bundleId) {
+            bundleKeys.push(bundleId);
+          }
+        }
+      }
+    }
+
+    return bundleKeys;
+  } catch (error) {
+    console.error("Failed to list S3 bundle keys:", error);
+    return [];
+  }
+}