@xyo-network/xl1-protocol-sdk 1.18.0-rc.1 → 1.18.1

package/src/summary/primitives/balances/balancesSummary.ts

@@ -1,27 +1,27 @@
 import type { Address } from '@xylabs/sdk-js'
-import {
-  asAddress, isDefined, spanRootAsync,
-} from '@xylabs/sdk-js'
-import {
-  asBlockBoundWitnessWithStorageMeta, asXL1BlockNumber, asXL1BlockRange,
-} from '@xyo-network/xl1-protocol'
+import { asAddress, spanRootAsync } from '@xylabs/sdk-js'
+import { asBlockBoundWitnessWithStorageMeta, asXL1BlockRange } from '@xyo-network/xl1-protocol'
 
 import { deepCalculateFramesFromRange } from '../../../block/index.ts'
-import type { Qualified } from '../../../model/index.ts'
+import {
+  type ChainQualified, type ChainQualifiedConfig, isChainQualifiedHeadConfig,
+  isChainQualifiedRangeConfig,
+} from '../../../model/index.ts'
 import { parseSignedBigInt } from '../../../SignedBigInt.ts'
 import type { BalanceStepSummaryContext } from '../../model/index.ts'
 import { balancesStepSummaryFromRange } from './balancesStepSummaryFromRange.ts'
 
 export async function balancesSummary(
   context: BalanceStepSummaryContext,
-): Promise<Qualified<Record<Address, bigint>>> {
+  config?: ChainQualifiedConfig,
+): Promise<ChainQualified<Record<Address, bigint>>> {
   return await spanRootAsync('balancesSummary', async () => {
-    const [headHash] = await context.head()
+    const [headHash] = isChainQualifiedHeadConfig(config) ? [config.head] : await context.head()
     const headResult = await context.store.chainMap.get(headHash)
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${headHash}`)
-    const rangeStart = asXL1BlockNumber(isDefined(context.windowSize) ? Math.max(headBoundWitness.block - context.windowSize + 1, 0) : 0, true)
+    const range = isChainQualifiedRangeConfig(config) ? config.range : asXL1BlockRange([0, headBoundWitness.block], true)
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange(
-      [rangeStart, headBoundWitness.block],
+      range,
       { name: 'balancesSummary' },
     ))
     const summaries = await Promise.all(ranges.map(range => balancesStepSummaryFromRange(context, range)))
@@ -32,6 +32,6 @@ export async function balancesSummary(
         balances[validAddress] = (balances[validAddress] ?? 0n) + parseSignedBigInt(balance)
       }
     }
-    return [balances, [rangeStart, headBoundWitness.block], headHash]
+    return [balances, { range, head: headHash }]
   })
 }

package/src/summary/primitives/schemas/schemasSummary.ts

@@ -1,24 +1,26 @@
-import { isDefined, spanRootAsync } from '@xylabs/sdk-js'
+import { spanRootAsync } from '@xylabs/sdk-js'
 import type { Schema } from '@xyo-network/payload-model'
-import {
-  asBlockBoundWitnessWithStorageMeta, asXL1BlockNumber, asXL1BlockRange,
-} from '@xyo-network/xl1-protocol'
+import { asBlockBoundWitnessWithStorageMeta, asXL1BlockRange } from '@xyo-network/xl1-protocol'
 
 import { deepCalculateFramesFromRange } from '../../../block/index.ts'
-import type { Qualified } from '../../../model/index.ts'
+import {
+  type ChainQualified, type ChainQualifiedConfig, isChainQualifiedHeadConfig,
+  isChainQualifiedRangeConfig,
+} from '../../../model/index.ts'
 import type { SchemasStepSummaryContext } from '../../model/index.ts'
 import { schemasStepSummaryFromRange } from './schemasStepSummaryFromRange.ts'
 
 export async function schemasSummary(
   context: SchemasStepSummaryContext,
-): Promise<Qualified<Record<Schema, number>>> {
+  config?: ChainQualifiedConfig,
+): Promise<ChainQualified<Record<Schema, number>>> {
   return await spanRootAsync('schemasSummary', async () => {
-    const [headHash] = await context.head()
+    const [headHash] = isChainQualifiedHeadConfig(config) ? [config.head] : await context.head()
     const headResult = await context.store.chainMap.get(headHash)
     const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${headHash}`)
-    const rangeStart = asXL1BlockNumber(isDefined(context.windowSize) ? Math.max(headBoundWitness.block - context.windowSize + 1, 0) : 0, true)
+    const range = isChainQualifiedRangeConfig(config) ? config.range : asXL1BlockRange([0, headBoundWitness.block], true)
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange(
-      [rangeStart, headBoundWitness.block],
+      range,
       { name: 'schemasSummary' },
     ))
     const summaries = await Promise.all(ranges.map(range => schemasStepSummaryFromRange(context, range)))
@@ -28,6 +30,6 @@ export async function schemasSummary(
         results[schema] = (results[schema] ?? 0) + count
       }
     }
