Skip to content

Skip x402 payment for zero budget #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Zuhwa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Skip x402 payment for zero budget #138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions virtuals_acp/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,19 +154,14 @@ def rejection_reason(self) -> Optional[str]:
return None

request_memo = next(
(
m
for m in self.memos
if m.next_phase == ACPJobPhase.NEGOTIATION
),
(m for m in self.memos if m.next_phase == ACPJobPhase.NEGOTIATION),
None,
)
if request_memo:
return request_memo.signed_reason

fallback_memo = next(
(m for m in self.memos if m.next_phase == ACPJobPhase.REJECTED),
None
(m for m in self.memos if m.next_phase == ACPJobPhase.REJECTED), None
)
return fallback_memo.content if fallback_memo else None

Expand Down Expand Up @@ -293,9 +288,12 @@ def pay_and_accept_requirement(self, reason: Optional[str] = "") -> str | None:
)
)

x402PaymentDetails = self.acp_contract_client.get_x402_payment_details(self.id)
if x402PaymentDetails.is_x402:
self.perform_x402_payment(self.price)
if self.price > 0:
x402PaymentDetails = self.acp_contract_client.get_x402_payment_details(
self.id
)
if x402PaymentDetails.is_x402:
self.perform_x402_payment(self.price)

response = self.acp_contract_client.handle_operation(operations)
return get_txn_hash_from_response(response)
Expand Down Expand Up @@ -325,7 +323,7 @@ def reject(self, reason: Optional[str] = None) -> str | None:
content=memo_content,
memo_type=MemoType.MESSAGE,
is_secured=True,
next_phase=ACPJobPhase.REJECTED
next_phase=ACPJobPhase.REJECTED,
)
)

Expand All @@ -347,8 +345,7 @@ def reject_payable(

operations.append(
self.acp_contract_client.approve_allowance(
amount.amount,
amount.fare.contract_address
amount.amount, amount.fare.contract_address
)
)

Expand Down Expand Up @@ -520,8 +517,7 @@ def create_payable_notification(

operations.append(
self.acp_contract_client.approve_allowance(
amount.amount,
amount.fare.contract_address
amount.amount, amount.fare.contract_address
)
)

Expand All @@ -543,7 +539,7 @@ def create_payable_notification(
next_phase=ACPJobPhase.COMPLETED,
memo_type=MemoType.PAYABLE_NOTIFICATION,
expired_at=expired_at,
token=amount.fare.contract_address
token=amount.fare.contract_address,
)
)

Expand Down Expand Up @@ -590,7 +586,10 @@ def perform_x402_payment(self, budget: float):
self.acp_contract_client.update_job_x402_nonce(self.id, str(nonce))

x402_response = self.acp_contract_client.perform_x402_request(
payment_url, self.acp_contract_client.get_acp_version(), str(budget), encoded_payment
payment_url,
self.acp_contract_client.get_acp_version(),
str(budget),
encoded_payment,
)
if x402_response.get("isPaymentRequired"):
# If payment is required, submit transfer with authorization and handle the operation
Expand Down