machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename PRICENODE to PRICE_DATA_SERVER

Browse Source
This commit is contained in:
Felipe Knorr Kuhn 2022-02-05 07:58:35 -08:00
parent ee7f8d8d18
commit 6b2900345a
No known key found for this signature in database
GPG Key ID: 79619B52BB097C1A
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -267,7 +267,7 @@ docker-compose overrides:
JSON: JSON:
``` ```
"PRICENODE": { "PRICE_DATA_SERVER": {
"TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices", "TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices",
"CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices" "CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices"
} }
@ -275,8 +275,8 @@ JSON:
docker-compose overrides: docker-compose overrides:
``` ```
PRICENODE_TOR_URL: "" PRICE_DATA_SERVER_TOR_URL: ""
PRICENODE_CLEARNET_URL: "" PRICE_DATA_SERVER_CLEARNET_URL: ""
``` ```
# Manual Installation # Manual Installation

2
backend/mempool-config.sample.json
View File

@ -69,7 +69,7 @@
"USERNAME": "", "USERNAME": "",
"PASSWORD": "" "PASSWORD": ""
}, },
"PRICENODE": { "PRICE_DATA_SERVER": {
"TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices", "TOR_URL": "http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices",
"CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices" "CLEARNET_URL": "https://price.bisq.wiz.biz/getAllMarketPrices"
} }

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

@ -20,9 +20,9 @@ class FiatConversion {
public startService() { public startService() {
logger.info('Starting currency rates service'); logger.info('Starting currency rates service');
if (config.SOCKS5PROXY.ENABLED) { if (config.SOCKS5PROXY.ENABLED) {
logger.info(`Currency rates service will be queried over the Tor network using ${config.PRICENODE.TOR_URL}`); logger.info(`Currency rates service will be queried over the Tor network using ${config.PRICE_DATA_SERVER.TOR_URL}`);
} else { } else {
logger.info(`Currency rates service will be queried over clearnet using ${config.PRICENODE.CLEARNET_URL}`); logger.info(`Currency rates service will be queried over clearnet using ${config.PRICE_DATA_SERVER.CLEARNET_URL}`);
} }
setInterval(this.updateCurrency.bind(this), 1000 * config.MEMPOOL.PRICE_FEED_UPDATE_INTERVAL); setInterval(this.updateCurrency.bind(this), 1000 * config.MEMPOOL.PRICE_FEED_UPDATE_INTERVAL);
this.updateCurrency(); this.updateCurrency();
@ -53,11 +53,11 @@ class FiatConversion {
} }
const agent = new SocksProxyAgent(socksOptions); const agent = new SocksProxyAgent(socksOptions);
fiatConversionUrl = config.PRICENODE.TOR_URL; fiatConversionUrl = config.PRICE_DATA_SERVER.TOR_URL;
logger.info('Querying currency rates service...'); logger.info('Querying currency rates service...');
response = await axios.get(fiatConversionUrl, { httpAgent: agent, headers: headers, timeout: 30000 }); response = await axios.get(fiatConversionUrl, { httpAgent: agent, headers: headers, timeout: 30000 });
} else { } else {
fiatConversionUrl = config.PRICENODE.CLEARNET_URL; fiatConversionUrl = config.PRICE_DATA_SERVER.CLEARNET_URL;
logger.info('Querying currency rates service...'); logger.info('Querying currency rates service...');
response = await axios.get(fiatConversionUrl, { headers: headers, timeout: 10000 }); response = await axios.get(fiatConversionUrl, { headers: headers, timeout: 10000 });
} }

8
backend/src/config.ts
View File