-    return [results, [rangeStart, headBoundWitness.block], headHash]
+    return [results, { range, head: headHash }]
   })
 }

package/src/summary/primitives/transfers/transfersSummary.ts

@@ -1,31 +1,29 @@
 import type { Address, Hash } from '@xylabs/sdk-js'
-import {
-  asAddress, isDefined, spanRootAsync,
-} from '@xylabs/sdk-js'
-import {
-  asBlockBoundWitnessWithStorageMeta, asXL1BlockNumber, asXL1BlockRange,
-} from '@xyo-network/xl1-protocol'
+import { asAddress, spanRootAsync } from '@xylabs/sdk-js'
+import { asBlockBoundWitnessWithStorageMeta, asXL1BlockRange } from '@xyo-network/xl1-protocol'
 
 import { deepCalculateFramesFromRange } from '../../../block/index.ts'
-import type { Qualified } from '../../../model/index.ts'
+import type { ChainQualified, ChainQualifiedConfig } from '../../../model/index.ts'
+import { isChainQualifiedHeadConfig, isChainQualifiedRangeConfig } from '../../../model/index.ts'
 import { parseSignedBigInt } from '../../../SignedBigInt.ts'
-import type { TransfersStepSummaryContext } from '../../index.ts'
+import type { TransfersStepSummaryContext } from '../../model/index.ts'
 import { transfersStepSummaryFromRange } from './transfersStepSummaryFromRange.ts'
 
 // the summary of amount of rewards claimed from the step reward pool by addresses
 export async function transfersSummary(
-  transferContext: TransfersStepSummaryContext,
-): Promise<Qualified<Record<Address, Record<Address, bigint>>>> {
+  context: TransfersStepSummaryContext,
+  config?: ChainQualifiedConfig,
+): Promise<ChainQualified<Record<Address, Record<Address, bigint>>>> {
   return await spanRootAsync('transferSummary', async () => {
-    const [headHash] = await transferContext.head()
-    const headResult = await transferContext.store.chainMap.get(headHash)
-    const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${transferContext.head}`)
-    const rangeStart = asXL1BlockNumber(isDefined(transferContext.windowSize) ? Math.max(headBoundWitness.block - transferContext.windowSize + 1, 0) : 0, true)
+    const [headHash] = isChainQualifiedHeadConfig(config) ? [config.head] : await context.head()
+    const headResult = await context.store.chainMap.get(headHash)
+    const headBoundWitness = asBlockBoundWitnessWithStorageMeta(headResult, () => `Head block not found for hash: ${headHash}`)
+    const range = isChainQualifiedRangeConfig(config) ? config.range : asXL1BlockRange([0, headBoundWitness.block], true)
     const ranges = deepCalculateFramesFromRange(asXL1BlockRange(
-      [rangeStart, headBoundWitness.block],
+      range,
       { name: 'transfersSummary' },
     ))
-    const summaries = await Promise.all(ranges.map(range => transfersStepSummaryFromRange(transferContext, range)))
+    const summaries = await Promise.all(ranges.map(range => transfersStepSummaryFromRange(context, range)))
     const transfers: Record<Address, Record<Address, bigint>> = {}
     for (let summary of summaries) {
       for (const [from, toMap] of Object.entries(summary.transfers)) {
@@ -37,7 +35,7 @@ export async function transfersSummary(
         }
       }
     }
-    return [transfers, [rangeStart, headBoundWitness.block], headHash]
+    return [transfers, { range, head: headHash }]
   })
 }
 

package/src/utils/isZodError.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 
 export const isZodError = (error: unknown): error is z.ZodError => {
   return error instanceof z.ZodError

package/src/validation/schema/Mnemonic.ts

@@ -1,4 +1,4 @@
-import * as z from 'zod'
+import { z } from 'zod'
 
 /**
  * Validates a single string containing a BIP-39 mnemonic.

package/src/viewers/AccountBalance.ts

@@ -1,18 +1,18 @@
-import type {
-  Address, Hash, Promisable,
-} from '@xylabs/sdk-js'
+import { type Address, type Promisable } from '@xylabs/sdk-js'
+import { zodIsFactory } from '@xylabs/zod'
 import { WithHashMetaZod } from '@xyo-network/payload-model'
 import {
   type AttoXL1,
   TransferZod,
-  type XL1BlockRange,
 } from '@xyo-network/xl1-protocol'
 import { BlockBoundWitnessZod, TransactionBoundWitnessZod } from '@xyo-network/xl1-protocol'
-import z from 'zod'
+import { z } from 'zod'
 
-import type {
-  Provider,
-  Qualified,
+import {
+  ChainQualificationZod,
+  type ChainQualified,
+  ChainQualifiedConfigZod,
+  type Provider,
 } from '../model/index.ts'
 
 export const AccountBalanceHistoryItemZod = z.tuple([
@@ -23,19 +23,27 @@ export const AccountBalanceHistoryItemZod = z.tuple([
 
 export type AccountBalanceHistoryItem = z.infer<typeof AccountBalanceHistoryItemZod>
 
+export const AccountBalanceQualificationZod = ChainQualificationZod
+export type AccountBalanceQualification = z.infer<typeof AccountBalanceQualificationZod>
+export const isAccountBalanceQualification = zodIsFactory(AccountBalanceQualificationZod)
+
+export const AccountBalanceConfigZod = ChainQualifiedConfigZod
+export type AccountBalanceConfig = z.infer<typeof AccountBalanceConfigZod>
+export const isAccountBalanceCOnfig = zodIsFactory(AccountBalanceConfigZod)
+
 export interface AccountBalanceViewerMethods {
   qualifiedAccountBalanceHistories(
     address: Address[],
-    headOrRange?: Hash | XL1BlockRange
-  ): Promisable<Qualified<Record<Address, AccountBalanceHistoryItem[]>>>
-  qualifiedAccountBalances(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Qualified<Record<Address, AttoXL1>>>
+    config: AccountBalanceConfig
+  ): Promisable<ChainQualified<Record<Address, AccountBalanceHistoryItem[]>>>
+  qualifiedAccountBalances(address: Address[], config: AccountBalanceConfig): Promisable<ChainQualified<Record<Address, AttoXL1>>>
 }
 
 export interface AccountBalanceViewer extends AccountBalanceViewerMethods, Provider<AccountBalanceViewerMoniker> {
-  accountBalance(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AttoXL1>
-  accountBalanceHistories(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Record<Address, AccountBalanceHistoryItem[]>>
-  accountBalanceHistory(address: Address, headOrRange?: Hash | XL1BlockRange): Promisable<AccountBalanceHistoryItem[]>
-  accountBalances(address: Address[], headOrRange?: Hash | XL1BlockRange): Promisable<Record<Address, AttoXL1>>
+  accountBalance(address: Address, config?: AccountBalanceConfig): Promisable<AttoXL1>
+  accountBalanceHistories(address: Address[], config?: AccountBalanceConfig): Promisable<Record<Address, AccountBalanceHistoryItem[]>>
+  accountBalanceHistory(address: Address, config?: AccountBalanceConfig): Promisable<AccountBalanceHistoryItem[]>
+  accountBalances(address: Address[], config?: AccountBalanceConfig): Promisable<Record<Address, AttoXL1>>
 }
 
 export const AccountBalanceViewerMoniker = 'AccountBalanceViewer' as const

package/src/viewers/Block.ts

@@ -4,7 +4,7 @@ import type {
   ChainId, SignedHydratedBlockWithHashMeta, XL1BlockNumber,
 } from '@xyo-network/xl1-protocol'
 
-import type { Provider } from '../model/index.ts'
+import type { Provider, ProviderMoniker } from '../model/index.ts'
 
 export interface BlockViewerMethods {
   blocksByHash(hash: Hash, limit?: number): Promisable<SignedHydratedBlockWithHashMeta[]>
@@ -16,7 +16,7 @@ export interface BlockViewerMethods {
 export const BlockViewerMoniker = 'BlockViewer' as const
 export type BlockViewerMoniker = typeof BlockViewerMoniker
 
-export interface BlockViewer extends BlockViewerMethods, Provider<BlockViewerMoniker> {
+export interface BlockViewer<TMoniker extends ProviderMoniker = BlockViewerMoniker> extends BlockViewerMethods, Provider<TMoniker> {
   blockByHash(hash: Hash): Promisable<SignedHydratedBlockWithHashMeta | null>
   blockByNumber(block: XL1BlockNumber): Promisable<SignedHydratedBlockWithHashMeta | null>
   chainId(): Promisable<ChainId>

package/src/viewers/BlockValidation.ts

@@ -0,0 +1,47 @@
+import { type Promisable } from '@xylabs/sdk-js'
+import { zodIsFactory } from '@xylabs/zod'
+import type { HydratedBlock, SignedHydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
+import { z } from 'zod'
+
+import {
+  ChainQualificationZod, ChainQualifiedHeadConfigZod, ChainQualifiedRangeConfigZod, type Provider,
+} from '../model/index.ts'
+import type { HydratedBlockValidationError } from '../validation/index.ts'
+
+export const BlockValidationQualificationZod = ChainQualificationZod
+export type BlockValidationQualification = z.infer<typeof BlockValidationQualificationZod>
+export const isBlockValidationQualification = zodIsFactory(BlockValidationQualificationZod)
+
+export const BlockValidationConfigFieldsZod = z.object({
+  value: z.boolean().optional(),
+  state: z.boolean().optional(),
+})
+
+export const BlockValidationConfigZod = z.union([
+  BlockValidationConfigFieldsZod.extend(ChainQualifiedHeadConfigZod.shape),
+  BlockValidationConfigFieldsZod.extend(ChainQualifiedRangeConfigZod.shape),
+  BlockValidationConfigFieldsZod,
+  z.object({}),
+])
+
+export type BlockValidationConfig = z.infer<typeof BlockValidationConfigZod>
+export const isBlockValidationConfig = zodIsFactory(BlockValidationConfigZod)
+
+export interface BlockValidationViewerMethods {
+  qualifiedValidateBlocks(
+    blocks: HydratedBlock[],
+    config?: BlockValidationConfig
+  ): Promisable<[HydratedBlockValidationError[], BlockValidationQualification]>
+}
+
+export const BlockValidationViewerMoniker = 'BlockValidationViewer' as const
+export type BlockValidationViewerMoniker = typeof BlockValidationViewerMoniker
+
+export interface BlockValidationViewer extends BlockValidationViewerMethods, Provider<BlockValidationViewerMoniker> {
+  qualifiedValidateBlock(
+    block: SignedHydratedBlockWithHashMeta,
+    config?: BlockValidationConfig
+  ): Promisable<[HydratedBlockValidationError[], BlockValidationQualification]>
+  validateBlock(block: SignedHydratedBlockWithHashMeta, config?: BlockValidationConfig): Promisable<HydratedBlockValidationError[]>
+  validateBlocks(blocks: SignedHydratedBlockWithHashMeta[], config?: BlockValidationConfig): Promisable<HydratedBlockValidationError[]>
+}

package/src/viewers/Finalization.ts

@@ -0,0 +1,19 @@
+import type { Hash } from '@xylabs/hex'
+import type {
+  SignedBlockBoundWitnessWithHashMeta, SignedHydratedBlockWithHashMeta, XL1BlockNumber,
+} from '@xyo-network/xl1-protocol'
+
+import type { Provider } from '../model/index.ts'
+
+export interface FinalizationViewerMethods {
+  head(): Promise<SignedHydratedBlockWithHashMeta>
+}
+
+export const FinalizationViewerMoniker = 'FinalizationViewer' as const
+export type FinalizationViewerMoniker = typeof FinalizationViewerMoniker
+
+export interface FinalizationViewer extends FinalizationViewerMethods, Provider<FinalizationViewerMoniker> {
+  headBlock(): Promise<SignedBlockBoundWitnessWithHashMeta>
+  headHash(): Promise<Hash>
+  headNumber(): Promise<XL1BlockNumber>
+}

package/src/viewers/Mempool.ts

@@ -1,7 +1,7 @@
 import { HashZod } from '@xylabs/sdk-js'
 import type { SignedHydratedBlockWithHashMeta, SignedHydratedTransactionWithHashMeta } from '@xyo-network/xl1-protocol'
 import { XL1BlockRangeZod } from '@xyo-network/xl1-protocol'
-import z from 'zod'
+import { z } from 'zod'
 
 import type { Provider } from '../model/index.ts'
 

package/src/viewers/StakeIntent.ts

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

package/src/viewers/TransactionValidation.ts

@@ -0,0 +1,35 @@
+import { type Promisable } from '@xylabs/sdk-js'
+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'
+
+export const TransactionValidationQualificationZod = ChainQualificationZod
+export type TransactionValidationQualification = z.infer<typeof TransactionValidationQualificationZod>
+export const isTransactionValidationQualification = zodIsFactory(TransactionValidationQualificationZod)
+
+export const TransactionValidationConfigZod = ChainQualifiedConfigZod
+export type TransactionValidationConfig = z.infer<typeof TransactionValidationConfigZod>
+export const isTransactionValidationConfig = zodIsFactory(TransactionValidationConfigZod)
+
+export interface TransactionValidationViewerMethods {
+  qualifiedValidateTransactions(
+    transactions: HydratedTransaction[],
+    config?: TransactionValidationConfig
+  ): Promisable<[ValidationError[][], TransactionValidationQualification]>
+}
+
+export const TransactionValidationViewerMoniker = 'TransactionValidationViewer' as const
+export type TransactionValidationViewerMoniker = typeof TransactionValidationViewerMoniker
+
+export interface TransactionValidationViewer extends TransactionValidationViewerMethods, Provider<TransactionValidationViewerMoniker> {
+  qualifiedValidateTransaction(
+    transaction: HydratedTransaction,
+    config?: TransactionValidationConfig
+  ): Promisable<[ValidationError[], TransactionValidationQualification]>
+  validateTransaction(transaction: HydratedTransaction[], config?: TransactionValidationConfig): Promisable<ValidationError[]>
+  validateTransactions(transactions: HydratedTransaction[], config?: TransactionValidationConfig): Promisable<ValidationError[][]>
+}

package/src/viewers/WindowedBlock.ts

@@ -0,0 +1,17 @@
+import type { Hash } from '@xylabs/hex'
+import type { Promisable } from '@xylabs/sdk-js'
+import type { HydratedBlockWithHashMeta } from '@xyo-network/xl1-protocol'
+
+import type { Provider, ProviderMoniker } from '../model/index.ts'
+import type { BlockViewerMethods } from './Block.ts'
+
+export interface WindowedBlockViewerMethods extends BlockViewerMethods {
+  blocksByTransactionHashes(hashes: Hash[]): Promisable<HydratedBlockWithHashMeta[]>
+}
+
+export const WindowedBlockViewerMoniker = 'WindowedBlockViewer' as const
+export type WindowedBlockViewerMoniker = typeof WindowedBlockViewerMoniker
+
+export interface WindowedBlockViewer<TMoniker extends ProviderMoniker = WindowedBlockViewerMoniker> extends WindowedBlockViewerMethods, Provider<TMoniker> {
+  blockByTransactionHash(hash: Hash): Promisable<HydratedBlockWithHashMeta | null>
+}

package/src/viewers/index.ts

@@ -1,8 +1,10 @@
 export * from './AccountBalance.ts'
 export * from './Block.ts'
 export * from './BlockReward.ts'
+export * from './BlockValidation.ts'
 export * from './ChainContract.ts'
 export * from './ChainStakeViewer.ts'
+export * from './Finalization.ts'
 export * from './Fork.ts'
 export * from './Mempool.ts'
 export * from './NetworkStakeStepReward.ts'
@@ -13,4 +15,6 @@ export * from './StepStake.ts'
 export * from './StepViewer.ts'
 export * from './TimeSync.ts'
 export * from './Transaction.ts'
+export * from './TransactionValidation.ts'
 export * from './TransferBalance.ts'
+export * from './WindowedBlock.ts'

package/dist/neutral/model/Qualified.d.ts

@@ -1,6 +0,0 @@
-import { type Hash } from '@xylabs/sdk-js';
-import { type XL1BlockRange } from '@xyo-network/xl1-protocol';
-import z from 'zod';
-export type Qualified<T> = [T, XL1BlockRange, Hash];
-export declare const QualifiedZod: <T>(zodType: z.ZodType<T>) => z.ZodTuple<[z.ZodType<T, unknown, z.z.core.$ZodTypeInternals<T, unknown>>, z.ZodTuple<[z.ZodPipe<z.ZodNumber, z.ZodTransform<import("@xyo-network/xl1-protocol").XL1BlockNumber, number>>, z.ZodPipe<z.ZodNumber, z.ZodTransform<import("@xyo-network/xl1-protocol").XL1BlockNumber, number>>], null>, z.ZodPipe<z.ZodString, z.ZodTransform<Hash, string>>], null>;
-//# sourceMappingURL=Qualified.d.ts.map

package/dist/neutral/model/Qualified.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Qualified.d.ts","sourceRoot":"","sources":["../../../src/model/Qualified.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAW,MAAM,gBAAgB,CAAA;AACnD,OAAO,EAAE,KAAK,aAAa,EAAoB,MAAM,2BAA2B,CAAA;AAChF,OAAO,CAAC,MAAM,KAAK,CAAA;AAEnB,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;AAEnD,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,wWAEpD,CAAA"}

package/src/model/Qualified.ts

@@ -1,9 +0,0 @@
-import { type Hash, HashZod } from '@xylabs/sdk-js'
-import { type XL1BlockRange, XL1BlockRangeZod } from '@xyo-network/xl1-protocol'
-import z from 'zod'
-
-export type Qualified<T> = [T, XL1BlockRange, Hash]
-
-export const QualifiedZod = <T>(zodType: z.ZodType<T>) => {
-  return z.tuple([zodType, XL1BlockRangeZod, HashZod])
-}