Mirror/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-01-31 10:31:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stabilize-runtime' of github.com:Reckless-Satoshi/robosats into stabilize-runtime

Browse Source
This commit is contained in:
Reckless_Satoshi 2022-02-13 09:55:52 -08:00
commit d77b8404c6
No known key found for this signature in database
GPG Key ID: 9C4585B561315571
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env-sample
View File

@ -18,6 +18,8 @@ MARKET_PRICE_APIS = https://blockchain.info/ticker, https://api.yadio.io/exrates
# Host e.g. robosats.com # Host e.g. robosats.com
HOST_NAME = '' HOST_NAME = ''
HOST_NAME2 = ''
LOCAL_ALIAS = 'e.g:my_garbage_server'
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-6^&6uw$b5^en%(cu2kc7_o)(mgpazx#j_znwlym0vxfamn2uo-' SECRET_KEY = 'django-insecure-6^&6uw$b5^en%(cu2kc7_o)(mgpazx#j_znwlym0vxfamn2uo-'

4
Dockerfile
View File

@ -1,10 +1,12 @@
FROM python:3.9 FROM python:3.10.2-bullseye
RUN mkdir -p /usr/src/robosats RUN mkdir -p /usr/src/robosats
# specifying the working dir inside the container # specifying the working dir inside the container
WORKDIR /usr/src/robosats WORKDIR /usr/src/robosats
RUN python -m pip install --upgrade pip
COPY requirements.txt ./ COPY requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt

1
api/logics.py
View File

@ -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: 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) #Settle the maker bond (Maker loses the bond for canceling an ongoing trade)
valid = cls.settle_bond(order.maker_bond) valid = cls.settle_bond(order.maker_bond)
cls.return_bond(order.taker_bond) # returns taker bond
if valid: if valid:
order.status = Order.Status.UCA order.status = Order.Status.UCA
order.save() order.save()

4
requirements.txt
View File

@ -13,11 +13,11 @@ celery==5.2.3
googleapis-common-protos==1.53.0 googleapis-common-protos==1.53.0
grpcio==1.43.0 grpcio==1.43.0
grpcio-tools==1.43.0 grpcio-tools==1.43.0
numpy==1.22.0 numpy==1.22.2
Pillow==7.0.0 Pillow==7.0.0
python-decouple==3.5 python-decouple==3.5
requests==2.22.0 requests==2.22.0
ring==0.9.1 ring==0.9.1
robohash==1.1 robohash==1.1
scipy==1.7.3 scipy==1.8.0
gunicorn==20.1.0 gunicorn==20.1.0

2
robosats/settings.py
View File

@ -36,7 +36,7 @@ if os.environ.get('DEVELOPMENT'):
AVATAR_ROOT = STATIC_ROOT + 'assets/avatars/' AVATAR_ROOT = STATIC_ROOT + 'assets/avatars/'
ALLOWED_HOSTS = [config('HOST_NAME'),'127.0.0.1'] ALLOWED_HOSTS = [config('HOST_NAME'),config('HOST_NAME2'),config('LOCAL_ALIAS'),'127.0.0.1']
# Application definition # Application definition