feat(smartsale-contracts): use plain objects

bitcashorg · Feb 7, 2024 · 12c1776 · 12c1776
1 parent 4982943
commit 12c1776
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 325 deletions.
diff --git a/apps/indexer/src/indexer.ts b/apps/indexer/src/indexer.ts
@@ -1,7 +1,7 @@
-import { parseEventLogs, Log, Address } from 'viem'
+import { Log } from 'viem'
 import { client } from './evm-client'
 import { TestnetEasyAuction } from 'smartsale-contracts'
-import { bigintToPostgresTimestamp, getTokenDetails, runPromisesInSeries } from './lib'
+import { bigintToPostgresTimestamp, getEvents, getTokenDetails, runPromisesInSeries } from './lib'
 import { PrismaClient } from '@prisma/client'
 import { NewAuctionEvent } from './types'
 const prisma = new PrismaClient()
@@ -12,8 +12,9 @@ export async function startIndexer() {
   // await writeToFile(stringify(TestnetEasyAuction.getEvents(), null, 2), './events.json')
   // Get historical event logs
   const blockNumber = await client.getBlockNumber()
+  const events = getEvents(TestnetEasyAuction)
   const logs = await client.getLogs({
-    events: TestnetEasyAuction.getEvents(),
+    events,
     fromBlock: BigInt(TestnetEasyAuction.indexFromBlock),
     toBlock: blockNumber,
   })
@@ -28,7 +29,7 @@ export async function startIndexer() {
 
   // Watch for new event logs
   client.watchEvent({
-    events: TestnetEasyAuction.getEvents(),
+    events,
     onLogs: (logs) => {
       const filteredlogs = logs.filter((log) => log.eventName !== 'OwnershipTransferred')
       // console.log(

diff --git a/apps/indexer/src/lib.ts b/apps/indexer/src/lib.ts
@@ -1,7 +1,7 @@
 import fs from 'fs/promises'
 import { erc20Abi } from 'abitype/abis'
 import { client } from './evm-client'
-import { Address } from 'viem'
+import { Abi, Address } from 'viem'
 
 export async function writeToFile(data: string, filePath: string) {
   try {
@@ -51,3 +51,6 @@ export function bigintToPostgresTimestamp(timestamp: bigint): string {
   const date = new Date(Number(timestamp) * 1000); // Convert seconds to milliseconds
   return date.toISOString().replace('T', ' ').replace('Z', ''); // Convert to PostgreSQL timestamp format
 }
+
+
+export const getEvents = (abi: Abi) => abi.filter(item => item.type === 'event');
diff --git a/apps/webapp/app/[project]/auction/page.tsx b/apps/webapp/app/[project]/auction/page.tsx
@@ -45,9 +45,9 @@ export default function AuctionPage({
               <Countdown auctionId={project.auctionId} />
             </div>
             <div className="w-full md:w-1/3">
-              <React.Suspense fallback={<div>Loading ...</div>}>
+               <React.Suspense fallback={<div>Loading ...</div>}>
                 <AuctionBids project={project} />
-              </React.Suspense>
+              </React.Suspense> 
             </div>
           </div>
         </div>

diff --git a/apps/webapp/components/auction/auction-bids.tsx b/apps/webapp/components/auction/auction-bids.tsx
@@ -18,7 +18,7 @@ export function AuctionBids({ project }: AuctionBidsProps) {
 
   return (
     <div>
-      <form onSubmit={handleSubmit}>
+      <form >
         <Table>
           <TableHeader>
             <TableRow>

diff --git a/packages/smartsale-contracts/src/testnet-allow-list.ts b/packages/smartsale-contracts/src/testnet-allow-list.ts
@@ -1,6 +1,6 @@
-import { createContractData } from "./types";
+import { ContractData } from "./types";
 
-export const TestnetAllowList = createContractData({
+export const TestnetAllowList : ContractData = {
   "address": "0x3D18904711fe451356eBA461B7747EA3Abff6c93",
   "indexFromBlock": 12241046,
   "abi": [
@@ -86,4 +86,4 @@ export const TestnetAllowList = createContractData({
       "type": "function"
     }
   ] 
-})
+}
diff --git a/packages/smartsale-contracts/src/testnet-deposit-order.ts b/packages/smartsale-contracts/src/testnet-deposit-order.ts
@@ -1,6 +1,6 @@
-import { createContractData } from "./types";
+import { ContractData } from "./types";
 
-export const TestnetDepositOrder = createContractData({
+export const TestnetDepositOrder : ContractData = {
   "address": "0x4faA684A1E0Cdd7cb271b5424a12A2D039624D78",
   "indexFromBlock": 12240840,
   "abi": [
@@ -81,4 +81,4 @@ export const TestnetDepositOrder = createContractData({
       "type": "function"
     }
   ]
-})
+}
diff --git a/packages/smartsale-contracts/src/testnet-easy-auction.ts b/packages/smartsale-contracts/src/testnet-easy-auction.ts
@@ -1,6 +1,6 @@
-import { createContractData } from "./types";
+import { ContractData } from "./types";
 
-export const TestnetEasyAuction = createContractData({
+export const TestnetEasyAuction : ContractData = {
   "address": "0x8d37219725eB0088360f744A5d894035D0f88F82",
   "indexFromBlock": 12239067,
   "abi": [
@@ -858,4 +858,4 @@ export const TestnetEasyAuction = createContractData({
       "type": "function"
     }
   ]
-})
+}