@typeberry/lib 0.1.3-af70ed0 → 0.1.3-ea24911

package/index.cjs

@@ -13343,10 +13343,16 @@ function signExtend32To64(value) {
 
 /** Attempt to convert a number into `HostCallIndex`. */
 const tryAsHostCallIndex = (v) => asOpaqueType(tryAsU32(v));
+/**
+ * Host-call exit reason.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/24a30124a501?v=0.7.2
+ */
 var PvmExecution;
 (function (PvmExecution) {
     PvmExecution[PvmExecution["Halt"] = 0] = "Halt";
     PvmExecution[PvmExecution["Panic"] = 1] = "Panic";
+    PvmExecution[PvmExecution["OOG"] = 2] = "OOG";
 })(PvmExecution || (PvmExecution = {}));
 /** A utility function to easily trace a bunch of registers. */
 function traceRegisters(...regs) {
@@ -16981,8 +16987,9 @@ class HostCalls {
             const index = tryAsHostCallIndex(hostCallIndex);
             const hostCall = this.hostCalls.get(index);
             const gasBefore = gas.get();
-            const gasCost = typeof hostCall.gasCost === "number" ? hostCall.gasCost : hostCall.gasCost(regs);
-            const underflow = gas.sub(gasCost);
+            // NOTE: `basicGasCost(regs)` function is for compatibility reasons: pre GP 0.7.2
+            const basicGasCost = typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(regs);
+            const underflow = gas.sub(basicGasCost);
             const pcLog = `[PC: ${pvmInstance.getPC()}]`;
             if (underflow) {
                 this.hostCalls.traceHostCall(`${pcLog} OOG`, index, hostCall, regs, gas.get());
@@ -16999,6 +17006,10 @@ class HostCalls {
                 status = Status.PANIC;
                 return this.getReturnValue(status, pvmInstance);
             }
+            if (result === PvmExecution.OOG) {
+                status = Status.OOG;
+                return this.getReturnValue(status, pvmInstance);
+            }
             if (result === undefined) {
                 pvmInstance.runProgram();
                 status = pvmInstance.getStatus();
@@ -17988,7 +17999,7 @@ class Preimages {
 
 class Missing {
     index = tryAsHostCallIndex(2 ** 32 - 1);
-    gasCost = tryAsSmallGas(10);
+    basicGasCost = tryAsSmallGas(10);
     currentServiceId = CURRENT_SERVICE_ID;
     tracedRegisters = traceRegisters(7);
     execute(_gas, regs, _memory) {

package/index.d.ts

@@ -13694,13 +13694,12 @@ interface PartialState {
 
   /**
    * Transfer given `amount` of funds to the `destination`,
-   * passing `suppliedGas` to invoke `OnTransfer` entry point
-   * and given `memo`.
+   * passing `gas` fee for transfer and given `memo`.
    */
   transfer(
     destination: ServiceId | null,
     amount: U64,
-    suppliedGas: ServiceGas,
+    gas: ServiceGas,
     memo: Bytes<TRANSFER_MEMO_BYTES>,
   ): Result$2<OK, TransferError>;
 
@@ -18071,9 +18070,15 @@ type HostCallIndex = Opaque<U32, "HostCallIndex[U32]">;
 /** Attempt to convert a number into `HostCallIndex`. */
 declare const tryAsHostCallIndex = (v: number): HostCallIndex => asOpaqueType(tryAsU32(v));
 
+/**
+ * Host-call exit reason.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/24a30124a501?v=0.7.2
+ */
 declare enum PvmExecution {
   Halt = 0,
   Panic = 1,
+  OOG = 2, // out-of-gas
 }
 
 /** A utility function to easily trace a bunch of registers. */
@@ -18086,8 +18091,12 @@ interface HostCallHandler {
   /** Index of that host call (i.e. what PVM invokes via `ecalli`) */
   readonly index: HostCallIndex;
 
-  /** The gas cost of invocation of that host call. */
-  readonly gasCost: SmallGas | ((reg: IHostCallRegisters) => Gas);
+  /**
+   * The gas cost of invocation of that host call.
+   *
+   * NOTE: `((reg: IHostCallRegisters) => Gas)` function is for compatibility reasons: pre GP 0.7.2
+   */
+  readonly basicGasCost: SmallGas | ((reg: IHostCallRegisters) => Gas);
 
   /** Currently executing service id. */
   readonly currentServiceId: U32;
@@ -18263,8 +18272,10 @@ declare class HostCalls {
 
       const hostCall = this.hostCalls.get(index);
       const gasBefore = gas.get();
-      const gasCost = typeof hostCall.gasCost === "number" ? hostCall.gasCost : hostCall.gasCost(regs);
-      const underflow = gas.sub(gasCost);
+      // NOTE: `basicGasCost(regs)` function is for compatibility reasons: pre GP 0.7.2
+      const basicGasCost =
+        typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(regs);
+      const underflow = gas.sub(basicGasCost);
 
       const pcLog = `[PC: ${pvmInstance.getPC()}]`;
       if (underflow) {
@@ -18291,6 +18302,11 @@ declare class HostCalls {
         return this.getReturnValue(status, pvmInstance);
       }
 
+      if (result === PvmExecution.OOG) {
+        status = Status.OOG;
+        return this.getReturnValue(status, pvmInstance);
+      }
+
       if (result === undefined) {
         pvmInstance.runProgram();
         status = pvmInstance.getStatus();

package/index.js

@@ -13340,10 +13340,16 @@ function signExtend32To64(value) {
 
 /** Attempt to convert a number into `HostCallIndex`. */
 const tryAsHostCallIndex = (v) => asOpaqueType(tryAsU32(v));
+/**
+ * Host-call exit reason.
+ *
+ * https://graypaper.fluffylabs.dev/#/ab2cdbd/24a30124a501?v=0.7.2
+ */
 var PvmExecution;
 (function (PvmExecution) {
     PvmExecution[PvmExecution["Halt"] = 0] = "Halt";
     PvmExecution[PvmExecution["Panic"] = 1] = "Panic";
+    PvmExecution[PvmExecution["OOG"] = 2] = "OOG";
 })(PvmExecution || (PvmExecution = {}));
 /** A utility function to easily trace a bunch of registers. */
 function traceRegisters(...regs) {
@@ -16978,8 +16984,9 @@ class HostCalls {
             const index = tryAsHostCallIndex(hostCallIndex);
             const hostCall = this.hostCalls.get(index);
             const gasBefore = gas.get();
-            const gasCost = typeof hostCall.gasCost === "number" ? hostCall.gasCost : hostCall.gasCost(regs);
-            const underflow = gas.sub(gasCost);
+            // NOTE: `basicGasCost(regs)` function is for compatibility reasons: pre GP 0.7.2
+            const basicGasCost = typeof hostCall.basicGasCost === "number" ? hostCall.basicGasCost : hostCall.basicGasCost(regs);
+            const underflow = gas.sub(basicGasCost);
             const pcLog = `[PC: ${pvmInstance.getPC()}]`;
             if (underflow) {
                 this.hostCalls.traceHostCall(`${pcLog} OOG`, index, hostCall, regs, gas.get());
@@ -16996,6 +17003,10 @@ class HostCalls {
                 status = Status.PANIC;
                 return this.getReturnValue(status, pvmInstance);
             }
+            if (result === PvmExecution.OOG) {
+                status = Status.OOG;
+                return this.getReturnValue(status, pvmInstance);
+            }
             if (result === undefined) {
                 pvmInstance.runProgram();
                 status = pvmInstance.getStatus();
@@ -17985,7 +17996,7 @@ class Preimages {
 
 class Missing {
     index = tryAsHostCallIndex(2 ** 32 - 1);
-    gasCost = tryAsSmallGas(10);
+    basicGasCost = tryAsSmallGas(10);
     currentServiceId = CURRENT_SERVICE_ID;
     tracedRegisters = traceRegisters(7);
     execute(_gas, regs, _memory) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typeberry/lib",
-  "version": "0.1.3-af70ed0",
+  "version": "0.1.3-ea24911",
   "main": "index.js",
   "author": "Fluffy Labs",
   "license": "MPL-2.0",