Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-03 09:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts: Remove save state delay.

Browse source
This commit is contained in:
tecnovert 2023-02-21 12:39:45 +02:00
parent 0a2133f43f
commit 114e8e4d2b
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/createoffers.py
View file

@ -177,6 +177,13 @@ def readConfig(args, known_coins):
return config return config
def write_state(statefile, script_state):
if os.path.exists(statefile):
shutil.copyfile(statefile, statefile + '.last')
with open(statefile, 'w') as fp:
json.dump(script_state, fp, indent=4)
def main(): def main():
parser = argparse.ArgumentParser(description=__doc__) parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('-v', '--version', action='version', parser.add_argument('-v', '--version', action='version',
@ -225,7 +232,6 @@ def main():
else: else:
read_json_api_wallet = read_json_api read_json_api_wallet = read_json_api
num_state_changes: int = 0
try: try:
sent_offers = read_json_api('sentoffers', {'active': 'active'}) sent_offers = read_json_api('sentoffers', {'active': 'active'})
@ -303,7 +309,6 @@ def main():
print('offer data {}'.format(offer_data)) print('offer data {}'.format(offer_data))
new_offer = read_json_api('offers/new', offer_data) new_offer = read_json_api('offers/new', offer_data)
print('New offer: {}'.format(new_offer['offer_id'])) print('New offer: {}'.format(new_offer['offer_id']))
num_state_changes += 1
if 'offers' not in script_state: if 'offers' not in script_state:
script_state['offers'] = {} script_state['offers'] = {}
template_name = offer_template['name'] template_name = offer_template['name']
@ -317,6 +322,7 @@ def main():
else: else:
time_between_offers = min_seconds_between_offers time_between_offers = min_seconds_between_offers
script_state['delay_next_offer_before'] = int(time.time()) + time_between_offers script_state['delay_next_offer_before'] = int(time.time()) + time_between_offers
write_state(args.statefile, script_state)
if args.debug and len(bid_templates) > 0: if args.debug and len(bid_templates) > 0:
print('Processing {} bid template{}'.format(config['num_enabled_bids'], 's' if config['num_enabled_bids'] != 1 else '')) print('Processing {} bid template{}'.format(config['num_enabled_bids'], 's' if config['num_enabled_bids'] != 1 else ''))
@ -347,12 +353,12 @@ def main():
if bid_state in ('Completed', 'Timed-out', 'Abandoned', 'Error', 'Rejected'): if bid_state in ('Completed', 'Timed-out', 'Abandoned', 'Error', 'Rejected'):
print(f'Marking bid inactive {previous_bid_id}, state {bid_state}') print(f'Marking bid inactive {previous_bid_id}, state {bid_state}')
previous_bid['active'] = False previous_bid['active'] = False
num_state_changes += 1 write_state(args.statefile, script_state)
continue continue
if bid_state in ('Sent', 'Received') and previous_bid_info['expired_at'] < int(time.time()): if bid_state in ('Sent', 'Received') and previous_bid_info['expired_at'] < int(time.time()):
print(f'Marking bid inactive {previous_bid_id}, expired') print(f'Marking bid inactive {previous_bid_id}, expired')
previous_bid['active'] = False previous_bid['active'] = False
num_state_changes += 1 write_state(args.statefile, script_state)
continue continue
bids_in_progress += 1 bids_in_progress += 1
@ -495,7 +501,6 @@ def main():
print('New bid: {} on offer {}'.format(new_bid['bid_id'], offer['offer_id'])) print('New bid: {} on offer {}'.format(new_bid['bid_id'], offer['offer_id']))
bid_id = new_bid['bid_id'] bid_id = new_bid['bid_id']
num_state_changes += 1
script_state['bids'][template_name].append({'bid_id': bid_id, 'time': int(time.time()), 'active': True}) script_state['bids'][template_name].append({'bid_id': bid_id, 'time': int(time.time()), 'active': True})
max_seconds_between_bids = config['max_seconds_between_bids'] max_seconds_between_bids = config['max_seconds_between_bids']
@ -505,6 +510,7 @@ def main():
else: else:
time_between_bids = min_seconds_between_bids time_between_bids = min_seconds_between_bids
script_state['delay_next_bid_before'] = int(time.time()) + time_between_bids script_state['delay_next_bid_before'] = int(time.time()) + time_between_bids
write_state(args.statefile, script_state)
break # Create max one bid per iteration break # Create max one bid per iteration
if args.debug and len(stealthex_swaps) > 0: if args.debug and len(stealthex_swaps) > 0:
@ -576,12 +582,6 @@ def main():
raise ValueError('TODO') raise ValueError('TODO')
if num_state_changes > 0:
if os.path.exists(args.statefile):
shutil.copyfile(args.statefile, args.statefile + '.last')
with open(args.statefile, 'w') as fp:
json.dump(script_state, fp, indent=4)
except Exception as e: except Exception as e:
print(f'Error: {e}.') print(f'Error: {e}.')