@xyo-network/xl1-protocol-sdk 1.19.2 → 1.19.4

package/src/{provider → model/providers}/XyoClient.ts

@@ -1,6 +1,6 @@
 import type { GatewayName } from '@xyo-network/xl1-protocol'
 
-import type { XyoPermissions } from './permissions/index.ts'
+import type { XyoPermissions } from '../permissions/index.ts'
 import type { XyoGateway } from './XyoGateway.ts'
 import type { XyoGatewayRunner } from './XyoGatewayRunner.ts'
 

package/src/{provider → model/providers}/XyoConnection.ts

@@ -1,6 +1,6 @@
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
+import type { NetworkStakeViewer, XyoViewer } from '../viewers/index.ts'
 import type { DataLakeRunner, DataLakeViewer } from './DataLake.ts'
-import type { NetworkStakeViewer, XyoViewer } from './viewer/index.ts'
 import type { XyoNetwork } from './XyoNetwork.ts'
 import type { XyoRunner } from './XyoRunner.ts'
 

package/src/{provider → model/providers}/XyoGateway.ts

@@ -1,4 +1,4 @@
-import type { Provider, ProviderMoniker } from '../model/index.ts'
+import type { Provider, ProviderMoniker } from '../Provider.ts'
 import type { DataLakesViewer } from './DataLakes.ts'
 import type { XyoConnection } from './XyoConnection.ts'
 

package/src/{provider → model/providers}/XyoGatewayRunner.ts

