mirrors/mempool
1
0
Fork 0
mirror of https://github.com/mempool/mempool.git synced 2024-12-28 01:04:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into fix_electrum_tls_enabled_var

Browse Source
This commit is contained in:
Felipe Knorr Kuhn 2022-05-12 10:21:21 -07:00 committed by GitHub
commit 9f4ef70682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/api/fiat-conversion.ts
View File

@ -43,7 +43,7 @@ class FiatConversion {
agentOptions: { agentOptions: {
keepAlive: true, keepAlive: true,
}, },
host: config.SOCKS5PROXY.HOST, hostname: config.SOCKS5PROXY.HOST,
port: config.SOCKS5PROXY.PORT port: config.SOCKS5PROXY.PORT
}; };

2
backend/src/sync-assets.ts
View File

@ -29,7 +29,7 @@ class SyncAssets {
agentOptions: { agentOptions: {
keepAlive: true, keepAlive: true,
}, },
host: config.SOCKS5PROXY.HOST, hostname: config.SOCKS5PROXY.HOST,
port: config.SOCKS5PROXY.PORT port: config.SOCKS5PROXY.PORT
}; };

4
production/bitcoin.minfee.conf
View File

@ -2,10 +2,8 @@ datadir=/minfee
server=1 server=1
txindex=0 txindex=0
listen=1 listen=1
discover=0
daemon=1 daemon=1
prune=1337 prune=1337
maxconnections=1
rpcallowip=127.0.0.1 rpcallowip=127.0.0.1
rpcuser=__BITCOIN_RPC_USER__ rpcuser=__BITCOIN_RPC_USER__
rpcpassword=__BITCOIN_RPC_PASS__ rpcpassword=__BITCOIN_RPC_PASS__
@ -15,4 +13,4 @@ rpcpassword=__BITCOIN_RPC_PASS__
bind=127.0.0.1:8303 bind=127.0.0.1:8303
rpcbind=127.0.0.1:8302 rpcbind=127.0.0.1:8302
rpcport=8302 rpcport=8302
connect=127.0.0.1:8333 addnode=127.0.0.1:8333