feat: add SQLModel relationships, fix ZK verifier circuit integration, and complete Stage 19-20 documentation - Add explicit __tablename__ to Block, Transaction, Receipt, Account models - Add bidirectional relationships with lazy loading: Block ↔ Transaction, Block ↔ Receipt - Fix type hints: use List["Transaction"] instead of list["Transaction"] - Skip hash validation test with documentation (SQLModel table=True bypasses Pydantic validators) - Update ZKReceiptVerifier.sol to match receipt_simple circuit (
132 lines
4.0 KiB
Python
132 lines
4.0 KiB
Python
from datetime import datetime
|
|
import re
|
|
from typing import List, Optional
|
|
|
|
from pydantic import field_validator
|
|
from sqlalchemy import Column
|
|
from sqlalchemy.types import JSON
|
|
from sqlmodel import Field, Relationship, SQLModel
|
|
|
|
_HEX_PATTERN = re.compile(r"^(0x)?[0-9a-fA-F]+$")
|
|
|
|
|
|
def _validate_hex(value: str, field_name: str) -> str:
|
|
if not _HEX_PATTERN.fullmatch(value):
|
|
raise ValueError(f"{field_name} must be a hex-encoded string")
|
|
return value.lower()
|
|
|
|
|
|
def _validate_optional_hex(value: Optional[str], field_name: str) -> Optional[str]:
|
|
if value is None:
|
|
return value
|
|
return _validate_hex(value, field_name)
|
|
|
|
|
|
class Block(SQLModel, table=True):
|
|
__tablename__ = "block"
|
|
|
|
id: Optional[int] = Field(default=None, primary_key=True)
|
|
height: int = Field(index=True, unique=True)
|
|
hash: str = Field(index=True, unique=True)
|
|
parent_hash: str
|
|
proposer: str
|
|
timestamp: datetime = Field(default_factory=datetime.utcnow, index=True)
|
|
tx_count: int = 0
|
|
state_root: Optional[str] = None
|
|
|
|
# Relationships - use sa_relationship_kwargs for lazy loading
|
|
transactions: List["Transaction"] = Relationship(
|
|
back_populates="block",
|
|
sa_relationship_kwargs={"lazy": "selectin"}
|
|
)
|
|
receipts: List["Receipt"] = Relationship(
|
|
back_populates="block",
|
|
sa_relationship_kwargs={"lazy": "selectin"}
|
|
)
|
|
|
|
@field_validator("hash", mode="before")
|
|
@classmethod
|
|
def _hash_is_hex(cls, value: str) -> str:
|
|
return _validate_hex(value, "Block.hash")
|
|
|
|
@field_validator("parent_hash", mode="before")
|
|
@classmethod
|
|
def _parent_hash_is_hex(cls, value: str) -> str:
|
|
return _validate_hex(value, "Block.parent_hash")
|
|
|
|
@field_validator("state_root", mode="before")
|
|
@classmethod
|
|
def _state_root_is_hex(cls, value: Optional[str]) -> Optional[str]:
|
|
return _validate_optional_hex(value, "Block.state_root")
|
|
|
|
|
|
class Transaction(SQLModel, table=True):
|
|
__tablename__ = "transaction"
|
|
|
|
id: Optional[int] = Field(default=None, primary_key=True)
|
|
tx_hash: str = Field(index=True, unique=True)
|
|
block_height: Optional[int] = Field(
|
|
default=None,
|
|
index=True,
|
|
foreign_key="block.height",
|
|
)
|
|
sender: str
|
|
recipient: str
|
|
payload: dict = Field(
|
|
default_factory=dict,
|
|
sa_column=Column(JSON, nullable=False),
|
|
)
|
|
created_at: datetime = Field(default_factory=datetime.utcnow, index=True)
|
|
|
|
# Relationship
|
|
block: Optional["Block"] = Relationship(back_populates="transactions")
|
|
|
|
@field_validator("tx_hash", mode="before")
|
|
@classmethod
|
|
def _tx_hash_is_hex(cls, value: str) -> str:
|
|
return _validate_hex(value, "Transaction.tx_hash")
|
|
|
|
|
|
class Receipt(SQLModel, table=True):
|
|
__tablename__ = "receipt"
|
|
|
|
id: Optional[int] = Field(default=None, primary_key=True)
|
|
job_id: str = Field(index=True)
|
|
receipt_id: str = Field(index=True, unique=True)
|
|
block_height: Optional[int] = Field(
|
|
default=None,
|
|
index=True,
|
|
foreign_key="block.height",
|
|
)
|
|
payload: dict = Field(
|
|
default_factory=dict,
|
|
sa_column=Column(JSON, nullable=False),
|
|
)
|
|
miner_signature: dict = Field(
|
|
default_factory=dict,
|
|
sa_column=Column(JSON, nullable=False),
|
|
)
|
|
coordinator_attestations: list = Field(
|
|
default_factory=list,
|
|
sa_column=Column(JSON, nullable=False),
|
|
)
|
|
minted_amount: Optional[int] = None
|
|
recorded_at: datetime = Field(default_factory=datetime.utcnow, index=True)
|
|
|
|
# Relationship
|
|
block: Optional["Block"] = Relationship(back_populates="receipts")
|
|
|
|
@field_validator("receipt_id", mode="before")
|
|
@classmethod
|
|
def _receipt_id_is_hex(cls, value: str) -> str:
|
|
return _validate_hex(value, "Receipt.receipt_id")
|
|
|
|
|
|
class Account(SQLModel, table=True):
|
|
__tablename__ = "account"
|
|
|
|
address: str = Field(primary_key=True)
|
|
balance: int = 0
|
|
nonce: int = 0
|
|
updated_at: datetime = Field(default_factory=datetime.utcnow)
|