Improve RPC stability

bitcart · Aug 12, 2023 · 198365a · 198365a
1 parent ee8c6c9
commit 198365a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 38 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -4,23 +4,23 @@ repos:
     hooks:
       - id: check-merge-conflict
   - repo: https://github.com/asottile/yesqa
-    rev: v1.4.0
+    rev: v1.5.0
     hooks:
       - id: yesqa
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.10.1
     hooks:
       - id: pyupgrade
         args: ["--py38-plus"]
@@ -45,7 +45,7 @@ repos:
         args: ["--remove"]
       - id: detect-private-key
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.6
+    rev: v3.0.1
     hooks:
       - id: prettier
   - repo: local

diff --git a/generator/docker-components/ethereum.yml b/generator/docker-components/ethereum.yml
@@ -1,44 +1,15 @@
 services:
-  geth:
-    image: ethereum/client-go:stable
-    restart: unless-stopped
-    expose:
-      - "8545"
-    volumes:
-      - "geth_datadir:/chaindata"
-    stop_signal: SIGINT
-    stop_grace_period: 2m
-    command:
-      - --datadir
-      - "/chaindata"
-      - --syncmode=light
-      - --http
-      - --http.api
-      - "personal,eth,net,web3,admin"
-      - --http.addr=0.0.0.0
-      - --http.vhosts=*
-
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "2m"
-        max-file: "10"
-
   ethereum:
     restart: unless-stopped
     image: bitcartcc/bitcart-eth:stable
     environment:
       ETH_NETWORK: ${ETH_NETWORK:-mainnet}
-      ETH_SERVER: ${ETH_SERVER:-https://rpc.ankr.com/eth}
+      ETH_SERVER: ${ETH_SERVER:-https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161}
       ETH_DEBUG: ${ETH_DEBUG:-false}
     expose:
       - "5002"
     volumes:
       - "ethereum_datadir:/data"
-    depends_on:
-      - geth
-    links:
-      - geth
 
   backend:
     depends_on:
@@ -48,4 +19,3 @@ services:
 
 volumes:
   ethereum_datadir:
-  geth_datadir:
diff --git a/generator/docker-components/polygon.yml b/generator/docker-components/polygon.yml
@@ -4,7 +4,7 @@ services:
     image: bitcartcc/bitcart-matic:stable
     environment:
       MATIC_NETWORK: ${MATIC_NETWORK:-mainnet}
-      MATIC_SERVER: ${MATIC_SERVER:-https://rpc.ankr.com/polygon}
+      MATIC_SERVER: ${MATIC_SERVER:-https://polygon-mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161}
       MATIC_DEBUG: ${MATIC_DEBUG:-false}
     expose:
       - "5008"

diff --git a/generator/tests/test_core.py b/generator/tests/test_core.py
@@ -6,7 +6,7 @@
 
 from generator.generator import AUTOGENERATED_COMMENT, add_components, get_components_list, load_component, save
 
-THIRD_PARTY_IMAGES = ["database", "geth", "nginx-https", "nginx", "redis", "pihole"]
+THIRD_PARTY_IMAGES = ["database", "nginx-https", "nginx", "redis", "pihole"]
 DEFAULT_SERVICES = [
     "admin",
     "backend",