Merge branch 'main' of github.com:cventastic/POKT_DOKT into main

docker-compose-rpc.yml

@@ -166,7 +166,6 @@ services:
       - "traefik.http.routers.harmony-mainnet.rule=Host(`$DOMAIN`) && PathPrefix(`/harmony`)"
       - "traefik.http.routers.harmony-mainnet.middlewares=harmony-mainnet-stripprefix, ipwhitelist"
       
-      
   erigon-trace:
     image: thorax/erigon
     expose:
@@ -180,7 +179,7 @@ services:
 
   rpcdaemon:
     image: thorax/erigon:latest
-    command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon-trace:9090 --txpool.api.addr=erigon-trace:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,debug,net,trace --ws
+    command: rpcdaemon --datadir=/home/erigon/.local/share/erigon --private.api.addr=erigon-trace:9090 --txpool.api.addr=erigon-trace:9090 --http.addr=0.0.0.0 --http.vhosts=* --http.corsdomain=* --http.api=eth,erigon,web3,net,debug,trace,txpool --ws
     pid: service:erigon-trace # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode)
     volumes:
       - erigon-trace:/home/erigon/.local/share/erigon

docker-compose.pokt-mainnet.yml

@@ -117,7 +117,7 @@ services:
       org.label-schema.group: "monitoring"
 
 ### POKT
-  pocket-mainnet:
+  pocket-fr-1:
     image: poktnetwork/pocket-core:stagenet-latest
     ports:
       - "127.0.0.1:8081:8081"
@@ -129,8 +129,8 @@ services:
     command: /home/app/.pocket/pokt_mainnet.sh && pocket start --seeds=$POCKET_MAIN_SEEDS --mainnet
     #command: pocket start --simulateRelay
     environment:
-      - POCKET_CORE_KEY=$POCKET_CORE_KEY
+      - POCKET_CORE_KEY=$POKT_FR_1_POCKET_CORE_KEY
-      - POCKET_CORE_PASSPHRASE=$POCKET_CORE_PASSPHRASE
+      - POCKET_CORE_PASSPHRASE=$POKT_FR_1_POCKET_CORE_PASSPHRASE
       - POCKET_SNAPSHOT=$POCKET_SNAPSHOT
     volumes:
       - ./chains/chains_mainnet.json:/home/app/.pocket/config/chains.json
@@ -139,13 +139,40 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.services.pocket-mainnet.loadbalancer.server.port=8081"
+      - "traefik.http.services.pocket-fr-1.loadbalancer.server.port=8081"
-      - "traefik.http.routers.pocket-mainnet.entrypoints=websecure"
+      - "traefik.http.routers.pocket-fr-1.entrypoints=websecure"
-      - "traefik.http.routers.pocket-mainnet.tls.certresolver=myresolver"
+      - "traefik.http.routers.pocket-fr-1.tls.certresolver=myresolver"
-      - "traefik.http.routers.pocket-mainnet.rule=Host(`$RELAYDOMAIN`)"
+      - "traefik.http.routers.pocket-fr-1.rule=Host(`$POKT-FR-1-DOMAIN`)"
+
+  pocket-fr-2:
+    image: poktnetwork/pocket-core:stagenet-latest
+    ports:
+      - "127.0.0.1:8082:8081"
+      - "26657:26656"
+    expose:
+      - 26656
+      - 8081
+      - 8083
+    command: /home/app/.pocket/pokt_mainnet.sh && pocket start --seeds=$POCKET_MAIN_SEEDS --mainnet
+    #command: pocket start --simulateRelay
+    environment:
+      - POCKET_CORE_KEY=$POKT_FR_2_POCKET_CORE_KEY
+      - POCKET_CORE_PASSPHRASE=$POKT_FR_2_POCKET_CORE_PASSPHRASE
+      - POCKET_SNAPSHOT=$POCKET_SNAPSHOT
+    volumes:
+      - ./chains/chains_mainnet.json:/home/app/.pocket/config/chains.json
+      - ./bootstrap_skript/pokt_mainnet.sh:/home/app/.pocket/pokt_mainnet.sh
+      - pocket-fr-2:/home/app/.pocket
+    restart: unless-stopped
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.services.pocket-fr-2.loadbalancer.server.port=8081"
+      - "traefik.http.routers.pocket-fr-2.entrypoints=websecure"
+      - "traefik.http.routers.pocket-fr-2.tls.certresolver=myresolver"
+      - "traefik.http.routers.pocket-fr-2.rule=Host(`$POKT-FR-2-DOMAIN`)"
 
 ### VOLUMES
 volumes:
   pocket-mainnet:
