crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For event entities, rename address -> contractAddress and make it a primary key

Browse Source
This commit is contained in:
Alex Browne
2018-09-25 16:06:52 -07:00
committed by Fred Carlsen
parent 1ae3592e45
commit 3ba98e2192
5 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/pipeline/src/data_types/events/exchange_events.ts
View File

@@ -60,10 +60,10 @@ export function _convertToExchangeFillEvent(eventLog: LogWithDecodedArgs<Exchang
const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
const exchangeFillEvent = new ExchangeFillEvent();
exchangeFillEvent.logIndex = eventLog.logIndex as number;
exchangeFillEvent.address = eventLog.address as string;
exchangeFillEvent.rawData = eventLog.data as string;
exchangeFillEvent.contractAddress = eventLog.address as string;
exchangeFillEvent.blockNumber = eventLog.blockNumber as number;
exchangeFillEvent.logIndex = eventLog.logIndex as number;
exchangeFillEvent.rawData = eventLog.data as string;
exchangeFillEvent.makerAddress = eventLog.args.makerAddress.toString();
exchangeFillEvent.takerAddress = eventLog.args.takerAddress.toString();
exchangeFillEvent.feeRecepientAddress = eventLog.args.feeRecipientAddress;
@@ -94,10 +94,10 @@ export function _convertToExchangeCancelEvent(
const takerAssetData = assetDataUtils.decodeAssetDataOrThrow(eventLog.args.takerAssetData);
const takerAssetType = takerAssetData.assetProxyId === AssetProxyId.ERC20 ? 'erc20' : 'erc721';
const exchangeCancelEvent = new ExchangeCancelEvent();
exchangeCancelEvent.logIndex = eventLog.logIndex as number;
exchangeCancelEvent.address = eventLog.address as string;
exchangeCancelEvent.rawData = eventLog.data as string;
exchangeCancelEvent.contractAddress = eventLog.address as string;
exchangeCancelEvent.blockNumber = eventLog.blockNumber as number;
exchangeCancelEvent.logIndex = eventLog.logIndex as number;
exchangeCancelEvent.rawData = eventLog.data as string;
exchangeCancelEvent.makerAddress = eventLog.args.makerAddress.toString();
exchangeCancelEvent.takerAddress =
eventLog.args.takerAddress == null ? null : eventLog.args.takerAddress.toString();
@@ -121,10 +121,10 @@ export function _convertToExchangeCancelUpToEvent(
eventLog: LogWithDecodedArgs<ExchangeCancelUpToEventArgs>,
): ExchangeCancelUpToEvent {
const exchangeCancelUpToEvent = new ExchangeCancelUpToEvent();
exchangeCancelUpToEvent.logIndex = eventLog.logIndex as number;
exchangeCancelUpToEvent.address = eventLog.address as string;
exchangeCancelUpToEvent.rawData = eventLog.data as string;
exchangeCancelUpToEvent.contractAddress = eventLog.address as string;
exchangeCancelUpToEvent.blockNumber = eventLog.blockNumber as number;
exchangeCancelUpToEvent.logIndex = eventLog.logIndex as number;
exchangeCancelUpToEvent.rawData = eventLog.data as string;
exchangeCancelUpToEvent.makerAddress = eventLog.args.makerAddress.toString();
exchangeCancelUpToEvent.senderAddress = eventLog.args.senderAddress.toString();
exchangeCancelUpToEvent.orderEpoch = eventLog.args.orderEpoch.toString();

2
packages/pipeline/src/entities/ExchangeCancelEvent.ts
View File

@@ -4,10 +4,10 @@ import { AssetType } from '../types';
@Entity()
export class ExchangeCancelEvent extends BaseEntity {
@PrimaryColumn() public contractAddress!: string;
@PrimaryColumn() public logIndex!: number;
@PrimaryColumn() public blockNumber!: number;
@Column() public address!: string;
@Column() public rawData!: string;
@Column() public makerAddress!: string;

2
packages/pipeline/src/entities/ExchangeCancelUpToEvent.ts
View File

@@ -2,10 +2,10 @@ import { BaseEntity, Column, Entity, PrimaryColumn } from 'typeorm';
@Entity()
export class ExchangeCancelUpToEvent extends BaseEntity {
@PrimaryColumn() public contractAddress!: string;
@PrimaryColumn() public logIndex!: number;
@PrimaryColumn() public blockNumber!: number;
@Column() public address!: string;
@Column() public rawData!: string;
@Column() public makerAddress!: string;

2
packages/pipeline/src/entities/ExchangeFillEvent.ts
View File

@@ -4,10 +4,10 @@ import { AssetType } from '../types';
@Entity()
export class ExchangeFillEvent extends BaseEntity {
@PrimaryColumn() public contractAddress!: string;
@PrimaryColumn() public logIndex!: number;
@PrimaryColumn() public blockNumber!: number;
@Column() public address!: string;
@Column() public rawData!: string;
@Column() public makerAddress!: string;

12
packages/pipeline/src/index.ts
View File

@@ -17,11 +17,19 @@ const EXCHANGE_ADDRESS = '0x4f833a24e1f95d70f028921e27040ca56e09ab0b';
const fillRepository = connection.getRepository(ExchangeFillEvent);
const cancelRepository = connection.getRepository(ExchangeCancelEvent);
const cancelUpToRepository = connection.getRepository(ExchangeCancelUpToEvent);
console.log(`found ${(await fillRepository.count()) + (await cancelRepository.count())} existing events`);
console.log(
`found ${(await fillRepository.count()) +
(await cancelRepository.count()) +
(await cancelUpToRepository.count())} existing events`,
);
const rawEvents = await etherscan.getContractEventsAsync(EXCHANGE_ADDRESS);
const events = parseExchangeEvents(rawEvents);
for (const event of events) {
await event.save();
}
console.log(`now there are ${(await fillRepository.count()) + (await cancelRepository.count())} total events`);
console.log(
`now there are ${(await fillRepository.count()) +
(await cancelRepository.count()) +
(await cancelUpToRepository.count())} total events`,
);
})();