diff --git a/.travis.yml b/.travis.yml index 7706fc3..6e1c3c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,13 +15,8 @@ script: "npm run test" after_success: - npm run coverage -notifications: - slack: - secure: OUK3/iI5CNePVCmOKjcrUiqCDHClew81paGXPo/E4KCYJYDLURZFzPmG70aRxEWJwilN0frmcKmdVqLWt1+yTR1DBjJQr0MT2aOmt/STUb9sRmVs49kHpwh9uAzmAKNp71YW+vkunVv9yfys+N+F8I3ky5DSRtRGA0tiqC9TQo7wM5c/LvZqVloPwhbx0435OUg6hNQJYIJ1bJi8gR33kRq9rH6QlHIPcrzhDugQhIweDZxevHIXNrAtA2alrWC0DMu5CSHWkDrNH9iJ5b7PMl9uA6/TJdeM4lt3NaTBp9oNTr+gORSx9OXatAudqdKwZ6GSj8Gc3CxWpNSgrV7SZ7Z4VCiuYsZB3sMZE+qsLiFqR65MvvSWZrdljQ9hvoAr435JTdXUJjgVenDM++MUZ2R1l2X9MT7rJ6SKJo+ZH4pHQ+rIYzQUv4dO4Ym+lVXaxGC9+yykebctq20e4uQnbX368LpWU+ReRo7AEzz050hKlpl81gEfL9/3vJSHXZsDU2id0f0U/Ce409xtjLf7oOQcs5cDxD77iYJeGvwcmDKgQBZQnzyYQIamozZOdTAeWV5HyIGgdmyn5LBOMaNhqL9ZSCEwj50dsqehqKEafmDtr+scNs+R1x80RrQSu/COZg/Pjo35SFjmTahPWqo2xeNDLUNlGxS1ANBBy6LYZnc= - deploy: provider: script skip_cleanup: true script: - - npx semantic-release - + - ./deploy-production.sh || npx semantic-release diff --git a/deploy-production.sh b/deploy-production.sh new file mode 100755 index 0000000..52be2fc --- /dev/null +++ b/deploy-production.sh @@ -0,0 +1,14 @@ +# Triggers a webhook to update the staging server at staging.fullstack.cash. + +#!/bin/bash +#echo $DEPLOY_SECRET + +echo "Deploy to production...." + +export DATA="{\"ref\":\"$DEPLOY_SECRET\"}" + +#echo $DATA + +curl -X POST http://fullstack.cash:9000/hooks/bch-api-mainnet -H "Content-Type: application/json" -d $DATA + +echo "...Finished deploying to production." diff --git a/docker/mainnet/start-local-mainnet.sh b/docker/mainnet/start-local-mainnet.sh index 6573614..6ceae1e 100755 --- a/docker/mainnet/start-local-mainnet.sh +++ b/docker/mainnet/start-local-mainnet.sh @@ -4,8 +4,6 @@ export RPC_BASEURL=http://172.17.0.1:8332/ export RPC_USERNAME=bitcoin export RPC_PASSWORD=password -export ZEROMQ_PORT=28332 -export ZEROMQ_URL=172.17.0.1 export NETWORK=mainnet # SLPDB @@ -17,4 +15,6 @@ export BLOCKBOOK_URL=https://172.17.0.1:9131/ # Allow node.js to make network calls to https using self-signed certificate. export NODE_TLS_REJECT_UNAUTHORIZED=0 +export JWT_AUTH_SERVER=http://localhost:5001/ + npm start diff --git a/src/routes/v3/full-node/blockchain.js b/src/routes/v3/full-node/blockchain.js index 9086629..6056ce7 100644 --- a/src/routes/v3/full-node/blockchain.js +++ b/src/routes/v3/full-node/blockchain.js @@ -595,7 +595,7 @@ async function getMempoolEntryBulk(req, res, next) { * against the 25 ancestor chain-limit. * * @apiExample Example usage: - * curl -X GET "https://mainnet.bchjs.cash/v3/blockchain/getMempoolEntry/fe28050b93faea61fa88c4c630f0e1f0a1c24d0082dd0e10d369e13212128f33" -H "accept: application/json" + * curl -X GET "https://mainnet.bchjs.cash/v3/blockchain/getMempoolAncestors/fe28050b93faea61fa88c4c630f0e1f0a1c24d0082dd0e10d369e13212128f33" -H "accept: application/json" * */ async function getMempoolAncestorsSingle(req, res, next) {