Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions backend/database_handler/transactions_processor.py
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,8 @@ def _storage_fee_used(accounting: dict) -> int:
if isinstance(genvm_buckets, dict):
return int(genvm_buckets.get("storage", 0) or 0)
consumed_buckets = accounting.get("genvm_fee_consumed_buckets") or []
if isinstance(consumed_buckets, dict):
return 0
if len(consumed_buckets) > 1:
return int(consumed_buckets[1])
return 0
Expand Down
12 changes: 6 additions & 6 deletions backend/node/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -1137,13 +1137,13 @@ async def _run_genvm(
if (
result.data_fee_bucket_totals is not None
and result.data_fees_remaining is not None
and result.data_fee_bucket_totals.keys()
== result.data_fees_remaining.keys()
):
data_fees_consumed = [
max(0, int(total) - int(remaining))
for total, remaining in zip(
result.data_fee_bucket_totals, result.data_fees_remaining
)
]
data_fees_consumed = {
name: max(0, int(total) - int(result.data_fees_remaining[name]))
for name, total in result.data_fee_bucket_totals.items()
}

result = Receipt(
result=genvmbase.encode_result_to_bytes(result.result),
Expand Down
39 changes: 21 additions & 18 deletions backend/node/genvm/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,15 @@
)

GENVM_GASLESS_GAS_DATA: dict[str, str] = {
**genvmhost.DEFAULT_GAS_DATA,
"storageUnitPrice": "0",
"receiptGasPerByte": "0",
"gasPerChangedSlot": "0",
"intrinsicGas": "0",
"bootloaderOverhead": "0",
"fixedProposeReceiptGas": "0",
"fixedMessageRevealGas": "0",
"lockedReceiptGasPrice": "0",
"genPerTimeUnit": "0",
}

Expand All @@ -91,7 +93,7 @@

@dataclass(frozen=True)
class GenVMFeeContext:
bucket_totals: list[int] | None = None
bucket_totals: dict[str, int] | None = None
gas_data: dict[str, str] | None = None
message_fee_allocation: list[dict] | None = None

Expand Down Expand Up @@ -300,8 +302,8 @@ class ExecutionResult:
processing_time: int
nondet_disagree: int | None
execution_stats: dict | None = None
data_fee_bucket_totals: list[int] | None = None
data_fees_remaining: list[int] | None = None
data_fee_bucket_totals: dict[str, int] | None = None
data_fees_remaining: dict[str, int] | None = None


def _emission_value(emission: dict, name: str):
Expand Down Expand Up @@ -676,10 +678,13 @@ def provide_result(
)
)

leader_public_data = LeaderPublicData.decode(res.result_leader_public_data)
eq_outputs = {
i: data for i, data in enumerate(leader_public_data.nondet_block_outputs)
}
eq_outputs = {}
if res.result_leader_public_data:
leader_public_data = LeaderPublicData.decode(res.result_leader_public_data)
eq_outputs = {
i: data
for i, data in enumerate(leader_public_data.nondet_block_outputs)
}

execution_stats = dict(ctx.stats)
llm_token_metrics = _extract_llm_token_metrics(res.metrics)
Expand Down Expand Up @@ -927,7 +932,7 @@ def _create_timeout_result(
state=state_proxy,
processing_time=processing_time,
nondet_disagree=None,
data_fees_remaining=[],
data_fees_remaining={},
)


Expand Down Expand Up @@ -978,17 +983,15 @@ async def run_genvm_host(
)
ctx = Context(logger=logger)
fee_context = fee_context or GenVMFeeContext()
effective_bucket_totals = fee_context.bucket_totals or [
10_000_000,
10_000_000,
10_000_000,
10_000_000,
]
effective_gas_data = (
dict(fee_context.gas_data)
if fee_context.gas_data
else dict(GENVM_GASLESS_GAS_DATA)
effective_bucket_totals = (
dict(fee_context.bucket_totals)
if fee_context.bucket_totals
else base_host.default_bucket_totals(3)
)
effective_gas_data = dict(base_host.DEFAULT_GAS_DATA)
effective_gas_data.update(GENVM_GASLESS_GAS_DATA)
if fee_context.gas_data:
effective_gas_data.update(fee_context.gas_data)
tmpdir = Path(tempfile.mkdtemp())
try:
base_delay = 5 # seconds
Expand Down
34 changes: 27 additions & 7 deletions backend/node/genvm/origin/base_host.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,34 @@
"bootloaderOverhead": "0",
"fixedProposeReceiptGas": "0",
"fixedMessageRevealGas": "0",
"lockedReceiptGasPrice": "1",
# 0 disables the overlay unless a fee test opts into a specific chain split
"overlaySplitBps": "0",
"receiptWrapperBytes": "1024",
"minProposeTimeout": "1",
"maxProposeTimeout": "340282366920938463463374607431768211455",
"minCommitTimeout": "1",
"maxCommitTimeout": "340282366920938463463374607431768211455",
"genPerTimeUnit": "0",
# 0 = no per-phase timeunit floor, so default-allocation tests are unaffected.
"minTimeUnitsPerPhase": "0",
# 0 = no per-round execution-budget floor for balance-funded messages.
"messageBudgetFloor": "0",
}

_DEFAULT_BUCKET_TOTALS: dict[str, int] = {
"execution_data_gas": 2**200,
"message_fee": 2**200,
"nondet_outputs": 2**200,
"submitted_messages": 2**200,
"submitted_messages_count": 2**200,
}


def default_bucket_totals(executor_major: int) -> dict[str, int]:
totals = _DEFAULT_BUCKET_TOTALS.copy()
if executor_major >= 3:
totals["submitted_messages_count"] = 2**200
return totals


