@xyo-network/react-chain-blockchain 1.18.0-rc.1 → 1.18.1

package/src/context/chain/Provider.tsx

@@ -1,40 +1,47 @@
+import { isDefined } from '@xylabs/sdk-js'
 import type { PropsWithChildren } from 'react'
-import React, { useMemo, useState } from 'react'
+import React, {
+  useCallback, useMemo, useState,
+} from 'react'
 
 import { ChainInfoContext } from './Context.ts'
 import type { ChainInfoState } from './State.ts'
 
-interface ChainInfoProviderProps extends PropsWithChildren, Omit<ChainInfoState, 'provided'> {
-}
+interface ChainInfoProviderProps extends PropsWithChildren, Omit<ChainInfoState, 'provided'> {}
 
 export const ChainInfoProvider: React.FC<ChainInfoProviderProps> = ({
   children, chainArchivist: chainArchivistProp, chainId: chainIdProp, chainIterator: chainIteratorProp,
 }) => {
   const [chainArchivist, setChainArchivist] = useState<ChainInfoState['chainArchivist']>(chainArchivistProp)
+  const [previousChainArchivist, setPreviousChainArchivist] = useState<ChainInfoState['chainArchivist']>(chainArchivistProp)
+  if (isDefined(chainArchivistProp) && chainArchivistProp !== previousChainArchivist) {
+    setChainArchivist(chainArchivistProp)
+    setPreviousChainArchivist(chainArchivistProp)
+  }
+
   const [chainId, setChainId] = useState<ChainInfoState['chainId']>(chainIdProp)
+  const [previousChainId, setPreviousChainId] = useState<ChainInfoState['chainId']>(chainIdProp)
+  if (isDefined(chainIdProp) && chainIdProp !== previousChainId) {
+    setChainId(chainIdProp)
+    setPreviousChainId(chainIdProp)
+  }
+
   const [chainIterator, setChainIterator] = useState<ChainInfoState['chainIterator']>(chainIteratorProp)
+  const [previousChainIterator, setPreviousChainIterator] = useState<ChainInfoState['chainIterator']>(chainIteratorProp)
+  if (isDefined(chainIteratorProp) && chainIteratorProp !== previousChainIterator) {
+    setChainIterator(chainIteratorProp)
+    setPreviousChainIterator(chainIteratorProp)
+  }
 
-  const updateChainArchivist = (chainArchivist: ChainInfoState['chainArchivist']) => {
+  const updateChainArchivist = useCallback((chainArchivist: ChainInfoState['chainArchivist']) => {
     setChainArchivist(chainArchivist)
-  }
-  const updateChainId = (chainId: ChainInfoState['chainId']) => {
+  }, [])
+  const updateChainId = useCallback((chainId: ChainInfoState['chainId']) => {
     setChainId(chainId)
-  }
-  const updateChainIterator = (chainIterator: ChainInfoState['chainIterator']) => {
+  }, [])
+  const updateChainIterator = useCallback((chainIterator: ChainInfoState['chainIterator']) => {
     setChainIterator(chainIterator)
-  }
-
-  useMemo(() => {
-    updateChainArchivist(chainArchivistProp)
-  }, [chainArchivistProp])
-
-  useMemo(() => {
-    updateChainId(chainIdProp)
-  }, [chainIdProp])
-
-  useMemo(() => {
-    updateChainIterator(chainIteratorProp)
-  }, [chainIteratorProp])
+  }, [])
 
   const chainState: ChainInfoState = useMemo(() => ({
     chainArchivist,

package/src/context/chain/State.ts

@@ -1,7 +1,6 @@
 import type { ContextExState } from '@xylabs/react-shared'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
-import type { ChainId } from '@xyo-network/xl1-protocol'
-import type { ChainBlockNumberIteratorService } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainBlockNumberIteratorService, ChainId } from '@xyo-network/xl1-sdk'
 
 export type ChainInfoState = ContextExState<{
   chainArchivist?: ArchivistInstance

package/src/helpers/rate/index.ts

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

package/src/helpers/rate/rateUnitToLabel.ts

@@ -0,0 +1,27 @@
+import type { TimeDurations } from '@xyo-network/xl1-sdk'
+
+export const rateUnitToLabel = (rateUnit: keyof TimeDurations) => {
+  switch (rateUnit) {
+    case 'millis': {
+      return 'b/ms'
+    }
+    case 'seconds': {
+      return 'b/s'
+    }
+    case 'minutes': {
+      return 'b/m'
+    }
+    case 'hours': {
+      return 'b/h'
+    }
+    case 'days': {
+      return 'b/d'
+    }
+    case 'weeks': {
+      return 'b/w'
+    }
+    default: {
+      return rateUnit
+    }
+  }
+}

package/src/helpers/txsFromBlock.ts

@@ -1,8 +1,10 @@
+import type { Hash } from '@xylabs/sdk-js'
 import { HydratedBlockWrapper } from '@xyo-network/chain-wrappers'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
-import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
+import type { Payload } from '@xyo-network/payload-model'
+import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-sdk'
 
-export const txsFromBlock = async (block: HydratedBlockWithHashMeta) => {
+export const txsFromBlock = async (block: HydratedBlockWithHashMeta): Promise<[Payload, Hash][]> => {
   const wrapper = await HydratedBlockWrapper.parse(block)
   const txs = wrapper.transactions
   const txPayloads = txs.map(tx => tx.boundWitness)

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

@@ -1,11 +1,14 @@
+import type { UsePromiseState } from '@xylabs/react-promise'
 import { usePromise } from '@xylabs/react-promise'
 import { type Hash, isHash } from '@xylabs/sdk-js'
 import { assertEx, isDefined } from '@xylabs/sdk-js'
 import type { ReadArchivist } from '@xyo-network/archivist-model'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import type { BlockBoundWitness } from '@xyo-network/xl1-protocol'
-import { isBlockBoundWitness } from '@xyo-network/xl1-protocol'
-import { getDefaultConfig } from '@xyo-network/xl1-protocol-sdk'
+import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
+import type {
+  BlockBoundWitness, BlockBoundWitnessWithHashMeta, ChainId, Config, PayloadMapRead,
+} from '@xyo-network/xl1-sdk'
+import { getDefaultConfig, isBlockBoundWitness } from '@xyo-network/xl1-sdk'
 
 import type { BlockChainIterator } from '../../types/index.ts'
 
@@ -26,7 +29,13 @@ export const resolveDefinedHead = async (head: Hash, chainArchivist: ReadArchivi
 
 export const useChainIteratorParams = ({
   chainMap, chainId, head, name,
-}: BlockChainIterator) => {
+}: BlockChainIterator): [{
+  chainId: ChainId
+  chainMap: PayloadMapRead<WithStorageMeta<Payload>>
+  config: Config
+  head: BlockBoundWitnessWithHashMeta
+  name: string
+} | undefined, Error | undefined, UsePromiseState | undefined] => {
   return usePromise(async () => {
     if (isDefined(chainMap) && isDefined(chainId) && isHash(head)) {
       const result = await chainMap.get(head)

package/src/hooks/useTxsFromBlock.ts

@@ -1,5 +1,5 @@
 import { usePromise } from '@xylabs/react-promise'
-import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
+import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-sdk'
 
 import { txsFromBlock } from '../helpers/index.ts'
 

package/src/types/BlockComponentProps.ts

@@ -1,5 +1,5 @@
 import type { Hash } from '@xylabs/sdk-js'
-import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
+import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-sdk'
 
 /** Interface for all components that render a single block */
 export interface BlockComponentProps {

package/src/types/BlockComponents.ts

@@ -1,5 +1,5 @@
 import type { NodesWithKeys } from '@xylabs/react-animation'
-import type { HydratedBlock } from '@xyo-network/xl1-protocol'
+import type { HydratedBlock } from '@xyo-network/xl1-sdk'
 
 /** Interface for all block components meant to be rendered in a chain */
 export interface BlockChainRenderComponent extends NodesWithKeys {

package/src/types/render/BlockChainRenderProps.ts

@@ -1,7 +1,6 @@
 import type { CreatableName, Hash } from '@xylabs/sdk-js'
 import type { Payload, WithStorageMeta } from '@xyo-network/payload-model'
-import type { ChainId } from '@xyo-network/xl1-protocol'
-import type { PayloadMapRead } from '@xyo-network/xl1-protocol-sdk'
+import type { ChainId, PayloadMapRead } from '@xyo-network/xl1-sdk'
 
 /** Props that control the rendering (not blockchain specific) */
 export interface RenderProps {