Enabled both stricter and previous object definition

This commit is contained in:
Gui Heise 2021-08-18 12:01:45 -04:00
parent daa208f72b
commit b64d22c92b
2 changed files with 28 additions and 3 deletions

View File

@ -29,6 +29,32 @@ class ClassifiedTrace(BaseModel):
trace_type: TraceType trace_type: TraceType
trace_address: List[int] trace_address: List[int]
classification: Classification classification: Classification
protocol: Optional[Protocol]
abi_name: Optional[str]
function_name: Optional[str]
function_signature: Optional[str]
inputs: Optional[Dict[str, Any]]
to_address: Optional[str]
from_address: Optional[str]
gas: Optional[int]
value: Optional[int]
gas_used: Optional[int]
error: Optional[str]
class Config:
json_encoders = {
# a little lazy but fine for now
# this is used for bytes value inputs
bytes: lambda b: b.hex(),
}
class ClassifiedTraceStrict(BaseModel):
transaction_hash: str
block_number: int
trace_type: TraceType
trace_address: List[int]
classification: Classification
class Config: class Config:
json_encoders = { json_encoders = {

View File

@ -4,7 +4,6 @@ from mev_inspect.schemas.blocks import TraceType
from mev_inspect.schemas.classified_traces import ( from mev_inspect.schemas.classified_traces import (
Classification, Classification,
ClassifiedTrace, ClassifiedTrace,
ClassifiedCallData,
) )
@ -17,7 +16,7 @@ def make_transfer_trace(
token_address: str, token_address: str,
amount: int, amount: int,
): ):
return ClassifiedCallData( return ClassifiedTrace(
transaction_hash=transaction_hash, transaction_hash=transaction_hash,
block_number=block_number, block_number=block_number,
trace_type=TraceType.call, trace_type=TraceType.call,
@ -42,7 +41,7 @@ def make_swap_trace(
recipient_address: str, recipient_address: str,
recipient_input_key: str, recipient_input_key: str,
): ):
return ClassifiedCallData( return ClassifiedTrace(
transaction_hash=transaction_hash, transaction_hash=transaction_hash,
block_number=block_number, block_number=block_number,
trace_type=TraceType.call, trace_type=TraceType.call,