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

Allow payment reuse for application redeployment #960

Merged
ashwin merged 2 commits from deep-stack/stack-orchestrator:pm-allow-redeployment into main 2024-10-29 06:51:49 +00:00
Conversation 0 Commits 2 Files Changed 1 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d661f478f7 - Show all commits

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

@ -616,7 +616,6 @@ def command( # noqa: C901
if confirm_payment(
laconic,
r,
lrn,
payment_address,
min_required_payment,
main_logger,

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

@ -798,7 +798,7 @@ def skip_by_tag(r, include_tags, exclude_tags):
return False
def confirm_payment(laconic: LaconicRegistryClient, record, deployer_lrn, payment_address, min_amount, logger):
def confirm_payment(laconic: LaconicRegistryClient, record, payment_address, min_amount, logger):
req_owner = laconic.get_owner(record)
if req_owner == payment_address:
# No need to confirm payment if the sender and recipient are the same account.
@ -848,7 +848,7 @@ def confirm_payment(laconic: LaconicRegistryClient, record, deployer_lrn, paymen
# Check if the payment was already used on a deployment
used = laconic.app_deployments(
{"deployer": deployer_lrn, "payment": tx.hash}, all=True
{"deployer": record.attributes.deployer, "payment": tx.hash}, all=True
)
if len(used):
# Check that payment was used for deployment of same application
@ -858,7 +858,7 @@ def confirm_payment(laconic: LaconicRegistryClient, record, deployer_lrn, paymen
return False
used = laconic.app_deployment_removals(
{"deployer": deployer_lrn, "payment": tx.hash}, all=True
{"deployer": record.attributes.deployer, "payment": tx.hash}, all=True
)
if len(used):
logger.log(