mirror of
https://github.com/Reckless-Satoshi/robosats.git
synced 2024-08-17 07:40:38 +03:00
Fix taker bond is not return on maker cancel. Update all libs. Add extra hosts.
This commit is contained in:
parent
04e097536e
commit
a9a344fddf
@ -18,6 +18,7 @@ MARKET_PRICE_APIS = https://blockchain.info/ticker, https://api.yadio.io/exrates
|
||||
|
||||
# Host e.g. robosats.com
|
||||
HOST_NAME = ''
|
||||
HOST_NAME2 = ''
|
||||
LOCAL_ALIAS = 'e.g:my_garbage_server'
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
|
@ -1,10 +1,12 @@
|
||||
FROM python:3.9
|
||||
FROM python:3.10.2-bullseye
|
||||
|
||||
RUN mkdir -p /usr/src/robosats
|
||||
|
||||
# specifying the working dir inside the container
|
||||
WORKDIR /usr/src/robosats
|
||||
|
||||
RUN python -m pip install --upgrade pip
|
||||
|
||||
COPY requirements.txt ./
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
@ -30,4 +32,4 @@ RUN sed -i 's/^import .*_pb2 as/from . \0/' api/lightning/invoices_pb2_grpc.py
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
|
||||
CMD ["python3", "manage.py", "runserver", "0.0.0.0:8000"]
|
||||
|
@ -439,6 +439,7 @@ class Logics():
|
||||
elif order.status in [Order.Status.PUB, Order.Status.TAK, Order.Status.WF2, Order.Status.WFE] and order.maker == user:
|
||||
#Settle the maker bond (Maker loses the bond for canceling an ongoing trade)
|
||||
valid = cls.settle_bond(order.maker_bond)
|
||||
cls.return_bond(order.taker_bond) # returns taker bond
|
||||
if valid:
|
||||
order.status = Order.Status.UCA
|
||||
order.save()
|
||||
@ -861,4 +862,4 @@ class Logics():
|
||||
def rate_platform(cls, user, rating):
|
||||
user.profile.platform_rating = rating
|
||||
user.profile.save()
|
||||
return True, None
|
||||
return True, None
|
||||
|
@ -13,11 +13,11 @@ celery==5.2.3
|
||||
googleapis-common-protos==1.53.0
|
||||
grpcio==1.43.0
|
||||
grpcio-tools==1.43.0
|
||||
numpy==1.22.0
|
||||
numpy==1.22.2
|
||||
Pillow==7.0.0
|
||||
python-decouple==3.5
|
||||
requests==2.22.0
|
||||
ring==0.9.1
|
||||
robohash==1.1
|
||||
scipy==1.7.3
|
||||
scipy==1.8.0
|
||||
gunicorn==20.1.0
|
||||
|
@ -36,7 +36,7 @@ if os.environ.get('DEVELOPMENT'):
|
||||
|
||||
AVATAR_ROOT = STATIC_ROOT + 'assets/avatars/'
|
||||
|
||||
ALLOWED_HOSTS = [config('HOST_NAME'),config('LOCAL_ALIAS'),'127.0.0.1']
|
||||
ALLOWED_HOSTS = [config('HOST_NAME'),config('HOST_NAME2'),config('LOCAL_ALIAS'),'127.0.0.1']
|
||||
|
||||
# Application definition
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user