Fix/db fail batch insert

.gitignore

@@ -1,7 +1,6 @@
 coverage/
 logs/
 node_modules/
-data
 .env
 .env.aws
 .docker.config
@@ -13,8 +12,8 @@ error.log
 bcn.config.json
 zmqlog.log
 packages/**/node_modules/
-packages/**/data/blockchain-data/
-packages/**/data/db-data/
+packages/**/chain-setup/**/blockchain-data
+packages/**/chain-setup/**/db-data
 # Logs
 logs
 *.log

packages/node/docker-compose.yml

@@ -14,7 +14,7 @@ services:
       - POSTGRES_PORT=${POSTGRES_PORT}
       - POSTGRES_HOST=${POSTGRES_HOST}
     volumes:
-      - ./data/db-data:/var/lib/postgresql/data
+      - ./chain-setup/${BCN_CHAIN}/${BCN_NETWORK}/db-data:/var/lib/postgresql/data
       - ./db/db_schema.sql:/docker-entrypoint-initdb.d/db_schema.sql
   node:
     image: ${BITCOIN_IMAGE}
@@ -25,7 +25,7 @@ services:
       - ${BITCOIN_RPC_PORT}:${BITCOIN_RPC_PORT}
       - ${BCN_ZMQ_PORT}:${BCN_ZMQ_PORT}
     volumes:
-      - ./data/blockchain-data:${BITCOIN_DATA_DIR}
+      - ./chain-setup/${BCN_CHAIN}/${BCN_NETWORK}/blockchain-data:${BITCOIN_DATA_DIR}
       - ./${BITCOIN_CONF_FILE}:${BITCOIN_DATA_DIR}/${BITCOIN_CONF_FILE}
   bcn:
     image: bitcoin-computer-node

packages/node/package.json

@@ -38,7 +38,7 @@
     "start": "node dist/bcn.es.mjs",
     "sync": "node dist/bcn.sync.es.mjs",
     "setup": "./scripts/setup.py",
-    "reset": "yes | ./scripts/reset.sh  ; rm -rf data",
+    "reset": "yes | ./scripts/reset.sh",
     "test": "mocha --config .mocharc.json ",
     "test-and-show": "npm run test 2>&1 | tee node-test.log && open node-test.log",
     "test-unit": "mocha --config .mocharc.json ",

packages/node/scripts/reset.sh

@@ -26,22 +26,19 @@ EOF
 # docker ps -a --format="{{.ID}}" | xargs docker update --restart=no | xargs docker stop
 docker stop $(docker ps -a -q) & docker update --restart=no $(docker ps -a -q) & systemctl restart docker
 
-# Delete all volumes:
-docker volume rm $(docker volume ls -q)
-
 # Delete all containers:
 docker rm -f $(docker ps -a -q)
 
-# delete all dangling containers, images, volumes, networks
+# delete all dangling containers, images, networks
 docker system prune
 docker network prune
-docker volume prune
 
 # uncomment to delete all stopped containers and unused images
 # docker system prune -a
 
 # delete data files
-rm -rf ./data/
+rm -rf ./chain-setup/**/**/db-data/
+
 # delete the logs
 yes | rm -r logs
 rm error.log