@xyo-network/xl1-protocol-sdk 1.16.10 → 1.16.12

package/src/provider/XyoNetwork.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { NetworkStatus } from '@xyo-network/xl1-protocol'
 
 export interface XyoNetwork {

package/src/provider/XyoRunner.ts

@@ -1,5 +1,4 @@
-import type { Hash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Hash, Promisable } from '@xylabs/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
 export interface XyoRunner {

package/src/provider/XyoWallet.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { ChainId } from '@xyo-network/xl1-protocol'
 
 /** @deprecated  - use XyoClient instead */

package/src/provider/permissions/InvokerPermission.ts

@@ -1,4 +1,4 @@
-import type { JsonValue } from '@xylabs/object'
+import type { JsonValue } from '@xylabs/sdk-js'
 
 /**
  * Modeled after EIP-2255

package/src/provider/signer/XyoSigner.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
 import type { Payload } from '@xyo-network/payload-model'
 import type {

package/src/provider/viewer/NetworkStake/NetworkStakeViewer.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 
 import type { NetworkStakeStepRewardsViewer } from './Rewards/index.ts'
 

package/src/provider/viewer/NetworkStake/Rewards/ByStakerViewer.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 
 import type { NetworkStakeStepRewardsByStakerViewerOptions } from './Options.ts'
 import type { NetworkStakeStepRewardsByIndexViewerMethodsTemplate } from './templates/index.ts'

package/src/provider/viewer/NetworkStake/Rewards/Options.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 import type { BlockRange, StepIdentity } from '@xyo-network/xl1-protocol'
 
 export interface NetworkStakeStepRewardsRangeOptions {

package/src/provider/viewer/NetworkStake/Rewards/templates/MethodsTemplate.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 
 export interface NetworkStakeStepRewardsViewerMethodsTemplate<TOptions, TResult> {
   bonus(options?: TOptions): Promisable<TResult>

package/src/provider/viewer/StepViewer.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { PositionId, StepIdentity } from '@xyo-network/xl1-protocol'
 
 import type { Position } from '../../model/index.ts'

package/src/services/AccountTransfersService.ts

@@ -1,5 +1,6 @@
-import type { Address, Hash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type {
+  Address, Hash, Promisable,
+} from '@xylabs/sdk-js'
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
 
 export interface AccountTransfersProvider {

package/src/services/BlockRewardService.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 
 export interface BlockRewardService {
   // The amount of xl1 to send to the producer from the block reward

package/src/services/BlockRewardServiceV2.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 
 import type { BlockRewardService } from './BlockRewardService.ts'
 

package/src/services/Chain/ChainHeadService.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 
 import type { BaseChainService } from './BaseChainService.ts'
 

package/src/services/ChainIterator/ChainIteratorService.ts

@@ -1,6 +1,6 @@
-import type { BaseParams } from '@xylabs/base'
-import type { BaseEmitter } from '@xylabs/events'
-import type { Hash } from '@xylabs/hex'
+import type {
+  BaseEmitter, BaseParams, Hash,
+} from '@xylabs/sdk-js'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type {
   BlockBoundWitness, ChainId, IterableRepository, ReadRepository,

package/src/services/ChainIterator/ChainIteratorServiceEventData.ts

@@ -1,4 +1,4 @@
-import type { EventData } from '@xylabs/events'
+import type { EventData } from '@xylabs/sdk-js'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 
 export type HeadEventArgs = { blocks: [BlockBoundWitness] }

package/src/services/Election.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 import type { WithHashMeta } from '@xyo-network/payload-model'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
 

package/src/services/Params.ts

@@ -1,4 +1,4 @@
-import type { CreatableParams } from '@xylabs/creatable'
+import type { CreatableParams } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type { OpenTelemetryProviders } from '@xyo-network/xl1-protocol'
 

package/src/services/PendingTransactionsService.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
 export interface PendingTransactionsService {

package/src/services/StakeIntentService/ChainIndexingServiceStateSchema.ts

@@ -1,6 +1,5 @@
-import type { Hash } from '@xylabs/hex'
-import type { JsonValue } from '@xylabs/object'
-import { AsObjectFactory } from '@xylabs/object'
+import type { Hash, JsonValue } from '@xylabs/sdk-js'
+import { AsObjectFactory } from '@xylabs/sdk-js'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType, isStorageMeta } from '@xyo-network/payload-model'
 

package/src/services/StakeIntentService/StakeIntentService.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 import type { Intent } from '@xyo-network/xl1-protocol'
 
 export interface StakeIntentService {

package/src/simple/accountBalance/SimpleAccountBalanceViewer.ts

@@ -1,8 +1,8 @@
-import { assertEx } from '@xylabs/assert'
-import { exists } from '@xylabs/exists'
-import type { Address, Hash } from '@xylabs/hex'
+import type { Address, Hash } from '@xylabs/sdk-js'
+import {
+  assertEx, exists, isDefined,
+} from '@xylabs/sdk-js'
 import { spanRootAsync } from '@xylabs/telemetry'
-import { isDefined } from '@xylabs/typeof'
 import type { Signed } from '@xyo-network/boundwitness-model'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type {

package/src/simple/datalake/SimpleDataLakeRunner.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 
 import type { MapType } from '../../map/index.ts'
 import type {

package/src/simple/datalake/SimpleDataLakeViewer.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 import { isAnyPayload, type Schema } from '@xyo-network/payload-model'
 
 import type { MapTypeRead } from '../../map/index.ts'

package/src/simple/gateway/SimpleXyoGateway.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 
 import type {
   XyoConnection, XyoGateway, XyoSigner,

package/src/simple/gateway/SimpleXyoGatewayRunner.ts

@@ -1,10 +1,9 @@
-import { assertEx } from '@xylabs/assert'
 import type {
-  Address, Hash, Hex,
-} from '@xylabs/hex'
-import { BigIntToJsonZod } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
-import { isDefined } from '@xylabs/typeof'
+  Address, Hash, Hex, Promisable,
+} from '@xylabs/sdk-js'
+import {
+  assertEx, BigIntToJsonZod, isDefined,
+} from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
 import {
@@ -19,22 +18,25 @@ import {
 import type {
   DataLakeRunner,
   TransactionOptions,
-  XyoConnection, XyoGateway, XyoGatewayRunner,
+  XyoConnection, XyoGatewayRunner,
   XyoSigner,
 } from '../../provider/index.ts'
-import { buildUnsignedTransaction } from '../../transaction/index.ts'
+import type { ConfirmSubmittedTransactionOptions } from '../../transaction/index.ts'
+import { buildUnsignedTransaction, confirmSubmittedTransaction } from '../../transaction/index.ts'
 
 export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
-  protected readonly gateway: XyoGateway
+  private readonly _connection: XyoConnection
   private _dataLakes: (DataLakeRunner | null)[]
+  private readonly _signer: XyoSigner
 
-  constructor(gateway: XyoGateway, dataLakes: DataLakeRunner[] = []) {
-    this.gateway = gateway
+  constructor(connection: XyoConnection, signer: XyoSigner, dataLakes: DataLakeRunner[] = []) {
+    this._connection = connection
     this._dataLakes = [...dataLakes]
+    this._signer = signer
   }
 
   get connectionInstance(): XyoConnection {
-    return this.gateway.connectionInstance
+    return this._connection
   }
 
   get dataLakes(): DataLakeRunner[] {
@@ -42,7 +44,7 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
   }
 
   get signerInstance(): XyoSigner {
-    return this.gateway.signerInstance
+    return this._signer
   }
 
   addDataLake(dataLake: DataLakeRunner): number {
@@ -73,10 +75,9 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
   }
 
   async addTransactionToChain(tx: SignedHydratedTransaction): Promise<[Hash, SignedHydratedTransactionWithHashMeta]> {
-    // eslint-disable-next-line sonarjs/deprecation
-    const connection = await this.gateway.connection()
-    // eslint-disable-next-line sonarjs/deprecation
-    const signer = await this.gateway.signer()
+    const connection = this.connectionInstance
+
+    const signer = this.signerInstance
     const runner = assertEx(connection.runner, () => 'No runner available on connection')
     const signedTx = await signer.signTransaction(tx)
     await this.addPayloadsToDataLakes(signedTx[1])
@@ -85,9 +86,17 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
     ), signedTx]
   }
 
+  async confirmSubmittedTransaction(txHash: Hash, options?: ConfirmSubmittedTransactionOptions): Promise<SignedHydratedTransaction> {
+    return await confirmSubmittedTransaction(
+      assertEx(this.connectionInstance.viewer, () => 'Connection viewer is undefined'),
+      txHash,
+      options,
+    )
+  }
+
   /** @deprecated use connectionInstance instead */
   connection(): Promisable<XyoConnection> {
-    return this.gateway.connection()
+    return this.connectionInstance
   }
 
   removeDataLake(index: number): void {
@@ -117,8 +126,7 @@ export class SimpleXyoGatewayRunner implements XyoGatewayRunner {
 
   /** @deprecated use signerInstance instead */
   signer(): Promisable<XyoSigner> {
-    // eslint-disable-next-line sonarjs/deprecation
-    return this.gateway.signer()
+    return this.signerInstance
   }
 
   protected async addPayloadsToDataLakes(payloads: WithHashMeta<Payload>[]): Promise<void> {

package/src/simple/network/SimpleXyoNetwork.ts

@@ -1,4 +1,4 @@
-import { isUndefined } from '@xylabs/typeof'
+import { isUndefined } from '@xylabs/sdk-js'
 import type {
   GatewayName,
   NetworkStatus,

package/src/simple/permissions/SimpleXyoPermissions.ts

@@ -1,4 +1,4 @@
-import { assertEx } from '@xylabs/assert'
+import { assertEx } from '@xylabs/sdk-js'
 
 import type {
   CaveatTypes,

package/src/simple/permissions/store/MemoryPermissions.ts

@@ -1,4 +1,4 @@
-import { assertEx } from '@xylabs/assert'
+import { assertEx } from '@xylabs/sdk-js'
 
 import type { InvokerPermission } from '../../../provider/index.ts'
 import type { Invoker, PermissionsStore } from './PermissionsStore.ts'

package/src/simple/runner/SimpleXyoRunner.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'

package/src/simple/signer/SimpleXyoSigner.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type { Signed, UnsignedBoundWitness } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'

package/src/simple/timesync/SimpleTimeSyncViewer.ts

@@ -1,8 +1,7 @@
-import { assertEx } from '@xylabs/assert'
-import type { Hash } from '@xylabs/hex'
-import { asHash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
-import { isDefined } from '@xylabs/typeof'
+import type { Hash, Promisable } from '@xylabs/sdk-js'
+import {
+  asHash, assertEx, isDefined,
+} from '@xylabs/sdk-js'
 import type { TimeDomain, TimePayload } from '@xyo-network/xl1-protocol'
 import {
   asTimePayload, asXL1BlockNumber, TimeSchema,

package/src/time/primitives/xl1BlockNumberToEthBlockNumber.ts

@@ -1,4 +1,4 @@
-import { assertEx } from '@xylabs/assert'
+import { assertEx } from '@xylabs/sdk-js'
 import type { XL1BlockNumber } from '@xyo-network/xl1-protocol'
 import { asTimePayload, TimeSchema } from '@xyo-network/xl1-protocol'
 

package/src/transaction/buildTransaction.ts

@@ -1,6 +1,5 @@
-import { assertEx } from '@xylabs/assert'
-import type { Address } from '@xylabs/hex'
-import { toHex } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
+import { assertEx, toHex } from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
 import { PayloadBuilder } from '@xyo-network/payload-builder'

package/src/transaction/buildUnsignedTransaction.ts

@@ -1,5 +1,5 @@
-import type { Address } from '@xylabs/hex'
-import { toHex } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
+import { toHex } from '@xylabs/sdk-js'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { Payload } from '@xyo-network/payload-model'

package/src/transaction/confirmSubmittedTransaction.ts

@@ -1,6 +1,5 @@
-import { delay } from '@xylabs/delay'
-import type { Logger } from '@xylabs/logger'
-import { isDefined } from '@xylabs/typeof'
+import type { Hash, Logger } from '@xylabs/sdk-js'
+import { delay, isDefined } from '@xylabs/sdk-js'
 import type { Signed } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { SignedHydratedTransaction, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
@@ -36,23 +35,22 @@ export type ConfirmSubmittedTransactionOptions = {
  */
 export const confirmSubmittedTransaction = async (
   viewer: XyoViewer,
-  transaction: Signed<TransactionBoundWitness>,
+  txHash: Hash,
   options?: ConfirmSubmittedTransactionOptions,
 ): Promise<SignedHydratedTransaction> => {
   const { attempts: maxAttempts = DEFAULT_CONFIRMATION_ATTEMPTS, delay: attemptDelay = DEFAULT_DELAY_BETWEEN_ATTEMPTS } = options ?? {}
-  const txBWHash = await PayloadBuilder.hash(transaction)
-  options?.logger?.log('🚀 confirming transaction:', txBWHash, '\n')
+  options?.logger?.log('🚀 confirming transaction:', txHash, '\n')
   let attempts = 0
   while (true) {
-    const tx = await viewer.transactionByHash(txBWHash) ?? undefined
+    const tx = await viewer.transactionByHash(txHash) ?? undefined
     if (isDefined(tx)) {
-      options?.logger?.log('✅ Transaction confirmed:', txBWHash, '\n')
+      options?.logger?.log('✅ Transaction confirmed:', txHash, '\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`)
+        throw new Error(`Transaction ${txHash} not confirmed after ${maxAttempts} attempts`)
       } else {
         options?.logger?.log(`🔄 Transaction not confirmed yet, attempt ${attempts}. Retrying...`, '\n')
         await delay(attemptDelay)

package/src/transaction/hydrateTransaction.ts

@@ -1,5 +1,5 @@
-import { assertEx } from '@xylabs/assert'
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
+import { assertEx } from '@xylabs/sdk-js'
 import { hydrateTypedBoundWitness, tryHydrateTypedBoundWitness } from '@xyo-network/archivist-model'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
 import type {

package/src/transaction/primitives/spec/transactionBlockByteCount.spec.ts

@@ -1,6 +1,6 @@
 import type {
   Address, Hash, Hex,
-} from '@xylabs/hex'
+} from '@xylabs/sdk-js'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type { AnyPayload, Sequence } from '@xyo-network/payload-model'
 import type { SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness } from '@xyo-network/xl1-protocol'

package/src/transaction/primitives/transactionElevatedPayloads.ts

@@ -1,4 +1,4 @@
-import { asHash, type Hash } from '@xylabs/hex'
+import { asHash, type Hash } from '@xylabs/sdk-js'
 import type { Payload, WithHashMeta } from '@xyo-network/payload-model'
 import type { SignedHydratedTransactionWithStorageMeta, TransactionBoundWitness } from '@xyo-network/xl1-protocol'
 

package/src/transaction/script.ts

@@ -1,6 +1,5 @@
-import { filterAs } from '@xylabs/array'
-import { assertEx } from '@xylabs/assert'
-import { asHash, type Hash } from '@xylabs/hex'
+import { asHash, type Hash } from '@xylabs/sdk-js'
+import { assertEx, filterAs } from '@xylabs/sdk-js'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type { AllowedBlockPayload, HydratedTransactionWithStorageMeta } from '@xyo-network/xl1-protocol'
 import { isAllowedBlockPayloadWithHashMeta } from '@xyo-network/xl1-protocol'

package/src/transaction/signTransaction.ts

@@ -1,6 +1,6 @@
-import { toArrayBuffer } from '@xylabs/arraybuffer'
-import { assertEx } from '@xylabs/assert'
-import { hexFromArrayBuffer } from '@xylabs/hex'
+import {
+  assertEx, hexFromArrayBuffer, toArrayBuffer,
+} from '@xylabs/sdk-js'
 import type { AccountInstance } from '@xyo-network/account-model'
 import type { Unsigned } from '@xyo-network/boundwitness-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'

package/src/validation/block/BlockValidationFunction.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { BlockBoundWitness, ChainId } from '@xyo-network/xl1-protocol'
 
 import type { BlockValidationError } from './error.ts'

package/src/validation/block/HydratedBlockStateValidationFunction.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { ChainId, HydratedBlock } from '@xyo-network/xl1-protocol'
 
 import type { AccountBalanceService } from '../../services/index.ts'

package/src/validation/block/HydratedBlockValidationFunction.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { ChainId, HydratedBlock } from '@xyo-network/xl1-protocol'
 
 import type { HydratedBlockValidationError } from './error.ts'

package/src/validation/block/error.spec.ts

@@ -1,4 +1,4 @@
-import type { Address, Hash } from '@xylabs/hex'
+import type { Address, Hash } from '@xylabs/sdk-js'
 import type { HydratedBlock } from '@xyo-network/xl1-protocol'
 import {
   describe, expect, it,

package/src/validation/block/error.ts

@@ -1,4 +1,4 @@
-import type { Hash } from '@xylabs/hex'
+import type { Hash } from '@xylabs/sdk-js'
 import type {
   BlockBoundWitness,
   ChainId,

package/src/viewers/AccountBalance.ts

@@ -1,5 +1,6 @@
-import type { Address, Hash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type {
+  Address, Hash, Promisable,
+} from '@xylabs/sdk-js'
 import type { Signed } from '@xyo-network/boundwitness-model'
 import type { WithStorageMeta } from '@xyo-network/payload-model'
 import type {

package/src/viewers/Block.ts

@@ -1,5 +1,4 @@
-import type { Hash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Hash, Promisable } from '@xylabs/sdk-js'
 import type { HydratedBlock, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 
 export interface BlockViewierMethods {

package/src/viewers/Chain.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { ChainId } from '@xyo-network/xl1-protocol'
 
 export interface ChainViewerMethods {

package/src/viewers/ChainContract.ts

@@ -1,4 +1,4 @@
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 
 export interface ChainContractViewerMethods {
   forkedAtBlockNumber(): Promise<bigint>

package/src/viewers/Fork.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { ChainId } from '@xyo-network/xl1-protocol'
 
 export type ForkHistory = Record<number, ChainId>

package/src/viewers/NetworkStakeStepReward.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { StepIdentity, StepIdentityString } from '@xyo-network/xl1-protocol'
 
 export interface NetworkStakeStepAddressRewardViewerMethods {

package/src/viewers/Stake.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 
 import type { Position } from '../model/index.ts'
 import type { StakeEventsViewer } from './StakeEvents.ts'

package/src/viewers/StakeEvents.ts

@@ -1,6 +1,6 @@
-import type { Address } from '@xylabs/hex'
-import type { JsonObject } from '@xylabs/object'
-import type { Promisable } from '@xylabs/promise'
+import type {
+  Address, JsonObject, Promisable,
+} from '@xylabs/sdk-js'
 
 export const StakeEventNames = ['StakeAdded', 'StakeRemoved', 'StakeWithdrawn'] as const
 export type StakeEventName = typeof StakeEventNames[number]

package/src/viewers/StakeTotals.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 
 export interface StakeTotalsViewerMethods {
   active(): Promisable<bigint>

package/src/viewers/StepStake.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { StepIdentity } from '@xyo-network/xl1-protocol'
 
 export interface StepStakeViewerMethods {

package/src/viewers/TimeSync.ts

@@ -1,4 +1,4 @@
-import type { Promisable } from '@xylabs/promise'
+import type { Promisable } from '@xylabs/sdk-js'
 import type { TimeDomain, TimePayload } from '@xyo-network/xl1-protocol'
 
 export interface TimeSyncViewerMethods {

package/src/viewers/Transaction.ts

@@ -1,5 +1,4 @@
-import type { Hash } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Hash, Promisable } from '@xylabs/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
 export interface TransactionViewerMethods {

package/src/viewers/TransferBalance.ts

@@ -1,5 +1,4 @@
-import type { Address } from '@xylabs/hex'
-import type { Promisable } from '@xylabs/promise'
+import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { Signed } from '@xyo-network/boundwitness-model'
 import type {
   AttoXL1,

package/src/wallet/spec/paths.spec.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @stylistic/max-len */
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
 import {
   describe, expect, it,
 } from 'vitest'