@xyo-network/react-chain-blockchain 1.5.35 → 1.5.36

package/src/components/chain/render/dynamic/flexbox/Remote.stories.tsx

@@ -1,7 +1,7 @@
 import type { Meta, StoryFn } from '@storybook/react-vite'
 import React from 'react'
 
-import { getChainInformation } from '../../../../../lib/index.ts'
+import { getChainId } from '../../../../../lib/index.ts'
 import type { BlockChainRenderProps } from '../../../../../types/index.ts'
 import { DynamicBlockchainRenderFlexbox } from './Flexbox.tsx'
 
@@ -9,10 +9,11 @@ import { DynamicBlockchainRenderFlexbox } from './Flexbox.tsx'
 // @ts-expect-error
 globalThis.rollbar = undefined
 
-const chainInformation = await getChainInformation()
+const chainId = await getChainId()
 
 const blockChainRenderProps: BlockChainRenderProps = {
-  chainInformation,
+  name: 'unknown',
+  chainId,
   maxBlocks: 100,
 }
 

package/src/components/chain/render/dynamic/flexbox/variants/WithAnalysis.tsx

@@ -1,3 +1,4 @@
+import { isAddress } from '@xylabs/hex'
 import { ChainProducersAnalyzer } from '@xyo-network/chain-analyze'
 import React, { useMemo } from 'react'
 
