cerc-io/stack-orchestrator
17
1
Fork 3
Code Issues 112 Pull Requests 19 Actions Packages Projects Releases 480 Wiki Activity

Update handling for deployment requests with auction
Some checks failed
Lint Checks / Run linter (pull_request) Successful in 32s
Details
Deploy Test / Run deploy test suite (pull_request) Successful in 4m51s
Details
K8s Deploy Test / Run deploy test suite on kind/k8s (pull_request) Successful in 7m29s
Details
Webapp Test / Run webapp test suite (pull_request) Failing after 2m16s
Details
K8s Deployment Control Test / Run deployment control suite on kind/k8s (pull_request) Successful in 5m30s
Details
Smoke Test / Run basic test suite (pull_request) Successful in 3m43s
Details

Browse Source
This commit is contained in:
Prathamesh Musale 2024-10-03 10:00:31 +05:30
parent 0694c31807
commit e9de97f371
2 changed files with 39 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
stack_orchestrator/deploy/webapp/deploy_webapp_from_registry.py
View File

@ -584,23 +584,32 @@ def command( # noqa: C901
requests_to_check_for_payment.append(r) requests_to_check_for_payment.append(r)
requests_to_execute = [] requests_to_execute = []
if min_required_payment:
for r in requests_to_check_for_payment: for r in requests_to_check_for_payment:
if (not r.attributes.payment) and r.attributes.auction: # Check if auction id is set
if not auction_requests: if r.attributes.auction:
main_logger.log(f"Skipping request {r.id}: not handling requests with auction.") if auction_requests:
dump_known_requests(state_file, [r], status="SKIP") # Check if the deployer payment address is an auction winner
else:
# Check if we are in auction winners
auction_id = r.attributes.auction auction_id = r.attributes.auction
auction = laconic.get_auction(auction_id) auction = laconic.get_auction(auction_id)
if not auction: if not auction:
raise Exception(f"Unable to locate auction: {auction_id}") main_logger.log(
f"Skipping request {r.id}: unable to locate auction: {auction_id}"
if payment_address in auction.winnerAddresses: )
main_logger.log(f"{r.id}: Auction winnner address confirmed.") dump_known_requests(state_file, [r], status="SKIP")
elif payment_address in auction.winnerAddresses:
main_logger.log(f"{r.id}: auction winnner address confirmed.")
requests_to_execute.append(r) requests_to_execute.append(r)
else: else:
main_logger.log(
f"Skipping request {r.id}: deployer payment address not found in auction winners."
)
dump_known_requests(state_file, [r], status="SKIP")
else:
main_logger.log(
f"Skipping request {r.id}: not handling requests with auction."
)
dump_known_requests(state_file, [r], status="SKIP")
elif min_required_payment:
main_logger.log(f"{r.id}: Confirming payment...") main_logger.log(f"{r.id}: Confirming payment...")
if confirm_payment( if confirm_payment(
laconic, laconic,
@ -617,7 +626,7 @@ def command( # noqa: C901
) )
dump_known_requests(state_file, [r], status="UNPAID") dump_known_requests(state_file, [r], status="UNPAID")
else: else:
requests_to_execute = requests_to_check_for_payment requests_to_execute.append(r)
main_logger.log( main_logger.log(
"Found %d unsatisfied request(s) to process." % len(requests_to_execute) "Found %d unsatisfied request(s) to process." % len(requests_to_execute)

2
stack_orchestrator/deploy/webapp/util.py
View File

@ -341,7 +341,7 @@ class LaconicRegistryClient:
except: # noqa: E722 except: # noqa: E722
pass pass
if len(results): if results and len(results):
return results[0] return results[0]
if require: if require: