@xyo-network/xl1-protocol-sdk 2.1.7 → 2.1.9

package/dist/neutral/index.mjs

@@ -1162,7 +1162,7 @@ import {
   zodIsFactory as zodIsFactory2,
   zodToFactory as zodToFactory2
 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry13, z as z18 } from "zod/mini";
+import { globalRegistry as globalRegistry12, z as z18 } from "zod/mini";
 
 // src/config/Base.ts
 import { z as z17 } from "zod/mini";
@@ -1370,65 +1370,61 @@ var MongoConfigZod = z12.object({
   })
 });
 
-// src/config/storage/driver/R2.ts
-import { isDefined as isDefined5, isUndefined as isUndefined6 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry9, z as z13 } from "zod";
-var hasR2Config = (config) => {
-  if (isUndefined6(config)) return false;
-  return isDefined5(config.accountId) && isDefined5(config.accessKeyId) && isDefined5(config.secretAccessKey) && isDefined5(config.bucket);
-};
-var R2ConfigZod = z13.object({
-  accessKeyId: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare R2 access key id (from an R2 API token)",
-    title: "storage.r2.accessKeyId",
-    type: "string"
-  }),
-  accountId: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare account id; determines the R2 endpoint https://<accountId>.r2.cloudflarestorage.com",
-    title: "storage.r2.accountId",
-    type: "string"
-  }),
-  bucket: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare R2 bucket name",
-    title: "storage.r2.bucket",
-    type: "string"
-  }),
-  chainStateBucket: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare R2 bucket for the mutable chain state (the head pointer); defaults to `bucket` when unset",
-    title: "storage.r2.chainStateBucket",
-    type: "string"
-  }),
-  indexBucket: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare R2 bucket for the chain index (the step-summary families); defaults to `bucket` when unset",
-    title: "storage.r2.indexBucket",
-    type: "string"
-  }),
-  prefix: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Optional key prefix namespacing this store within the bucket",
-    title: "storage.r2.prefix",
-    type: "string"
-  }),
-  secretAccessKey: z13.string().nonempty().optional().register(globalRegistry9, {
-    description: "Cloudflare R2 secret access key (from an R2 API token)",
-    title: "storage.r2.secretAccessKey",
-    type: "string"
-  })
+// src/config/storage/driver/S3.ts
+import { isDefined as isDefined5 } from "@xylabs/sdk-js";
+import { z as z13 } from "zod";
+var S3BucketConfigZod = z13.object({
+  accessKeyId: z13.string().nonempty().optional().describe("S3-compatible access key id for this bucket (overrides the shared default)"),
+  accountId: z13.string().nonempty().optional().describe("Account id for this bucket; on Cloudflare R2 it forms the endpoint (overrides the shared default)"),
+  bucket: z13.string().nonempty().optional().describe("S3-compatible bucket name"),
+  prefix: z13.string().nonempty().optional().describe("Optional key prefix within the bucket"),
+  readUrl: z13.string().nonempty().optional().describe("Public HTTP/CDN base URL for anonymous reads of this bucket"),
+  secretAccessKey: z13.string().nonempty().optional().describe("S3-compatible secret access key for this bucket (overrides the shared default)")
+});
+var S3ConfigZod = z13.object({
+  accessKeyId: z13.string().nonempty().optional().describe("Shared S3-compatible access key id (default for all buckets)"),
+  accountId: z13.string().nonempty().optional().describe("Shared account id (default for all buckets; on Cloudflare R2 it forms the endpoint)"),
+  chainState: S3BucketConfigZod.optional().describe("Bucket for the mutable chain state (the head pointer)"),
+  finalized: S3BucketConfigZod.optional().describe("Bucket for the finalized files (blocks, payloads, manifest)"),
+  index: S3BucketConfigZod.optional().describe("Bucket for the chain index (the step-summary families)"),
+  prefix: z13.string().nonempty().optional().describe("Shared key prefix (default for all buckets)"),
+  secretAccessKey: z13.string().nonempty().optional().describe("Shared S3-compatible secret access key (default for all buckets)")
 });