@ -69,7 +69,7 @@ interface IConfig {
USERNAME: string; USERNAME: string;
PASSWORD: string; PASSWORD: string;
}; };
PRICENODE: { PRICE_DATA_SERVER: {
TOR_URL: string; TOR_URL: string;
CLEARNET_URL: string; CLEARNET_URL: string;
}; };
@ -146,7 +146,7 @@ const defaults: IConfig = {
'USERNAME': '', 'USERNAME': '',
'PASSWORD': '' 'PASSWORD': ''
}, },
"PRICENODE": { "PRICE_DATA_SERVER": {
'TOR_URL': 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices', 'TOR_URL': 'http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices',
'CLEARNET_URL': 'https://price.bisq.wiz.biz/getAllMarketPrices' 'CLEARNET_URL': 'https://price.bisq.wiz.biz/getAllMarketPrices'
} }
@ -163,7 +163,7 @@ class Config implements IConfig {
STATISTICS: IConfig['STATISTICS']; STATISTICS: IConfig['STATISTICS'];
BISQ: IConfig['BISQ']; BISQ: IConfig['BISQ'];
SOCKS5PROXY: IConfig['SOCKS5PROXY']; SOCKS5PROXY: IConfig['SOCKS5PROXY'];
PRICENODE: IConfig['PRICENODE']; PRICE_DATA_SERVER: IConfig['PRICE_DATA_SERVER'];
constructor() { constructor() {
const configs = this.merge(configFile, defaults); const configs = this.merge(configFile, defaults);
@ -177,7 +177,7 @@ class Config implements IConfig {
this.STATISTICS = configs.STATISTICS; this.STATISTICS = configs.STATISTICS;
this.BISQ = configs.BISQ; this.BISQ = configs.BISQ;
this.SOCKS5PROXY = configs.SOCKS5PROXY; this.SOCKS5PROXY = configs.SOCKS5PROXY;
this.PRICENODE = configs.PRICENODE; this.PRICE_DATA_SERVER = configs.PRICE_DATA_SERVER;
} }
merge = (...objects: object[]): IConfig => { merge = (...objects: object[]): IConfig => {

6
docker/backend/mempool-config.json
View File

@ -66,8 +66,8 @@
"USERNAME": "__SOCKS5PROXY_USERNAME__", "USERNAME": "__SOCKS5PROXY_USERNAME__",
"PASSWORD": "__SOCKS5PROXY_PASSWORD__" "PASSWORD": "__SOCKS5PROXY_PASSWORD__"
}, },
"PRICENODE": { "PRICE_DATA_SERVER": {
"TOR_URL": "__PRICENODE_TOR_URL__", "TOR_URL": "__PRICE_DATA_SERVER_TOR_URL__",
"CLEARNET_URL": "__PRICENODE_CLEARNET_URL__" "CLEARNET_URL": "__PRICE_DATA_SERVER_CLEARNET_URL__"
} }
} }

10
docker/backend/start.sh
View File

@ -68,9 +68,9 @@ __SOCKS5PROXY_PORT__=${SOCKS5PROXY_PORT:=9050}
__SOCKS5PROXY_USERNAME__=${SOCKS5PROXY_USERNAME:=""} __SOCKS5PROXY_USERNAME__=${SOCKS5PROXY_USERNAME:=""}
__SOCKS5PROXY_PASSWORD__=${SOCKS5PROXY_PASSWORD:=""} __SOCKS5PROXY_PASSWORD__=${SOCKS5PROXY_PASSWORD:=""}
# PRICENODE # PRICE_DATA_SERVER
__PRICENODE_TOR_URL__=${PRICENODE_TOR_URL:=http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices} __PRICE_DATA_SERVER_TOR_URL__=${PRICE_DATA_SERVER_TOR_URL:=http://wizpriceje6q5tdrxkyiazsgu7irquiqjy2dptezqhrtu7l2qelqktid.onion/getAllMarketPrices}
__PRICENODE_CLEARNET_URL__=${PRICENODE_CLEARNET_URL:=https://price.bisq.wiz.biz/getAllMarketPrices} __PRICE_DATA_SERVER_CLEARNET_URL__=${PRICE_DATA_SERVER_CLEARNET_URL:=https://price.bisq.wiz.biz/getAllMarketPrices}
mkdir -p "${__MEMPOOL_CACHE_DIR__}" mkdir -p "${__MEMPOOL_CACHE_DIR__}"
@ -132,7 +132,7 @@ sed -i "s/__SOCKS5PROXY_PORT__/${__SOCKS5PROXY_PORT__}/g" mempool-config.json
sed -i "s/__SOCKS5PROXY_USERNAME__/${__SOCKS5PROXY_USERNAME__}/g" mempool-config.json sed -i "s/__SOCKS5PROXY_USERNAME__/${__SOCKS5PROXY_USERNAME__}/g" mempool-config.json
sed -i "s/__SOCKS5PROXY_PASSWORD__/${__SOCKS5PROXY_PASSWORD__}/g" mempool-config.json sed -i "s/__SOCKS5PROXY_PASSWORD__/${__SOCKS5PROXY_PASSWORD__}/g" mempool-config.json
sed -i "s!__PRICENODE_TOR_URL__!${__PRICENODE_TOR_URL__}!g" mempool-config.json sed -i "s!__PRICE_DATA_SERVER_TOR_URL__!${__PRICE_DATA_SERVER_TOR_URL__}!g" mempool-config.json
sed -i "s!__PRICENODE_CLEARNET_URL__!${__PRICENODE_CLEARNET_URL__}!g" mempool-config.json sed -i "s!__PRICE_DATA_SERVER_CLEARNET_URL__!${__PRICE_DATA_SERVER_CLEARNET_URL__}!g" mempool-config.json
node /backend/dist/index.js node /backend/dist/index.js