Merge pull request #418 from 0xOlias/kjs/examples-bugs

Fix bugs in example repos
ponder-sh · Nov 10, 2023 · df46c1b · df46c1b · vercel · Nov 10, 2023
2 parents 390c0f6 + 04fda99
commit df46c1b
Show file tree

Hide file tree

Showing 22 changed files with 40 additions and 42 deletions.
diff --git a/examples/art-gobblers/.eslintrc.json b/examples/art-gobblers/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/art-gobblers/.gitignore b/examples/art-gobblers/.gitignore
@@ -1,3 +1,4 @@
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/art-gobblers/src/index.ts b/examples/art-gobblers/src/index.ts
@@ -1,7 +1,7 @@
 import { ponder } from "@/generated";
 
 ponder.on("ArtGobblers:ArtGobbled", async ({ event, context }) => {
-  const { GobbledArt } = context.entities;
+  const { GobbledArt } = context.models;
 
   await GobbledArt.create({
     id: `${event.params.nft}-${event.params.id}`,

diff --git a/examples/ethfs/.eslintrc.json b/examples/ethfs/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/ethfs/.gitignore b/examples/ethfs/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/ethfs/ponder.config.ts b/examples/ethfs/ponder.config.ts
@@ -2,7 +2,6 @@ import { createConfig } from "@ponder/core";
 import { http } from "viem";
 
 import { FileStoreAbi } from "./abis/FileStore.abi";
-import { FileStoreFrontendAbi } from "./abis/FileStoreFrontend.abi";
 
 export const config = createConfig({
   networks: [
@@ -20,11 +19,5 @@ export const config = createConfig({
       address: "0x9746fD0A77829E12F8A9DBe70D7a322412325B91",
       startBlock: 15963553,
     },
-    {
-      name: "FileStoreFrontend",
-      network: [{ name: "mainnet" }],
-      address: "0xBc66C61BCF49Cc3fe4E321aeCEa307F61EC57C0b",
-      abi: FileStoreFrontendAbi,
-    },
   ],
 });
diff --git a/examples/ethfs/ponder.schema.ts b/examples/ethfs/ponder.schema.ts
@@ -6,7 +6,7 @@ export const schema = p.createSchema({
     name: p.string(),
     size: p.int(),
     contents: p.string(),
-    createdAt: p.int().list(),
+    createdAt: p.int(),
     type: p.string().optional(),
     encoding: p.string().optional(),
     compression: p.string().optional(),

diff --git a/examples/ethfs/src/FileStore.ts b/examples/ethfs/src/FileStore.ts
@@ -1,7 +1,10 @@
-import { fromHex, Hex } from "viem";
+import type { Hex } from "viem";
+import { fromHex } from "viem";
 
 import { ponder } from "@/generated";
 
+import { FileStoreFrontendAbi } from "../abis/FileStoreFrontend.abi";
+
 const parseJson = (encodedJson: string, defaultValue: any = null) => {
   try {
     return JSON.parse(encodedJson);
@@ -15,15 +18,17 @@ ponder.on("FileStore:FileCreated", async ({ event, context }) => {
 
   const metadata = parseJson(fromHex(rawMetadata as Hex, "string"));
 
-  await context.entities.File.create({
+  await context.models.File.create({
     id: filename,
     data: {
       name: filename,
       size: Number(size),
-      contents: await context.contracts.FileStoreFrontend.read.readFile([
-        event.transaction.to as `0x{string}`,
-        filename,
-      ]),
+      contents: await context.client.readContract({
+        abi: FileStoreFrontendAbi,
+        functionName: "readFile",
+        address: "0xBc66C61BCF49Cc3fe4E321aeCEa307F61EC57C0b",
+        args: [event.transaction.to!, filename],
+      }),
       createdAt: Number(event.block.timestamp),
       type: metadata?.type,
       compression: metadata?.compression,
@@ -33,5 +38,5 @@ ponder.on("FileStore:FileCreated", async ({ event, context }) => {
 });
 
 ponder.on("FileStore:FileDeleted", async ({ event, context }) => {
-  await context.entities.File.delete({ id: event.params.filename });
+  await context.models.File.delete({ id: event.params.filename });
 });
diff --git a/examples/factory-llama/.eslintrc.json b/examples/factory-llama/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/factory-llama/.gitignore b/examples/factory-llama/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/friendtech/.eslintrc.json b/examples/friendtech/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/friendtech/.gitignore b/examples/friendtech/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/friendtech/src/FriendtechSharesV1.ts b/examples/friendtech/src/FriendtechSharesV1.ts
@@ -1,7 +1,7 @@
 import { ponder } from "@/generated";
 
 ponder.on("FriendtechSharesV1:Trade", async ({ event, context }) => {
-  const { Share, Subject, TradeEvent, Trader } = context.entities;
+  const { Share, Subject, TradeEvent, Trader } = context.models;
 
   // Skip phantom events
   if (event.params.shareAmount === 0n) {

diff --git a/examples/token-erc20/.eslintrc.json b/examples/token-erc20/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/token-erc20/.gitignore b/examples/token-erc20/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/token-erc20/src/index.ts b/examples/token-erc20/src/index.ts
@@ -1,7 +1,7 @@
 import { ponder } from "@/generated";
 
 ponder.on("AdventureGold:Transfer", async ({ event, context }) => {
-  const { Account, TransferEvent } = context.entities;
+  const { Account, TransferEvent } = context.models;
 
   // Create an Account for the sender, or update the balance if it already exists.
   await Account.upsert({
@@ -40,7 +40,7 @@ ponder.on("AdventureGold:Transfer", async ({ event, context }) => {
 });
 
 ponder.on("AdventureGold:Approval", async ({ event, context }) => {
-  const { Approval, ApprovalEvent } = context.entities;
+  const { Approval, ApprovalEvent } = context.models;
 
   const approvalId =
     `${event.params.owner}-${event.params.spender}` as `0x${string}`;
@@ -71,7 +71,7 @@ ponder.on("AdventureGold:Approval", async ({ event, context }) => {
 });
 
 ponder.on("AdventureGold:OwnershipTransferred", async ({ event, context }) => {
-  const { Account } = context.entities;
+  const { Account } = context.models;
 
   await Account.upsert({
     id: event.params.previousOwner,

diff --git a/examples/token-erc721/.eslintrc.json b/examples/token-erc721/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/token-erc721/.gitignore b/examples/token-erc721/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/token-erc721/src/index.ts b/examples/token-erc721/src/index.ts
@@ -1,7 +1,7 @@
 import { ponder } from "@/generated";
 
 ponder.on("SmolBrain:Transfer", async ({ event, context }) => {
-  const { Account, Token, TransferEvent } = context.entities;
+  const { Account, Token, TransferEvent } = context.models;
 
   // Create an Account for the sender, or update the balance if it already exists.
   await Account.upsert({
@@ -17,20 +17,20 @@ ponder.on("SmolBrain:Transfer", async ({ event, context }) => {
   await Token.upsert({
     id: event.params.tokenId,
     create: {
-      owner: event.params.to,
+      ownerId: event.params.to,
     },
     update: {
-      owner: event.params.to,
+      ownerId: event.params.to,
     },
   });
 
   // Create a TransferEvent.
   await TransferEvent.create({
     id: event.log.id,
     data: {
-      from: event.params.from,
-      to: event.params.to,
-      token: event.params.tokenId,
+      fromId: event.params.from,
+      toId: event.params.to,
+      tokenId: event.params.tokenId,
       timestamp: Number(event.block.timestamp),
     },
   });

diff --git a/examples/token-reth/.eslintrc.json b/examples/token-reth/.eslintrc.json
@@ -1,4 +1,3 @@
 {
-  "root": true,
   "extends": "ponder"
 }
diff --git a/examples/token-reth/.gitignore b/examples/token-reth/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 
 .env.local
 .ponder/
-generated/
+generated/
+ponder-env.d.ts
diff --git a/examples/token-reth/src/RocketTokenRETH.ts b/examples/token-reth/src/RocketTokenRETH.ts
@@ -1,7 +1,7 @@
 import { ponder } from "@/generated";
 
 ponder.on("RocketTokenRETH:Transfer", async ({ event, context }) => {
-  await context.entities.Transfer.create({
+  await context.models.Transfer.create({
     id: `${event.transaction.hash}-${event.log.logIndex}`,
     data: {
       sender: event.params.from,
@@ -16,7 +16,7 @@ ponder.on("RocketTokenRETH:Transfer", async ({ event, context }) => {
 });
 
 ponder.on("RocketTokenRETH:Approval", async ({ event, context }) => {
-  await context.entities.Approval.create({
+  await context.models.Approval.create({
     id: `${event.transaction.hash}-${event.log.logIndex}`,
     data: {
       owner: event.params.owner,