@@ -7,13 +8,13 @@ import type { BlockChainRenderFlexboxProps } from '../../../../../../types/index
 import { DynamicListBase } from './Base.tsx'
 
 export const WithAnalysis: React.FC<BlockChainRenderFlexboxProps> = ({ blockChainRenderProps, ...props }) => {
-  const { chainInformation } = blockChainRenderProps ?? {}
+  const { chainId } = blockChainRenderProps ?? {}
 
   const analyzers = useMemo(() => {
-    if (chainInformation) {
+    if (isAddress(chainId)) {
       return { producers: new ChainProducersAnalyzer() } as ChainAnalyzers
     }
-  }, [chainInformation])
+  }, [chainId])
 
   return (
     <ChainAnalyzersProvider analyzers={analyzers}>

package/src/components/chain/render/dynamic/hooks/useDynamicBlockRenderComponents.ts

@@ -14,7 +14,7 @@ export const useDynamicBlockRenderComponents = (
 ) => {
   const { maxBlocks } = blockChainRenderProps ?? {}
 
-  const chainIteratorParams = useMemo(() => blockChainRenderProps ?? {}, [blockChainRenderProps])
+  const chainIteratorParams = useMemo(() => blockChainRenderProps ?? { name: 'unknown' }, [blockChainRenderProps])
 
   const [params, paramsError] = useChainIteratorParams(chainIteratorParams)
 

package/src/components/chain/render/dynamic/hooks/useRemoteBlockChainRenderProps.ts

@@ -20,6 +20,7 @@ export const useRemoteBlockChainRenderProps = (
   const blockChainRenderProps: BlockChainRenderProps = useMemo(() => ({
     ...blockChainRenderPropsArg,
     chainArchivist,
+    name: 'blockChainRenderProps',
   }), [blockChainRenderPropsArg, chainArchivist])
 
   return {

package/src/components/chain/render/static/flexbox/Flexbox.stories.tsx

@@ -24,11 +24,11 @@ Default.args = {}
 Default.decorators = [ChainArchivistDecorator]
 
 const WithMaxBlocks = Template.bind({})
-WithMaxBlocks.args = { blockChainRenderProps: { maxBlocks: 4 } }
+WithMaxBlocks.args = { blockChainRenderProps: { maxBlocks: 4, name: 'unknown' } }
 WithMaxBlocks.decorators = [ChainArchivistDecorator]
 
 const WithPagination = Template.bind({})
-WithPagination.args = { blockChainRenderProps: { pageSize: 4 } }
+WithPagination.args = { blockChainRenderProps: { pageSize: 4, name: 'unknown' } }
 WithPagination.decorators = [ChainArchivistDecorator]
 
 export {

package/src/components/chain/render/static/flexbox/variants/WithAnalysis.tsx

@@ -1,3 +1,4 @@
+import { isAddress } from '@xylabs/hex'
 import { ChainProducersAnalyzer } from '@xyo-network/chain-analyze'
 import React, { useMemo } from 'react'
 
@@ -7,13 +8,13 @@ import type { BlockChainRenderFlexboxProps } from '../../../../../../types/index
 import { StaticListBase } from './Base.tsx'
 
 export const WithAnalysis: React.FC<BlockChainRenderFlexboxProps> = ({ blockChainRenderProps, ...props }) => {
-  const { chainInformation } = blockChainRenderProps ?? {}
+  const { chainId } = blockChainRenderProps ?? {}
 
   const analyzers = useMemo(() => {
-    if (chainInformation) {
+    if (isAddress(chainId)) {
       return { producers: new ChainProducersAnalyzer() } as ChainAnalyzers
     }
-  }, [chainInformation])
+  }, [chainId])
 
   return (
     <ChainAnalyzersProvider analyzers={analyzers}>

package/src/components/chain/render/static/hooks/useStaticBlockRenderComponents.ts

@@ -14,7 +14,7 @@ export const useStaticBlockRenderComponents = (BlockComponent: ComponentType<Blo
   const { maxBlocks } = blockChainRenderProps ?? {}
   const pageSize = blockChainRenderProps?.pageSize ?? DEFAULT_PAGE_SIZE
 
-  const chainIteratorParams = useMemo(() => blockChainRenderProps ?? {}, [blockChainRenderProps])
+  const chainIteratorParams = useMemo(() => blockChainRenderProps ?? { name: 'unknown' }, [blockChainRenderProps])
 
   const [params, paramsError] = useChainIteratorParams(chainIteratorParams)
 

package/src/components/chain/render/static/table/Ex.stories.tsx

@@ -22,11 +22,11 @@ Default.args = {}
 Default.decorators = [ChainArchivistDecorator]
 
 const WithMaxBlocks = Template.bind({})
-WithMaxBlocks.args = { blockChainRenderProps: { maxBlocks: 4 } }
+WithMaxBlocks.args = { blockChainRenderProps: { maxBlocks: 4, name: 'unknown' } }
 WithMaxBlocks.decorators = [ChainArchivistDecorator]
 
 const WithPagination = Template.bind({})
-WithPagination.args = { blockChainRenderProps: { pageSize: 4 } }
+WithPagination.args = { blockChainRenderProps: { pageSize: 4, name: 'unknown' } }
 WithPagination.decorators = [ChainArchivistDecorator]
 
 export {

package/src/context/chain/Provider.tsx

@@ -8,17 +8,17 @@ interface ChainInfoProviderProps extends PropsWithChildren, Omit<ChainInfoState,
 }
 
 export const ChainInfoProvider: React.FC<ChainInfoProviderProps> = ({
-  children, chainArchivist: chainArchivistProp, chainInformation: chainInformationProp, chainIterator: chainIteratorProp,
+  children, chainArchivist: chainArchivistProp, chainId: chainIdProp, chainIterator: chainIteratorProp,
 }) => {
   const [chainArchivist, setChainArchivist] = useState<ChainInfoState['chainArchivist']>(chainArchivistProp)
-  const [chainInformation, setChainInformation] = useState<ChainInfoState['chainInformation']>(chainInformationProp)
+  const [chainId, setChainId] = useState<ChainInfoState['chainId']>(chainIdProp)
   const [chainIterator, setChainIterator] = useState<ChainInfoState['chainIterator']>(chainIteratorProp)
 
   const updateChainArchivist = (chainArchivist: ChainInfoState['chainArchivist']) => {
     setChainArchivist(chainArchivist)
   }
-  const updateChainInformation = (chainInformation: ChainInfoState['chainInformation']) => {
-    setChainInformation(chainInformation)
+  const updateChainId = (chainId: ChainInfoState['chainId']) => {
+    setChainId(chainId)
   }
   const updateChainIterator = (chainIterator: ChainInfoState['chainIterator']) => {
     setChainIterator(chainIterator)
@@ -29,8 +29,8 @@ export const ChainInfoProvider: React.FC<ChainInfoProviderProps> = ({
   }, [chainArchivistProp])
 
   useMemo(() => {
-    updateChainInformation(chainInformationProp)
-  }, [chainInformationProp])
+    updateChainId(chainIdProp)
+  }, [chainIdProp])
 
   useMemo(() => {
     updateChainIterator(chainIteratorProp)
@@ -38,13 +38,13 @@ export const ChainInfoProvider: React.FC<ChainInfoProviderProps> = ({
 
   const chainState: ChainInfoState = useMemo(() => ({
     chainArchivist,
-    chainInformation,
+    chainId,
     chainIterator,
     updateChainArchivist,
-    updateChainInformation,
+    updateChainId,
     updateChainIterator,
     provided: true,
-  }), [chainArchivist, chainInformation, chainIterator, updateChainArchivist, updateChainInformation, updateChainIterator])
+  }), [chainArchivist, chainId, chainIterator, updateChainArchivist, updateChainId, updateChainIterator])
 
   return (
     <ChainInfoContext value={chainState}>

package/src/context/chain/State.ts

@@ -1,9 +1,10 @@
+import type { Address } from '@xylabs/hex'
 import type { ContextExState } from '@xylabs/react-shared'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { ChainBlockNumberIterator, ChainInformation } from '@xyo-network/xl1-protocol'
+import type { ChainBlockNumberIterator } from '@xyo-network/xl1-protocol'
 
 export type ChainInfoState = ContextExState<{
   chainArchivist?: ArchivistInstance
-  chainInformation?: ChainInformation
+  chainId?: Address
   chainIterator?: ChainBlockNumberIterator
 }>

package/src/hooks/chain-iterator/ChainIteratorStore.ts

@@ -1,12 +1,12 @@
 import { assertEx } from '@xylabs/assert'
-import { hydrateBlock } from '@xyo-network/chain-protocol'
+import type { XyoChainIteratorParams } from '@xyo-network/chain-services'
 import { ChainBlockNumberIterationService } from '@xyo-network/chain-services'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import type {
   EventingChainBlockNumberIterator, HeadEventArgs,
   HydratedBlock,
-  XyoChainIteratorParams,
 } from '@xyo-network/xl1-protocol'
+import { hydrateBlock } from '@xyo-network/xl1-protocol-sdk'
 
 export type Listener = (...args: Array<unknown>) => void
 

package/src/hooks/chain-iterator/useChainIteratorParams.ts

@@ -1,6 +1,7 @@
 import { assertEx } from '@xylabs/assert'
 import { type Hash, isHash } from '@xylabs/hex'
 import { usePromise } from '@xylabs/react-promise'
+import { isDefined } from '@xylabs/typeof'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
@@ -24,10 +25,10 @@ export const resolveDefinedHead = async (head: Hash, chainArchivist: ReadArchivi
 }
 
 export const useChainIteratorParams = ({
-  chainArchivist, chainInformation, head,
+  chainArchivist, chainId, head, name,
 }: BlockChainIterator) => {
   return usePromise(async () => {
-    if (chainArchivist && chainInformation && isHash(head)) {
+    if (isDefined(chainArchivist) && isDefined(chainId) && isHash(head)) {
       const [result] = await chainArchivist.get([head])
       const foundResult = assertEx(result, () => `Head not found: ${head}`)
       const resolvedHead = assertEx(
@@ -35,8 +36,8 @@ export const useChainIteratorParams = ({
         () => `Head is not a boundwitness: ${JSON.stringify(foundResult)}`,
       )
       return {
-        chainArchivist, chainInformation, head: resolvedHead,
+        chainArchivist, chainId, head: resolvedHead, name,
       }
     }
-  }, [chainArchivist, chainInformation, head])
+  }, [chainArchivist, chainId, head])
 }

package/src/hooks/chain-iterator/useChainIteratorStore.ts

@@ -1,5 +1,5 @@
 import { usePromise } from '@xylabs/react-promise'
-import type { XyoChainIteratorParams } from '@xyo-network/xl1-protocol'
+import type { XyoChainIteratorParams } from '@xyo-network/chain-services'
 import {
   useEffect,
   useMemo, useRef, useSyncExternalStore,

package/src/hooks/useIterateChain.ts

@@ -1,13 +1,12 @@
 import { assertEx } from '@xylabs/assert'
 import { usePromise } from '@xylabs/react-promise'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
-import { hydrateBlock } from '@xyo-network/chain-protocol'
+import type { XyoChainIteratorParams } from '@xyo-network/chain-services'
 import { ChainBlockNumberIterationService } from '@xyo-network/chain-services'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type {
-  BlockBoundWitness, HydratedBlock, XyoChainIteratorParams,
-} from '@xyo-network/xl1-protocol'
+import type { BlockBoundWitness, HydratedBlock } from '@xyo-network/xl1-protocol'
 import { isBlockBoundWitness } from '@xyo-network/xl1-protocol'
+import { hydrateBlock } from '@xyo-network/xl1-protocol-sdk'
 
 const getHydratedBlock = async (chainArchivist: ReadArchivist, head: BlockBoundWitness) => {
   const headHash = await PayloadBuilder.hash(head)

package/src/lib/getChainId.ts

@@ -0,0 +1,8 @@
+import type { Address } from '@xylabs/hex'
+import type { Promisable } from '@xylabs/promise'
+
+const id = 'ce080bf3043a40c6c8838c7e813c00ab53df1684'
+
+export const getChainId = (): Promisable<Address> => {
+  return id
+}

package/src/lib/index.ts

@@ -1,2 +1,2 @@
 export * from './getChainArchivist.ts'
-export * from './getChainInformation.ts'
+export * from './getChainId.ts'

package/src/stories/ChainArchivistDecorator.tsx

@@ -3,11 +3,11 @@ import type { Decorator } from '@storybook/react-vite'
 import { usePromise } from '@xylabs/react-promise'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { ArchivistConfigSchema } from '@xyo-network/archivist-model'
-import { flattenHydratedBlocks } from '@xyo-network/chain-protocol'
 import { buildRandomBlockChain } from '@xyo-network/react-chain-shared'
+import { flattenHydratedBlocks } from '@xyo-network/xl1-protocol-sdk'
 import React, { useEffect } from 'react'
 
-import { getChainInformation } from '../lib/index.ts'
+import { getChainId } from '../lib/index.ts'
 import type { BlockChainRenderBaseProps } from '../types/index.ts'
 
 export const ChainArchivistDecorator: Decorator = (Story, context) => {
@@ -17,8 +17,8 @@ export const ChainArchivistDecorator: Decorator = (Story, context) => {
       const chainArchivist = await MemoryArchivist.create({ config: { schema: ArchivistConfigSchema, name: 'ChainArchivist' } })
       const flattened = flattenHydratedBlocks(randomBlockChain)
       await chainArchivist.insert(flattened)
-      const chainInformation = await getChainInformation()
-      return { chainArchivist, chainInformation }
+      const chainId = await getChainId()
+      return { chainArchivist, chainId }
     }
   }, [randomBlockChain])
 

package/src/stories/ChainArchivistDelayedInsertDecorator.tsx

@@ -4,12 +4,12 @@ import { delay } from '@xylabs/delay'
 import { usePromise } from '@xylabs/react-promise'
 import { MemoryArchivist } from '@xyo-network/archivist-memory'
 import { ArchivistConfigSchema } from '@xyo-network/archivist-model'
-import { flattenHydratedBlock } from '@xyo-network/chain-protocol'
 import { buildRandomBlockChain } from '@xyo-network/react-chain-shared'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
+import { flattenHydratedBlock } from '@xyo-network/xl1-protocol-sdk'
 import React, { useEffect, useState } from 'react'
 
-import { getChainInformation } from '../lib/index.ts'
+import { getChainId } from '../lib/index.ts'
 import type { BlockChainRenderBaseProps } from '../types/index.ts'
 
 let chainArchivistRef: MemoryArchivist | undefined
@@ -51,8 +51,8 @@ export const ChainArchivistDelayedInsertDecorator: Decorator = (Story, context)
   }, [delayedInsertError])
 
   const [blockChainRenderProps] = usePromise(async () => {
-    const chainInformation = await getChainInformation()
-    return { chainArchivist, chainInformation }
+    const chainId = await getChainId()
+    return { chainArchivist, chainId }
   }, [chainArchivist])
 
   const props = {

package/src/stories/ChainInfoContextDecorator.tsx

@@ -1,6 +1,7 @@
 import type { Decorator } from '@storybook/react-vite'
 import { assertEx } from '@xylabs/assert'
 import { usePromise } from '@xylabs/react-promise'
+import { isDefined } from '@xylabs/typeof'
 import { ChainBlockNumberIterationService } from '@xyo-network/chain-services'
 import { findFirstMatching } from '@xyo-network/chain-utils'
 import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
@@ -9,7 +10,7 @@ import React from 'react'
 
 import { ChainInfoProvider } from '../context/index.ts'
 import type { BridgedChainArchivistParams } from '../lib/index.ts'
-import { getChainArchivistFromBridge, getChainInformation } from '../lib/index.ts'
+import { getChainArchivistFromBridge, getChainId } from '../lib/index.ts'
 
 const archivistConfig: BridgedChainArchivistParams = {
   url: 'http://localhost:8080',
@@ -17,28 +18,28 @@ const archivistConfig: BridgedChainArchivistParams = {
 }
 
 export const ChainInfoContextDecorator: Decorator = (Story, context) => {
-  const [chainInformationResponse] = usePromise(async () => {
-    return await getChainInformation()
+  const [chainIdResponse] = usePromise(async () => {
+    return await getChainId()
   }, [])
 
-  const chainInformation = chainInformationResponse
+  const chainId = chainIdResponse
 
   const [chainArchivist] = usePromise(async () => {
     return await getChainArchivistFromBridge(archivistConfig)
   }, [])
 
   const [chainIterator] = usePromise(async () => {
-    if (chainArchivist && chainInformation) {
+    if (isDefined(chainArchivist) && isDefined(chainId)) {
       const firstMatch = assertEx(await findFirstMatching(chainArchivist), () => `No head found in archivist: ${chainArchivist.id} `)
       const head: BlockBoundWitness = assertEx(isBlockBoundWitness(firstMatch)
         ? firstMatch
         : undefined, () => `Expected a block bound witness: ${JSON.stringify(firstMatch)}`)
       return await ChainBlockNumberIterationService.create({ chainArchivist, head })
     }
-  }, [chainArchivist, chainInformation])
+  }, [chainArchivist, chainId])
 
   return (
-    <ChainInfoProvider chainArchivist={chainArchivist} chainInformation={chainInformation} chainIterator={chainIterator}>
+    <ChainInfoProvider chainArchivist={chainArchivist} chainId={chainId} chainIterator={chainIterator}>
       <Story {...context} />
     </ChainInfoProvider>
   )

package/src/types/render/BlockChainRenderProps.ts

@@ -1,6 +1,5 @@
-import type { Hash } from '@xylabs/hex'
+import type { Address, Hash } from '@xylabs/hex'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { ChainInformation } from '@xyo-network/xl1-protocol'
 
 /** Props that control the rendering (not blockchain specific) */
 export interface RenderProps {
@@ -11,12 +10,15 @@ export interface RenderProps {
 /** Fields needed to talk to a block chain iterator */
 export interface BlockChainIterator {
   chainArchivist?: ArchivistInstance
-  chainInformation?: ChainInformation
+  chainId?: Address
   head?: Hash
+  name: string
 }
 
 /** Props for rendering a blockchain */
-export interface BlockChainRenderProps extends BlockChainIterator, RenderProps {}
+export interface BlockChainRenderProps extends BlockChainIterator, RenderProps {
+
+}
 
 /** Base interface for encapsulating blockChainRenderProps for easy extension */
 export interface BlockChainRenderBaseProps {

package/dist/types/lib/getChainInformation.d.ts

@@ -1,4 +0,0 @@
-import type { Promisable } from '@xylabs/promise';
-import type { ChainInformation } from '@xyo-network/xl1-protocol';
-export declare const getChainInformation: () => Promisable<ChainInformation>;
-//# sourceMappingURL=getChainInformation.d.ts.map

package/dist/types/lib/getChainInformation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getChainInformation.d.ts","sourceRoot":"","sources":["../../../src/lib/getChainInformation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAA;AAIjE,eAAO,MAAM,mBAAmB,QAAO,UAAU,CAAC,gBAAgB,CAGjE,CAAA"}

package/src/lib/getChainInformation.ts

@@ -1,9 +0,0 @@
-import type { Promisable } from '@xylabs/promise'
-import type { ChainInformation } from '@xyo-network/xl1-protocol'
-
-const id = 'ce080bf3043a40c6c8838c7e813c00ab53df1684'
-
-export const getChainInformation = (): Promisable<ChainInformation> => {
-  const chainInformation: ChainInformation = { id }
-  return chainInformation
-}