@xyo-network/xl1-protocol-sdk 1.24.2 → 1.24.4

package/dist/neutral/transaction/TransactionBuilder.d.ts

@@ -1,7 +1,7 @@
 import { Base } from '@xylabs/sdk-js';
 import type { AccountInstance } from '@xyo-network/account-model';
-import { type PayloadBuilderOptions } from '@xyo-network/payload-builder';
 import type { Payload } from '@xyo-network/payload-model';
+import { type PayloadBuilderOptions } from '@xyo-network/sdk-js';
 import type { AllowedBlockPayload, ChainId, TransactionFeesBigInt } from '@xyo-network/xl1-protocol';
 export declare class TransactionBuilder<TPayload extends Payload> extends Base<Omit<PayloadBuilderOptions, 'schema'>> {
     private _blockRange?;

package/dist/neutral/transaction/TransactionBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TransactionBuilder.d.ts","sourceRoot":"","sources":["../../../src/transaction/TransactionBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,EAAkB,KAAK,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACzF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EACP,qBAAqB,EACtB,MAAM,2BAA2B,CAAA;AASlC,qBAAa,kBAAkB,CAAC,QAAQ,SAAS,OAAO,CAAE,SAAQ,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IAC3G,OAAO,CAAC,WAAW,CAAC,CAAkB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAK;IACpB,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAwB;gBAE5B,OAAO,GAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAM;IAIzD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgBX,KAAK,CAAC,KAAK,EAAE,OAAO;IAKd,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAaZ,eAAe,CAAC,OAAO,CAAC,EAAE,mBAAmB;IAO7C,gBAAgB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,EAAE;IAQ3C,oBAAoB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAY5D,IAAI,CAAC,IAAI,EAAE,qBAAqB;IAKhC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ;IAK1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;IAU9B,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ5B,qBAAqB,CAAC,OAAO,EAAE,mBAAmB;IAalD,aAAa,CAAC,OAAO,EAAE,QAAQ;IAarC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe;IAO/B,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC,EAAE;CAS7C"}
+{"version":3,"file":"TransactionBuilder.d.ts","sourceRoot":"","sources":["../../../src/transaction/TransactionBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC/C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAkB,KAAK,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAChF,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EACP,qBAAqB,EACtB,MAAM,2BAA2B,CAAA;AASlC,qBAAa,kBAAkB,CAAC,QAAQ,SAAS,OAAO,CAAE,SAAQ,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC;IAC3G,OAAO,CAAC,WAAW,CAAC,CAAkB;IACtC,OAAO,CAAC,MAAM,CAAC,CAAK;IACpB,OAAO,CAAC,iBAAiB,CAA4B;IACrD,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,QAAQ,CAAwB;gBAE5B,OAAO,GAAE,IAAI,CAAC,qBAAqB,EAAE,QAAQ,CAAM;IAIzD,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgBX,KAAK,CAAC,KAAK,EAAE,OAAO;IAKd,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAaZ,eAAe,CAAC,OAAO,CAAC,EAAE,mBAAmB;IAO7C,gBAAgB,CAAC,QAAQ,CAAC,EAAE,mBAAmB,EAAE;IAQ3C,oBAAoB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAY5D,IAAI,CAAC,IAAI,EAAE,qBAAqB;IAKhC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ;IAK1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE;IAU9B,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;IAQ5B,qBAAqB,CAAC,OAAO,EAAE,mBAAmB;IAalD,aAAa,CAAC,OAAO,EAAE,QAAQ;IAarC,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe;IAO/B,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,eAAe,GAAG,IAAI,CAAC,EAAE;CAS7C"}

package/dist/neutral/transaction/buildRandomTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildRandomTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildRandomTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EACW,OAAO,EAC5B,qCAAqC,EAErC,cAAc,EACf,MAAM,2BAA2B,CAAA;AAMlC,eAAO,MAAM,sBAAsB,GACjC,OAAO,OAAO,EACd,WAAW,OAAO,EAAE,EACpB,UAAU,eAAe,EACzB,MAAK,cAA0C,EAC/C,MAAK,cAAmD,EACxD,wBAAuB,MAAM,EAAO,EACpC,kBAAkB,OAAO,KACxB,OAAO,CAAC,qCAAqC,CAY/C,CAAA"}
+{"version":3,"file":"buildRandomTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildRandomTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAEjE,OAAO,KAAK,EACW,OAAO,EAC5B,qCAAqC,EAErC,cAAc,EACf,MAAM,2BAA2B,CAAA;AAMlC,eAAO,MAAM,sBAAsB,GACjC,OAAO,OAAO,EACd,WAAW,OAAO,EAAE,EACpB,UAAU,eAAe,EACzB,MAAK,cAA0C,EAC/C,MAAK,cAAmD,EACxD,wBAAuB,MAAM,EAAO,EACpC,kBAAkB,OAAO,KACxB,OAAO,CAAC,qCAAqC,CAY/C,CAAA"}

package/dist/neutral/transaction/buildTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AAGjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EAGP,qCAAqC,EACmB,qBAAqB,EAC7E,cAAc,EACf,MAAM,2BAA2B,CAAA;AAGlC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,qCAAqC,CAAC,CAwChD"}
+{"version":3,"file":"buildTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAA;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEzD,OAAO,KAAK,EACV,mBAAmB,EACnB,OAAO,EAGP,qCAAqC,EACmB,qBAAqB,EAC7E,cAAc,EACf,MAAM,2BAA2B,CAAA;AAGlC,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,EAC3C,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,CAAC,EAAE,OAAO,EACd,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,qCAAqC,CAAC,CAwChD"}

package/dist/neutral/transaction/buildUnsignedTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildUnsignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildUnsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAI7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EACV,mBAAmB,EAAE,OAAO,EAAwF,qBAAqB,EACzI,2BAA2B,EAC3B,cAAc,EACf,MAAM,2BAA2B,CAAA;AAGlC,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,OAAO,EACb,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,2BAA2B,CAAC,CAmCtC"}
+{"version":3,"file":"buildUnsignedTransaction.d.ts","sourceRoot":"","sources":["../../../src/transaction/buildUnsignedTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEzD,OAAO,KAAK,EACV,mBAAmB,EAAE,OAAO,EAAwF,qBAAqB,EACzI,2BAA2B,EAC3B,cAAc,EACf,MAAM,2BAA2B,CAAA;AAGlC,wBAAsB,wBAAwB,CAC5C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,mBAAmB,EAAE,EACtC,gBAAgB,EAAE,OAAO,EAAE,EAC3B,GAAG,EAAE,cAAc,EACnB,GAAG,EAAE,cAAc,EACnB,IAAI,EAAE,OAAO,EACb,IAAI,GAAE,qBAA8C,GACnD,OAAO,CAAC,2BAA2B,CAAC,CAmCtC"}

package/dist/neutral/transaction/signTransaction.d.ts

@@ -17,7 +17,7 @@ export declare function signTransaction(tx: UnsignedTransactionBoundWitness, acc
         readonly __address: true;
     })[];
     payload_hashes: import("@xylabs/sdk-js").BrandedHash[];
-    payload_schemas: import("@xyo-network/payload-model").BrandedSchema<string>[];
+    payload_schemas: import("@xyo-network/sdk-js").BrandedSchema<string>[];
     previous_hashes: (import("@xylabs/sdk-js").BrandedHash | null)[];
     $signatures: (import("@xylabs/sdk-js").BrandedHex | null)[];
     nbf: import("@xyo-network/xl1-protocol").XL1BlockNumber;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-protocol-sdk",
-  "version": "1.24.2",
+  "version": "1.24.4",
   "description": "XYO Layer One SDK Protocol",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -23,6 +23,10 @@
   "exports": {
     ".": {
       "types": "./dist/neutral/index.d.ts",
+      "node": {
+        "types": "./dist/neutral/index-node.d.ts",
+        "export": "./dist/neutral/index-node.mjs"
+      },
       "source": "./src/index.ts",
       "default": "./dist/neutral/index.mjs"
     },
@@ -44,23 +48,21 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@opentelemetry/api": "^1.9.0",
     "@xylabs/axios": "^5.0.79",
     "@xylabs/sdk-js": "~5.0.79",
     "@xylabs/zod": "~5.0.79",
-    "@xyo-network/account": "~5.3.2",
     "@xyo-network/account-model": "~5.3.2",
     "@xyo-network/archivist-memory": "~5.3.2",
     "@xyo-network/archivist-model": "~5.3.2",
-    "@xyo-network/boundwitness-builder": "~5.3.2",
     "@xyo-network/boundwitness-model": "~5.3.2",
     "@xyo-network/id-payload-plugin": "~5.3.2",
-    "@xyo-network/payload-builder": "~5.3.2",
     "@xyo-network/payload-model": "~5.3.2",
+    "@xyo-network/sdk-js": "~5.3.2",
     "@xyo-network/wallet": "~5.3.2",
-    "@xyo-network/xl1-protocol": "~1.24.2",
-    "@xyo-network/xl1-schema": "~1.24.2",
+    "@xyo-network/xl1-protocol": "~1.24.4",
+    "@xyo-network/xl1-schema": "~1.24.4",
     "async-mutex": "~0.5.0",
+    "cosmiconfig": "^9.0.0",
     "ethers": "^6.16.0",
     "lru-cache": "^11.2.6"
   },
@@ -70,7 +72,6 @@
     "@xylabs/ts-scripts-yarn3": "~7.3.2",
     "@xylabs/tsconfig": "~7.3.2",
     "@xylabs/vitest-extended": "~5.0.79",
-    "@xyo-network/account": "~5.3.2",
     "@xyo-network/archivist-memory": "~5.3.2",
     "@xyo-network/archivist-mongodb": "~5.3.2",
     "@xyo-network/boundwitness-validator": "~5.3.2",

package/src/config/Actor.ts

@@ -0,0 +1,36 @@
+import {
+  zodAsFactory, zodIsFactory, zodToFactory,
+} from '@xylabs/zod'
+import { globalRegistry, z } from 'zod'
+
+import { BaseConfigContextZod } from '../CreatableProvider/index.ts'
+import { MnemonicStringZod } from '../validation/index.ts'
+import { BaseConfigZod } from './Base.ts'
+
+export const ActorConfigZod = BaseConfigZod.extend({
+  name: z.string(),
+  mnemonic: MnemonicStringZod.optional().register(globalRegistry, {
+    description: 'Mnemonic for the Actor wallet',
+    title: 'mnemonic',
+    type: 'string',
+  }),
+  healthCheckPort: z.coerce.number().optional().register(globalRegistry, {
+    description: 'Port for the Producer health checks',
+    title: 'producer.healthCheckPort',
+    type: 'number',
+  }),
+})
+
+export type ActorConfig = z.infer<typeof ActorConfigZod>
+
+export const isActorConfig = zodIsFactory(ActorConfigZod)
+export const asActorConfig = zodAsFactory(ActorConfigZod, 'asActorConfig')
+export const toActorConfig = zodToFactory(ActorConfigZod, 'toActorConfig')
+
+export const ActorConfigContext = BaseConfigContextZod.extend({ config: ActorConfigZod })
+
+export type ActorConfigContext = z.infer<typeof ActorConfigContext>
+
+export const isActorConfigContext = zodIsFactory(ActorConfigContext)
+export const asActorConfigContext = zodAsFactory(ActorConfigContext, 'asActorConfigContext')
+export const toActorConfigContext = zodToFactory(ActorConfigContext, 'toActorConfigContext')

package/src/config/Config.ts

@@ -1,9 +1,13 @@
-import { deepMerge } from '@xylabs/sdk-js'
 import z from 'zod'
 
+import { ActorConfigZod } from './Actor.ts'
 import { BaseConfigZod } from './Base.ts'
 
-export const ActorsConfigZod = z.array(BaseConfigZod.loose()).describe('Actor-specific configurations that override the base configuration when the actor is running').default([])
+export type DeepPartial<T> = {
+  [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P]
+}
+
+export const ActorsConfigZod = z.array(ActorConfigZod.loose()).describe('Actor-specific configurations that override the base configuration when the actor is running').default([])
 
 export type ActorsConfig = z.infer<typeof ActorsConfigZod>
 
@@ -14,15 +18,12 @@ export type Config = z.infer<typeof ConfigZod>
 export type ActorName = keyof ActorsConfig
 
 export function resolveConfig(
-  config: Config,
+  config: DeepPartial<Config>,
 ) {
   const parsedConfig = ConfigZod.parse(config)
   const { actors, ...rootConfig } = parsedConfig
   parsedConfig.actors = actors.map((actorConfig) => {
-    return BaseConfigZod.loose().parse(deepMerge(rootConfig, actorConfig))
+    return ActorConfigZod.loose().parse({ ...rootConfig, ...actorConfig })
   })
   return parsedConfig
 }
-
-/** @deprecated Use ConfigZod.parse({}) instead */
-export const getDefaultConfig = (): Config => ConfigZod.parse({})

package/src/config/HostActor.ts

@@ -0,0 +1,36 @@
+import {
+  zodAsFactory, zodIsFactory, zodToFactory,
+} from '@xylabs/zod'
+import { globalRegistry, z } from 'zod'
+
+import { BaseConfigContextZod } from '../CreatableProvider/index.ts'
+import { ActorConfigZod } from './Actor.ts'
+
+export const HostActorConfigZod = ActorConfigZod.extend({
+  host: z.string().default('localhost').register(globalRegistry, {
+    default: 'localhost',
+    description: 'Host for the Actor',
+    title: 'host',
+    type: 'string',
+  }),
+  port: z.coerce.number().default(8080).register(globalRegistry, {
+    default: 8080,
+    description: 'Port for the Actor',
+    title: 'port',
+    type: 'number',
+  }),
+})
+
+export type HostActorConfig = z.infer<typeof HostActorConfigZod>
+
+export const isHostActorConfig = zodIsFactory(HostActorConfigZod)
+export const asHostActorConfig = zodAsFactory(HostActorConfigZod, 'asHostActorConfig')
+export const toHostActorConfig = zodToFactory(HostActorConfigZod, 'toHostActorConfig')
+
+export const HostActorConfigContext = BaseConfigContextZod.extend({ config: HostActorConfigZod })
+
+export type HostActorConfigContext = z.infer<typeof HostActorConfigContext>
+
+export const isHostActorConfigContext = zodIsFactory(HostActorConfigContext)
+export const asHostActorConfigContext = zodAsFactory(HostActorConfigContext, 'asHostActorConfigContext')
+export const toHostActorConfigContext = zodToFactory(HostActorConfigContext, 'toHostActorConfigContext')

package/src/config/getFileConfig.ts

@@ -0,0 +1,36 @@
+import { isDefined, isNull } from '@xylabs/sdk-js'
+import { cosmiconfig } from 'cosmiconfig'
+
+import { ConfigZod } from './Config.ts'
+
+/**
+ * The name of the configuration file to search for.
+ */
+const configName = 'xyo'
+
+/**
+ * The name of the section within the configuration file to parse.
+ */
+const configSection = 'xl1' // Default section in the config file
+
+/**
+ * Attempts to parse the configuration from a file using cosmiconfig.
+ * @returns The parsed configuration object if found and valid, otherwise undefined.
+ */
+export async function getFileConfig(searchPlaces?: string[]) {
+  const explorer = cosmiconfig(
+    configName,
+    {
+      cache: true,
+      searchPlaces,
+    },
+  )
+  const result = (await explorer.search())?.config
+  if (!isNull(result)) {
+    const section = result[configSection]
+    if (isDefined(section) && typeof section === 'object') {
+      return ConfigZod.loose().parse(section)
+    }
+  }
+  return ConfigZod.parse({})
+}

package/src/config/index-node.ts

@@ -0,0 +1,3 @@
+export * from './getFileConfig.ts'
+// eslint-disable-next-line no-restricted-imports
+export * from './index.ts'

package/src/config/index.ts

@@ -1,5 +1,7 @@
+export * from './Actor.ts'
 export * from './Base.ts'
 export * from './Config.ts'
+export * from './HostActor.ts'
 export { hasMongoConfig } from './storage/index.ts'
 export { DefaultMetricsScrapePorts } from './Telemetry.ts'
 export * from './UsageMeta.ts'

package/src/createDeclarationPayload.ts

@@ -1,6 +1,6 @@
 import type { Address } from '@xylabs/sdk-js'
 import { isDefined } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   type ChainStakeIntent, ChainStakeIntentSchema, type Intent,
 } from '@xyo-network/xl1-protocol'

package/src/createTransferPayload.ts

@@ -1,6 +1,6 @@
 import type { Address, JsonObject } from '@xylabs/sdk-js'
 import { toHex } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { Transfer } from '@xyo-network/xl1-protocol'
 import { TransferSchema } from '@xyo-network/xl1-protocol'
 

package/src/eip-712/sign.ts

@@ -1,4 +1,4 @@
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { Signer } from 'ethers'
 
 import {

package/src/eip-712/verify.ts

@@ -1,5 +1,5 @@
 import { asHash, isUndefined } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import { verifyTypedData } from 'ethers'
 
 import type { EIP712DataPayload, EIP712SignaturePayload } from './Payloads/index.ts'

package/src/index-node.ts

@@ -0,0 +1,3 @@
+// eslint-disable-next-line import-x/no-internal-modules
+export * from './config/index-node.ts'
+export * from './index-shared.ts'

package/src/index-shared.ts

@@ -0,0 +1,24 @@
+export * from './actor/index.ts'
+export * from './block/index.ts'
+export * from './constants.ts'
+export * from './context/index.ts'
+export * from './CreatableProvider/index.ts'
+export * from './createDeclarationPayload.ts'
+export * from './createTransferPayload.ts'
+export * from './driver/index.ts'
+export * from './eip-712/index.ts'
+export * from './instances/index.ts'
+export * from './model/index.ts'
+export * from './multipliers.ts'
+export * from './payloads/index.ts'
+export * from './primitives/index.ts'
+export * from './services/index.ts'
+export * from './SignedBigInt.ts'
+export * from './simple/index.ts'
+export * from './status/index.ts'
+export * from './summary/index.ts'
+export * from './time/index.ts'
+export * from './transaction/index.ts'
+export * from './utils/index.ts'
+export * from './validation/index.ts'
+export * from './wallet/index.ts'

package/src/index.ts

@@ -1,25 +1,2 @@
-export * from './actor/index.ts'
-export * from './block/index.ts'
 export * from './config/index.ts'
-export * from './constants.ts'
-export * from './context/index.ts'
-export * from './CreatableProvider/index.ts'
-export * from './createDeclarationPayload.ts'
-export * from './createTransferPayload.ts'
-export * from './driver/index.ts'
-export * from './eip-712/index.ts'
-export * from './instances/index.ts'
-export * from './model/index.ts'
-export * from './multipliers.ts'
-export * from './payloads/index.ts'
-export * from './primitives/index.ts'
-export * from './services/index.ts'
-export * from './SignedBigInt.ts'
-export * from './simple/index.ts'
-export * from './status/index.ts'
-export * from './summary/index.ts'
-export * from './time/index.ts'
-export * from './transaction/index.ts'
-export * from './utils/index.ts'
-export * from './validation/index.ts'
-export * from './wallet/index.ts'
+export * from './index-shared.ts'

package/src/model/PayloadBundle/bundledPayloadToHydratedBlock.ts

@@ -1,5 +1,5 @@
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 import { asSignedBlockBoundWitnessWithHashMeta } from '@xyo-network/xl1-protocol'
 

package/src/model/PayloadBundle/bundledPayloadToHydratedTransaction.ts

@@ -1,5 +1,5 @@
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { PayloadBundle } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 import { asSignedTransactionBoundWitnessWithHashMeta } from '@xyo-network/xl1-protocol'
 

package/src/model/PayloadBundle/hydratedBlockToPayloadBundle.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { type PayloadBundle, PayloadBundleSchema } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
 import { flattenHydratedBlock } from '../../block/index.ts'

package/src/model/PayloadBundle/hydratedTransactionToPayloadBundle.ts

@@ -1,6 +1,6 @@
 import type { Hash } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { type PayloadBundle, PayloadBundleSchema } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type { SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 
 import { flattenHydratedTransaction } from '../../transaction/index.ts'

package/src/simple/blockInvalidation/SimpleBlockInvalidationViewer.ts

@@ -1,5 +1,5 @@
 import { assertEx, Promisable } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   AccountBalanceViewer,
   AccountBalanceViewerMoniker,

package/src/simple/blockValidation/SimpleBlockValidationViewer.ts

@@ -1,5 +1,5 @@
 import { assertEx, Promisable } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   AccountBalanceViewer,
   AccountBalanceViewerMoniker,

package/src/simple/datalake/RestDataLakeRunner.ts

@@ -1,8 +1,8 @@
 import {
   assertEx, exists, type Hash,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { isAnyPayload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   DataLakeData,
   DataLakeRunner,

package/src/simple/gateway/SimpleXyoGateway.ts

@@ -1,5 +1,10 @@
+import type { Hash } from '@xylabs/sdk-js'
+import {
+  isAnyPayload, isHashMeta, type Payload, type WithHashMeta,
+} from '@xyo-network/payload-model'
 import type {
   DataLakesViewer,
+  SignedHydratedBlockWithHashMeta,
   XyoConnection,
   XyoGateway,
 } from '@xyo-network/xl1-protocol'
@@ -30,6 +35,25 @@ export class SimpleXyoGateway extends AbstractCreatableProvider<SimpleXyoGateway
     return this._dataLakes
   }
 
+  async blockByHash(hash: Hash): Promise<SignedHydratedBlockWithHashMeta | null> {
+    const [block, payloads] = await this.connection.viewer?.block.blockByHash(hash) ?? [null, []]
+    if (block !== null) {
+      const missingHashes = block.payload_hashes.filter(h => !payloads.some(p => p._hash === h))
+      const foundPayloads: Record<Hash, WithHashMeta<Payload>> = {}
+      const dataLakes = this.dataLakes ? this.dataLakes.dataLakes : []
+      for (const dataLake of dataLakes) {
+        const found = (await dataLake.getMany(missingHashes)).filter(p => isAnyPayload(p) && isHashMeta(p) && missingHashes.includes(p._hash)) as WithHashMeta<Payload>[]
+        for (const payload of found) {
+          foundPayloads[payload._hash] = payload
+        }
+      }
+      for (const [, payload] of Object.entries(foundPayloads)) {
+        payloads.push(payload)
+      }
+    }
+    return block ? [block, payloads] : null
+  }
+
   override async createHandler() {
     await super.createHandler()
     this._connection = await this.locator.getInstance<XyoConnection>(XyoConnectionMoniker)

package/src/simple/gateway/SimpleXyoGatewayRunner.ts

@@ -4,11 +4,13 @@ import type {
 import {
   assertEx, BigIntToJsonZod, isDefined,
 } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
-import { type Payload, type WithHashMeta } from '@xyo-network/payload-model'
+import {
+  isAnyPayload, isHashMeta, type Payload, type WithHashMeta,
+} from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   AllowedBlockPayload, AttoXL1, ConfirmSubmittedTransactionOptions,
-  DataLakeRunner, DataLakesRunner, SignedHydratedTransaction, SignedHydratedTransactionWithHashMeta, TransactionOptions, Transfer, UnsignedHydratedTransaction,
+  DataLakeRunner, DataLakesRunner, SignedHydratedBlockWithHashMeta, SignedHydratedTransaction, SignedHydratedTransactionWithHashMeta, TransactionOptions, Transfer, UnsignedHydratedTransaction,
   XyoConnection, XyoGatewayRunner, XyoSigner,
 } from '@xyo-network/xl1-protocol'
 import {
@@ -97,6 +99,25 @@ export class SimpleXyoGatewayRunner extends AbstractCreatableProvider<SimpleXyoG
     return [await runner.broadcastTransaction([signedTx[0], signedTx[1]]), signedTx]
   }
 
+  async blockByHash(hash: Hash): Promise<SignedHydratedBlockWithHashMeta | null> {
+    const [block, payloads] = await this.connection.viewer?.block.blockByHash(hash) ?? [null, []]
+    if (block !== null) {
+      const missingHashes = block.payload_hashes.filter(h => !payloads.some(p => p._hash === h))
+      const foundPayloads: Record<Hash, WithHashMeta<Payload>> = {}
+      const dataLakes = this.dataLakes ? this.dataLakes.dataLakes : []
+      for (const dataLake of dataLakes) {
+        const found = (await dataLake.getMany(missingHashes)).filter(p => isAnyPayload(p) && isHashMeta(p) && missingHashes.includes(p._hash)) as WithHashMeta<Payload>[]
+        for (const payload of found) {
+          foundPayloads[payload._hash] = payload
+        }
+      }
+      for (const [, payload] of Object.entries(foundPayloads)) {
+        payloads.push(payload)
+      }
+    }
+    return block ? [block, payloads] : null
+  }
+
   async confirmSubmittedTransaction(txHash: Hash, options?: ConfirmSubmittedTransactionOptions): Promise<SignedHydratedTransaction> {
     return await confirmSubmittedTransaction(
       assertEx(this.connection.viewer, () => 'Connection viewer is undefined'),

package/src/simple/mempool/SimpleMempoolRunner.ts

@@ -2,11 +2,11 @@ import {
   assertEx, exists, type Hash,
 } from '@xylabs/sdk-js'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import {
   isPayloadBundle, Payload, Sequence,
   WithHashMeta,
 } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   BlockValidationViewer,
   BlockValidationViewerMoniker,

package/src/simple/runner/SimpleXyoRunner.ts

@@ -1,5 +1,5 @@
 import { type Hash } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   MempoolRunner,
   MempoolRunnerMoniker, SignedHydratedTransactionWithStorageMeta,

package/src/simple/signer/SimpleXyoSigner.ts

@@ -1,8 +1,7 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
-import { Account } from '@xyo-network/account'
 import type { AccountInstance } from '@xyo-network/account-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { type Payload } from '@xyo-network/payload-model'
+import { Account, PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   AllowedBlockPayload, ChainId, SignedHydratedTransactionWithHashMeta,
   SignedTransactionBoundWitness, TransactionFeesBigInt,

package/src/simple/transactionInvalidation/SimpleTransactionInvalidationViewer.ts

@@ -1,5 +1,5 @@
 import { assertEx, Promisable } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   AccountBalanceViewer,
   AccountBalanceViewerMoniker,

package/src/simple/transactionValidation/SimpleTransactionValidationViewer.ts

@@ -1,5 +1,5 @@
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   AccountBalanceViewer,
   AccountBalanceViewerMoniker,

package/src/summary/primitives/balances/balancesStepSummaryFromRange.ts

@@ -1,8 +1,8 @@
 import { type Address, spanRootAsync } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   BlockViewer, CachingContext, MapType, XL1BlockRange,
 } from '@xyo-network/xl1-protocol'

package/src/summary/primitives/schemas/schemasStepSummaryFromRange.ts

@@ -1,8 +1,8 @@
 import { assertEx } from '@xylabs/sdk-js'
 import { isBoundWitness } from '@xyo-network/boundwitness-model'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Schema, WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload, isHashMeta } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   BlockViewer, CachingContext, MapType, XL1BlockRange,
 } from '@xyo-network/xl1-protocol'

package/src/summary/primitives/transfers/transfersStepSummaryFromRange.ts

@@ -1,9 +1,9 @@
 /* eslint-disable max-statements */
 import { type Address } from '@xylabs/sdk-js'
 import { assertEx } from '@xylabs/sdk-js'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { WithHashMeta } from '@xyo-network/payload-model'
 import { isAnyPayload } from '@xyo-network/payload-model'
+import { PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   BlockViewer, CachingContext, MapType, XL1BlockRange,
 } from '@xyo-network/xl1-protocol'

package/src/test/buildBlock.ts

@@ -4,9 +4,8 @@ import type { Hex } from '@xylabs/sdk-js'
 import {
   assertEx, isDefined, isHash, toSafeJsonString,
 } from '@xylabs/sdk-js'
-import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
+import { BoundWitnessBuilder, PayloadBuilder } from '@xyo-network/sdk-js'
 import type {
   BlockBoundWitness, SignedHydratedBlockWithHashMeta, Transfer,
 } from '@xyo-network/xl1-protocol'

package/src/test/buildRandomChain.ts

@@ -1,12 +1,11 @@
 import type { Address } from '@xylabs/sdk-js'
 import { asAddress, assertEx } from '@xylabs/sdk-js'
-import { Account } from '@xyo-network/account'
 import type { AccountInstance } from '@xyo-network/account-model'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import type { Id } from '@xyo-network/id-payload-plugin'
 import { IdSchema } from '@xyo-network/id-payload-plugin'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { asSchema } from '@xyo-network/payload-model'
+import { Account, PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   asXL1BlockNumber,
   type ChainId, type SignedHydratedBlockWithHashMeta, type SignedHydratedTransactionWithHashMeta,

package/src/test/buildRandomGenesisBlock.ts

@@ -1,10 +1,9 @@
 import { asAddress, assertEx } from '@xylabs/sdk-js'
-import { Account } from '@xyo-network/account'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type { Id } from '@xyo-network/id-payload-plugin'
 import { IdSchema } from '@xyo-network/id-payload-plugin'
-import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { asSchema } from '@xyo-network/payload-model'
+import { Account, PayloadBuilder } from '@xyo-network/sdk-js'
 import {
   asXL1BlockNumber, type ChainId, type HydratedBlockWithHashMeta,
 } from '@xyo-network/xl1-protocol'