Merge pull request #238 from dappradar/fix

Revert "Merge branch 'staging' into master"
dappradar · Dec 4, 2023 · c50dc90 · c50dc90
2 parents f8d1a5a + 0b1145e
commit c50dc90
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 976 deletions.
diff --git a/.github/workflows/build-push-image.yml b/.github/workflows/build-push-image.yml
@@ -26,47 +26,47 @@ jobs:
  runs-on: dappradar-runner
 
  steps:
- - uses: actions/checkout@v3
+  - uses: actions/checkout@v3
 
- - name: Configure AWS credentials
- uses: aws-actions/configure-aws-credentials@v2
- with:
- aws-region: ${{ env.AWS_DEFAULT_REGION }}
- role-to-assume: ${{ env.AWS_IAM_ROLE_GITHUB }}
+  - name: Configure AWS credentials
+  uses: aws-actions/configure-aws-credentials@v2
+  with:
+  aws-region: ${{ env.AWS_DEFAULT_REGION }}
+  role-to-assume: ${{ env.AWS_IAM_ROLE_GITHUB }}
 
- - name: Authenticate to Amazon ECR
- uses: aws-actions/amazon-ecr-login@v1
+  - name: Authenticate to Amazon ECR
+  uses: aws-actions/amazon-ecr-login@v1
 
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
- with:
- driver: docker
+  - name: Set up Docker Buildx
+  uses: docker/setup-buildx-action@v2
+  with:
+  driver: docker
 
- - name: Build Docker image
- uses: docker/build-push-action@v4
- with:
- context: .
- tags: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
- push: false
+  - name: Build Docker image
+  uses: docker/build-push-action@v4
+  with:
+  context: .
+  tags: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
+  push: false
 
- - name: Push Docker image
- uses: docker/build-push-action@v4
- with:
- context: .
- tags: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
- push: true
+  - name: Push Docker image
+  uses: docker/build-push-action@v4
+  with:
+  context: .
+  tags: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
+  push: true
 
- - name: Bake and push manifests
- run: |
- kubectl kustomize $MANIFESTS_PATH | \
- envsubst '$CONTAINER_IMAGE' | \
- flux push artifact oci://$OCI_IMAGE_URL_INFRA -f - \
- --source="$(git config --get remote.origin.url)" \
- --revision="$(git branch --show-current)@sha1:$(git rev-parse HEAD)" \
- --provider=aws && \
- flux tag artifact oci://$OCI_IMAGE_URL_INFRA \
- --tag $GITHUB_REF_NAME \
- --provider aws
- env:
- OCI_IMAGE_URL_INFRA: "${{ env.ECR_REPOSITORY_URL_INFRA }}:${{ env.IMAGE_TAG }}"
- CONTAINER_IMAGE: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
+  - name: Bake and push manifests
+  run: |
+  kubectl kustomize $MANIFESTS_PATH | \
+  envsubst '$CONTAINER_IMAGE' | \
+  flux push artifact oci://$OCI_IMAGE_URL_INFRA -f - \
+  --source="$(git config --get remote.origin.url)" \
+  --revision="$(git branch --show-current)@sha1:$(git rev-parse HEAD)" \
+  --provider=aws && \
+  flux tag artifact oci://$OCI_IMAGE_URL_INFRA \
+  --tag $GITHUB_REF_NAME \
+  --provider aws
+  env:
+  OCI_IMAGE_URL_INFRA: "${{ env.ECR_REPOSITORY_URL_INFRA }}:${{ env.IMAGE_TAG }}"
+  CONTAINER_IMAGE: "${{ env.ECR_REPOSITORY_URL_APP }}:${{ env.IMAGE_TAG }}"
diff --git a/kubernetes/base/kustomization.yml b/kubernetes/base/kustomization.yml
@@ -5,4 +5,4 @@ resources:
 - service.yml
 - ingress.yml
 - secrets.yml
-- redis.yml
+# - redis.yml
diff --git a/kubernetes/base/redis.yml b/kubernetes/base/redis.yml
@@ -14,7 +14,7 @@ spec:
  spec:
  containers:
  - name: defi-providers-redis
- image: redis:7
+ image: redis:7.0.11
  imagePullPolicy: Always
  args: ["--requirepass", "$(REDIS_PASS)"]
  resources:

diff --git a/src/factory/factory.service.ts b/src/factory/factory.service.ts
@@ -1,4 +1,4 @@
-import { Injectable, OnModuleInit } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import BigNumber from 'bignumber.js';
 import {
  GetPoolAndTokenVolumesReply,
@@ -28,7 +28,7 @@ interface IProvider {
 }
 
 @Injectable()
-export class FactoryService implements OnModuleInit {
+export class FactoryService {
  constructor(private readonly web3ProviderService: Web3ProviderService) {}
  async getTvl(
  req: GetTvlRequest,
@@ -44,6 +44,8 @@ export class FactoryService implements OnModuleInit {
  const block = parseInt(req.block) - basicUtil.getDelay(req.chain);
  const web3 = await this.web3ProviderService.getWeb3(req?.chain);
  let tvlData;
+ console.log('req', req);
+
  if (
  req?.autointegrationParams?.autointegrated === 'false' ||
  req?.autointegrationParams?.autointegrated === undefined
@@ -121,12 +123,4 @@ export class FactoryService implements OnModuleInit {
  ): string {
  return `${__dirname}/providers/${chain}/${provider}/${path}`;
  }
-
- async onModuleInit() {
- log.info({
- message: `Node Urls: ${JSON.stringify(nodeUrls)} config: 
- ${JSON.stringify(config)}`,
- endpoint: 'printenv',
- });
- }
 }
diff --git a/src/factory/providers/zksync-era/eralend/index.ts b/src/factory/providers/zksync-era/eralend/index.ts
@@ -21,7 +21,6 @@ async function tvl(params: ITvlParams): Promise<Partial<ITvlReturn>> {
  web3,
  );
 
-
  const tokenBalances = {};
  Object.keys(balances).forEach(function (key) {
  tokenBalances[key] = BigNumber(balances[key]);