@matterlabs/zksync-js 0.0.6 → 0.0.7

package/dist/adapters/ethers/client.cjs

@@ -206,6 +206,8 @@ var METHODS = {
   getBridgehub: "zks_getBridgehubContract",
   getL2ToL1LogProof: "zks_getL2ToL1LogProof",
   getReceipt: "eth_getTransactionReceipt",
+  getBytecodeSupplier: "zks_getBytecodeSupplierContract",
+  getBlockMetadataByNumber: "zks_getBlockMetadataByNumber",
   getGenesis: "zks_getGenesis"
 };
 function toHexArray(arr) {
@@ -258,7 +260,9 @@ function ensureHex(value, field, context) {
     context: { field, valueType: typeof value, ...context }
   });
 }
-function ensureNumber(value, field) {
+function ensureNumber(value, field, opts) {
+  const operation = opts?.operation ?? "zksrpc.normalizeGenesis";
+  const messagePrefix = opts?.messagePrefix ?? "Malformed genesis response";
   if (typeof value === "number" && Number.isFinite(value)) return value;
   if (typeof value === "bigint") return Number(value);
   if (typeof value === "string" && value.trim() !== "") {
@@ -267,8 +271,36 @@ function ensureNumber(value, field) {
   }
   throw createError("RPC", {
     resource: "zksrpc",
-    operation: "zksrpc.normalizeGenesis",
-    message: "Malformed genesis response: expected numeric value.",
+    operation,
+    message: `${messagePrefix}: expected numeric value.`,
+    context: { field, valueType: typeof value }
+  });
+}
+function ensureBigInt(value, field, opts) {
+  const operation = opts?.operation ?? "zksrpc.normalizeBlockMetadata";
+  const messagePrefix = opts?.messagePrefix ?? "Malformed block metadata response";
+  if (typeof value === "bigint") return value;
+  if (typeof value === "number" && Number.isFinite(value)) {
+    if (!Number.isInteger(value)) {
+      throw createError("RPC", {
+        resource: "zksrpc",
+        operation,
+        message: `${messagePrefix}: expected integer value.`,
+        context: { field, valueType: typeof value }
+      });
+    }
+    return BigInt(value);
+  }
+  if (typeof value === "string" && value.trim() !== "") {
+    try {
+      return BigInt(value);
+    } catch {
+    }
+  }
+  throw createError("RPC", {
+    resource: "zksrpc",
+    operation,
+    message: `${messagePrefix}: expected bigint-compatible value.`,
     context: { field, valueType: typeof value }
   });
 }
@@ -354,6 +386,57 @@ function normalizeGenesis(raw) {
     });
   }
 }
+function normalizeBlockMetadata(raw) {
+  try {
+    if (!raw || typeof raw !== "object") {
+      throw createError("RPC", {
+        resource: "zksrpc",
+        operation: "zksrpc.normalizeBlockMetadata",
+        message: "Malformed block metadata response: expected object.",
+        context: { receivedType: typeof raw }
+      });
+    }
+    const record = raw;
+    const pubdataPricePerByte = ensureBigInt(
+      record["pubdata_price_per_byte"] ?? record["pubdataPricePerByte"],
+      "pubdata_price_per_byte",
+      {
+        operation: "zksrpc.normalizeBlockMetadata",
+        messagePrefix: "Malformed block metadata response"
+      }
+    );
+    const nativePrice = ensureBigInt(
+      record["native_price"] ?? record["nativePrice"],
+      "native_price",
+      {
+        operation: "zksrpc.normalizeBlockMetadata",
+        messagePrefix: "Malformed block metadata response"
+      }
+    );
+    const executionVersion = ensureNumber(
+      record["execution_version"] ?? record["executionVersion"],
+      "execution_version",
+      {
+        operation: "zksrpc.normalizeBlockMetadata",
+        messagePrefix: "Malformed block metadata response"
+      }
+    );
+    return {
+      pubdataPricePerByte,
+      nativePrice,
+      executionVersion
+    };
+  } catch (e) {
+    if (isZKsyncError(e)) throw e;
+    throw createError("RPC", {
+      resource: "zksrpc",
+      operation: "zksrpc.normalizeBlockMetadata",
+      message: "Failed to normalize block metadata response.",
+      context: { receivedType: typeof raw },
+      cause: shapeCause(e)
+    });
+  }
+}
 function createZksRpc(transport) {
   return {
     // Fetches the Bridgehub contract address.
@@ -376,6 +459,26 @@ function createZksRpc(transport) {
         }
       );
     },
+    // Fetches the Bytecode Supplier contract address.
+    async getBytecodeSupplierAddress() {
+      return withRpcOp(
+        "zksrpc.getBytecodeSupplierAddress",
+        "Failed to fetch Bytecode Supplier address.",
+        {},
+        async () => {
+          const addrRaw = await transport(METHODS.getBytecodeSupplier, []);
+          if (typeof addrRaw !== "string" || !addrRaw.startsWith("0x")) {
+            throw createError("RPC", {
+              resource: "zksrpc",
+              operation: "zksrpc.getBytecodeSupplierAddress",
+              message: "Unexpected Bytecode Supplier address response.",
+              context: { valueType: typeof addrRaw }
+            });
+          }
+          return addrRaw;
+        }
+      );
+    },
     // Fetches a proof for an L2→L1 log emitted in the given transaction.
     async getL2ToL1LogProof(txHash, index) {
       return withRpcOp(
@@ -412,6 +515,19 @@ function createZksRpc(transport) {
         }
       );
     },
