@xyo-network/xl1-rpc 1.7.16 → 1.7.18

package/dist/node/provider/provider/index.d.ts

@@ -1,3 +1,5 @@
+export * from './confirmSubmittedTransaction.ts';
+export * from './confirmTransaction.ts';
 export * from './RpcXyoConnection.ts';
 export * from './XyoConnection.ts';
 //# sourceMappingURL=index.d.ts.map

package/dist/node/provider/provider/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/provider/provider/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/provider/provider/index.ts"],"names":[],"mappings":"AAAA,cAAc,kCAAkC,CAAA;AAChD,cAAc,yBAAyB,CAAA;AACvC,cAAc,uBAAuB,CAAA;AACrC,cAAc,oBAAoB,CAAA"}

package/dist/node/types/schema/common/JsonSchema.d.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+declare const JsonValueSchema: z.ZodType<unknown>;
+export declare const JsonObjectSchema: z.ZodRecord<z.ZodString, z.ZodType<unknown, z.ZodTypeDef, unknown>>;
+export type JsonValue = z.infer<typeof JsonValueSchema>;
+export type JsonObject = z.infer<typeof JsonObjectSchema>;
+export {};
+//# sourceMappingURL=JsonSchema.d.ts.map

package/dist/node/types/schema/common/JsonSchema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JsonSchema.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/JsonSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,QAAA,MAAM,eAAe,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAQnC,CAAA;AAGL,eAAO,MAAM,gBAAgB,qEAA4B,CAAA;AAGzD,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AACvD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA"}

package/dist/node/types/schema/common/index.d.ts

@@ -6,6 +6,7 @@ export * from './HashSchema.ts';
 export * from './HexSchema.ts';
 export * from './HydratedBlockSchema.ts';
 export * from './HydratedTransactionSchema.ts';
+export * from './JsonSchema.ts';
 export * from './PayloadSchema.ts';
 export * from './SequenceSchema.ts';
 export * from './StorageMetaSchema.ts';

