@typeberry/lib 0.0.1-6b496a1 → 0.0.1-886997c

package/index.d.ts

@@ -16320,12 +16320,6 @@ declare class Interpreter {
     }
 
     if (this.instructionResult.status !== null) {
-      // All abnormal terminations should be interpreted as TRAP and we should subtract the gas. In case of FAULT we have to do it manually at the very end.
-      if (this.instructionResult.status === Result.FAULT || this.instructionResult.status === Result.FAULT_ACCESS) {
-        // TODO [ToDr] underflow?
-        this.gas.sub(instructionGasMap[Instruction.TRAP]);
-      }
-
       switch (this.instructionResult.status) {
         case Result.FAULT:
           this.status = Status.FAULT;
@@ -16684,7 +16678,7 @@ declare class HostCalls {
       this.hostCalls.traceHostCall("Invoking", index, hostCall, regs, gasBefore);
       const result = await hostCall.execute(gas, regs, memory);
       this.hostCalls.traceHostCall(
-        result === undefined ? "Result" : `Status(${result})`,
+        result === undefined ? "Result" : `Status(${PvmExecution[result]})`,
         index,
         hostCall,
         regs,

package/index.js

@@ -15987,11 +15987,6 @@ class Interpreter {
             }
         }
         if (this.instructionResult.status !== null) {
-            // All abnormal terminations should be interpreted as TRAP and we should subtract the gas. In case of FAULT we have to do it manually at the very end.
-            if (this.instructionResult.status === Result.FAULT || this.instructionResult.status === Result.FAULT_ACCESS) {
-                // TODO [ToDr] underflow?
-                this.gas.sub(instructionGasMap[Instruction.TRAP]);
-            }
             switch (this.instructionResult.status) {
                 case Result.FAULT:
                     this.status = Status.FAULT;
@@ -16435,7 +16430,7 @@ class HostCalls {
             }
             this.hostCalls.traceHostCall("Invoking", index, hostCall, regs, gasBefore);
             const result = await hostCall.execute(gas, regs, memory);
-            this.hostCalls.traceHostCall(result === undefined ? "Result" : `Status(${result})`, index, hostCall, regs, gas.get());
+            this.hostCalls.traceHostCall(result === undefined ? "Result" : `Status(${PvmExecution[result]})`, index, hostCall, regs, gas.get());
             if (result === PvmExecution.Halt) {
                 status = Status.HALT;
                 return this.getReturnValue(status, pvmInstance);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.0.1-6b496a1",
+  "version": "0.0.1-886997c",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0"