@xyo-network/xl1-protocol-sdk 1.15.21 → 1.15.23

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-protocol-sdk",
-  "version": "1.15.21",
+  "version": "1.15.23",
   "description": "XYO Layer One SDK Protocol",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -36,35 +36,35 @@
     "src"
   ],
   "dependencies": {
-    "@xylabs/array": "~5.0.14",
-    "@xylabs/arraybuffer": "~5.0.14",
-    "@xylabs/assert": "~5.0.14",
-    "@xylabs/delay": "~5.0.14",
-    "@xylabs/hex": "~5.0.14",
-    "@xylabs/logger": "~5.0.14",
-    "@xylabs/object": "~5.0.14",
-    "@xylabs/promise": "~5.0.14",
-    "@xylabs/telemetry": "~5.0.14",
-    "@xylabs/typeof": "~5.0.14",
-    "@xyo-network/account-model": "~5.1.8",
-    "@xyo-network/archivist-model": "~5.1.8",
-    "@xyo-network/boundwitness-builder": "~5.1.8",
-    "@xyo-network/boundwitness-model": "~5.1.8",
-    "@xyo-network/payload-builder": "~5.1.8",
-    "@xyo-network/payload-model": "~5.1.8",
-    "@xyo-network/wallet": "~5.1.8",
-    "@xyo-network/wallet-model": "~5.1.8",
-    "@xyo-network/xl1-protocol": "~1.12.84",
+    "@xylabs/array": "~5.0.17",
+    "@xylabs/arraybuffer": "~5.0.17",
+    "@xylabs/assert": "~5.0.17",
+    "@xylabs/delay": "~5.0.17",
+    "@xylabs/hex": "~5.0.17",
+    "@xylabs/logger": "~5.0.17",
+    "@xylabs/object": "~5.0.17",
+    "@xylabs/promise": "~5.0.17",
+    "@xylabs/telemetry": "~5.0.17",
+    "@xylabs/typeof": "~5.0.17",
+    "@xyo-network/account-model": "~5.1.15",
+    "@xyo-network/archivist-model": "~5.1.15",
+    "@xyo-network/boundwitness-builder": "~5.1.15",
+    "@xyo-network/boundwitness-model": "~5.1.15",
+    "@xyo-network/payload-builder": "~5.1.15",
+    "@xyo-network/payload-model": "~5.1.15",
+    "@xyo-network/wallet": "~5.1.15",
+    "@xyo-network/wallet-model": "~5.1.15",
+    "@xyo-network/xl1-protocol": "~1.12.89",
     "async-mutex": "~0.5.0",
     "ethers": "~6.15.0",
     "zod": "~4.1.12"
   },
   "devDependencies": {
-    "@types/node": "~24.9.1",
+    "@types/node": "~24.9.2",
     "@xylabs/ts-scripts-yarn3": "~7.1.8",
     "@xylabs/tsconfig": "~7.1.8",
-    "@xyo-network/account": "~5.1.8",
-    "@xyo-network/boundwitness-validator": "~5.1.8",
+    "@xyo-network/account": "~5.1.15",
+    "@xyo-network/boundwitness-validator": "~5.1.15",
     "eslint": "^9.38.0",
     "typescript": "~5.9.3",
     "vitest": "~3.2.4"

package/src/block/primitives/blockFromBlockNumber.ts

@@ -17,7 +17,7 @@ export async function blockFromBlockNumber(context: ChainContextRead, blockNumbe
     let jumpHash: Hash | null = currentBlock.previous
     let jumpBlockNumber = currentBlock.block - 1
     for (const [step, stepSize] of StepSizes.entries()) {
-      const possibleJumpBlockNumber = currentBlock.block - stepSize
+      const possibleJumpBlockNumber = currentBlock.block - (currentBlock.block % stepSize) - 1
       if (possibleJumpBlockNumber >= blockNumber && possibleJumpBlockNumber <= jumpBlockNumber) {
         jumpBlockNumber = possibleJumpBlockNumber
         jumpHash = asHash(currentBlock.step_hashes.at(step), () => `Step hash not found for step ${step} in block ${currentBlock.block}`)
@@ -31,7 +31,7 @@ export async function blockFromBlockNumber(context: ChainContextRead, blockNumbe
       break
     }
     if (currentBlock.block < blockNumber) {
-      throw new Error(`Block number ${blockNumber} is not a valid step block number for block ${context.head}.`)
+      throw new Error(`Block number ${blockNumber} is not a valid step block number for block ${head}.`)
     }
   }
   return currentBlock

package/src/config/storage/driver/Mongo.ts

@@ -22,27 +22,27 @@ export const hasMongoConfig = (config?: MongoConfig): config is Required<MongoCo
 
 export const MongoConfigZod = z.object({
   // TODO: Create from other arguments
-  connectionString: z.string().min(1).optional().register(globalRegistry, {
+  connectionString: z.string().nonempty().optional().register(globalRegistry, {
     description: 'MongoDB connection string',
     title: 'storage.mongo.connectionString',
     type: 'string',
   }),
-  database: z.string().min(1).optional().register(globalRegistry, {
+  database: z.string().nonempty().optional().register(globalRegistry, {
     description: 'MongoDB database name',
     title: 'storage.mongo.database',
     type: 'string',
   }),
-  domain: z.string().min(1).optional().register(globalRegistry, {
+  domain: z.string().nonempty().optional().register(globalRegistry, {
     description: 'MongoDB domain',
     title: 'storage.mongo.domain',
     type: 'string',
   }),
-  password: z.string().min(1).optional().register(globalRegistry, {
+  password: z.string().nonempty().optional().register(globalRegistry, {
     description: 'MongoDB password',
     title: 'storage.mongo.password',
     type: 'string',
   }),
-  username: z.string().min(1).optional().register(globalRegistry, {
+  username: z.string().nonempty().optional().register(globalRegistry, {
     description: 'MongoDB username',
     title: 'storage.mongo.username',
     type: 'string',

package/src/eip-712/Payloads/EIP712Data.ts

@@ -0,0 +1,45 @@
+import { AsObjectFactory } from '@xylabs/object'
+import { isPayloadOfZodType, type Payload } from '@xyo-network/payload-model'
+import z from 'zod'
+
+import {
+  TypedDataDomainZod, TypedDataTypesZod, TypedDataValueZod,
+} from '../Types.ts'
+
+export const EIP712DataPayloadFieldsZod = z.object({
+  domain: TypedDataDomainZod,
+  types: TypedDataTypesZod,
+  values: TypedDataValueZod,
+})
+export type EIP712DataPayloadFields = z.infer<typeof EIP712DataPayloadFieldsZod>
+
+/**
+ * @deprecated Use EIP712DataPayloadFields instead
+ */
+export type EIP712PayloadFields = EIP712DataPayloadFields
+
+export const EIP712DataPayloadSchema = 'network.xyo.chains.ethereum.eip712.data' as const
+export type EIP712DataPayloadSchema = typeof EIP712DataPayloadSchema
+
+/**
+ * @deprecated Use EIP712DataPayloadSchema instead
+ */
+export const EIP712PayloadSchema = EIP712DataPayloadSchema
+/**
+ * @deprecated Use EIP712DataPayloadSchema instead
+ */
+export type EIP712PayloadSchema = typeof EIP712DataPayloadSchema
+
+export type EIP712DataPayload = Payload<EIP712DataPayloadFields, EIP712DataPayloadSchema>
+
+/**
+ * @deprecated Use EIP712DataPayload instead
+ */
+export type EIP712Payload = EIP712DataPayload
+
+export const isEIP712DataPayload = isPayloadOfZodType<EIP712DataPayload>(
+  EIP712DataPayloadFieldsZod,
+  EIP712DataPayloadSchema,
+)
+
+export const asEIP712DataPayload = AsObjectFactory.create(isEIP712DataPayload)

package/src/eip-712/Payloads/EIP712Signature.ts

@@ -0,0 +1,24 @@
+import { HashZod } from '@xylabs/hex'
+import { AsObjectFactory } from '@xylabs/object'
+import { isPayloadOfZodType, type Payload } from '@xyo-network/payload-model'
+import z from 'zod'
+
+export const EIP712SignaturePayloadFieldsZod = z.object({
+  address: z.string(),
+  hash: HashZod,
+  signature: z.string(),
+})
+
+export type EIP712SignaturePayloadFields = z.infer<typeof EIP712SignaturePayloadFieldsZod>
+
+export const EIP712SignaturePayloadSchema = 'network.xyo.chains.ethereum.eip712.signature' as const
+export type EIP712SignaturePayloadSchema = typeof EIP712SignaturePayloadSchema
+
+export type EIP712SignaturePayload = Payload<EIP712SignaturePayloadFields, EIP712SignaturePayloadSchema>
+
+export const isEIP712SignaturePayload = isPayloadOfZodType<EIP712SignaturePayload>(
+  EIP712SignaturePayloadFieldsZod,
+  EIP712SignaturePayloadSchema,
+)
+
+export const asEIP712SignaturePayload = AsObjectFactory.create(isEIP712SignaturePayload)

package/src/eip-712/Payloads/index.ts

@@ -0,0 +1,2 @@
+export * from './EIP712Data.ts'
+export * from './EIP712Signature.ts'

package/src/eip-712/Types.ts

@@ -1,4 +1,5 @@
-import type { Signer } from 'ethers/providers'
+// import type { Signer } from 'ethers/providers'
+import z from 'zod'
 
 /**
  * Typed Data Types
@@ -6,6 +7,27 @@ import type { Signer } from 'ethers/providers'
  * we can fix in one place if they change
  */
 
-export type TypedDataDomain = Parameters<Signer['signTypedData']>[0]
-export type TypedDataTypes = Parameters<Signer['signTypedData']>[1]
-export type TypedDataValues = Parameters<Signer['signTypedData']>[2]
+// export type TypedDataDomain = Parameters<Signer['signTypedData']>[0]
+// export type TypedDataTypes = Parameters<Signer['signTypedData']>[1]
+// export type TypedDataValues = Parameters<Signer['signTypedData']>[2]
+
+export const TypedDataDomainZod = z.object({
+  name: z.string().nullable().optional(),
+  version: z.string().nullable().optional(),
+  chainId: z.union([z.string(), z.number(), z.bigint()]).nullable().optional(),
+  verifyingContract: z.string().nullable().optional(),
+  salt: z.union([z.string(), z.instanceof(Uint8Array)]).nullable().optional(),
+})
+export type TypedDataDomain = z.infer<typeof TypedDataDomainZod>
+
+export const TypedDataFieldZod = z.object({
+  name: z.string(),
+  type: z.string(),
+})
+export type TypedDataField = z.infer<typeof TypedDataFieldZod>
+
+export const TypedDataTypesZod = z.record(z.string(), z.array(TypedDataFieldZod))
+export type TypedDataTypes = z.infer<typeof TypedDataTypesZod>
+
+export const TypedDataValueZod = z.record(z.string(), z.any())
+export type TypedDataValues = z.infer<typeof TypedDataValueZod>

package/src/eip-712/index.ts

@@ -1,4 +1,4 @@
-export * from './Payload.ts'
+export * from './Payloads/index.ts'
 export * from './sign.ts'
 export * from './Types.ts'
 export * from './verify.ts'

package/src/eip-712/sign.ts

@@ -2,14 +2,17 @@ import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Signer } from 'ethers/providers'
 
 import {
-  type EIP712Payload, type EIP712SignaturePayload, EIP712SignaturePayloadSchema,
-} from './Payload.ts'
+  type EIP712DataPayload, type EIP712SignaturePayload, EIP712SignaturePayloadSchema,
+} from './Payloads/index.ts'
 
-export const signEIP712Message = async (signer: Signer, data: EIP712Payload): Promise<EIP712SignaturePayload> => {
-  const { schema, ...fields } = data
-  const signature = await signer.signTypedData(fields.domain, fields.types, fields.values)
+export const signEIP712Message = async (signer: Signer, data: EIP712DataPayload): Promise<EIP712SignaturePayload> => {
+  const {
+    domain, types, values,
+  } = data
+  const signature = await signer.signTypedData(domain, types, values)
   const hash = await PayloadBuilder.hash(data)
+  const address = await signer.getAddress()
   return {
-    address: await signer.getAddress(), signature, schema: EIP712SignaturePayloadSchema, hash,
+    address, hash, schema: EIP712SignaturePayloadSchema, signature,
   }
 }

package/src/eip-712/spec/fixtures.ts

@@ -1,14 +1,14 @@
 import { Wallet } from 'ethers/wallet'
 
-import type { EIP712Payload } from '../Payload.ts'
-import { EIP712PayloadSchema } from '../Payload.ts'
+import type { EIP712DataPayload } from '../Payloads/index.ts'
+import { EIP712DataPayloadSchema } from '../Payloads/index.ts'
 
 const mnemonic = 'test test test test test test test test test test test junk'
 
 export const wallet = Wallet.fromPhrase(mnemonic)
 
-export const samplePayload: EIP712Payload = {
-  schema: EIP712PayloadSchema,
+export const samplePayload: EIP712DataPayload = {
+  schema: EIP712DataPayloadSchema,
   domain: {
     name: 'MyDApp',
     version: '1',
@@ -22,6 +22,6 @@ export const samplePayload: EIP712Payload = {
   },
   values: {
     hash: '0x1234567890abcdef',
-    schema: EIP712PayloadSchema,
+    schema: EIP712DataPayloadSchema,
   },
 }

package/src/eip-712/spec/signAndVerify.spec.ts

@@ -2,7 +2,7 @@ import {
   describe, expect, it,
 } from 'vitest'
 
-import { EIP712SignaturePayloadSchema } from '../Payload.ts'
+import { EIP712SignaturePayloadSchema } from '../Payloads/index.ts'
 import { signEIP712Message } from '../sign.ts'
 import { verifyEIP712Message } from '../verify.ts'
 import { samplePayload, wallet } from './fixtures.ts'

package/src/eip-712/verify.ts

@@ -1,12 +1,20 @@
-import type { Promisable } from '@xylabs/promise'
+import { asHash } from '@xylabs/hex'
+import { isUndefined } from '@xylabs/typeof'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { verifyTypedData } from 'ethers/hash'
 
-import type { EIP712Payload, EIP712SignaturePayload } from './Payload.ts'
+import type { EIP712DataPayload, EIP712SignaturePayload } from './Payloads/index.ts'
 
-export const verifyEIP712Message = (data: EIP712Payload, sig: EIP712SignaturePayload): Promisable<boolean> => {
-  const { address, signature } = sig
+export const verifyEIP712Message = async (data: EIP712DataPayload, sig: EIP712SignaturePayload): Promise<boolean> => {
+  const {
+    address, signature, hash,
+  } = sig
   const { schema, ...fields } = data
-
+  const signedHash = asHash(hash)
+  // If there is no valid hash in the signature, or it doesn't match the calculated hash, return false
+  if (isUndefined(signedHash) || signedHash !== await PayloadBuilder.hash(data)) return false
+  // Recover the address from the signature
   const recoveredAddress = verifyTypedData(fields.domain, fields.types, fields.values, signature)
+  // Verify it matches the expected address
   return recoveredAddress.toLowerCase() === address.toLowerCase()
 }

package/dist/neutral/eip-712/Payload.d.ts

@@ -1,24 +0,0 @@
-import type { Hash } from '@xylabs/hex';
-import type { TypedDataDomain } from 'ethers/hash';
-import type { TypedDataTypes, TypedDataValues } from './Types.ts';
-export interface EIP712PayloadFields<T extends TypedDataTypes = TypedDataTypes, V extends TypedDataValues = TypedDataValues> {
-    domain: TypedDataDomain;
-    types: T;
-    values: V;
-}
-export declare const EIP712PayloadSchema: "network.xyo.chains.ethereum.eip712.payload";
-export type EIP712PayloadSchema = typeof EIP712PayloadSchema;
-export type EIP712Payload = EIP712PayloadFields & {
-    schema: EIP712PayloadSchema;
-};
-export interface EIP712SignaturePayloadFields {
-    address: string;
-    hash: Hash;
-    signature: string;
-}
-export declare const EIP712SignaturePayloadSchema: "network.xyo.chains.ethereum.eip712.signaturePayload";
-export type EIP712SignaturePayloadSchema = typeof EIP712SignaturePayloadSchema;
-export type EIP712SignaturePayload = EIP712SignaturePayloadFields & {
-    schema: EIP712SignaturePayloadSchema;
-};
-//# sourceMappingURL=Payload.d.ts.map

package/dist/neutral/eip-712/Payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/eip-712/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjE,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,EAAE,CAAC,SAAS,eAAe,GAAG,eAAe;IACzH,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,CAAC,CAAA;IACR,MAAM,EAAE,CAAC,CAAA;CACV;AAED,eAAO,MAAM,mBAAmB,EAAG,4CAAqD,CAAA;AACxF,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAA;AAE5D,MAAM,MAAM,aAAa,GAAG,mBAAmB,GAAG;IAChD,MAAM,EAAE,mBAAmB,CAAA;CAC5B,CAAA;AAED,MAAM,WAAW,4BAA4B;IAC3C,OAAO,EAAE,MAAM,CAAA;IAEf,IAAI,EAAE,IAAI,CAAA;IACV,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,4BAA4B,EAAG,qDAA8D,CAAA;AAC1G,MAAM,MAAM,4BAA4B,GAAG,OAAO,4BAA4B,CAAA;AAE9E,MAAM,MAAM,sBAAsB,GAAG,4BAA4B,GAAG;IAClE,MAAM,EAAE,4BAA4B,CAAA;CACrC,CAAA"}

package/src/eip-712/Payload.ts

@@ -1,31 +0,0 @@
-import type { Hash } from '@xylabs/hex'
-import type { TypedDataDomain } from 'ethers/hash'
-
-import type { TypedDataTypes, TypedDataValues } from './Types.ts'
-
-export interface EIP712PayloadFields<T extends TypedDataTypes = TypedDataTypes, V extends TypedDataValues = TypedDataValues> {
-  domain: TypedDataDomain
-  types: T
-  values: V
-}
-
-export const EIP712PayloadSchema = 'network.xyo.chains.ethereum.eip712.payload' as const
-export type EIP712PayloadSchema = typeof EIP712PayloadSchema
-
-export type EIP712Payload = EIP712PayloadFields & {
-  schema: EIP712PayloadSchema
-}
-
-export interface EIP712SignaturePayloadFields {
-  address: string
-  // the hash of the EIP712Payload
-  hash: Hash
-  signature: string
-}
-
-export const EIP712SignaturePayloadSchema = 'network.xyo.chains.ethereum.eip712.signaturePayload' as const
-export type EIP712SignaturePayloadSchema = typeof EIP712SignaturePayloadSchema
-
-export type EIP712SignaturePayload = EIP712SignaturePayloadFields & {
-  schema: EIP712SignaturePayloadSchema
-}