Refactor Marketplace contract to use string for contenthash, update event signatures, and enhance listing management. Remove unused SimpleListings references and improve EAS configuration handling. Update Next.js app metadata and styles for Ethereum Bazaar branding.

Author: escottalexander

packages/hardhat/contracts/Marketplace.sol

@@ -11,20 +11,20 @@ contract Marketplace {
     struct ListingPointer {
         address creator;
         address listingType;
-        bytes32 contenthash;
+        string contenthash;
         bool active;
     }
 
     uint256 public listingCount;
     mapping(uint256 => ListingPointer) public listings;
 
-    event ListingCreated(uint256 indexed id, address indexed creator, address indexed listingType, uint256 listingId, bytes32 contenthash);
+    event ListingCreated(uint256 indexed id, address indexed creator, address indexed listingType, uint256 listingId, string contenthash);
     event ListingAction(uint256 indexed id, address indexed caller, bytes32 action);
     event ListingActivationChanged(uint256 indexed listingId, bool active);
 
     function createListing(
         address listingType,
-        bytes32 contenthash,
+        string calldata contenthash,
         bytes calldata data
     ) external returns (uint256 id) {
         id = ++listingCount;
@@ -55,7 +55,7 @@ contract Marketplace {
     function getListing(uint256 id) external view returns (
         address creator,
         address listingType,
-        bytes32 contenthash,
+        string memory contenthash,
         bool active,
         bytes memory listingData
     ) {

packages/hardhat/test/YourContract.ts

@@ -1,10 +1,8 @@
 import { createConfig } from "ponder";
-import { MarketplaceAbi } from "./abis/MarketplaceAbi";
-import { SimpleListingsAbi } from "./abis/SimpleListingsAbi";
+// Use deployed ABIs to avoid drift with contracts
 import { easGetAttestationAbi } from "./abis/EASAbi";
 import easDeployment from "../hardhat/deployments/localhost/EAS.json" assert { type: "json" };
 import MarketplaceDeployment from "../hardhat/deployments/localhost/Marketplace.json" assert { type: "json" };
-import SimpleListingsDeployment from "../hardhat/deployments/localhost/SimpleListings.json" assert { type: "json" };
 
 export default createConfig({
   chains: {
@@ -16,16 +14,11 @@ export default createConfig({
   contracts: {
     Marketplace: {
       chain: "localhost",
-      abi: MarketplaceAbi,
+      // Cast ABI to const to preserve literal event names for type inference
+      abi: MarketplaceDeployment.abi as const,
       address: MarketplaceDeployment.address as `0x${string}`,
       startBlock: 0,
     },
-    SimpleListings: {
-      chain: "localhost",
-      abi: SimpleListingsAbi,
-      address: SimpleListingsDeployment.address as `0x${string}`,
-      startBlock: 0,
-    },
     // Index EAS core contract using the deployed ABI to match emitted events
     EAS: {
       chain: "localhost",

packages/indexer/ponder.config.ts

@@ -1,80 +1,42 @@
 import { onchainTable } from "ponder";
 
+// Listings table (Marketplace-only)
 export const listings = onchainTable("listings", (t) => ({
   id: t.text().primaryKey(), // Marketplace listing id (uint256 as string)
   creator: t.text(),
   listingType: t.text(),
-  listingInnerId: t.text(),
-  // Sale details
-  buyer: t.text(),
-  // SimpleListings enrichment
+  cid: t.text(),
+  // Token/payment fields parsed from listingData
   paymentToken: t.text(),
   priceWei: t.text(),
-  ipfsCid: t.text(),
-  active: t.boolean(),
-  // Review status flags
-  buyerReviewed: t.boolean(),
-  sellerReviewed: t.boolean(),
-  // Token metadata enrichment (for ERC-20s; null for native ETH)
   tokenName: t.text(),
   tokenSymbol: t.text(),
   tokenDecimals: t.integer(),
-  // IPFS metadata
+  // Denormalized from metadata
   title: t.text(),
   description: t.text(),
   category: t.text(),
   image: t.text(),
+  contact: t.json(),
+  tags: t.json(),
+  price: t.text(),
+  currency: t.text(),
   locationId: t.text(),
-  createdBlockNumber: t.text(),
-  createdBlockTimestamp: t.text(),
-  createdTxHash: t.text(),
-}));
-
-// Buffer table to handle ordering between SimpleListings and Marketplace events
-export const simple_buffer = onchainTable("simple_buffer", (t) => ({
-  id: t.text().primaryKey(), // `${listingType}:${listingInnerId}`
-  listingType: t.text(),
-  listingInnerId: t.text(),
-  paymentToken: t.text(),
-  priceWei: t.text(),
-  ipfsCid: t.text(),
-  // Token metadata enrichment (buffered until Marketplace row exists)
-  tokenName: t.text(),
-  tokenSymbol: t.text(),
-  tokenDecimals: t.integer(),
-}));
-
-export const listing_created = onchainTable("listing_created", (t) => ({
-  id: t.text().primaryKey(), // txHash-logIndex
-  listingId: t.text(),
-  creator: t.text(),
-  listingType: t.text(),
-  listingInnerId: t.text(),
-  blockNumber: t.text(),
-  txHash: t.text(),
-}));
-
-export const listing_prebuy = onchainTable("listing_prebuy", (t) => ({
-  id: t.text().primaryKey(), // txHash-logIndex
-  listingId: t.text(),
-  buyer: t.text(),
-  blockNumber: t.text(),
-  txHash: t.text(),
-}));
-
-export const listing_sold = onchainTable("listing_sold", (t) => ({
-  id: t.text().primaryKey(), // txHash-logIndex
-  listingId: t.text(),
   buyer: t.text(),
+  active: t.boolean(),
   buyerReviewed: t.boolean(),
   sellerReviewed: t.boolean(),
-  blockNumber: t.text(),
-  txHash: t.text(),
+  createdBlockNumber: t.text(),
+  createdBlockTimestamp: t.text(),
+  createdTxHash: t.text(),
 }));
 
-export const listing_closed = onchainTable("listing_closed", (t) => ({
+// Recorded actions from Marketplace
+export const listing_actions = onchainTable("listing_actions", (t) => ({
   id: t.text().primaryKey(), // txHash-logIndex
   listingId: t.text(),
+  selectorHex: t.text(),
+  actionName: t.text(),
   caller: t.text(),
   blockNumber: t.text(),
   txHash: t.text(),

packages/indexer/ponder.schema.ts

@@ -1,6 +1,7 @@
 {
-  "chainId": "31337",
-  "schemaRegistry": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-  "eas": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707",
-  "reviewSchemaUid": "0xacde809080fd143534906c94758ae51f26ef9047f769b4c4d033ad9b7305856b"
+  "31337": {
+    "schemaRegistry": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
+    "eas": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707",
+    "reviewSchemaUid": "0xacde809080fd143534906c94758ae51f26ef9047f769b4c4d033ad9b7305856b"
+  }
 }