lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-8.1' into release-8.5

Browse source
This commit is contained in:
Taranto 2023-06-15 20:40:22 +01:00
commit 78be4a47b6
21 changed files with 58 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/blockchain/common.js
View file

@ -34,12 +34,12 @@ const BINARIES = {
dir: 'bitcoin-23.1/bin'
},
ETH: {
url: 'https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.11.6-ea9e62ca.tar.gz',
dir: 'geth-linux-amd64-1.11.6-ea9e62ca'
url: 'https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.12.0-e501b3b0.tar.gz',
dir: 'geth-linux-amd64-1.12.0-e501b3b0'
},
ZEC: {
url: 'https://z.cash/downloads/zcash-5.5.0-linux64-debian-bullseye.tar.gz',
dir: 'zcash-5.5.0/bin'
url: 'https://z.cash/downloads/zcash-5.5.1-linux64-debian-bullseye.tar.gz',
dir: 'zcash-5.5.1/bin'
},
DASH: {
url: 'https://github.com/dashpay/dash/releases/download/v18.1.0/dashcore-18.1.0-x86_64-linux-gnu.tar.gz',
@ -52,8 +52,8 @@ const BINARIES = {
dir: 'litecoin-0.21.2.2/bin'
},
BCH: {
url: 'https://github.com/bitcoin-cash-node/bitcoin-cash-node/releases/download/v26.0.0/bitcoin-cash-node-26.0.0-x86_64-linux-gnu.tar.gz',
dir: 'bitcoin-cash-node-26.0.0/bin',
url: 'https://github.com/bitcoin-cash-node/bitcoin-cash-node/releases/download/v26.1.0/bitcoin-cash-node-26.1.0-x86_64-linux-gnu.tar.gz',
dir: 'bitcoin-cash-node-26.1.0/bin',
files: [['bitcoind', 'bitcoincashd'], ['bitcoin-cli', 'bitcoincash-cli']]
},
XMR: {

2
lib/blockchain/install.js
View file

@ -210,7 +210,7 @@ function isDisabled (crypto) {
case 'ETH':
return 'Use admin\'s Infura plugin'
case 'ZEC':
return isInstalled(crypto) && 'Installed' || isInstalled(_.find(it => it.code === 'monero', cryptos)) && 'Insufficient resources. Contact support.'
return 'Use admin\'s BitGo plugin'
case 'XMR':
return isInstalled(crypto) && 'Installed' || isInstalled(_.find(it => it.code === 'zcash', cryptos)) && 'Insufficient resources. Contact support.'
default: