From 2f4879565113615b88e51ce32c58ab14149bf293 Mon Sep 17 00:00:00 2001
From: czarly <379651+czarly@users.noreply.github.com>
Date: Wed, 16 Mar 2022 12:57:37 +0400
Subject: [PATCH] more pokt node fixes

---
 bootstrap_skript/pokt_mainnet.sh |  9 -------
 chains/chains_mainnet.json       | 46 --------------------------------
 chains/chains_testnet.json       | 18 -------------
 pocket-frontend.yml              | 11 +++-----
 pokt/bootstrap.sh                |  4 +--
 5 files changed, 5 insertions(+), 83 deletions(-)
 delete mode 100755 bootstrap_skript/pokt_mainnet.sh
 delete mode 100644 chains/chains_mainnet.json
 delete mode 100644 chains/chains_testnet.json

diff --git a/bootstrap_skript/pokt_mainnet.sh b/bootstrap_skript/pokt_mainnet.sh
deleted file mode 100755
index 8d3899af..00000000
--- a/bootstrap_skript/pokt_mainnet.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-if [ ! -f /home/app/.pocket/setupdone ]
-then
-  mkdir -p /home/app/.pocket/data
-  echo "wget -q -O - '$POCKET_SNAPSHOT' | tar -xv -C /home/app/.pocket/data/"
-  wget -q -O - $POCKET_SNAPSHOT | tar -xv -C /home/app/.pocket/data/
-  touch /home/app/.pocket/setupdone
-fi
-
diff --git a/chains/chains_mainnet.json b/chains/chains_mainnet.json
deleted file mode 100644
index 97e7c1c4..00000000
--- a/chains/chains_mainnet.json
+++ /dev/null
@@ -1,46 +0,0 @@
-[
-    {
-        "id": "0001",
-        "url": "https://${DOMAIN}/pokt"
-    },
-    {
-        "id": "0004",
-        "url": "https://${DOMAIN}/bsc"
-    },
-    {
-        "id": "0005",
-        "url": "https://${DOMAIN}/fuse"
-    },
-    {
-        "id": "0021",
-        "url": "https://${DOMAIN}/erigon"
-    },
-    {
-        "id": "0022",
-        "url": "https://${DOMAIN}/erigon"
-    },
-    {
-        "id": "0023",
-        "url": "https://${DOMAIN}/ropsten"
-    },
-    {
-        "id": "0025",
-        "url": "https://${DOMAIN}/rinkeby"
-    },
-    {
-        "id": "0026",
-        "url": "https://${DOMAIN}/goerli"
-    },
-    {
-        "id": "0027",
-        "url": "https://${DOMAIN}/xdai"
-    },
-    {
-        "id": "0028",
-        "url": "https://${DOMAIN}/erigon"
-    },
-    {
-        "id": "0040",
-        "url": "https://${DOMAIN}/harmony"
-    }
-]
\ No newline at end of file
diff --git a/chains/chains_testnet.json b/chains/chains_testnet.json
deleted file mode 100644
index 6d1546f8..00000000
--- a/chains/chains_testnet.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-    {
-        "id": "0020",
-        "url": "https://${DOMAIN}/goerli"
-    },
-    {
-        "id": "0022",
-        "url": "https://${DOMAIN}/rinkeby"
-    },
-    {
-        "id": "0023",
-        "url": "https://${DOMAIN}/ropsten"
-    },
-    {
-        "id": "0002",
-        "url": "https://${DOMAIN}/pokttest"
-    }
-]
\ No newline at end of file
diff --git a/pocket-frontend.yml b/pocket-frontend.yml
index a1135079..2b62d583 100644
--- a/pocket-frontend.yml
+++ b/pocket-frontend.yml
@@ -47,8 +47,8 @@ services:
       - "prometheus-scrape.job_name=haproxy"
       - "prometheus-scrape.metrics_path=/metrics"
 
-  pocket:
-    image: poktnetwork/pocket-core:stagenet-latest
+  pocket:    
+    build: pokt
     ports:
       - "127.0.0.1:8081:8081"
       - "26657:26656"
@@ -57,17 +57,12 @@ services:
       - 26660
       - 8081
       - 8083
-    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_PASSPHRASE=$POCKET_CORE_PASSPHRASE
       - POCKET_SNAPSHOT=$POCKET_SNAPSHOT
     volumes:
-      - ./bootstrap_skript/pokt_mainnet.sh:/home/app/.pocket/pokt_mainnet.sh
-      - ./chains/chains_mainnet.json:/home/app/.pocket/config/chains.json
-      - ./pokt/config.json:/home/app/.pocket/config/config.json
-      - pocket:/home/app/.pocket
+      - pocket:/home/app/.pocket/data
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
diff --git a/pokt/bootstrap.sh b/pokt/bootstrap.sh
index f326d5fe..2cdbfa4b 100755
--- a/pokt/bootstrap.sh
+++ b/pokt/bootstrap.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-if [ ! -f /home/app/.pocket/setupdone ]
+if [ ! -f /home/app/.pocket/data/setupdone ]
 then
   mkdir -p /home/app/.pocket/data
   echo "wget -q -O - '$POCKET_SNAPSHOT' | tar -xv -C /home/app/.pocket/data/"
   wget -q -O - $POCKET_SNAPSHOT | tar -xv -C /home/app/.pocket/data/
-  touch /home/app/.pocket/setupdone
+  touch /home/app/.pocket/data/setupdone
 fi