diff --git a/packages/modules/packages/module/package.json b/packages/modules/packages/module/package.json index b4590cfc1..03a4f5db8 100644 --- a/packages/modules/packages/module/package.json +++ b/packages/modules/packages/module/package.json @@ -61,7 +61,7 @@ "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", "@xyo-network/archivist": "^3.6.0-rc.12", - "@xyo-network/crypto-asset-plugin": "^3.1.2", + "@xyo-network/crypto-asset-plugin": "^3.2.0-rc.2", "@xyo-network/diviner-address-history": "^3.6.0-rc.12", "@xyo-network/node-memory": "^3.6.0-rc.12", "react": "^18.3.1", diff --git a/packages/modules/packages/sentinal/package.json b/packages/modules/packages/sentinal/package.json index c819defc4..9a454ca05 100644 --- a/packages/modules/packages/sentinal/package.json +++ b/packages/modules/packages/sentinal/package.json @@ -73,7 +73,7 @@ "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", "@xyo-network/account": "^3.6.0-rc.12", - "@xyo-network/evm-call-witness": "^3.1.2", + "@xyo-network/evm-call-witness": "^3.2.0-rc.2", "@xyo-network/manifest": "^3.6.0-rc.12", "@xyo-network/module-factory-locator": "^3.6.0-rc.12", "ethers": "^6.13.4", diff --git a/packages/modules/packages/witness/package.json b/packages/modules/packages/witness/package.json index d591f9639..e1fb5862e 100644 --- a/packages/modules/packages/witness/package.json +++ b/packages/modules/packages/witness/package.json @@ -63,7 +63,7 @@ "@storybook/react": "^8.4.7", "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", - "@xyo-network/id-plugin": "^3.1.2", + "@xyo-network/id-plugin": "^3.2.0-rc.2", "react": "^18.3.1", "react-dom": "^18.3.1", "storybook": "^8.4.7", diff --git a/packages/plugins/packages/aggregate-price/package.json b/packages/plugins/packages/aggregate-price/package.json index a21ed4cce..00ba31ffb 100644 --- a/packages/plugins/packages/aggregate-price/package.json +++ b/packages/plugins/packages/aggregate-price/package.json @@ -46,7 +46,7 @@ "@xylabs/decimal-precision": "^4.4.25", "@xylabs/react-flexbox": "^5.3.13", "@xylabs/react-quick-tip-button": "^5.3.13", - "@xyo-network/crypto-asset-payload-plugin": "^3.1.2", + "@xyo-network/crypto-asset-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-payload-plugin": "workspace:^", "@xyo-network/react-shared": "workspace:^" diff --git a/packages/plugins/packages/coin-gecko-prices/package.json b/packages/plugins/packages/coin-gecko-prices/package.json index 50726be57..a68dfbc3e 100644 --- a/packages/plugins/packages/coin-gecko-prices/package.json +++ b/packages/plugins/packages/coin-gecko-prices/package.json @@ -43,7 +43,7 @@ "lint-pkg": "npmPkgJsonLint ." }, "dependencies": { - "@xyo-network/coingecko-crypto-market-payload-plugin": "^3.1.2", + "@xyo-network/coingecko-crypto-market-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-aggregate-price-plugin": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", diff --git a/packages/plugins/packages/crypto-market-uniswap/package.json b/packages/plugins/packages/crypto-market-uniswap/package.json index 22a0a8a6d..51dac092b 100644 --- a/packages/plugins/packages/crypto-market-uniswap/package.json +++ b/packages/plugins/packages/crypto-market-uniswap/package.json @@ -49,7 +49,7 @@ "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-payload-plugin": "workspace:^", "@xyo-network/react-shared": "workspace:^", - "@xyo-network/uniswap-crypto-market-payload-plugin": "^3.1.2" + "@xyo-network/uniswap-crypto-market-payload-plugin": "^3.2.0-rc.2" }, "devDependencies": { "@emotion/react": "^11.14.0", diff --git a/packages/plugins/packages/crypto-prices/package.json b/packages/plugins/packages/crypto-prices/package.json index f3d6e3d97..d78667b6e 100644 --- a/packages/plugins/packages/crypto-prices/package.json +++ b/packages/plugins/packages/crypto-prices/package.json @@ -44,11 +44,11 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/coingecko-crypto-market-payload-plugin": "^3.1.2", + "@xyo-network/coingecko-crypto-market-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-payload-plugin": "workspace:^", "@xyo-network/react-shared": "workspace:^", - "@xyo-network/uniswap-crypto-market-payload-plugin": "^3.1.2" + "@xyo-network/uniswap-crypto-market-payload-plugin": "^3.2.0-rc.2" }, "devDependencies": { "@emotion/react": "^11.14.0", diff --git a/packages/plugins/packages/ethereum-gas/packages/blocknative/package.json b/packages/plugins/packages/ethereum-gas/packages/blocknative/package.json index aaf9596b3..d52fff999 100644 --- a/packages/plugins/packages/ethereum-gas/packages/blocknative/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/blocknative/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/blocknative-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", diff --git a/packages/plugins/packages/ethereum-gas/packages/eth-gas-station/package.json b/packages/plugins/packages/ethereum-gas/packages/eth-gas-station/package.json index e82c6f3dc..ddf318695 100644 --- a/packages/plugins/packages/ethereum-gas/packages/eth-gas-station/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/eth-gas-station/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", @@ -59,7 +59,7 @@ "@storybook/react": "^8.4.7", "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", - "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/ethgasstation-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/react-storybook": "workspace:^", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/packages/plugins/packages/ethereum-gas/packages/etherchain/packages/v2/package.json b/packages/plugins/packages/ethereum-gas/packages/etherchain/packages/v2/package.json index 2120061f0..2cb293cb3 100644 --- a/packages/plugins/packages/ethereum-gas/packages/etherchain/packages/v2/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/etherchain/packages/v2/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/etherchain-ethereum-gas-v2-payload-plugin": "^3.1.2", + "@xyo-network/etherchain-ethereum-gas-v2-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", diff --git a/packages/plugins/packages/ethereum-gas/packages/ethers/package.json b/packages/plugins/packages/ethereum-gas/packages/ethers/package.json index 7f1885a33..5f6619ffb 100644 --- a/packages/plugins/packages/ethereum-gas/packages/ethers/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/ethers/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/ethers-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/ethers-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", @@ -59,7 +59,7 @@ "@storybook/react": "^8.4.7", "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", - "@xyo-network/ethers-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/ethers-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/react-storybook": "workspace:^", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/packages/plugins/packages/ethereum-gas/packages/etherscan/package.json b/packages/plugins/packages/ethereum-gas/packages/etherscan/package.json index cc474f5c8..6d9ce91d9 100644 --- a/packages/plugins/packages/ethereum-gas/packages/etherscan/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/etherscan/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", @@ -59,7 +59,7 @@ "@storybook/react": "^8.4.7", "@xylabs/ts-scripts-yarn3": "^4.2.6", "@xylabs/tsconfig-react": "^4.2.6", - "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^3.1.2", + "@xyo-network/etherscan-ethereum-gas-payload-plugin": "^3.2.0-rc.2", "@xyo-network/react-storybook": "workspace:^", "react": "^18.3.1", "react-dom": "^18.3.1", diff --git a/packages/plugins/packages/ethereum-gas/packages/gas-price/package.json b/packages/plugins/packages/ethereum-gas/packages/gas-price/package.json index 10cb666c6..3efcf343b 100644 --- a/packages/plugins/packages/ethereum-gas/packages/gas-price/package.json +++ b/packages/plugins/packages/ethereum-gas/packages/gas-price/package.json @@ -45,7 +45,7 @@ "dependencies": { "@xylabs/react-flexbox": "^5.3.13", "@xylabs/react-quick-tip-button": "^5.3.13", - "@xyo-network/gas-price-payload-plugin": "^3.1.2", + "@xyo-network/gas-price-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-gas-price": "workspace:^", "@xyo-network/react-payload-plugin": "workspace:^", diff --git a/packages/plugins/packages/location-point-map/package.json b/packages/plugins/packages/location-point-map/package.json index 3d3220250..9623bb673 100644 --- a/packages/plugins/packages/location-point-map/package.json +++ b/packages/plugins/packages/location-point-map/package.json @@ -45,7 +45,7 @@ "dependencies": { "@xylabs/react-flexbox": "^5.3.13", "@xyo-network/api": "^3.6.0-rc.12", - "@xyo-network/location-payload-plugin": "^3.1.2", + "@xyo-network/location-payload-plugin": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-map": "workspace:^", "@xyo-network/react-map-model": "workspace:^", diff --git a/packages/plugins/packages/location-points-map/src/components/PointsMapRenderer.tsx b/packages/plugins/packages/location-points-map/src/components/PointsMapRenderer.tsx index a1c9f851b..a4f708162 100644 --- a/packages/plugins/packages/location-points-map/src/components/PointsMapRenderer.tsx +++ b/packages/plugins/packages/location-points-map/src/components/PointsMapRenderer.tsx @@ -13,6 +13,7 @@ import { isNetworkLocationAnswer, useMapboxAccessToken, } from '@xyo-network/react-map-model' +import type { Feature, Point } from 'geojson' import React from 'react' import { PointsMapSettings } from './PointsMapSettings.ts' @@ -44,7 +45,7 @@ const PointsMapInner: React.FC = ({ ? ( []} layers={LocationPointsMapLayerBuilder(theme.palette.secondary.main)} height="100%" {...props} diff --git a/packages/plugins/packages/nft-score/package.json b/packages/plugins/packages/nft-score/package.json index c61cf7b13..5456682be 100644 --- a/packages/plugins/packages/nft-score/package.json +++ b/packages/plugins/packages/nft-score/package.json @@ -44,8 +44,8 @@ }, "dependencies": { "@xylabs/react-flexbox": "^5.3.13", - "@xyo-network/crypto-nft-payload-plugin": "^3.1.2", - "@xyo-network/crypto-nft-score-model": "^3.1.2", + "@xyo-network/crypto-nft-payload-plugin": "^3.2.0-rc.2", + "@xyo-network/crypto-nft-score-model": "^3.2.0-rc.2", "@xyo-network/payload-model": "^3.6.0-rc.12", "@xyo-network/react-payload-plugin": "workspace:^", "@xyo-network/react-shared": "workspace:^" diff --git a/packages/sdk/packages/advertising/package.json b/packages/sdk/packages/advertising/package.json index 84d782dc4..6902b9ab1 100644 --- a/packages/sdk/packages/advertising/package.json +++ b/packages/sdk/packages/advertising/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@xylabs/react-promise": "^5.3.13", - "@xyo-network/advertising-payload-plugins": "^3.1.2", + "@xyo-network/advertising-payload-plugins": "^3.2.0-rc.2", "@xyo-network/archivist-storage": "^3.6.0-rc.12" }, "devDependencies": { diff --git a/packages/sdk/packages/advertising/src/utm/hooks/useCaptureUtmLocation.ts b/packages/sdk/packages/advertising/src/utm/hooks/useCaptureUtmLocation.ts index a18ad8c1c..bfddf968e 100644 --- a/packages/sdk/packages/advertising/src/utm/hooks/useCaptureUtmLocation.ts +++ b/packages/sdk/packages/advertising/src/utm/hooks/useCaptureUtmLocation.ts @@ -1,5 +1,6 @@ import { usePromise } from '@xylabs/react-promise' import { type Utm, UtmSchema } from '@xyo-network/advertising-payload-plugins' +import type { PayloadWithOptionalSources } from '@xyo-network/payload-model' import { useMemo } from 'react' import { useSearchParams } from 'react-router-dom' @@ -18,7 +19,7 @@ export const useCaptureUtmLocation = (removeAfterCapture = true) => { const utmPayload = useMemo(() => { // Construct the base UTM payload - const utm: Utm = { schema: UtmSchema } + const utm: PayloadWithOptionalSources = { schema: UtmSchema } // determine if there's a utm field that still has a value // if there is none, it means that either the page loaded diff --git a/packages/sdk/packages/advertising/src/utm/lib/UtmStorageArchivist.ts b/packages/sdk/packages/advertising/src/utm/lib/UtmStorageArchivist.ts index 2ad97f21f..e6c6ad73d 100644 --- a/packages/sdk/packages/advertising/src/utm/lib/UtmStorageArchivist.ts +++ b/packages/sdk/packages/advertising/src/utm/lib/UtmStorageArchivist.ts @@ -1,6 +1,7 @@ import type { Utm } from '@xyo-network/advertising-payload-plugins' import { isUtm } from '@xyo-network/advertising-payload-plugins' import { StorageArchivist, StorageArchivistConfigSchema } from '@xyo-network/archivist-storage' +import type { PayloadWithOptionalSources } from '@xyo-network/payload-model' const STORAGE_NAME_SPACE = 'utm' as const @@ -24,7 +25,7 @@ export const UtmStorageArchivist = async () => { } } -export const LatestUtmPayload = async (): Promise => { +export const LatestUtmPayload = async (): Promise | undefined> => { const archivist = await UtmStorageArchivist() - return (await archivist.next()).find(isUtm) as Utm + return (await archivist.next()).find(isUtm) as PayloadWithOptionalSources } diff --git a/packages/sdk/packages/block/src/components/Table/BlockTableColumnConfig.ts b/packages/sdk/packages/block/src/components/Table/BlockTableColumnConfig.ts index 6e3872ff0..bed2ae872 100644 --- a/packages/sdk/packages/block/src/components/Table/BlockTableColumnConfig.ts +++ b/packages/sdk/packages/block/src/components/Table/BlockTableColumnConfig.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/member-ordering */ -export type BlockTableColumnSlug = 'hash' | 'time' | 'payloads' | 'valid' +export type BlockTableColumnSlug = 'hash' | 'payloads' | 'valid' export interface BlockTableColumnConfig { xs?: BlockTableColumnSlug[] @@ -11,7 +11,6 @@ export interface BlockTableColumnConfig { export const blockColumnNames: Record = { hash: 'Hash', - time: 'Time', payloads: 'Payloads', valid: 'Valid', } @@ -19,9 +18,9 @@ export const blockColumnNames: Record = { export const blockTableColumnConfigDefaults = (): BlockTableColumnConfig => { const xs: BlockTableColumnSlug[] = ['hash', 'payloads', 'valid'] const sm: BlockTableColumnSlug[] = ['hash', 'payloads', 'valid'] - const md: BlockTableColumnSlug[] = ['hash', 'time', 'payloads', 'valid'] - const lg: BlockTableColumnSlug[] = ['hash', 'time', 'payloads', 'valid'] - const xl: BlockTableColumnSlug[] = ['hash', 'time', 'payloads', 'valid'] + const md: BlockTableColumnSlug[] = ['hash', 'payloads', 'valid'] + const lg: BlockTableColumnSlug[] = ['hash', 'payloads', 'valid'] + const xl: BlockTableColumnSlug[] = ['hash', 'payloads', 'valid'] return { lg, md, sm, xl, xs, } diff --git a/packages/sdk/packages/block/src/components/Table/TableRow.tsx b/packages/sdk/packages/block/src/components/Table/TableRow.tsx index 21219195f..0c2d6c219 100644 --- a/packages/sdk/packages/block/src/components/Table/TableRow.tsx +++ b/packages/sdk/packages/block/src/components/Table/TableRow.tsx @@ -5,6 +5,7 @@ import { usePromise } from '@xylabs/react-promise' import { useBreakpoint } from '@xylabs/react-shared' import type { BoundWitness } from '@xyo-network/boundwitness-model' import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator' +import type { WithStorageMeta } from '@xyo-network/payload-model' import { useNetwork } from '@xyo-network/react-network' import { HashTableCell, usePayloadHash } from '@xyo-network/react-shared' import type { ReactElement } from 'react' @@ -16,7 +17,7 @@ import type { BlockTableColumnConfig, BlockTableColumnSlug } from './BlockTableC import { blockTableColumnConfigDefaults } from './BlockTableColumnConfig.ts' export interface BlockTableRowProps extends TableRowProps { - block?: BoundWitness + block?: WithStorageMeta columns?: BlockTableColumnConfig exploreDomain?: string network?: string @@ -39,12 +40,6 @@ export const BlockTableRow: React.FC = ({ const hash = - const time = ( - - {block?.timestamp ? new Date(block?.timestamp as number).toLocaleString(undefined, { timeStyle: 'medium' }) : '--'} - - ) - const payloads = ( {(block?.payload_hashes ?? []).filter(exists).length} @@ -65,7 +60,6 @@ export const BlockTableRow: React.FC = ({ const tableCells: Record = { hash, - time, payloads, valid, } diff --git a/packages/sdk/packages/embed/src/contexts/ResolvePayloadContext/Provider.tsx b/packages/sdk/packages/embed/src/contexts/ResolvePayloadContext/Provider.tsx index 7231bd906..c11236aa7 100644 --- a/packages/sdk/packages/embed/src/contexts/ResolvePayloadContext/Provider.tsx +++ b/packages/sdk/packages/embed/src/contexts/ResolvePayloadContext/Provider.tsx @@ -2,7 +2,9 @@ import { delay } from '@xylabs/delay' import { useAsyncEffect } from '@xylabs/react-async-effect' import { Huri } from '@xyo-network/huri' -import type { ModuleError, Payload } from '@xyo-network/payload-model' +import type { + ModuleError, Payload, WithSources, +} from '@xyo-network/payload-model' import { ModuleErrorSchema } from '@xyo-network/payload-model' import type { PropsWithChildren } from 'react' import React, { useEffect, useState } from 'react' @@ -30,7 +32,7 @@ export const ResolvePayloadProvider: React.FC() - const [huriError, setHuriError] = useState() + const [huriError, setHuriError] = useState>() useAsyncEffect( async (mounted) => { @@ -49,7 +51,7 @@ export const ResolvePayloadProvider: React.FC