fix: WRITE host call + other minor fixes

Author: harsh-csl

jam/execution/invocations/functions/accumulate_fns.py

@@ -1,4 +1,3 @@
-import asyncio
 from jam.state.accounts import AccountDataView, DeltaView
 from jam.state.partial import GhostPartial
 from jam.types.state.accumulation.types import (
@@ -187,10 +186,7 @@ def new(gas: Gas, registers: list, memory: Memory, context: AccumulationContext,
         new_service = AccountData(
             service=AccountMetadata(
                 code_hash=ServiceCodeHash(c),
-                balance=Balance(BASIC_MINIMUM_BALANCE
-                    + ADDITIONAL_BALANCE_PER_ITEM * 2
-                    + ADDITIONAL_BALANCE_PER_OCTET * (81+l) - f
-                ),
+                balance=Balance(0),
                 gas_limit=Gas(g),
                 min_gas=Gas(m),
                 num_o=Ao(0),
@@ -206,6 +202,9 @@ def new(gas: Gas, registers: list, memory: Memory, context: AccumulationContext,
                 LookupTable(hash=ServiceCodeHash(c), length=BlobLength(l)): Timestamps([])
             })
         )
+        new_service.service.balance = new_service.service.t()
+        # print("new balance", new_service.service.balance)
+
 
         if accounts[ServiceId(context.x.s_index)].service.balance < new_service.service.balance:
             registers[7] = HostStatus.CASH.value
@@ -261,6 +260,7 @@ def transfer(gas: Gas, registers: list, memory: Memory, context: AccumulationCon
         if ServiceId(d) not in delta:
             registers[7] = HostStatus.WHO.value
             return CONTINUE, gas, registers, memory, context
+        # print("SERVICE DSDSD", ServiceId(d), context.x.s_index, delta[context.x.s_index].service.balance, Balance(a))
 
         memo = memory.read(o, TRANSFER_MEMO_SIZE)
 
@@ -271,20 +271,20 @@ def transfer(gas: Gas, registers: list, memory: Memory, context: AccumulationCon
             memo=Bytes[128](memo),
             gas=Gas(l),
         )
-
-        new_balance_sender = delta[context.x.s_index].service.balance - Balance(a)
+        # print("SERVICE BAL", context.x.s_index, delta[context.x.s_index].service.balance, Balance(a))
+        new_balance_sender = int(delta[context.x.s_index].service.balance) - int(a)
 
         if l < delta[d].service.min_gas:
             registers[7] = HostStatus.LOW.value
             return CONTINUE, gas, registers, memory, context
 
-        if new_balance_sender < delta[context.x.s_index].service.t:
+        if new_balance_sender < int(delta[context.x.s_index].service.t):
             registers[7] = HostStatus.CASH.value
             return CONTINUE, gas, registers, memory, context
         else:
             registers[7] = HostStatus.OK.value
             context.x.deferred_transfers.append(t)
-            delta[context.x.s_index].service.balance = new_balance_sender
+            delta[context.x.s_index].service.balance = Balance(new_balance_sender)
             gas = gas - l
             return CONTINUE, gas, registers, memory, context
 
@@ -309,13 +309,14 @@ def eject(
         if d in delta and d != context.x.s_index:
             account = delta[d]
 
-        l = BlobLength(max(81, account.service.num_o) - 81)
-        lookup_key = LookupTable(hash=ServiceCodeHash(code_hash), length=BlobLength(l))
         if account == None or account.service.code_hash != ServiceCodeHash(list(context.x.s_index.encode()) + [0] * 28):
             logger.warning("Eject function called with mismatched code hash for service account")
             registers[7] = HostStatus.WHO.value
             return CONTINUE, gas, registers, memory, context
-        elif account.service.num_i != 2 or account.lookup[lookup_key] is None:
+        l = BlobLength(max(81, account.service.num_o) - 81)
+        lookup_key = LookupTable(hash=ServiceCodeHash(code_hash), length=BlobLength(l))
+
+        if account.service.num_i != 2 or account.lookup[lookup_key] is None:
             logger.warning("Eject function called with invalid number of items or missing lookup entry for service account")
             registers[7] = HostStatus.HUH.value
             return CONTINUE, gas, registers, memory, context

jam/execution/invocations/functions/general_fns.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, List
 
-from jam.log_setup import pvm_logger as logger, logger as jam_logger
+from jam.log_setup import logger as logger, logger as jam_logger
 from jam.execution.invocations.functions.protocol import (
     InvocationFunctions as INVF,
 )
@@ -80,7 +80,7 @@ def fetch(
         item_index: int,
         import_segments: Optional[List],
         extrinsics: Optional[Extrinsics],
-        o: Optional[AccumulationInputs]
+        o: Optional[AccumulationInputs]  # bold i
     ):
         fetch_type = registers[10]
 
@@ -132,21 +132,33 @@ def fetch(
             v = trace
         elif (
             w10 == 3
-            and item_index is not None
+            and extrinsics is not None
             and w11 < len(extrinsics)
             and w12 < len(extrinsics[int(w11)])
         ):
             v = extrinsics[w11][int(w12)]
-        elif w10 == 4 and item_index is not None and w11 < len(extrinsics[item_index]):
+        elif (
+                w10 == 4
+                and extrinsics is not None
+                and item_index is not None
+                and item_index < len(extrinsics)
+                and w11 < len(extrinsics[item_index])
+        ):
             v = extrinsics[item_index][w11]
         elif (
             w10 == 5
-            and item_index is not None
+            and import_segments is not None
             and w11 < len(import_segments)
             and w12 < len(import_segments[w11])
         ):
             v = import_segments[w11][w12]
-        elif w10 == 6 and item_index is not None and w11 < len(import_segments[item_index]):
+        elif (
+                w10 == 6
+                and import_segments is not None
+                and item_index is not None
+                and item_index < len(import_segments)
+                and w11 < len(import_segments[item_index])
+        ):
             v = import_segments[item_index][w11]
         elif package is not None:
 
@@ -347,7 +359,7 @@ def write(
         service_data: AccountData,
         service_index: ServiceId,
     ):
-        # Get key,value start,end
+        # Get key, value offset & size
         [ko, kz, vo, vz] = registers[7 : 7 + 4]
 
         logger.debug(
@@ -367,25 +379,21 @@ def write(
             )
             raise PvmError(PANIC)
 
-    
-        # TODO: Handle out of balance using temp caches
-        # from jam.state.state import state
-        # state.store.save_n_clear_cache()
-
         k = Bytes(memory.read(ko, kz))
 
         a = service_data.storage
 
         curr_value = a.get(k)
         storage_len = len(curr_value) if curr_value else HostStatus.NONE.value
+
         if vz == 0:
             a.__delitem__(k)
-        elif memory.is_accessible(vo, vz, Accessibility.WRITE):
+        elif memory.is_accessible(vo, vz):
             pre_data = a[k]
             a[k] = Bytes(memory.read(vo, vz))
             if service_data.service.t > service_data.service.balance:
-                # state.store.clear()
                 registers[7] = HostStatus.FULL.value
+                # print("Storing FULL val on r[7]", registers[7])
                 if pre_data is None:
                     del a[k]
                 else:
@@ -400,6 +408,7 @@ def write(
             )
             raise PvmError(PANIC)
 
+        # print("Storing s_len val on r[7]", storage_len)
         registers[7] = storage_len
         return CONTINUE, gas, registers, memory, context
 
@@ -426,15 +435,14 @@ def info(
         if target_service == 2**64 - 1:
             target_service = service_index
 
-        if target_service > 2**32-1:
-            registers[7] = HostStatus.NONE.value
-            return CONTINUE, gas, registers, memory, context
 
-        if target_service not in accounts:
+        if target_service > 2**32-1 or target_service not in accounts:
             registers[7] = HostStatus.NONE.value
             return CONTINUE, gas, registers, memory, context
 
+        # print("TYPE OF SERVICE", target_service, type(target_service))
         acc: AccountData = accounts[target_service]
+
         v = (
             bytes(acc.service.code_hash)
             + U64(acc.service.balance).encode()

jam/execution/invocations/is_authorized.py

@@ -38,9 +38,10 @@ def build_table(self):
     def execute(self):
         from jam.state.state import state
 
+        # pc == pu
         _, pc = self.work_package.m_c(state.delta)
 
-        if pc == None:
+        if pc is None:
             return HostStatus.BAD, 0
         elif len(pc) > MAX_AUTH_CODE_SIZE:
             return HostStatus.BIG, 0

jam/execution/invocations/protocol.py

@@ -31,7 +31,8 @@ def dispatch(
         if table_entry is None:
             registers[7] = HostStatus.WHAT.value
             return ExecutionStatus.CONTINUE, gas - 10, registers, memory, x
-        
+
+        # print("dispatching call >> ", host_call)
         # Direct unpacking and execution
         dispatch_fn_calls, args = table_entry