class Context(typing.Protocol):
logger: Logger
Expand Down Expand Up @@ -507,7 +528,7 @@ class ConsumedResult:
result_storage_deltas: list[tuple[bytes, bytes]] = field(default_factory=list)
result_emissions: list[ResultEmission] = field(default_factory=list)
result_leader_public_data: bytes = b""
data_fees_remaining: list[int] = field(default_factory=list)
data_fees_remaining: dict[str, int] = field(default_factory=dict)

@classmethod
def internal_error(cls, message: str) -> "ConsumedResult":
Expand Down Expand Up @@ -560,7 +581,7 @@ def decode(cls, raw: typing.Any) -> "ConsumedResult":
result_storage_deltas=decoded.get("storage_deltas", []),
result_emissions=decoded.get("emissions", []),
result_leader_public_data=decoded.get("leader_public_data", b""),
data_fees_remaining=decoded.get("data_fees_remaining", []),
data_fees_remaining=decoded.get("data_fees_remaining", {}),
)


Expand All @@ -580,7 +601,7 @@ class RunHostAndProgramRes:
result_storage_deltas: list[tuple[bytes, bytes]]
result_emissions: list[ResultEmission]
result_leader_public_data: bytes
data_fees_remaining: list[int]
data_fees_remaining: dict[str, int]
metrics: dict[str, typing.Any] | None = None
vm_error_description: str | None = None

Expand Down Expand Up @@ -1173,8 +1194,7 @@ async def run_genvm(
gas_data: dict[str, str] | None = None,
host: str,
extra_args: collections.abc.Sequence[str] = (),
# default config fee buckets use bucket_no 0 and 1
bucket_totals: list[int],
bucket_totals: dict[str, int],
code: bytes | None = None,
calldata: bytes,
leader_public_data: bytes | None = None,
Expand Down
87 changes: 11 additions & 76 deletions backend/node/genvm/origin/leader_public_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,27 @@
from dataclasses import dataclass
from typing import Self

_PADDING = b"padded"
from . import calldata as gvm_calldata


@dataclass
class LeaderPublicData:
nondet_block_outputs: list[bytes]

def encode(self) -> bytes:
payload = b"".join(
_encode_bytes(value) for value in (*self.nondet_block_outputs, _PADDING)
)
return _encode_length(len(payload), 0xC0, 0xF7) + payload
return gvm_calldata.encode({"nd_outs": self.nondet_block_outputs})

@classmethod
def decode(cls, encoded: collections.abc.Buffer) -> Self:
data = bytes(encoded)
if not data:
return cls([])

payload_start, payload_len = _decode_length(data, 0, list_=True)
payload_end = payload_start + payload_len
if payload_end != len(data):
raise ValueError("trailing leader public data")

outputs: list[bytes] = []
cursor = payload_start
while cursor < payload_end:
value_start, value_len = _decode_length(data, cursor, list_=False)
value_end = value_start + value_len
if value_end > payload_end:
raise ValueError("leader public data item exceeds list")
outputs.append(data[value_start:value_end])
cursor = value_end

if not outputs or outputs[-1] != _PADDING:
raise ValueError("leader public data padding is missing")
return cls(outputs[:-1])
decoded = gvm_calldata.decode(bytes(encoded))
if (
not isinstance(decoded, dict)
or decoded.keys() != {"nd_outs"}
or not isinstance(decoded["nd_outs"], list)
or any(not isinstance(output, bytes) for output in decoded["nd_outs"])
):
raise ValueError("invalid leader public data")
return cls(decoded["nd_outs"])


def encode(value: LeaderPublicData) -> bytes:
Expand All @@ -47,52 +31,3 @@ def encode(value: LeaderPublicData) -> bytes:

def decode(encoded: collections.abc.Buffer) -> LeaderPublicData:
return LeaderPublicData.decode(encoded)


def _encode_bytes(value: bytes) -> bytes:
if len(value) == 1 and value[0] < 0x80:
return value
return _encode_length(len(value), 0x80, 0xB7) + value


def _encode_length(length: int, short_base: int, long_base: int) -> bytes:
if length <= 55:
return bytes([short_base + length])
length_bytes = length.to_bytes((length.bit_length() + 7) // 8, "big")
return bytes([long_base + len(length_bytes)]) + length_bytes


def _decode_length(
encoded: bytes,
offset: int,
*,
list_: bool,
) -> tuple[int, int]:
if offset >= len(encoded):
raise ValueError("truncated leader public data")

prefix = encoded[offset]
short_base = 0xC0 if list_ else 0x80
long_base = 0xF7 if list_ else 0xB7
if not list_ and prefix < 0x80:
return offset, 1
if prefix < short_base or prefix > long_base + 8:
raise ValueError("invalid RLP prefix")
if prefix <= long_base:
if not list_ and prefix == 0x81 and offset + 1 < len(encoded):
if encoded[offset + 1] < 0x80:
raise ValueError("non-canonical RLP string")
return offset + 1, prefix - short_base

length_len = prefix - long_base
length_start = offset + 1
length_end = length_start + length_len
if length_end > len(encoded):
raise ValueError("truncated RLP length")
length_bytes = encoded[length_start:length_end]
if length_bytes[0] == 0:
raise ValueError("non-canonical RLP length")
length = int.from_bytes(length_bytes, "big")
if length <= 55:
raise ValueError("non-canonical long RLP value")
return length_end, length
4 changes: 4 additions & 0 deletions backend/node/genvm/origin/public_abi.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,10 @@ class _VmErrorFee:
def below_minimum() -> "VmError":
return VmError("fee below_minimum")

@staticmethod
def phase_timeout_out_of_bounds() -> "VmError":
return VmError("fee phase_timeout_out_of_bounds")

@staticmethod
def too_many_rounds() -> "VmError":
return VmError("fee too_many_rounds")
Expand Down
Loading
Loading