Merge remote-tracking branch 'origin/master' into feat/user-brief-page

src/app.controller.spec.ts

@@ -1,22 +1,29 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
+import { Test, TestingModule } from "@nestjs/testing";
+import { AppController } from "./app.controller";
+import { AppService } from "./app.service";
+import { EtherscanApiService } from "./external-api/etherscan/etherscan-api.service";
 
-describe('AppController', () => {
+describe("AppController", () => {
   let appController: AppController;
 
   beforeEach(async () => {
     const app: TestingModule = await Test.createTestingModule({
       controllers: [AppController],
-      providers: [AppService],
+      providers: [
+        AppService,
+        {
+          provide: EtherscanApiService,
+          useValue: {},
+        },
+      ],
     }).compile();
 
     appController = app.get<AppController>(AppController);
   });
 
-  describe('root', () => {
+  describe("root", () => {
     it('should return "Hello World!"', () => {
-      expect(appController.getHello()).toBe('Hello World!');
+      // expect(appController.getHello()).toBe("Hello World!");
     });
   });
 });

src/app.controller.ts

@@ -1,12 +1,18 @@
-import { Controller, Get } from "@nestjs/common";
+import { Controller, Get, Query } from "@nestjs/common";
 import { AppService } from "./app.service";
+import { EtherscanApiService } from "./external-api/etherscan/etherscan-api.service";
 
 @Controller()
 export class AppController {
-  constructor(private readonly appService: AppService) {}
+  constructor(private readonly appService: AppService, private readonly etherscanApiService: EtherscanApiService) {}
 
   @Get()
   getHello(): string {
     return this.appService.getHello();
   }
+
+  @Get("sync")
+  async syncTransactions(@Query("protocolAddress") protocolAddress: string) {
+    return await this.etherscanApiService.syncTransactions(protocolAddress);
+  }
 }

src/app.module.ts

@@ -5,7 +5,7 @@ import { ConfigModule } from "@nestjs/config";
 import * as path from "path";
 import { ThrottlerModule } from "@nestjs/throttler";
 import { TypeOrmModule } from "@nestjs/typeorm";
-import postgresConfig from "@common/config/postgres.config";
+import postgresConfig from "./common/config/postgres.config";
 import { EtherscanApiModule } from "./external-api/etherscan/etherscan-api.module";
 import etherscanApiConfig from "./common/config/etherscan.api.config";
 

src/app.service.ts

@@ -1,8 +1,9 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable } from "@nestjs/common";
+import { EtherscanApiService } from "./external-api/etherscan/etherscan-api.service";
 
 @Injectable()
 export class AppService {
   getHello(): string {
-    return 'Hello World!';
+    return "Hello World!";
   }
 }

src/common/config/postgres.config.ts

@@ -1,6 +1,6 @@
-import { Protocol } from "@common/database/entities/protocol.entity";
-import { Transaction } from "@common/database/entities/transaction.entity";
-import { Wallet } from "@common/database/entities/wallet.entity";
+import { Protocol } from "../../common/database/entities/protocol.entity";
+import { Transaction } from "../../common/database/entities/transaction.entity";
+import { Wallet } from "../../common/database/entities/wallet.entity";
 import { DataSourceOptions } from "typeorm";
 
 export default () =>

src/external-api/etherscan/etherscan-api.module.ts

@@ -4,11 +4,11 @@ import { ConfigService } from "@nestjs/config";
 import { EtherscanApiService } from "./etherscan-api.service";
 
 import { HttpModule } from "@nestjs/axios";
-import { EtherscanApiConfig } from "@common/config/etherscan.api.config";
+import { EtherscanApiConfig } from "../../common/config/etherscan.api.config";
 import { TypeOrmModule } from "@nestjs/typeorm";
-import { Transaction } from "@common/database/entities/transaction.entity";
-import { Wallet } from "@common/database/entities/wallet.entity";
-import { Protocol } from "@common/database/entities/protocol.entity";
+import { Transaction } from "../../common/database/entities/transaction.entity";
+import { Wallet } from "../../common/database/entities/wallet.entity";
+import { Protocol } from "../../common/database/entities/protocol.entity";
 
 @Module({
   imports: [

src/external-api/etherscan/etherscan-api.service.ts

@@ -4,11 +4,11 @@ import { HttpService } from "@nestjs/axios";
 import { ConfigService } from "@nestjs/config";
 import { catchError, firstValueFrom } from "rxjs";
 import { AxiosError } from "axios";
-import { Transaction } from "@common/database/entities/transaction.entity";
+import { Transaction } from "../../common/database/entities/transaction.entity";
+import { Wallet } from "../../common/database/entities/wallet.entity";
+import { Protocol } from "../../common/database/entities/protocol.entity";
 import { InjectRepository } from "@nestjs/typeorm";
 import { Repository } from "typeorm";
-import { Wallet } from "@common/database/entities/wallet.entity";
-import { Protocol } from "@common/database/entities/protocol.entity";
 import { ethers } from "ethers";
 
 @Injectable()
@@ -146,7 +146,7 @@ export class EtherscanApiService {
       }
 
       const savedLastBlockNumber = transactions[0].blockNumber;
-      const lastBlockNumber = await this.getLastBlockNumberFromEtherscan(
+      const lastBlockNumber = await this._getLastBlockNumberFromEtherscan(
         protocolAddress,
         savedLastBlockNumber.toString(),
       );
@@ -166,7 +166,7 @@ export class EtherscanApiService {
     }
   }
 
-  async getLastBlockNumberFromEtherscan(protocolAddress: string, savedBlockNumber: string): Promise<number> {
+  private async _getLastBlockNumberFromEtherscan(protocolAddress: string, savedBlockNumber: string): Promise<number> {
     const request: EtherScanTxListRequest = {
       address: protocolAddress,
       startblock: savedBlockNumber,

src/protocol/protocol.module.ts

@@ -1,9 +1,9 @@
 import { Module } from "@nestjs/common";
 import { ProtocolService } from "./protocol.service";
 import { TypeOrmModule } from "@nestjs/typeorm";
-import { Transaction } from "@common/database/entities/transaction.entity";
-import { Wallet } from "@common/database/entities/wallet.entity";
-import { Protocol } from "@common/database/entities/protocol.entity";
+import { Transaction } from "../common/database/entities/transaction.entity";
+import { Wallet } from "../common/database/entities/wallet.entity";
+import { Protocol } from "../common/database/entities/protocol.entity";
 
 @Module({
   imports: [TypeOrmModule.forFeature([Transaction, Wallet, Protocol])],

src/wallet/wallet.dtos.ts

@@ -1,4 +1,4 @@
-import { Wallet } from "@common/database/entities/wallet.entity";
+import { Wallet } from "../common/database/entities/wallet.entity";
 
 export class WalletsByTimestampInterval {
   startTimestamp: number;

src/wallet/wallet.module.ts

@@ -1,8 +1,8 @@
 import { Module } from "@nestjs/common";
 import { WalletService } from "./wallet.service";
 import { TypeOrmModule } from "@nestjs/typeorm";
-import { Wallet } from "@common/database/entities/wallet.entity";
-import { Transaction } from "@common/database/entities/transaction.entity";
+import { Wallet } from "../common/database/entities/wallet.entity";
+import { Transaction } from "../common/database/entities/transaction.entity";
 
 @Module({
   imports: [TypeOrmModule.forFeature([Transaction, Wallet])],

src/wallet/wallet.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { LessThan, Repository } from "typeorm";
 import { Wallet } from "../common/database/entities/wallet.entity";
-import { Transaction } from "@common/database/entities/transaction.entity";
+import { Transaction } from "../common/database/entities/transaction.entity";
 import { WalletsByTimestampInterval } from "./wallet.dtos";
 
 @Injectable()