added get all timestamps

hoonsubin · hoonsubin · commit 3ce166d4561d · 2020-03-22T00:19:42.000+09:00
diff --git a/app/src/components/LockedEthList.tsx b/app/src/components/LockedEthList.tsx
@@ -100,8 +100,11 @@ const LockedEthList: React.FC<LockHistoryProps> = ({ web3, contractInstance }) =
         setValue(index);
     };
 
-    const updateList = () => {
-        getLockEvents(web3, contractInstance).then(i => setEvents(i));
+    const updateList = async () => {
+        await getLockEvents(web3, contractInstance).then(i => {
+            setEvents(i);
+            console.log(i);
+        });
     };
 
     const getTotalLockVal = (locks: LockEvent[]): string => {
@@ -116,8 +119,8 @@ const LockedEthList: React.FC<LockHistoryProps> = ({ web3, contractInstance }) =
     };
 
     useEffect(() => {
-        setTimeout(() => {
-            updateList();
+        setTimeout(async () => {
+            await updateList();
         }, 1000);
     });
     return (
diff --git a/app/src/helpers/lockdrop/EthereumLockdrop.ts b/app/src/helpers/lockdrop/EthereumLockdrop.ts
@@ -47,7 +47,6 @@ export async function connectWeb3() {
         }
     } catch (error) {
         // Catch any errors for any of the above operations.
-        //todo: display a graphical error message
         alert('Failed to load web3, accounts, or contract. Check console for details.');
         console.error(error);
     }
@@ -105,42 +104,29 @@ export async function getLockEvents(web3: Web3, instance: Contract): Promise<Loc
     // this value can be set as the block number of where the contract was deployed
     const startBlock = 0;
     try {
-        const ev = await instance.getPastEvents('allEvents', {
-            filter: { event: 'Locked' },
-            fromBlock: startBlock,
-            toBlock: 'latest',
-        });
-        ev.map(i => {
-            //console.log(i);
-            const e = i.returnValues;
+        const ev = await instance.getPastEvents('Locked', { fromBlock: startBlock });
 
-            web3.eth.getBlock(i.transactionHash).then(x => {
-                // getting key value pairs from the event value
-                lockEvents.push({
+        return Promise.all(
+            ev.map(async i => {
+                const transactionString = await Promise.resolve(web3.eth.getBlock(i.blockNumber));
+                const time = transactionString.timestamp.toString();
+
+                const e = i.returnValues;
+                return {
                     eth: e['eth'] as BN,
                     duration: e['duration'] as number,
                     lock: e['lock'] as string,
                     introducer: e['introducer'] as string,
                     blockNo: i.blockNumber,
                     txHash: i.transactionHash,
-                    timestamp: x.timestamp,
-                });
-            });
-
-            // getting key value pairs from the event value
-            // lockEvents.push({
-            //     eth: e['eth'] as BN,
-            //     duration: e['duration'] as number,
-            //     lock: e['lock'] as string,
-            //     introducer: e['introducer'] as string,
-            //     blockNo: i.blockNumber,
-            //     txHash: i.transactionHash,
-            //     timestamp: lockedTime,
-            // });
-        });
+                    timestamp: time,
+                } as LockEvent;
+            }),
+        );
     } catch (error) {
         console.log(error);
+        return lockEvents;
     }
 
-    return lockEvents;
+    //return lockEvents;
 }
diff --git a/app/src/models/LockdropModels.ts b/app/src/models/LockdropModels.ts
@@ -15,5 +15,5 @@ export interface LockEvent {
     introducer: string;
     blockNo: number;
     txHash: string;
-    timestamp: string | number; // in Unix epoch
+    timestamp: string; // in Unix epoch
 }
diff --git a/app/yarn.lock b/app/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ export interface LockEvent {`
`15`	`15`	`introducer: string;`
`16`	`16`	`blockNo: number;`
`17`	`17`	`txHash: string;`
`18`		`- timestamp: string \| number; // in Unix epoch`
	`18`	`+ timestamp: string; // in Unix epoch`
`19`	`19`	`}`