package/dist/node/types/schema/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,0BAA0B,CAAA;AACxC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,oCAAoC,CAAA;AAClD,cAAc,sBAAsB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/types/schema/common/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAA;AAClC,cAAc,mBAAmB,CAAA;AACjC,cAAc,8BAA8B,CAAA;AAC5C,cAAc,yBAAyB,CAAA;AACvC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,0BAA0B,CAAA;AACxC,cAAc,gCAAgC,CAAA;AAC9C,cAAc,iBAAiB,CAAA;AAC/B,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA;AACnC,cAAc,wBAAwB,CAAA;AACtC,cAAc,oCAAoC,CAAA;AAClD,cAAc,sBAAsB,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-rpc",
-  "version": "1.7.16",
+  "version": "1.7.18",
   "description": "XYO Layer One API",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -57,42 +57,43 @@
     "types": "tsc --noEmit -p tsconfig.test.json"
   },
   "dependencies": {
-    "@metamask/json-rpc-engine": "^10.0.3",
-    "@metamask/utils": "^11.4.2",
-    "@xylabs/assert": "^4.13.23",
-    "@xylabs/axios": "^4.13.23",
-    "@xylabs/delay": "^4.13.23",
-    "@xylabs/hex": "^4.13.23",
-    "@xylabs/object": "^4.13.23",
-    "@xylabs/promise": "^4.13.23",
-    "@xylabs/typeof": "^4.13.23",
-    "@xyo-network/account-model": "^4.1.7",
-    "@xyo-network/archivist-memory": "^4.1.7",
-    "@xyo-network/archivist-model": "^4.1.7",
-    "@xyo-network/boundwitness-model": "^4.1.7",
-    "@xyo-network/module-model": "^4.1.7",
-    "@xyo-network/node-model": "^4.1.7",
-    "@xyo-network/payload-builder": "^4.1.7",
-    "@xyo-network/payload-model": "^4.1.7",
-    "@xyo-network/payload-wrapper": "^4.1.7",
-    "@xyo-network/xl1-protocol": "^1.7.20",
-    "@xyo-network/xl1-protocol-sdk": "^1.7.16",
-    "@xyo-network/xl1-wrappers": "^1.7.16",
-    "axios": "^1.11.0",
-    "uuid": "^11.1.0",
-    "zod": "^3.25.76"
+    "@metamask/json-rpc-engine": "~10.0.3",
+    "@metamask/utils": "~11.4.2",
+    "@xylabs/assert": "~4.13.23",
+    "@xylabs/axios": "~4.13.23",
+    "@xylabs/delay": "~4.13.23",
+    "@xylabs/hex": "~4.13.23",
+    "@xylabs/object": "~4.13.23",
+    "@xylabs/promise": "~4.13.23",
+    "@xylabs/typeof": "~4.13.23",
+    "@xyo-network/account-model": "~4.1.7",
+    "@xyo-network/archivist-memory": "~4.1.7",
+    "@xyo-network/archivist-model": "~4.1.7",
+    "@xyo-network/boundwitness-model": "~4.1.7",
+    "@xyo-network/module-model": "~4.1.7",
+    "@xyo-network/node-model": "~4.1.7",
+    "@xyo-network/payload-builder": "~4.1.7",
+    "@xyo-network/payload-model": "~4.1.7",
+    "@xyo-network/payload-wrapper": "~4.1.7",
+    "@xyo-network/xl1-protocol": "~1.7.20",
+    "@xyo-network/xl1-protocol-sdk": "~1.7.18",
+    "@xyo-network/xl1-wrappers": "~1.7.18",
+    "axios": "~1.11.0",
+    "uuid": "~11.1.0",
+    "zod": "~3.25.76"
   },
   "devDependencies": {
-    "@metamask/utils": "^11.4.2",
-    "@types/node": "^24.1.0",
-    "@xylabs/ts-scripts-yarn3": "^7.0.1",
-    "@xylabs/tsconfig": "^7.0.1",
-    "@xylabs/vitest-extended": "^4.13.23",
-    "@xyo-network/account": "^4.1.7",
-    "dotenv": "^17.2.0",
-    "knip": "^5.62.0",
-    "typescript": "^5.8.3",
-    "vitest": "^3.2.4"
+    "@metamask/utils": "~11.4.2",
+    "@types/node": "~24.1.0",
+    "@xylabs/ts-scripts-yarn3": "~7.0.1",
+    "@xylabs/tsconfig": "~7.0.1",
+    "@xylabs/vitest-extended": "~4.13.23",
+    "@xyo-network/account": "~4.1.7",
+    "@xyo-network/wallet": "~4.1.7",
+    "dotenv": "~17.2.1",
+    "knip": "~5.62.0",
+    "typescript": "~5.8.3",
+    "vitest": "~3.2.4"
   },
   "packageManager": "yarn@4.6.0",
   "engines": {

package/src/provider/client/spec/MemoryXyoClient.spec.ts

@@ -1,7 +1,12 @@
-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 { HDWallet } from '@xyo-network/wallet'
+import type { AllowedBlockPayload, HashPayload } from '@xyo-network/xl1-protocol'
+import { HashSchema } from '@xyo-network/xl1-protocol'
+import { ADDRESS_INDEX, generateXyoBaseWalletFromPhrase } from '@xyo-network/xl1-protocol-sdk'
 import {
-  beforeEach, describe, expect, it,
+  beforeAll, beforeEach, describe, expect, it,
 } from 'vitest'
 
 import { MemoryPermissionsStore, MemoryXyoGateway } from '../../host/index.ts'
@@ -10,6 +15,11 @@ import { MemoryXyoSigner } from '../../signer/index.ts'
 import { MemoryXyoClient } from '../MemoryXyoClient.ts'
 import type { XyoClient } from '../XyoClient.ts'
 
+type TestPayload = Payload<{
+  id: string
+  schema: 'network.xyo.test'
+}>
+
 describe('Client', () => {
   const endpoint = 'http://localhost:8080/rpc'
   const dataLakeEndpoint = 'http://localhost:8080/chain/archivist'
@@ -17,28 +27,42 @@ describe('Client', () => {
   let signer: MemoryXyoSigner
   let store: MemoryPermissionsStore
   let gateway: MemoryXyoGateway
-  let sut: XyoClient
+  let client: XyoClient
 
   beforeEach(async () => {
-    account = await Account.random()
+    const mnemonic = process.env.XL1_PRODUCER__MNEMONIC ?? HDWallet.generateMnemonic()
+    const wallet = await generateXyoBaseWalletFromPhrase(mnemonic)
+    account = await wallet.derivePath(ADDRESS_INDEX.XYO)
     signer = new MemoryXyoSigner(account)
-
     store = new MemoryPermissionsStore()
     gateway = new MemoryXyoGateway(signer, store)
-    await gateway.addConnection('localhost', new RpcXyoConnection({ endpoint }))
-    sut = new MemoryXyoClient(store, { localhost: gateway })
+    await gateway.addConnection('localhost', new RpcXyoConnection({ endpoint, account }))
+    client = new MemoryXyoClient(store, { localhost: gateway })
   })
 
   describe('gateways', () => {
     describe('activeConnection', () => {
+      let onChainPayloads: AllowedBlockPayload[]
+      let offChainPayloads: Payload[]
+      beforeAll(async () => {
+        const id = new PayloadBuilder<TestPayload>({ schema: 'network.xyo.test' }).fields({ id: Date.now().toString() }).build()
+        const hash = await PayloadBuilder.hash(id)
+        const hashPayload: HashPayload = new PayloadBuilder<HashPayload>({ schema: HashSchema }).fields({ hash }).build()
+        onChainPayloads = [hashPayload]
+        offChainPayloads = [id]
+      })
       it('should be defined', () => {
-        const gateway = sut.gateways.localhost.activeConnection()
+        const gateway = client.gateways.localhost.activeConnection()
         expect(gateway).toBeDefined()
       })
       it('should allow retrieving the chain ID', async () => {
-        const chainId = await sut.gateways.localhost?.activeConnection()?.viewer?.chainId()
+        const chainId = await client.gateways.localhost?.activeConnection()?.viewer?.chainId()
         expect(chainId).toBeDefined()
       })
+      it.only('should allow for submitting transactions', async () => {
+        const transaction = await client.gateways.localhost?.activeConnection()?.submitTransaction?.(onChainPayloads, offChainPayloads)
+        expect(transaction).toBeDefined()
+      })
     })
   })
 })

package/src/provider/provider/confirmSubmittedTransaction.ts

@@ -0,0 +1,55 @@
+import { delay } from '@xylabs/delay'
+import type { Logger } from '@xylabs/logger'
+import { isDefined } from '@xylabs/typeof'
+import type { Signed } from '@xyo-network/boundwitness-model'
+import { PayloadBuilder } from '@xyo-network/payload-builder'
+import type {
+  HydratedTransaction, TransactionBoundWitness, XyoConnectionProvider,
+} from '@xyo-network/xl1-protocol'
+
+const DEFAULT_CONFIRMATION_ATTEMPTS = 20
+const DEFAULT_DELAY_BETWEEN_ATTEMPTS = 1000 // milliseconds
+
+export type ConfirmSubmittedTransactionOptions = {
+  /**
+   * Number of attempts to confirm the transaction.
+   * Defaults to 20.
+   */
+  attempts?: number
+  /**
+   * Delay in milliseconds between confirmation attempts.
+   * Defaults to 1000 (1 second).
+   */
+  delay?: number
+  /**
+   * Optional logger instance for logging progress.
+   */
+  logger?: Logger
+}
+
+export const confirmSubmittedTransaction = async (
+  provider: XyoConnectionProvider,
+  txBW: Signed<TransactionBoundWitness>,
+  options?: ConfirmSubmittedTransactionOptions,
+): Promise<HydratedTransaction> => {
+  const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options || {}
+  const txBWHash = await PayloadBuilder.hash(txBW)
+  options?.logger?.log('✅ confirming transaction:', txBWHash, '\n')
+  let attempts = 0
+  while (true) {
+    const tx = await provider.viewer?.transactionByHash(txBWHash) ?? undefined
+    if (isDefined(tx)) {
+      options?.logger?.log('🍻 Transaction confirmed:', txBWHash, '\n')
+      return tx
+    } else {
+      attempts++
+      if (attempts > maxAttempts) {
+        options?.logger?.error(`⚠️ Transaction not confirmed after ${maxAttempts} attempts`)
+        throw new Error(`Transaction ${txBWHash} not confirmed after ${maxAttempts} attempts`)
+      } else {
+        options?.logger?.log(`🔄 Transaction not confirmed yet, attempt ${attempts}. Retrying...`, '\n')
+        await delay(attemptDelay)
+      }
+    }
+  }
+}

package/src/provider/provider/index.ts

@@ -1,2 +1,4 @@
+export * from './confirmSubmittedTransaction.ts'
+export * from './confirmTransaction.ts'
 export * from './RpcXyoConnection.ts'
 export * from './XyoConnection.ts'

package/src/types/schema/common/JsonSchema.ts

@@ -0,0 +1,19 @@
+import { z } from 'zod'
+
+// Define recursive JSON value schema
+const JsonValueSchema: z.ZodType<unknown> = z.lazy(() =>
+  z.union([
+    z.string(),
+    z.number(),
+    z.boolean(),
+    z.null(),
+    z.array(JsonValueSchema),
+    z.record(JsonValueSchema), // object with string keys and JSON values
+  ]))
+
+// JSON object schema — top-level must be an object
+export const JsonObjectSchema = z.record(JsonValueSchema)
+
+// TypeScript type for reference
+export type JsonValue = z.infer<typeof JsonValueSchema>
+export type JsonObject = z.infer<typeof JsonObjectSchema>

package/src/types/schema/common/index.ts

@@ -6,6 +6,7 @@ export * from './HashSchema.ts'
 export * from './HexSchema.ts'
 export * from './HydratedBlockSchema.ts'
 export * from './HydratedTransactionSchema.ts'
+export * from './JsonSchema.ts'
 export * from './PayloadSchema.ts'
 export * from './SequenceSchema.ts'
 export * from './StorageMetaSchema.ts'