+function resolveS3Bucket(config, which) {
+  if (config === void 0) return void 0;
+  const entry = config[which];
+  const accessKeyId = entry?.accessKeyId ?? config.accessKeyId;
+  const accountId = entry?.accountId ?? config.accountId;
+  const secretAccessKey = entry?.secretAccessKey ?? config.secretAccessKey;
+  const bucket = entry?.bucket ?? config.finalized?.bucket;
+  if (!isDefined5(accessKeyId) || !isDefined5(accountId) || !isDefined5(secretAccessKey) || !isDefined5(bucket)) return void 0;
+  return {
+    accessKeyId,
+    accountId,
+    bucket,
+    prefix: entry?.prefix ?? config.prefix,
+    readUrl: entry?.readUrl,
+    secretAccessKey
+  };
+}
+function hasS3Config(config, which = "finalized") {
+  return resolveS3Bucket(config, which) !== void 0;
+}
 
 // src/config/storage/Storage.ts
-import { globalRegistry as globalRegistry10, z as z14 } from "zod";
+import { globalRegistry as globalRegistry9, z as z14 } from "zod";
 var StorageConfigZod = z14.object({
   mongo: MongoConfigZod.optional().describe("Configuration for the MongoD storage driver"),
-  r2: R2ConfigZod.optional().describe("Configuration for the Cloudflare R2 storage driver"),
-  root: z14.string().optional().register(globalRegistry10, {
+  root: z14.string().optional().register(globalRegistry9, {
     description: "Root directory for local storage",
     title: "storage.root",
     type: "string"
-  })
+  }),
+  s3: S3ConfigZod.optional().describe("Configuration for S3-compatible object storage (e.g. Cloudflare R2)")
 }).describe("Storage configuration options");
 
 // src/config/Telemetry.ts
