Skip to content

Add block to tx result #37

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

Draft
StanislavBreadless wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Add block to tx result #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
083f4bd
Add block to tx result
StanislavBreadless Oct 5, 2021
b122da9
optional
StanislavBreadless Oct 5, 2021
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
12 changes: 7 additions & 5 deletions zksync_sdk/zksync_provider/transaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from dataclasses import dataclass
from enum import Enum, auto
from typing import Optional
from zksync_sdk.types.responses import BlockInfo


class TransactionStatus(Enum):
Expand All @@ -14,6 +15,7 @@ class TransactionStatus(Enum):
class TransactionResult:
status: TransactionStatus
fail_reason: str
block: Optional[BlockInfo]


class Transaction:
Expand All @@ -40,12 +42,12 @@ async def await_committed(self, attempts: Optional[int] = None, attempts_timeout
if attempts is not None:
attempts -= 1
if "failReason" in transaction_details and transaction_details["failReason"] is not None:
return TransactionResult(TransactionStatus.FAILED, transaction_details['failReason'])
return TransactionResult(TransactionStatus.FAILED, transaction_details['failReason'], transaction_details['block'])

if "block" in transaction_details:
block = transaction_details["block"]
if block is not None and "committed" in block and block["committed"]:
return TransactionResult(TransactionStatus.COMMITTED, "")
return TransactionResult(TransactionStatus.COMMITTED, "", block)
if attempts_timeout is not None:
await asyncio.sleep(attempts_timeout / 1000)

Expand All @@ -63,19 +65,19 @@ async def await_verified(self, attempts: Optional[int] = None, attempts_timeout:
if attempts is not None:
attempts -= 1
if "failReason" in transaction_details and transaction_details["failReason"] is not None:
return TransactionResult(TransactionStatus.FAILED, transaction_details['failReason'])
return TransactionResult(TransactionStatus.FAILED, transaction_details['failReason'], transaction_details['block'])

if "block" in transaction_details:
block = transaction_details["block"]
if block is not None and "committed" in block and block["committed"]:
intermediate_status = TransactionResult(TransactionStatus.COMMITTED, "")
intermediate_status = TransactionResult(TransactionStatus.COMMITTED, "", block)

if "block" in transaction_details:
block = transaction_details["block"]
if block is not None and \
"verified" in block and \
block["verified"]:
return TransactionResult(TransactionStatus.VERIFIED, "")
return TransactionResult(TransactionStatus.VERIFIED, "", block)

if attempts_timeout is not None:
await asyncio.sleep(attempts_timeout / 1000)