diff options
| -rw-r--r-- | .env.sample | 19 | ||||
| -rw-r--r-- | db/index.js | 2 | ||||
| -rw-r--r-- | docker-compose.yml | 89 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | yarn.lock | 2 |
5 files changed, 25 insertions, 89 deletions
diff --git a/.env.sample b/.env.sample index 0ea792ba..c03c9c97 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,13 @@ -SECRET= -SENDGRID_TOKEN= -BLOCKCYPHER_TOKEN= -TWILIO_SID= -TWILIO_TOKEN= -TWILIO_NUMBER= +BITCOIN_PEER_PORT=18432 +BITCOIN_NODE_PORT=18433 +LIQUID_PEER_PORT=7044 +LIQUID_NODE_PORT=7045 +BITCOIN_ELECTRS_RPC_PORT=51401 +BITCOIN_ELECTRS_PORT=3002 +LIQUID_ELECTRS_RPC_PORT=60401 +LIQUID_ELECTRS_PORT=3012 +LIQUID_BLOCK_PORT=18606 +LIQUID_TX_PORT=18607 +LIQUID_ESPLORA_URL=http://localhost:5005 +LIQUID_ESPLORA_PORT=5005 +LIQUID_ELECTRS_URL=http://192.168.1.5:3012 diff --git a/db/index.js b/db/index.js index afdc08a5..86827bca 100644 --- a/db/index.js +++ b/db/index.js @@ -2,8 +2,6 @@ const Sequelize = require("sequelize"); const conf = config.dbOptions; const debug = require('debug')('test') -console.log(conf); - debug('DB connection: ', conf.host + ' : ' + conf.database + ' : ' + conf.user) db = new Sequelize(conf.database, conf.user, conf.password, { diff --git a/docker-compose.yml b/docker-compose.yml index 2f9570cb..e3b8e5a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,88 +6,10 @@ services: container_name: app image: asoltys/coinos-server restart: on-failure - environment: - HASURA_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}' - CLOUDFLARE_TOKEN: '${CLOUDFLARE_TOKEN}' - CLOUDFLARE_ZONE: '${CLOUDFLARE_ZONE}' - DOMAIN: '${DOMAIN}' - COINOS_URL: '${COINOS_URL}' - COINOS_TOKEN: '${COINOS_TOKEN}' - HASURA_URL: '${HASURA_URL}' - HASURA_JWT: '${HASURA_GRAPHQL_JWT_SECRET}' - LIQUID_ELECTRS_URL: '${LIQUID_ELECTRS_URL}' - HBP_URL: '${HBP_URL}' - IPFS_URL: '${IPFS_URL}' - IPFS_WEB_URL: '${IPFS_WEB_URL}' - SIGNING_SERVER_MNEMONIC: '${SIGNING_SERVER_MNEMONIC}' ports: - - '8091:8091' - - '8092:8092' + - '3119:3119' volumes: - ./config:/app/config - postgres: - container_name: postgres - image: postgres:12 - restart: always - environment: - POSTGRES_PASSWORD: postgrespassword - volumes: - - ${DATA_DIR}:/var/lib/postgresql/data - ports: - - '5433:5432' - hasura: - container_name: hasura - image: hasura/graphql-engine:v1.3.3 - ports: - - '8080:8080' - depends_on: - - postgres - restart: always - volumes: - - ./migrations:/hasura-migrations - - ./metadata:/hasura-metadata - environment: - HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:postgrespassword@postgres:5432/postgres - HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}' - HASURA_GRAPHQL_JWT_SECRET: '${HASURA_GRAPHQL_JWT_SECRET}' - HASURA_GRAPHQL_ENABLE_CONSOLE: "true" - HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "anonymous" - hbp: - container_name: hbp - image: nhost/hasura-backend-plus:latest - depends_on: - - hasura - ports: - - '3400:3000' - environment: - SERVER_URL: '${SERVER_URL}' - HASURA_ENDPOINT: '${HASURA_URL}/v1/graphql' - HASURA_GRAPHQL_ADMIN_SECRET: '${HASURA_GRAPHQL_ADMIN_SECRET}' - JWT_ALGORITHM: '${JWT_ALGORITHM}' - JWT_KEY: '${JWT_KEY}' - AUTO_MIGRATE: "true" - AUTO_ACTIVATE_NEW_USERS: "false" - STORAGE_ENABLE: "false" - MAX_REQUESTS: 10000 - LOST_PASSWORD_ENABLE: "true" - EMAILS_ENABLE: "true" - SMTP_HOST: '${SMTP_HOST}' - SMTP_PORT: '${SMTP_PORT}' - SMTP_USER: '${SMTP_USER}' - SMTP_PASS: '${SMTP_PASS}' - SMTP_SENDER: '${SMTP_SENDER}' - volumes: - - ./custom:/app/custom - ipfs: - container_name: ipfs - image: ipfs/go-ipfs - ports: - - 8081:8080 - - 4001:4001 - - 5001:5001 - volumes: - - ${IPFS_DATA}:/data/ipfs - - ${STORAGE_DIR}:/export bitcoin: image: asoltys/bitcoin:latest container_name: bitcoin @@ -108,6 +30,14 @@ services: volumes: - ./liquidregtest/liquid-config/:/config restart: unless-stopped + lightning: + image: asoltys/lightning:latest + container_name: lightning + environment: + - LIGHTNINGD_NETWORK: regtest + volumes: + - ./config/lightning:/root/.lightning + restart: unless-stopped electrs-liquid: image: vulpemventures/electrs-liquid:latest container_name: electrs-liquid @@ -149,3 +79,4 @@ services: ports: - ${LIQUID_ESPLORA_PORT}:5000 restart: unless-stopped + diff --git a/package.json b/package.json index f11adec6..c567380d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ }, "dependencies": { "@asoltys/bitcoin-core": "^3.0.6", - "@asoltys/liquidjs-lib": "*", + "@asoltys/liquidjs-lib": "^5.1.36", "@grpc/proto-loader": "^0.5.3", "async-mutex": "^0.2.4", "axios": "^0.21.1", @@ -18,7 +18,7 @@ resolved "https://registry.yarnpkg.com/@asoltys/blech32/-/blech32-1.0.4.tgz#10066fb173b9b426a465504d7418e3d7295d2d58" integrity sha512-yiiQNRSCqUMCDcFbPvG2QIyBNJsTbZvthq7inIF9RKVd6ei8yuMUXPdO85cwyANLeVvtdFEBpsKBzCETahSk0A== -"@asoltys/liquidjs-lib@*": +"@asoltys/liquidjs-lib@^5.1.36": version "5.1.36" resolved "https://registry.yarnpkg.com/@asoltys/liquidjs-lib/-/liquidjs-lib-5.1.36.tgz#6a78253429f884f46e0760240e13f48073a27dd0" integrity sha512-yMOwXGSEpYglgriIx+twG/Y0n4JGCcBPD9flWoldDplPD9beccdB85qOYI6Dx48lfsy0Ar2j5FfqqG8asMF6jA== |