@@ -8,7 +8,7 @@ import type {
   XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 
-import type { ConfirmSubmittedTransactionOptions } from '../transaction/index.ts'
+import type { ConfirmSubmittedTransactionOptions } from '../../transaction/index.ts'
 import type { DataLakesRunner } from './DataLakes.ts'
 import type { XyoSigner } from './signer/index.ts'
 import type { XyoGatewayProvider } from './XyoGateway.ts'

package/src/{provider → model/providers}/XyoRunner.ts

@@ -1,7 +1,7 @@
 import type { Hash, Promisable } from '@xylabs/sdk-js'
 import type { SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 import type { MempoolRunner } from '../runners/index.ts'
 
 export interface XyoRunnerMethods {

package/src/{provider → model/providers}/index.ts

@@ -1,9 +1,7 @@
 export * from './DataLake.ts'
 export * from './DataLakes.ts'
-export * from './permissions/index.ts'
 export * from './signer/index.ts'
 export * from './TransactionSubmitter.ts'
-export * from './viewer/index.ts'
 export * from './XyoClient.ts'
 export * from './XyoConnection.ts'
 export * from './XyoGateway.ts'

package/src/{provider → model/providers}/signer/XyoSigner.ts

@@ -7,7 +7,7 @@ import type {
   TransactionFeesBigInt,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../../model/index.ts'
+import type { Provider } from '../../Provider.ts'
 
 export const XyoSignerMoniker = 'XyoSigner' as const
 export type XyoSignerMoniker = typeof XyoSignerMoniker

package/src/{runners → model/runners}/Block.ts

@@ -3,7 +3,7 @@ import type {
   BlockBoundWitness, SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface BlockRunnerMethods {
   produceNextBlock(head: SignedBlockBoundWitnessWithHashMeta, force: true): Promise<SignedHydratedBlockWithHashMeta>

package/src/{runners → model/runners}/Finalization.ts

@@ -1,7 +1,7 @@
 import type { Hash } from '@xylabs/sdk-js'
 import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface FinalizationRunnerMethods {
   finalizeBlocks(blocks: SignedHydratedBlockWithHashMeta[]): Promise<Hash[]>

package/src/{runners → model/runners}/Mempool.ts

@@ -1,7 +1,7 @@
 import type { Hash } from '@xylabs/sdk-js'
 import type { SignedHydratedBlock, SignedHydratedTransaction } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface MempoolRunnerMethods {
   submitBlocks(blocks: SignedHydratedBlock[]): Promise<Hash[]>

package/src/{viewers → model/viewers}/AccountBalance.ts

@@ -8,12 +8,9 @@ import {
 import { BlockBoundWitnessZod, TransactionBoundWitnessZod } from '@xyo-network/xl1-protocol'
 import { z } from 'zod'
 
-import {
-  ChainQualificationZod,
-  type ChainQualified,
-  ChainQualifiedConfigZod,
-  type Provider,
-} from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
+import type { ChainQualified } from '../zod/index.ts'
+import { ChainQualificationZod, ChainQualifiedConfigZod } from '../zod/index.ts'
 
 export const AccountBalanceHistoryItemZod = z.tuple([
   WithHashMetaZod(BlockBoundWitnessZod),

package/src/{viewers → model/viewers}/Block.ts

@@ -6,7 +6,7 @@ import type {
   XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider, ProviderMoniker } from '../model/index.ts'
+import type { Provider, ProviderMoniker } from '../Provider.ts'
 
 export interface BlockViewerMethods {
   blocksByHash(hash: Hash, limit?: number): Promisable<SignedHydratedBlockWithHashMeta[]>

package/src/{viewers → model/viewers}/BlockReward.ts

@@ -1,7 +1,7 @@
 import type { Promisable } from '@xylabs/sdk-js'
 import type { AttoXL1, XL1BlockNumber } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface BlockRewardViewerMethods {
   // The amount of xl1 to send to the producer from the block reward

package/src/{viewers → model/viewers}/BlockValidation.ts

@@ -3,10 +3,11 @@ import { zodIsFactory } from '@xylabs/zod'
 import { type HydratedBlock, type SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 import { z } from 'zod'
 
+import type { HydratedBlockValidationError } from '../../validation/index.ts'
+import type { Provider } from '../Provider.ts'
 import {
-  ChainQualificationZod, ChainQualifiedHeadConfigZod, ChainQualifiedRangeConfigZod, type Provider,
-} from '../model/index.ts'
-import type { HydratedBlockValidationError } from '../validation/index.ts'
+  ChainQualificationZod, ChainQualifiedHeadConfigZod, ChainQualifiedRangeConfigZod,
+} from '../zod/index.ts'
 
 export const BlockValidationQualificationZod = ChainQualificationZod
 export type BlockValidationQualification = z.infer<typeof BlockValidationQualificationZod>

package/src/{viewers → model/viewers}/ChainContract.ts

@@ -3,7 +3,7 @@ import type {
 } from '@xylabs/sdk-js'
 import type { ChainId } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface ChainContractViewerMethods {
   chainId(): Promisable<ChainId>

package/src/{viewers → model/viewers}/ChainStakeViewer.ts

@@ -1,4 +1,4 @@
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 import type { ChainContractViewer } from './ChainContract.ts'
 import type { StakeTotalsViewer } from './StakeTotals.ts'
 

package/src/{viewers → model/viewers}/Finalization.ts

@@ -3,7 +3,7 @@ import type {
   SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface FinalizationViewerMethods {
   head(): Promise<SignedHydratedBlockWithHashMeta>

package/src/{viewers → model/viewers}/Mempool.ts

@@ -3,7 +3,7 @@ import type { SignedHydratedBlockWithHashMeta, SignedHydratedTransactionWithHash
 import { XL1BlockRangeZod } from '@xyo-network/xl1-protocol'
 import { z } from 'zod'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export const PendingTransactionsOptionsZod = z.object({
   cursor: HashZod.optional(),

package/src/{provider/viewer → model/viewers}/NetworkStake/NetworkStakeViewer.ts

@@ -1,6 +1,6 @@
 import type { Promisable } from '@xylabs/sdk-js'
 
-import type { Provider } from '../../../model/index.ts'
+import type { Provider } from '../../Provider.ts'
 import type { NetworkStakeStepRewardsViewer } from './Rewards/index.ts'
 
 export interface NetworkStakeViewerMethods {

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/ByPositionViewer.ts

@@ -1,4 +1,4 @@
-import type { Provider } from '../../../../model/index.ts'
+import type { Provider } from '../../../Provider.ts'
 import type { NetworkStakeStepRewardsByPositionViewerOptions } from './Options.ts'
 import type { NetworkStakeStepRewardsByIndexViewerMethodsTemplate } from './templates/index.ts'
 

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/ByStakerViewer.ts

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

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/ByStepViewer.ts

@@ -1,6 +1,6 @@
 import type { StepIdentityString } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../../../../model/index.ts'
+import type { Provider } from '../../../Provider.ts'
 import type { NetworkStakeStepRewardsByStepViewerOptions } from './Options.ts'
 import type { NetworkStakeStepRewardsByIndexViewerMethodsTemplate } from './templates/index.ts'
 

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/TotalViewer.ts

@@ -1,6 +1,6 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../../../../model/index.ts'
+import type { Provider } from '../../../Provider.ts'
 import type { NetworkStakeStepRewardsRangeOptions } from './Options.ts'
 import type { NetworkStakeStepRewardsViewerMethodsTemplate } from './templates/index.ts'
 

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/Viewer.ts

@@ -1,4 +1,4 @@
-import type { Provider } from '../../../../model/index.ts'
+import type { Provider } from '../../../Provider.ts'
 import type { NetworkStakeStepRewardsByPositionViewer } from './ByPositionViewer.ts'
 import type { NetworkStakeStepRewardsByStakerViewer } from './ByStakerViewer.ts'
 import type { NetworkStakeStepRewardsByStepViewer } from './ByStepViewer.ts'

package/src/{provider/viewer → model/viewers}/NetworkStake/Rewards/templates/ByIndexMethodsTemplate.ts

@@ -1,6 +1,6 @@
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
 
-import type { RecordKeyType } from '../../../../../model/index.ts'
+import type { RecordKeyType } from '../../../../RecordKeyType.ts'
 import type { NetworkStakeStepRewardsViewerMethodsTemplate } from './MethodsTemplate.ts'
 
 export interface NetworkStakeStepRewardsByIndexViewerMethodsTemplate<TOptions, TResultIndex extends RecordKeyType>

package/src/{viewers → model/viewers}/NetworkStakeStepReward.ts

@@ -3,7 +3,7 @@ import type {
   AttoXL1, StepIdentity, StepIdentityString,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface NetworkStakeStepAddressRewardViewerMethods {
   // the step rewards for a specific network stakers for all of history

package/src/{viewers → model/viewers}/Stake.ts

@@ -1,6 +1,7 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 
-import type { Position, Provider } from '../model/index.ts'
+import type { Position } from '../Position.ts'
+import type { Provider } from '../Provider.ts'
 import type { StakeEventsViewer } from './StakeEvents.ts'
 
 export interface StakeViewerProperties {

package/src/{viewers → model/viewers}/StakeEvents.ts

@@ -2,7 +2,7 @@ import type {
   Address, JsonObject, Promisable,
 } from '@xylabs/sdk-js'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export const StakeEventNames = ['StakeAdded', 'StakeRemoved', 'StakeWithdrawn'] as const
 export type StakeEventName = typeof StakeEventNames[number]

package/src/{viewers → model/viewers}/StakeIntent.ts

@@ -3,7 +3,8 @@ import type {
 } from '@xylabs/sdk-js'
 import type { ChainStakeIntent, XL1BlockRange } from '@xyo-network/xl1-protocol'
 
-import type { ChainQualified, Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
+import type { ChainQualified } from '../zod/index.ts'
 
 export interface StakeIntentViewerMethods {
   qualifiedIntentByAddress(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<ChainQualified<ChainStakeIntent | null>>

package/src/{viewers → model/viewers}/StakeTotals.ts

@@ -1,6 +1,6 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface StakeTotalsViewerMethods {
   active(): Promisable<bigint>

package/src/{viewers → model/viewers}/StepStake.ts

@@ -1,7 +1,7 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { StepIdentity } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface StepStakeViewerMethods {
   // this is the prorated stake for all addresses in the step

package/src/{viewers → model/viewers}/StepViewer.ts

@@ -1,8 +1,9 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { PositionId, StepIdentity } from '@xyo-network/xl1-protocol'
 
-import type { Position, Provider } from '../model/index.ts'
-import type { NetworkStakeStepRewardsViewer } from '../provider/index.ts'
+import type { Position } from '../Position.ts'
+import type { Provider } from '../Provider.ts'
+import type { NetworkStakeStepRewardsViewer } from './NetworkStake/index.ts'
 
 export interface PagedPositionsOptions {
   cursor?: PositionId

package/src/{viewers → model/viewers}/TimeSync.ts

@@ -1,7 +1,7 @@
 import type { Promisable } from '@xylabs/sdk-js'
 import type { TimeDomain, TimePayload } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export interface TimeSyncViewerMethods {
   /** Convert time between different domains */

package/src/{viewers → model/viewers}/TransactionValidation.ts

@@ -3,9 +3,8 @@ import { zodIsFactory } from '@xylabs/zod'
 import { type HydratedTransaction, type ValidationError } from '@xyo-network/xl1-protocol'
 import type { z } from 'zod'
 
-import {
-  ChainQualificationZod, ChainQualifiedConfigZod, type Provider,
-} from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
+import { ChainQualificationZod, ChainQualifiedConfigZod } from '../zod/index.ts'
 
 export const TransactionValidationQualificationZod = ChainQualificationZod
 export type TransactionValidationQualification = z.infer<typeof TransactionValidationQualificationZod>

package/src/{viewers → model/viewers}/TransferBalance.ts

@@ -6,7 +6,7 @@ import type {
   XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider } from '../Provider.ts'
 
 export type TransferBalanceHistoryItem = [
   Signed<BlockBoundWitness> /* block */,

package/src/{viewers → model/viewers}/WindowedBlock.ts

@@ -1,7 +1,7 @@
 import type { Hash, Promisable } from '@xylabs/sdk-js'
 import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
-import type { Provider, ProviderMoniker } from '../model/index.ts'
+import type { Provider, ProviderMoniker } from '../Provider.ts'
 import type { BlockViewerMethods } from './Block.ts'
 
 type ExtendableBlockViewerMethods = Omit<BlockViewerMethods, 'rate' | 'stepSizeRate' | 'timeDurationRate'>

package/src/{provider/viewer → model/viewers}/XyoViewer.ts

@@ -1,22 +1,18 @@
 import type { Address, Promisable } from '@xylabs/sdk-js'
 import type { AttoXL1 } from '@xyo-network/xl1-protocol'
 
-import type { ChainQualifiedConfig, Provider } from '../../model/index.ts'
-import type {
-  AccountBalanceHistoryItem,
-  AccountBalanceViewer,
-  BlockViewer,
-  BlockViewerMethods,
-  ForkViewerMethods,
-  MempoolViewer,
-  NetworkStakeStepRewardViewerMethods,
-  StakeViewer,
-  StakeViewerMethods,
-  StepViewer,
-  TimeSyncViewer,
-  TransactionViewerMethods,
-} from '../../viewers/index.ts'
+import type { Provider } from '../Provider.ts'
+import type { ChainQualifiedConfig } from '../zod/index.ts'
+import type { AccountBalanceHistoryItem, AccountBalanceViewer } from './AccountBalance.ts'
+import type { BlockViewer, BlockViewerMethods } from './Block.ts'
+import type { ForkViewerMethods } from './Fork.ts'
+import type { MempoolViewer } from './Mempool.ts'
 import type { NetworkStakeViewer } from './NetworkStake/index.ts'
+import type { NetworkStakeStepRewardViewerMethods } from './NetworkStakeStepReward.ts'
+import type { StakeViewer, StakeViewerMethods } from './Stake.ts'
+import type { StepViewer } from './StepViewer.ts'
+import type { TimeSyncViewer } from './TimeSync.ts'
+import type { TransactionViewerMethods } from './Transaction.ts'
 
 export interface XyoViewerMethods extends
   NetworkStakeStepRewardViewerMethods, BlockViewerMethods,

package/src/{viewers → model/viewers}/index.ts

@@ -7,6 +7,7 @@ export * from './ChainStakeViewer.ts'
 export * from './Finalization.ts'
 export * from './Fork.ts'
 export * from './Mempool.ts'
+export * from './NetworkStake/index.ts'
 export * from './NetworkStakeStepReward.ts'
 export * from './Stake.ts'
 export * from './StakeEvents.ts'
@@ -18,3 +19,4 @@ export * from './Transaction.ts'
 export * from './TransactionValidation.ts'
 export * from './TransferBalance.ts'
 export * from './WindowedBlock.ts'
+export * from './XyoViewer.ts'

package/src/model/zod/index.ts

@@ -0,0 +1 @@
+export * from './ChainQualification.ts'

package/src/primitives/block/rate/blockRate.ts

@@ -4,7 +4,7 @@ import type {
 } from '@xyo-network/xl1-protocol'
 import { asXL1BlockRange } from '@xyo-network/xl1-protocol'
 
-import type { BlockViewer } from '../../../viewers/index.ts'
+import type { BlockViewer } from '../../../model/index.ts'
 import { rateMultipliers, timeDurations } from './timeHelpers.ts'
 
 export const blockRate = (

package/src/primitives/block/rate/stepRate.ts

@@ -6,7 +6,7 @@ import {
   asXL1BlockRange, isValidStep, StepSizes,
 } from '@xyo-network/xl1-protocol'
 
-import type { BlockViewer } from '../../../viewers/index.ts'
+import type { BlockViewer } from '../../../model/index.ts'
 import { calculateBlockRate } from './blockRate.ts'
 
 export const stepRate = async (

package/src/primitives/block/rate/timeRate.ts

@@ -10,7 +10,7 @@ import type {
 } from '@xyo-network/xl1-protocol'
 import { asXL1BlockNumber, asXL1BlockRange } from '@xyo-network/xl1-protocol'
 
-import type { BlockViewer } from '../../../viewers/index.ts'
+import type { BlockViewer } from '../../../model/index.ts'
 import { calculateBlockRate } from './blockRate.ts'
 import { getTimeConfigInMilliseconds } from './timeHelpers.ts'
 

package/src/primitives/chain/getWindowedChain.ts

@@ -4,7 +4,7 @@ import {
 } from '@xylabs/sdk-js'
 import type { SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
 
-import type { BlockViewer } from '../../viewers/index.ts'
+import type { BlockViewer } from '../../model/index.ts'
 
 /**
  * Constructs a bounded, contiguous canonical chain ending at the current head.

package/src/primitives/chain/time/externalBlockNumberFromXL1BlockNumber.ts

@@ -4,9 +4,8 @@ import {
   asBlockNumber, asTimePayload, isTimePayload,
 } from '@xyo-network/xl1-protocol'
 
-import type { CachingBaseContext } from '../../../model/index.ts'
+import type { BlockViewer, CachingBaseContext } from '../../../model/index.ts'
 import { withContextCacheResponse } from '../../../model/index.ts'
-import type { BlockViewer } from '../../../viewers/index.ts'
 
 const functionName = 'externalBlockNumberFromXL1BlockNumber' as const
 

package/src/primitives/chain/time/externalBlockRangeFromStep.ts

@@ -1,9 +1,8 @@
 import type { BlockRange, StepIdentity } from '@xyo-network/xl1-protocol'
 
 import { toStepIdentityString } from '../../../block/index.ts'
-import type { CachingBaseContext } from '../../../model/index.ts'
+import type { BlockViewer, CachingBaseContext } from '../../../model/index.ts'
 import { withContextCacheResponse } from '../../../model/index.ts'
-import type { BlockViewer } from '../../../viewers/index.ts'
 import { stepBlockRange } from '../../step/index.ts'
 import { externalBlockRangeFromXL1BlockRange } from './externalBlockRangeFromXL1BlockRange.ts'
 

package/src/primitives/chain/time/externalBlockRangeFromXL1BlockRange.ts

@@ -1,7 +1,6 @@
 import type { BlockRange, XL1BlockRange } from '@xyo-network/xl1-protocol'
 
-import type { CachingBaseContext } from '../../../model/index.ts'
-import type { BlockViewer } from '../../../viewers/index.ts'
+import type { BlockViewer, CachingBaseContext } from '../../../model/index.ts'
 import { externalBlockNumberFromXL1BlockNumber } from './externalBlockNumberFromXL1BlockNumber.ts'
 
 export async function externalBlockRangeFromXL1BlockRange(

package/src/primitives/mapToMapType.ts

@@ -1,6 +1,6 @@
 import { isDefined } from '@xylabs/sdk-js'
 
-import type { SyncIterableMap } from '../map/index.ts'
+import type { SyncIterableMap } from '../model/index.ts'
 
 export function mapToMapType<K extends {}, V extends {}>(map: Map<K, V> | SyncIterableMap<K, V>): SyncIterableMap<K, V> {
   return {

package/src/primitives/rewards/networkStakeStepRewardPositionWeight.ts

@@ -1,7 +1,6 @@
 import { type StepIdentity, XYO_NETWORK_STAKING_ADDRESS } from '@xyo-network/xl1-protocol'
 
-import type { StakedChainContextRead } from '../../model/index.ts'
-import type { BlockViewer } from '../../viewers/index.ts'
+import type { BlockViewer, StakedChainContextRead } from '../../model/index.ts'
 import { externalBlockRangeFromStep } from '../chain/index.ts'
 import { weightedStakeForRangeByPosition } from '../stake/index.ts'
 

package/src/primitives/stake/activeStakeAtTimeByAddress.ts

@@ -1,7 +1,7 @@
 import type { Address } from '@xylabs/sdk-js'
 import { isDefined } from '@xylabs/sdk-js'
 
-import type { StakeEventsViewer } from '../../viewers/index.ts'
+import type { StakeEventsViewer } from '../../model/index.ts'
 import { mergedAddRemoveStakeEventsByStaker } from './mergedAddRemoveStakeEventsByStaker.ts'
 
 export async function activeStakeAtTimeByAddress(

package/src/primitives/stake/activeStakeAtTimeByPosition.ts

@@ -1,6 +1,6 @@
 import { isUndefined } from '@xylabs/sdk-js'
 
-import type { StakeEventsViewer } from '../../viewers/index.ts'
+import type { StakeEventsViewer } from '../../model/index.ts'
 import { mergedAddRemoveStakeEventsByPosition } from './mergedAddRemoveStakeEventsByPosition.ts'
 
 export async function activeStakeAtTimeByPosition(

package/src/primitives/stake/allStakersForRange.ts

@@ -3,7 +3,7 @@ import {
   toAddress,
 } from '@xylabs/sdk-js'
 
-import type { StakeEventsViewer } from '../../viewers/index.ts'
+import type { StakeEventsViewer } from '../../model/index.ts'
 import { mergedAddRemoveStakeEventsByStaker } from './mergedAddRemoveStakeEventsByStaker.ts'
 
 export async function allStakersForRange(

package/src/primitives/stake/allStakersForStep.ts

@@ -1,8 +1,7 @@
 import { type Address } from '@xylabs/sdk-js'
 import type { StepIdentity } from '@xyo-network/xl1-protocol'
 
-import type { StakedChainContextRead } from '../../model/index.ts'
-import type { BlockViewer } from '../../viewers/index.ts'
+import type { BlockViewer, StakedChainContextRead } from '../../model/index.ts'
 import { externalBlockRangeFromXL1BlockRange } from '../chain/index.ts'
 import { stepBlockRange } from '../step/index.ts'
 import { allStakersForRange } from './allStakersForRange.ts'

package/src/primitives/stake/mergedAddRemoveStakeEventsByPosition.ts

@@ -1,4 +1,4 @@
-import type { StakeEvent, StakeEventsViewer } from '../../viewers/index.ts'
+import type { StakeEvent, StakeEventsViewer } from '../../model/index.ts'
 
 export async function mergedAddRemoveStakeEventsByPosition(
   chainEvents: StakeEventsViewer,

package/src/primitives/stake/mergedAddRemoveStakeEventsByStaker.ts

@@ -1,6 +1,6 @@
 import type { Address } from '@xylabs/sdk-js'
 
-import type { StakeEvent, StakeEventsViewer } from '../../viewers/index.ts'
+import type { StakeEvent, StakeEventsViewer } from '../../model/index.ts'
 
 export async function mergedAddRemoveStakeEventsByStaker(
   chainEvents: StakeEventsViewer,

package/src/primitives/stake/weightedStakeForRangeByPosition.ts

@@ -2,8 +2,8 @@ import type { Address } from '@xylabs/sdk-js'
 import { isDefined } from '@xylabs/sdk-js'
 import { asBlockNumber, type BlockRange } from '@xyo-network/xl1-protocol'
 
-import { type StakedChainContextRead, withContextCacheResponse } from '../../model/index.ts'
-import type { BlockViewer } from '../../viewers/index.ts'
+import type { BlockViewer, StakedChainContextRead } from '../../model/index.ts'
+import { withContextCacheResponse } from '../../model/index.ts'
 import { mergedAddRemoveStakeEventsByPosition } from './mergedAddRemoveStakeEventsByPosition.ts'
 
 export async function weightedStakeForRangeByPosition(

package/src/services/Chain/ChainService.ts

@@ -1,4 +1,4 @@
-import type { ChainContractViewer, ChainStakeViewer } from '../../viewers/index.ts'
+import type { ChainContractViewer, ChainStakeViewer } from '../../model/index.ts'
 import type { BaseChainService } from './BaseChainService.ts'
 
 /** @deprecated use ChainContractViewer, StakeTotalsViewer, StakeRunner instead */

package/src/services/NetworkStakeService.ts

@@ -1,3 +1,3 @@
-import type { NetworkStakeStepRewardViewer } from '../viewers/index.ts'
+import type { NetworkStakeStepRewardViewer } from '../model/index.ts'
 
 export interface NetworkStakeStepRewardService extends NetworkStakeStepRewardViewer {}