-import { globalRegistry as globalRegistry11, z as z15 } from "zod";
+import { globalRegistry as globalRegistry10, z as z15 } from "zod";
 var DefaultMetricsScrapePorts = {
   api: 9465,
   bridge: 9468,
@@ -1437,13 +1433,13 @@ var DefaultMetricsScrapePorts = {
   rewardRedemptionApi: 9467
 };
 var MetricsScrapeConfigZod = z15.object({
-  path: z15.string().default("/metrics").register(globalRegistry11, {
+  path: z15.string().default("/metrics").register(globalRegistry10, {
     default: "/metrics",
     description: "Path for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.path",
     type: "string"
   }),
-  port: z15.coerce.number().int().positive().optional().register(globalRegistry11, {
+  port: z15.coerce.number().int().positive().optional().register(globalRegistry10, {
     description: "Port for the metrics scrape endpoint",
     title: "telemetry.metrics.scrape.port",
     type: "number"
@@ -1452,7 +1448,7 @@ var MetricsScrapeConfigZod = z15.object({
 var MetricsConfigZod = z15.object({ scrape: MetricsScrapeConfigZod }).describe("Metrics configuration options");
 var OpenTelemetryConfigZod = z15.object({
   // OpenTelemetry options
-  otlpEndpoint: z15.url().optional().register(globalRegistry11, {
+  otlpEndpoint: z15.url().optional().register(globalRegistry10, {
     description: "OTLP endpoint for exporting telemetry data",
     title: "telemetry.otel.otlpEndpoint",
     type: "string"
@@ -1467,7 +1463,7 @@ var TelemetryConfigZod = z15.object({
 
 // src/config/Validation.ts
 import { XyoAddressZod as XyoAddressZod2 } from "@xyo-network/address";
-import { globalRegistry as globalRegistry12, z as z16 } from "zod";
+import { globalRegistry as globalRegistry11, z as z16 } from "zod";
 
 // src/primitives/block/range/blockRangeSteps.ts
 import { asXL1BlockNumber as asXL1BlockNumber2, StepSizes as StepSizes3 } from "@xyo-network/xl1-protocol-lib";
@@ -2101,7 +2097,7 @@ async function activeStakeAtTimeByAddress(chain, staked, time, staker) {
 }
 
 // src/primitives/stake/activeStakeAtTimeByPosition.ts
-import { isUndefined as isUndefined7 } from "@xylabs/sdk-js";
+import { isUndefined as isUndefined6 } from "@xylabs/sdk-js";
 
 // src/primitives/stake/mergedAddRemoveStakeEventsByPosition.ts
 async function mergedAddRemoveStakeEventsByPosition(chainEvents, range, position) {
@@ -2119,7 +2115,7 @@ async function activeStakeAtTimeByPosition(chainStakeEvents, externalTime, posit
   let result = 0n;
   for (const event of stakeEvents) {
     if (event.time > externalTime) break;
-    if (isUndefined7(position) || position === Number(event.args.id)) {
+    if (isUndefined6(position) || position === Number(event.args.id)) {
       if (event.name === "StakeAdded") {
         result += event.args.amount;
       } else if (event.name === "StakeRemoved") {
@@ -2367,23 +2363,23 @@ function findUncles(context, finalizedWindowedChain, blocks) {
 
 // src/config/Validation.ts
 var ValidationConfigZod = z16.object({
-  allowedRewardRedeemers: z16.array(XyoAddressZod2).optional().register(globalRegistry12, {
+  allowedRewardRedeemers: z16.array(XyoAddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward redeemer addresses, if undefined anyone can participate",
     title: "allowedRewardRedeemers",
     type: "array"
   }),
-  allowedRewardEscrowAccountSigners: z16.array(XyoAddressZod2).optional().register(globalRegistry12, {
+  allowedRewardEscrowAccountSigners: z16.array(XyoAddressZod2).optional().register(globalRegistry11, {
     description: "List of allowed reward escrow account signer addresses, if undefined anyone can participate",
     title: "allowedRewardEscrowAccountSigners",
     type: "array"
   }),
-  minCandidates: z16.coerce.number().default(DEFAULT_MIN_CANDIDATES).register(globalRegistry12, {
+  minCandidates: z16.coerce.number().default(DEFAULT_MIN_CANDIDATES).register(globalRegistry11, {
     default: DEFAULT_MIN_CANDIDATES,
     description: "Minimum number of uncle candidates before selecting the best uncle",
     title: "validation.minCandidates",
     type: "number"
   }),
-  backoffMs: z16.coerce.number().default(DEFAULT_BACKOFF_MS).register(globalRegistry12, {
+  backoffMs: z16.coerce.number().default(DEFAULT_BACKOFF_MS).register(globalRegistry11, {
     default: DEFAULT_BACKOFF_MS,
     description: "Back-off timeout in ms. If head age exceeds this, minCandidates is ignored",
     title: "validation.backoffMs",
@@ -2411,7 +2407,7 @@ var AccountPathZod = z18.string().check(z18.regex(
 ));
 var ActorConfigZod = z18.extend(BaseConfigZod, {
   name: z18.string(),
-  accountPath: z18.optional(AccountPathZod).register(globalRegistry13, {
+  accountPath: z18.optional(AccountPathZod).register(globalRegistry12, {
     description: 'BIP-32 derivation path for the actor wallet. Absolute when it starts with "m/"; otherwise relative to the root wallet base path. Each actor must derive to a distinct path.',
     title: "accountPath",
     type: "string"
@@ -2429,10 +2425,10 @@ var ActorsConfigZod = z19._default(
 );
 
 // src/config/Config.ts
-import { globalRegistry as globalRegistry14, z as z20 } from "zod/mini";
+import { globalRegistry as globalRegistry13, z as z20 } from "zod/mini";
 var ConfigZod = z20.extend(BaseConfigZod, {
   actors: ActorsConfigZod,
-  healthCheckPort: z20.optional(z20.coerce.number()).register(globalRegistry14, {
+  healthCheckPort: z20.optional(z20.coerce.number()).register(globalRegistry13, {
     description: "Port for the system-wide health, readiness, and liveness endpoints (/healthz, /livez, /readyz). Set to 0 to disable.",
     title: "healthCheckPort",
     type: "number"
@@ -2457,15 +2453,15 @@ import {
   zodIsFactory as zodIsFactory3,
   zodToFactory as zodToFactory3
 } from "@xylabs/sdk-js";
-import { globalRegistry as globalRegistry15, z as z21 } from "zod/mini";
+import { globalRegistry as globalRegistry14, z as z21 } from "zod/mini";
 var HostActorConfigZod = z21.extend(ActorConfigZod, {
-  host: z21._default(z21.string(), "localhost").register(globalRegistry15, {
+  host: z21._default(z21.string(), "localhost").register(globalRegistry14, {
     default: "localhost",
     description: "Host for the Actor",
     title: "host",
     type: "string"
   }),
-  port: z21._default(z21.coerce.number(), 8080).register(globalRegistry15, {
+  port: z21._default(z21.coerce.number(), 8080).register(globalRegistry14, {
     default: 8080,
     description: "Port for the Actor",
     title: "port",
@@ -3492,7 +3488,7 @@ var signEIP712Message = async (signer, data) => {
 };
 
 // src/eip-712/verify.ts
-import { asHash as asHash3, isUndefined as isUndefined8 } from "@xylabs/sdk-js";
+import { asHash as asHash3, isUndefined as isUndefined7 } from "@xylabs/sdk-js";
 import { PayloadBuilder as PayloadBuilder16 } from "@xyo-network/sdk-js";
 import { verifyTypedData } from "ethers";
 var verifyEIP712Message = async (data, sig) => {
@@ -3503,7 +3499,7 @@ var verifyEIP712Message = async (data, sig) => {
   } = sig;
   const { schema, ...fields } = data;
   const signedHash = asHash3(hash);
-  if (isUndefined8(signedHash) || signedHash !== await PayloadBuilder16.hash(data)) return false;
+  if (isUndefined7(signedHash) || signedHash !== await PayloadBuilder16.hash(data)) return false;
   const recoveredAddress = verifyTypedData(fields.domain, fields.types, fields.values, signature);
   return recoveredAddress.toLowerCase() === address.toLowerCase();
 };
@@ -4232,7 +4228,7 @@ SimpleAccountBalanceViewer = __decorateClass([
 import {
   assertEx as assertEx34,
   exists as exists4,
-  isUndefined as isUndefined9
+  isUndefined as isUndefined8
 } from "@xylabs/sdk-js";
 import { LruCacheMap as LruCacheMap2 } from "@xyo-network/xl1-driver-memory";
 import {
@@ -4344,7 +4340,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
   async blockByNumber(blockNumber) {
     return await this.spanAsync("blockByNumber", async () => {
       const chainContext = await this.getChainContextRead();
-      if (isUndefined9(chainContext.head)) {
+      if (isUndefined8(chainContext.head)) {
         return null;
       }
       return await this.blockByNumberWithContext(chainContext, blockNumber);
@@ -4370,7 +4366,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
       assertEx34(limit > 0, () => "limit must be greater than 0");
       assertEx34(limit <= 100, () => "limit must be less than 100");
       const chainContext = await this.getChainContextRead();
-      if (isUndefined9(chainContext.head)) {
+      if (isUndefined8(chainContext.head)) {
         return [];
       }
       const blocks = [];
@@ -4393,7 +4389,7 @@ var SimpleBlockViewer = class extends AbstractCreatableProvider {
         () => `blocksByStep does not support step levels above ${blocksMaxStep} (requested ${stepLevel})`
       );
       const chainContext = await this.getChainContextRead();
-      if (isUndefined9(chainContext.head)) {
+      if (isUndefined8(chainContext.head)) {
         return [];
       }
       const start = stepIndex * size;
@@ -5805,7 +5801,7 @@ function deduplicateWithBundleBySigner(items) {
 }
 
 // src/simple/network/SimpleXyoNetwork.ts
-import { fetchJsonGet, isUndefined as isUndefined10 } from "@xylabs/sdk-js";
+import { fetchJsonGet, isUndefined as isUndefined9 } from "@xylabs/sdk-js";
 import { isNetworkStatus } from "@xyo-network/xl1-protocol-lib";
 
 // src/simple/network/lib/FailedNetworkStatusPayloads.ts
@@ -5853,7 +5849,7 @@ var SimpleXyoNetwork = class {
   }
   async status() {
     const statusNetwork = StatusNetworks[this._networkId];
-    if (isUndefined10(statusNetwork)) {
+    if (isUndefined9(statusNetwork)) {
       throw new Error(`Unknown status network ID: ${this._networkId}`);
     }
     return await this.makeRequest(statusNetwork.statusUrl);
@@ -7568,7 +7564,7 @@ export {
   getWindowedChain,
   hasLabels,
   hasMongoConfig,
-  hasR2Config,
+  hasS3Config,
   hashFromBlockNumber,
   hydrateBlock,
   hydrateElevatedTransaction,
@@ -7622,6 +7618,7 @@ export {
   registerCreatableProviderFactory,
   resolveConfig,
   resolveProviders,
+  resolveS3Bucket,
   rewardFromBlockNumber,
   schemasMaxStep,
   schemasStepSummaryFromRange,