+    // Fetches block metadata for the given block number.
+    async getBlockMetadataByNumber(blockNumber) {
+      return withRpcOp(
+        "zksrpc.getBlockMetadataByNumber",
+        "Failed to fetch block metadata.",
+        { blockNumber },
+        async () => {
+          const raw = await transport(METHODS.getBlockMetadataByNumber, [blockNumber]);
+          if (raw == null) return null;
+          return normalizeBlockMetadata(raw);
+        }
+      );
+    },
     // Fetches the genesis configuration returned by `zks_getGenesis`.
     async getGenesis() {
       return withRpcOp(
@@ -4931,6 +5047,56 @@ var MailboxABI = [
   { type: "error", name: "ZeroGasPriceL1TxZKSyncOS", inputs: [] }
 ];
 var Mailbox_default = MailboxABI;
+
+// src/core/errors/error-ops.ts
+function resolveMessage(op, msg) {
+  if (!msg) return `Error during ${op}.`;
+  return typeof msg === "function" ? msg() : msg;
+}
+function createErrorOps(decodeRevert2) {
+  function toZKsyncError2(type, base, err) {
+    if (isZKsyncError(err)) return err;
+    const revert = decodeRevert2 ? decodeRevert2(err) : void 0;
+    return createError(type, { ...base, ...revert ? { revert } : {}, cause: shapeCause(err) });
+  }
+  function createErrorHandlers2(resource) {
+    async function run(kind, operation, fn, opts) {
+      try {
+        return await fn();
+      } catch (e) {
+        if (isZKsyncError(e)) throw e;
+        const message = resolveMessage(operation, opts?.message);
+        throw toZKsyncError2(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
+      }
+    }
+    function wrap(operation, fn, opts) {
+      return run("INTERNAL", operation, fn, opts);
+    }
+    function wrapAs2(kind, operation, fn, opts) {
+      return run(kind, operation, fn, opts);
+    }
+    async function toResult(operation, fn, opts) {
+      try {
+        const value = await wrap(operation, fn, opts);
+        return { ok: true, value };
+      } catch (e) {
+        const shaped = isZKsyncError(e) ? e : toZKsyncError2(
+          "INTERNAL",
+          {
+            resource,
+            operation,
+            context: opts?.ctx ?? {},
+            message: resolveMessage(operation, opts?.message)
+          },
+          e
+        );
+        return { ok: false, error: shaped };
+      }
+    }
+    return { wrap, wrapAs: wrapAs2, toResult };
+  }
+  return { toZKsyncError: toZKsyncError2, createErrorHandlers: createErrorHandlers2 };
+}
 var ERROR_IFACES = [];
 var IFACE_ERROR_STRING = new ethers.Interface(["error Error(string)"]);
 var IFACE_PANIC = new ethers.Interface(["error Panic(uint256)"]);
@@ -5014,51 +5180,7 @@ function decodeRevert(e) {
 }
 
 // src/adapters/ethers/errors/error-ops.ts
-function toZKsyncError(type, base, err) {
-  if (isZKsyncError(err)) return err;
-  const revert = decodeRevert(err);
-  return createError(type, { ...base, ...revert ? { revert } : {}, cause: shapeCause(err) });
-}
-function resolveMessage(op, msg) {
-  if (!msg) return `Error during ${op}.`;
-  return typeof msg === "function" ? msg() : msg;
-}
-function createErrorHandlers(resource) {
-  async function run(kind, operation, fn, opts) {
-    try {
-      return await fn();
-    } catch (e) {
-      if (isZKsyncError(e)) throw e;
-      const message = resolveMessage(operation, opts?.message);
-      throw toZKsyncError(kind, { resource, operation, context: opts?.ctx ?? {}, message }, e);
-    }
-  }
-  function wrap(operation, fn, opts) {
-    return run("INTERNAL", operation, fn, opts);
-  }
-  function wrapAs2(kind, operation, fn, opts) {
-    return run(kind, operation, fn, opts);
-  }
-  async function toResult(operation, fn, opts) {
-    try {
-      const value = await wrap(operation, fn, opts);
-      return { ok: true, value };
-    } catch (e) {
-      const shaped = isZKsyncError(e) ? e : toZKsyncError(
-        "INTERNAL",
-        {
-          resource,
-          operation,
-          context: opts?.ctx ?? {},
-          message: resolveMessage(operation, opts?.message)
-        },
-        e
-      );
-      return { ok: false, error: shaped };
-    }
-  }
-  return { wrap, wrapAs: wrapAs2, toResult };
-}
+var { createErrorHandlers } = createErrorOps(decodeRevert);
 
 // src/adapters/ethers/client.ts
 var { wrapAs } = createErrorHandlers("client");