@xyo-network/xl1-rpc 1.15.25 → 1.15.26

package/dist/node/provider/gateway/Abstract.d.ts

@@ -1,9 +1,9 @@
 import type { Hash } from '@xylabs/hex';
 import type { Promisable } from '@xylabs/promise';
 import type { Payload } from '@xyo-network/payload-model';
-import type { AllowedBlockPayload, SignedHydratedTransaction, XyoConnection, XyoGatewayProvider, XyoSigner } from '@xyo-network/xl1-protocol';
+import type { AllowedBlockPayload, SignedHydratedTransaction, TransactionOptions, XyoConnection, XyoGatewayProvider, XyoSigner } from '@xyo-network/xl1-protocol';
 export declare abstract class AbstractXyoGateway implements XyoGatewayProvider {
-    addPayloadsToChain(onChain: AllowedBlockPayload[], offChain: Payload[]): Promise<[Hash, SignedHydratedTransaction]>;
+    addPayloadsToChain(onChain: AllowedBlockPayload[], offChain: Payload[], options?: TransactionOptions): Promise<[Hash, SignedHydratedTransaction]>;
     addTransactionToChain(tx: SignedHydratedTransaction): Promise<Hash>;
     /** @deprecated use addPayloadsToChain instead */
     submitTransaction(elevatedPayloads: AllowedBlockPayload[], additionalPayloads: Payload[]): Promise<SignedHydratedTransaction>;

package/dist/node/provider/gateway/Abstract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../../../src/provider/gateway/Abstract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,aAAa,EAAE,kBAAkB,EAAE,SAAS,EAC7C,MAAM,2BAA2B,CAAA;AAGlC,8BAAsB,kBAAmB,YAAW,kBAAkB;IAC9D,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;IAgBnH,qBAAqB,CAAC,EAAE,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzE,iDAAiD;IAC3C,iBAAiB,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC;IASnI,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,aAAa,CAAC;IAChD,QAAQ,CAAC,MAAM,IAAI,UAAU,CAAC,SAAS,CAAC;CACzC"}
+{"version":3,"file":"Abstract.d.ts","sourceRoot":"","sources":["../../../../src/provider/gateway/Abstract.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,KAAK,EACV,mBAAmB,EACnB,yBAAyB,EACzB,kBAAkB,EAClB,aAAa,EAAE,kBAAkB,EAAE,SAAS,EAC7C,MAAM,2BAA2B,CAAA;AAGlC,8BAAsB,kBAAmB,YAAW,kBAAkB;IAC9D,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC;IAyBjJ,qBAAqB,CAAC,EAAE,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAWzE,iDAAiD;IAC3C,iBAAiB,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,EAAE,kBAAkB,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC;IASnI,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,aAAa,CAAC;IAChD,QAAQ,CAAC,MAAM,IAAI,UAAU,CAAC,SAAS,CAAC;CACzC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/package.json",
   "name": "@xyo-network/xl1-rpc",
-  "version": "1.15.25",
+  "version": "1.15.26",
   "description": "XYO Layer One API",
   "homepage": "https://xylabs.com",
   "bugs": {
@@ -75,8 +75,8 @@
     "@xyo-network/payload-builder": "~5.1.15",
     "@xyo-network/payload-model": "~5.1.15",
     "@xyo-network/xl1-protocol": "~1.12.95",
-    "@xyo-network/xl1-protocol-sdk": "~1.15.25",
-    "@xyo-network/xl1-wrappers": "~1.15.25",
+    "@xyo-network/xl1-protocol-sdk": "~1.15.26",
+    "@xyo-network/xl1-wrappers": "~1.15.26",
     "axios": "~1.13.1",
     "uuid": "~13.0.0",
     "zod": "~4.1.12"
@@ -89,7 +89,7 @@
     "@xylabs/tsconfig": "~7.1.8",
     "@xylabs/vitest-extended": "~5.0.17",
     "@xyo-network/account": "~5.1.15",
-    "@xyo-network/chain-protocol": "~1.15.25",
+    "@xyo-network/chain-protocol": "~1.15.26",
     "@xyo-network/wallet": "~5.1.15",
     "dotenv": "~17.2.3",
     "eslint": "^9.39.0",

package/src/provider/gateway/Abstract.ts

@@ -1,23 +1,34 @@
 import { assertEx } from '@xylabs/assert'
 import type { Hash } from '@xylabs/hex'
 import type { Promisable } from '@xylabs/promise'
+import { isDefined } from '@xylabs/typeof'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload } from '@xyo-network/payload-model'
 import type {
   AllowedBlockPayload,
   SignedHydratedTransaction,
+  TransactionOptions,
   XyoConnection, XyoGatewayProvider, XyoSigner,
 } from '@xyo-network/xl1-protocol'
 import { buildUnsignedTransaction } from '@xyo-network/xl1-protocol-sdk'
 
 export abstract class AbstractXyoGateway implements XyoGatewayProvider {
-  async addPayloadsToChain(onChain: AllowedBlockPayload[], offChain: Payload[]): Promise<[Hash, SignedHydratedTransaction]> {
+  async addPayloadsToChain(onChain: AllowedBlockPayload[], offChain: Payload[], options?: TransactionOptions): Promise<[Hash, SignedHydratedTransaction]> {
+    // Get chain providers
     const connection = await this.connection()
     const viewer = assertEx(connection.viewer, () => 'No viewer available on connection')
     const signer = await this.signer()
-    const chainId = await viewer.chainId()
-    const nbf = await viewer.currentBlockNumber()
-    const tx = await buildUnsignedTransaction(chainId, onChain, offChain, nbf, nbf + 1000, await signer.address())
+
+    // Resolve transaction options
+    const {
+      nbf, exp, chain, fees,
+    } = options ?? {}
+    const resolvedChainId = isDefined(chain) ? chain : await viewer.chainId()
+    const resolvedNbf = isDefined(nbf) ? nbf : await viewer?.currentBlockNumber()
+    const resolvedExp = isDefined(exp) ? exp : resolvedNbf + 10
+
+    // Build, sign, and broadcast the transaction
+    const tx = await buildUnsignedTransaction(resolvedChainId, onChain, offChain, resolvedNbf, resolvedExp, await signer.address(), fees)
     const runner = assertEx(connection.runner, () => 'No runner available on connection')
     const signedTx = await signer.signTransaction(tx)
     const hash = await runner.broadcastTransaction(

package/src/provider/gateway/spec/MemoryXyoGateway.spec.ts

@@ -1,10 +1,15 @@
+import { isAddress, isHash } from '@xylabs/hex'
 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 type { AllowedBlockPayload } from '@xyo-network/xl1-protocol'
+import type {
+  AllowedBlockPayload, ChainId, SignedHydratedTransaction,
+} from '@xyo-network/xl1-protocol'
 import { buildUnsignedTransaction } from '@xyo-network/xl1-protocol-sdk'
 import {
   beforeEach, describe, expect, it,
+  vi,
 } from 'vitest'
 
 import { HttpRpcXyoConnection } from '../../connection/index.ts'
@@ -57,4 +62,32 @@ describe('MemoryXyoGateway', () => {
       }
     })
   })
+  describe('addPayloadsToChain', () => {
+    it('should add payloads to the chain', async () => {
+      const mockRunner = vi.spyOn(connection.runner!, 'broadcastTransaction').mockImplementation(async (tx: SignedHydratedTransaction) => {
+        return await PayloadBuilder.hash(tx[0])
+      })
+      const chainId = (await Account.random()).address
+      const mockSigner = vi.spyOn(signer, 'signTransaction')
+      const elevatedPayloads: AllowedBlockPayload[] = []
+      const additionalPayloads: Payload[] = []
+      const result = await sut.addPayloadsToChain(elevatedPayloads, additionalPayloads, {
+        nbf: 0,
+        exp: 1000,
+        chain: chainId,
+      })
+
+      // Verify mocks were called
+      expect(mockRunner).toHaveBeenCalled()
+      expect(mockSigner).toHaveBeenCalled()
+
+      // Verify result
+      expect(result).toBeDefined()
+      expect(result.length).toBe(2)
+      expect(isHash(result[0])).toBe(true)
+      expect(result[1][0].nbf).toBe(0)
+      expect(result[1][0].exp).toBe(1000)
+      expect(result[1][0].chain).toBe(chainId)
+    })
+  })
 })