fix bridge, add listing purchase information

BibliothecaDAO · Feb 2, 2024 · aca9129 · aca9129
1 parent c3c110e
commit aca9129
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 15 deletions.
diff --git a/apps/nextjs/src/app/collection/[id]/(list)/activity/L2ActivityCard.tsx b/apps/nextjs/src/app/collection/[id]/(list)/activity/L2ActivityCard.tsx
@@ -90,7 +90,7 @@ export const L2ActivityCard = ({ activity }: ActivityCardProps) => {
                   #{activity.token.token_id}
                 </span>{" "}
                 <br />
-                {activity.token.name}
+                {decodeURIComponent(activity.token.name ?? "")}
               </span>
             </Link>
           )}

diff --git a/apps/nextjs/src/app/collection/[id]/(list)/analytics/page.tsx b/apps/nextjs/src/app/collection/[id]/(list)/analytics/page.tsx
@@ -10,6 +10,9 @@ import { TopOwners } from "./TopOwners";
 
 export default async function Page({ params }: { params: { id: string } }) {
   const tokenAddresses = getCollectionAddresses(params.id);
+  if (!tokenAddresses[SUPPORTED_L1_CHAIN_ID]) {
+    return <h3 className="mt-8 text-center">Coming Soon</h3>;
+  }
   const ownersDistributionData = getOwnersDistribution({
     collection: tokenAddresses[SUPPORTED_L1_CHAIN_ID] ?? params.id,
   }) as Promise<

diff --git a/apps/nextjs/src/app/providers/providers.tsx b/apps/nextjs/src/app/providers/providers.tsx
@@ -19,12 +19,11 @@ import { mainnet, sepolia } from "wagmi/chains";
 
 import { TransferLogProvider } from "./TransferLogProvider";
 
-const starkProvider =
-  /*process.env.NEXT_PUBLIC_BLAST_API
+const starkProvider = process.env.NEXT_PUBLIC_BLAST_API
   ? blastProvider({
       apiKey: process.env.NEXT_PUBLIC_BLAST_API,
     })
-  :*/ starkPublicProvider();
+  : starkPublicProvider();
 const starkConnectors = [
   new InjectedConnector({ options: { id: "braavos", name: "Braavos" } }),
   new InjectedConnector({ options: { id: "argentX", name: "Argent X" } }),

diff --git a/apps/nextjs/src/hooks/useBridgeContract.ts b/apps/nextjs/src/hooks/useBridgeContract.ts
@@ -53,10 +53,12 @@ export const useBridgeContract = () => {
 
   const calls: Call[] = useMemo(() => {
     if (!amount || !addressL1) return [];
-    return contract?.populateTransaction.initiate_withdrawal!(addressL1, {
-      low: parseEther(amount),
-      high: 0,
-    });
+    return [
+      contract?.populateTransaction.initiate_withdrawal!(addressL1, {
+        low: parseEther(amount),
+        high: 0,
+      }),
+    ];
 
     /*const tx = {
       contractAddress: l2BridgeAddress as `0x${string}`,

diff --git a/packages/api/src/router/erc721MarketEvents.ts b/packages/api/src/router/erc721MarketEvents.ts
@@ -85,7 +85,11 @@ export const erc721MarketEventsRouter = createTRPCRouter({
         where: and(...whereFilter),
         orderBy: orderByFilter,
         with: {
-          token: true,
+          token: {
+            //@ts-expect-error should allow where on relationship
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+            where: (token, { sql }) => sql`upper_inf(_cursor)`,
+          },
         },
       });
       console.log(items);

diff --git a/packages/apibara/src/erc721_market_events.ts b/packages/apibara/src/erc721_market_events.ts
@@ -87,6 +87,8 @@ export default function transform({ header, events }: Block) {
             id: orderId,
           },
           update: {
+            finalize_hash: receipt.transactionHash,
+            purchaser: receipt.events[0].data[0],
             active: Boolean(BigInt(event.data[5])),
             status: "filled",
             updated_at: header?.timestamp,

diff --git a/packages/db/src/schema/erc721_attributes.ts b/packages/db/src/schema/erc721_attributes.ts
@@ -6,10 +6,10 @@ export const erc721Attributes = pgSqlTable(
   "erc721_attributes",
   {
     id: serial("id"),
-    value: text("value"),
-    key: text("key"),
+    value: text("value").notNull(),
+    key: text("key").notNull(),
     kind: text("kind"),
-    collectionId: text("collection_id"),
+    collectionId: text("collection_id").notNull(),
     attributeKeyId: integer("attribute_key_id"),
     tokenCount: integer("token_count").default(0),
     /*on_sale_count: number;

diff --git a/packages/db/src/schema/erc721_market_events.ts b/packages/db/src/schema/erc721_market_events.ts
@@ -18,10 +18,12 @@ export const erc721MarketEvents = pgSqlTable("erc721_market_events", {
   _cursor: int8range("_cursor"),
   id: integer("id").notNull(),
   hash: text("hash"),
+  finalize_hash: text("finalize_hash"),
   token_key: text("token_key"),
   token_id: integer("token_id"),
   collection_id: integer("collection_id"),
   created_by: text("created_by"),
+  purchaser: text("purchaser"),
   price: numeric("price"),
   expiration: integer("expiration"),
   active: boolean("active"),

diff --git a/packages/db/src/schema/erc721_token_attributes.ts b/packages/db/src/schema/erc721_token_attributes.ts
@@ -13,9 +13,9 @@ import { erc721Tokens } from "./erc721_tokens";
 export const erc721TokenAttributes = pgSqlTable(
   "erc721_token_attributes",
   {
-    token_key: text("token_key"),
-    value: text("value"),
-    key: text("key"),
+    token_key: text("token_key").notNull(),
+    value: text("value").notNull(),
+    key: text("key").notNull(),
     collectionId: text("collection_id"),
     attributeId: integer("attribute_id"),
   },