seasharp
/
basicswap_miserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid monkeypatching PySocks

Browse Source
2024-05-20_merge
tecnovert 2 years ago
parent f33629f2a5
commit 724e7f0ffc
No known key found for this signature in database
GPG Key ID: 8ED6D8750C4E3F93
3 changed files with 145 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      basicswap/base.py
  2. 274
      basicswap/basicswap.py
  3. 10
      basicswap/explorers.py

11
basicswap/base.py
Unescape View File

@ -15,6 +15,8 @@ import threading
import traceback
import subprocess
from sockshandler import SocksiPyHandler
import basicswap.config as cfg
from .rpc import (
@ -172,6 +174,15 @@ class BaseApp:
socket.getaddrinfo = self.default_socket_getaddrinfo
socket.setdefaulttimeout(self.default_socket_timeout)
def readURL(self, url: str, timeout: int = 120, headers=None) -> bytes:
open_handler = None
if self.use_tor_proxy:
open_handler = SocksiPyHandler(socks.PROXY_TYPE_SOCKS5, self.tor_proxy_host, self.tor_proxy_port)
opener = urllib.request.build_opener(open_handler) if self.use_tor_proxy else urllib.request.build_opener()
opener.addheaders = [('User-agent', 'Mozilla/5.0')]
request = urllib.request.Request(url, headers=headers)
return opener.open(request, timeout=timeout).read()
def logException(self, message) -> None:
self.log.error(message)
if self.debug:

274
basicswap/basicswap.py
Unescape View File

@ -16,7 +16,6 @@ import random
import shutil
import string
import struct
import urllib.request
import hashlib
import secrets
import datetime as dt
@ -6397,151 +6396,142 @@ class BasicSwap(BaseApp):
ticker_from = ci_from.chainparams()['ticker']
ticker_to = ci_to.chainparams()['ticker']
headers = {'Connection': 'close'}
try:
self.setConnectionParameters()
rv = {}
rv = {}
if rate_sources.get('coingecko.com', True):
try:
url = 'https://api.coingecko.com/api/v3/simple/price?ids={},{}&vs_currencies=usd,btc'.format(exchange_name_from, exchange_name_to)
if rate_sources.get('coingecko.com', True):
try:
url = 'https://api.coingecko.com/api/v3/simple/price?ids={},{}&vs_currencies=usd,btc'.format(exchange_name_from, exchange_name_to)
self.log.debug(f'lookupRates: {url}')
start = time.time()
js = json.loads(self.readURL(url, timeout=10, headers=headers))
js['time_taken'] = time.time() - start
rate = float(js[exchange_name_from]['usd']) / float(js[exchange_name_to]['usd'])
js['rate_inferred'] = ci_to.format_amount(rate, conv_int=True, r=1)
rv['coingecko'] = js
except Exception as e:
rv['coingecko_error'] = str(e)
if self.debug:
self.log.error(traceback.format_exc())
if exchange_name_from != name_from:
js[name_from] = js[exchange_name_from]
js.pop(exchange_name_from)
if exchange_name_to != name_to:
js[name_to] = js[exchange_name_to]
js.pop(exchange_name_to)
if rate_sources.get('bittrex.com', True):
bittrex_api_v3 = 'https://api.bittrex.com/v3'
try:
exchange_ticker_to = ci_to.getExchangeTicker('bittrex.com')
exchange_ticker_from = ci_from.getExchangeTicker('bittrex.com')
USDT_coins = (Coins.FIRO,)
# TODO: How to compare USDT pairs with BTC pairs
if ci_from.coin_type() in USDT_coins:
raise ValueError('No BTC pair')
if ci_to.coin_type() in USDT_coins:
raise ValueError('No BTC pair')
if ci_from.coin_type() == Coins.BTC:
pair = f'{exchange_ticker_to}-{exchange_ticker_from}'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
req = urllib.request.Request(url, headers=headers)
js = json.loads(urllib.request.urlopen(req, timeout=10).read())
js = json.loads(self.readURL(url, timeout=10, headers=headers))
js['time_taken'] = time.time() - start
rate = float(js[exchange_name_from]['usd']) / float(js[exchange_name_to]['usd'])
js['rate_inferred'] = ci_to.format_amount(rate, conv_int=True, r=1)
rv['coingecko'] = js
except Exception as e:
rv['coingecko_error'] = str(e)
if self.debug:
self.log.error(traceback.format_exc())
if exchange_name_from != name_from:
js[name_from] = js[exchange_name_from]
js.pop(exchange_name_from)
if exchange_name_to != name_to:
js[name_to] = js[exchange_name_to]
js.pop(exchange_name_to)
if rate_sources.get('bittrex.com', True):
bittrex_api_v3 = 'https://api.bittrex.com/v3'
try:
exchange_ticker_to = ci_to.getExchangeTicker('bittrex.com')
exchange_ticker_from = ci_from.getExchangeTicker('bittrex.com')
USDT_coins = (Coins.FIRO,)
# TODO: How to compare USDT pairs with BTC pairs
if ci_from.coin_type() in USDT_coins:
raise ValueError('No BTC pair')
if ci_to.coin_type() in USDT_coins:
raise ValueError('No BTC pair')
if ci_from.coin_type() == Coins.BTC:
pair = f'{exchange_ticker_to}-{exchange_ticker_from}'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
req = urllib.request.Request(url, headers=headers)
js = json.loads(urllib.request.urlopen(req, timeout=10).read())
js['time_taken'] = time.time() - start
js['pair'] = pair
try:
rate_inverted = ci_from.make_int(1.0 / float(js['lastTradeRate']), r=1)
js['rate_inferred'] = ci_to.format_amount(rate_inverted)
except Exception as e:
self.log.warning('lookupRates error: %s', str(e))
js['rate_inferred'] = 'error'
js['from_btc'] = 1.0
js['to_btc'] = js['lastTradeRate']
rv['bittrex'] = js
elif ci_to.coin_type() == Coins.BTC:
pair = f'{exchange_ticker_from}-{exchange_ticker_to}'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
req = urllib.request.Request(url, headers=headers)
js = json.loads(urllib.request.urlopen(req, timeout=10).read())
js['time_taken'] = time.time() - start
js['pair'] = pair
js['rate_last'] = js['lastTradeRate']
js['from_btc'] = js['lastTradeRate']
js['to_btc'] = 1.0
rv['bittrex'] = js
else:
pair = f'{exchange_ticker_from}-BTC'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
req = urllib.request.Request(url, headers=headers)
js_from = json.loads(urllib.request.urlopen(req, timeout=10).read())
js_from['time_taken'] = time.time() - start
js_from['pair'] = pair
pair = f'{exchange_ticker_to}-BTC'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
req = urllib.request.Request(url, headers=headers)
js_to = json.loads(urllib.request.urlopen(req, timeout=10).read())
js_to['time_taken'] = time.time() - start
js_to['pair'] = pair
js['pair'] = pair
try:
rate_inverted = ci_from.make_int(1.0 / float(js['lastTradeRate']), r=1)
js['rate_inferred'] = ci_to.format_amount(rate_inverted)
except Exception as e:
self.log.warning('lookupRates error: %s', str(e))
js['rate_inferred'] = 'error'
js['from_btc'] = 1.0
js['to_btc'] = js['lastTradeRate']
rv['bittrex'] = js
elif ci_to.coin_type() == Coins.BTC:
pair = f'{exchange_ticker_from}-{exchange_ticker_to}'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
js = json.loads(self.readURL(url, timeout=10, headers=headers))
js['time_taken'] = time.time() - start
js['pair'] = pair
js['rate_last'] = js['lastTradeRate']
js['from_btc'] = js['lastTradeRate']
js['to_btc'] = 1.0
rv['bittrex'] = js
else:
pair = f'{exchange_ticker_from}-BTC'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
js_from = json.loads(self.readURL(url, timeout=10, headers=headers))
js_from['time_taken'] = time.time() - start
js_from['pair'] = pair
try:
rate_inferred = float(js_from['lastTradeRate']) / float(js_to['lastTradeRate'])
rate_inferred = ci_to.format_amount(rate, conv_int=True, r=1)
except Exception as e:
rate_inferred = 'error'
rv['bittrex'] = {
'from': js_from,
'to': js_to,
'rate_inferred': rate_inferred,
'from_btc': js_from['lastTradeRate'],
'to_btc': js_to['lastTradeRate']
}
except Exception as e:
rv['bittrex_error'] = str(e)
if self.debug:
self.log.error(traceback.format_exc())
pair = f'{exchange_ticker_to}-BTC'
url = f'{bittrex_api_v3}/markets/{pair}/ticker'
self.log.debug(f'lookupRates: {url}')
start = time.time()
js_to = json.loads(self.readURL(url, timeout=10, headers=headers))
js_to['time_taken'] = time.time() - start
js_to['pair'] = pair
if output_array:
def format_float(f):
return '{:.12f}'.format(f).rstrip('0').rstrip('.')
rv_array = []
if 'coingecko_error' in rv:
rv_array.append(('coingecko.com', 'error', rv['coingecko_error']))
if 'coingecko' in rv:
js = rv['coingecko']
rv_array.append((
'coingecko.com',
ticker_from,
ticker_to,
format_float(float(js[name_from]['usd'])),
format_float(float(js[name_to]['usd'])),
format_float(float(js[name_from]['btc'])),
format_float(float(js[name_to]['btc'])),
format_float(float(js['rate_inferred'])),
))
if 'bittrex_error' in rv:
rv_array.append(('bittrex.com', 'error', rv['bittrex_error']))
if 'bittrex' in rv:
js = rv['bittrex']
rate = js['rate_last'] if 'rate_last' in js else js['rate_inferred']
rv_array.append((
'bittrex.com',
ticker_from,
ticker_to,
'',
'',
format_float(float(js['from_btc'])),
format_float(float(js['to_btc'])),
format_float(float(rate))
))
return rv_array
try:
rate_inferred = float(js_from['lastTradeRate']) / float(js_to['lastTradeRate'])
rate_inferred = ci_to.format_amount(rate, conv_int=True, r=1)
except Exception as e:
rate_inferred = 'error'
rv['bittrex'] = {
'from': js_from,
'to': js_to,
'rate_inferred': rate_inferred,
'from_btc': js_from['lastTradeRate'],
'to_btc': js_to['lastTradeRate']
}
except Exception as e:
rv['bittrex_error'] = str(e)
if self.debug:
self.log.error(traceback.format_exc())
if output_array:
def format_float(f):
return '{:.12f}'.format(f).rstrip('0').rstrip('.')
rv_array = []
if 'coingecko_error' in rv:
rv_array.append(('coingecko.com', 'error', rv['coingecko_error']))
if 'coingecko' in rv:
js = rv['coingecko']
rv_array.append((
'coingecko.com',
ticker_from,
ticker_to,
format_float(float(js[name_from]['usd'])),
format_float(float(js[name_to]['usd'])),
format_float(float(js[name_from]['btc'])),
format_float(float(js[name_to]['btc'])),
format_float(float(js['rate_inferred'])),
))
if 'bittrex_error' in rv:
rv_array.append(('bittrex.com', 'error', rv['bittrex_error']))
if 'bittrex' in rv:
js = rv['bittrex']
rate = js['rate_last'] if 'rate_last' in js else js['rate_inferred']
rv_array.append((
'bittrex.com',
ticker_from,
ticker_to,
'',
'',
format_float(float(js['from_btc'])),
format_float(float(js['to_btc'])),
format_float(float(rate))
))
return rv_array
return rv
finally:
self.popConnectionParameters()
return rv

10
basicswap/explorers.py
Unescape View File

@ -1,11 +1,10 @@
# -*- coding: utf-8 -*-
# Copyright (c) 2019-2022 tecnovert
# Copyright (c) 2019-2023 tecnovert
# Distributed under the MIT software license, see the accompanying
# file LICENSE or http://www.opensource.org/licenses/mit-license.php.
import json
import urllib.request
class Explorer():
@ -17,12 +16,7 @@ class Explorer():
def readURL(self, url):
self.log.debug('Explorer url: {}'.format(url))
try:
self.swapclient.setConnectionParameters()
req = urllib.request.Request(url)
return urllib.request.urlopen(req).read()
finally:
self.swapclient.popConnectionParameters()
return self.swapclient.readURL(url)
class ExplorerInsight(Explorer):

Write Preview
Loading…
Cancel
Save