midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-06 02:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Allow selecting automation strategy when creating offer.

Browse Source 
Add alternate pgp key urls.
This commit is contained in:
tecnovert
2022-06-01 00:38:50 +02:00
parent 08c10bc69e
commit 6153b76ec0
10 changed files with 525 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
basicswap/basicswap.py
View File

@@ -1083,13 +1083,16 @@ class BasicSwap(BaseApp):
xmr_offer.offer_id = offer_id
session.add(xmr_offer)
if auto_accept_bids:
automation_id = extra_options.get('automation_id', -1)
if automation_id == -1 and auto_accept_bids:
# Use default strategy
automation_id = 1
if automation_id != -1:
auto_link = AutomationLink(
active_ind=1,
linked_type=TableTypes.OFFER,
linked_id=offer_id,
strategy_id=1,
strategy_id=automation_id,
created_at=offer_created_at,
repeat_limit=1,
repeat_count=0)
@@ -5470,6 +5473,10 @@ class BasicSwap(BaseApp):
query_str = 'SELECT strats.record_id, strats.label, strats.type_ind FROM automationstrategies AS strats'
query_str += ' WHERE strats.active_ind = 1 '
type_ind = filters.get('type_ind', None)
if type_ind is not None:
query_str += f' AND strats.type_ind = {type_ind} '
sort_dir = filters.get('sort_dir', 'DESC').upper()
sort_by = filters.get('sort_by', 'created_at')
query_str += f' ORDER BY strats.{sort_by} {sort_dir}'
@@ -5501,6 +5508,21 @@ class BasicSwap(BaseApp):
session.remove()
self.mxDB.release()
def getLinkedStrategy(self, linked_type, linked_id):
self.mxDB.acquire()
try:
rv = []
session = scoped_session(self.session_factory)
query_str = 'SELECT links.strategy_id, strats.label FROM automationlinks links' + \
' LEFT JOIN automationstrategies strats ON strats.record_id = links.strategy_id' + \
' WHERE links.linked_type = {} AND links.linked_id = x\'{}\' AND links.active_ind = 1'.format(int(linked_type), linked_id.hex())
q = session.execute(query_str).first()
return q
finally:
session.close()
session.remove()
self.mxDB.release()
def newSMSGAddress(self, use_type=AddressTypes.RECV_OFFER, addressnote=None, session=None):
now = int(time.time())
use_session = None