+  pocket-fr-2:
   prometheus_data:
-

prometheus/prometheus-rpc.yml

@@ -77,10 +77,3 @@ scrape_configs:
         regex: (.*)
         replacement: $1
         target_label: geth_ropsten
-
-alerting:
-  alertmanagers:
-  - scheme: http
-    static_configs:
-    - targets:
-      - 'alertmanager:9093'

prometheus/prometheus.yml

@@ -34,9 +34,14 @@ scrape_configs:
     static_configs:
       - targets: ['pushgateway:9091']
 
-alerting:
+  - job_name: 'pocket-fr-1'
-  alertmanagers:
+    scrape_interval: 10s
-  - scheme: http
+    honor_labels: true
     static_configs:
-    - targets:
+      - targets: ['pocket-fr-1:8083']
-      - 'alertmanager:9093'
+
+  - job_name: 'pocket-fr-2'
+    scrape_interval: 10s
+    honor_labels: true
+    static_configs:
+      - targets: ['pocket-fr-1:8083']

traefik/traefik.toml

@@ -45,7 +45,7 @@
   # Optional
   # Default: "ERROR"
   #
-  level = "DEBUG"
+  level = "ERROR"
  
   # Sets the filepath for the traefik log. If not specified, stdout will be used.
   # Intermediate directories are created if necessary.

util/prepare.sh

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 source .env
-
+export DOMAIN=$RPC_DOMAIN
-export DOMAIN=$DOMAIN
 
 chown -R root:root chains bootstrap_skript
 

util/relay.sh

@@ -6,6 +6,11 @@ chain_arr[goerli]="0026"
 chain_arr[rinkeby]="0025"
 chain_arr[ropsten]="0023"
 chain_arr[mainnet]="0021"
+chain_arr[harmony]="040"
+chain_arr[xdai]="0027"
+chain_arr[erigon-archival-trace]="0028"
+chain_arr[erigon-mainnet]="0021"
+chain_arr[erigon-archive]="0022"
 
 for i in ${!chain_arr[@]}; do
   echo curl ${i} ${chain_arr[${i}]}
@@ -15,7 +20,3 @@ done
 POKT="0001"
 curl -X POST --data '{"relay_network_id":"'$POKT'","payload":{"data":"{}","method":"POST","path":"v1/query/height","headers":{}}}' http://localhost:8081/v1/client/sim
 echo \n
-
-HARMONY="0040"
-curl -X POST --data '{"relay_network_id":"'$HARMONY'","payload":{"data":"{\"jsonrpc\": \"2.0\", \"method\": \"hmy_latestHeader\", \"params\": [], \"id\": 1}","method":"POST","path":"v1/query/height","headers":{}}}' http://localhost:8081/v1/client/sim
-echo \n

xdai/xdai.json

@@ -58,6 +58,15 @@
     "eip2565Transition": 16101500,
     "eip2929Transition": 16101500,
     "eip2930Transition": 16101500,
+    "eip3198Transition": 19040000,
+    "eip3529Transition": 19040000,
+    "eip3541Transition": 19040000,
+    "eip1559Transition": 19040000,
+    "eip1559BaseFeeMaxChangeDenominator": "0x8",
+    "eip1559ElasticityMultiplier": "0x2",
+    "eip1559BaseFeeInitialValue": "0x3b9aca00",
+    "eip1559FeeCollector": "0x6BBe78ee9e474842Dbd4AB4987b3CeFE88426A92",
+    "eip1559FeeCollectorTransition": 19040000,
     "registrar": "0x6B53721D4f2Fb9514B85f5C49b197D857e36Cf03",
     "transactionPermissionContract": "0x7Dd7032AA75A37ea0b150f57F899119C7379A78b",
     "transactionPermissionContractTransition": 9186425