Revert "resolve conflicts with master"

This reverts commit f3b376f, reversing
changes made to dc23aa1.

Author: akshay-ghy

.github/FUNDING.yml

@@ -1,4 +1,4 @@
 # These are supported funding model platforms
 
-custom: https://gitcoin.co/grants/233/ethereumetl
+github: [medvedev1088]
 

.github/workflows/publish-to-dockerhub.yml

@@ -51,6 +51,3 @@ ENV/
 last_synced_block.txt
 pyrightconfig.json
 pyrightconfig.json
-
-# etl
-/last_synced_block.txt

.github/workflows/publish-to-pypi.yml

@@ -2,13 +2,13 @@ language: python
 dist: xenial
 matrix:
   include:
-    - python: "3.7.2"
+    - python: "3.5"
+      env: TOX_POSARGS="-e py35"
+    - python: "3.6"
+      env: TOX_POSARGS="-e py36"
+    - python: "3.7"
       env: TOX_POSARGS="-e py37"
-    - python: "3.8"
-      env: TOX_POSARGS="-e py38"
-    - python: "3.9"
-      env: TOX_POSARGS="-e py39"
 install:
   - travis_retry pip install tox
 script:
-  - travis_wait tox $TOX_POSARGS
+  - tox $TOX_POSARGS

.gitignore

@@ -1,12 +1,12 @@
-FROM python:3.7
-MAINTAINER Evgeny Medvedev <evge.medvedev@gmail.com>
+FROM python:3.6-alpine
+MAINTAINER Eric Lim <elim0322@gmail.com>
 ENV PROJECT_DIR=ethereum-etl
 
 RUN mkdir /$PROJECT_DIR
 WORKDIR /$PROJECT_DIR
 COPY . .
 RUN apk add --no-cache gcc musl-dev  #for C libraries: <limits.h> <stdio.h>
-RUN pip install --upgrade pip && pip install -e /$PROJECT_DIR/[streaming]
+RUN pip install --upgrade pip && pip install -e /$PROJECT_DIR/
 RUN apt-get update && apt-get install -y apt-transport-https ca-certificates curl gnupg && \
     curl -sLf --retry 3 --tlsv1.2 --proto "=https" 'https://packages.doppler.com/public/cli/gpg.DE2A7741A397C129.key' | apt-key add - && \
     echo "deb https://packages.doppler.com/public/cli/deb/debian any-version main" | tee /etc/apt/sources.list.d/doppler-cli.list && \