@xyo-network/node-model 2.99.6 → 2.100.1

package/package.json

@@ -13,9 +13,11 @@
     "@xylabs/hex": "^3.3.2",
     "@xylabs/object": "^3.3.2",
     "@xylabs/promise": "^3.3.2",
-    "@xyo-network/module-events": "~2.99.6",
-    "@xyo-network/module-model": "~2.99.6",
-    "@xyo-network/payload-model": "~2.99.6"
+    "@xyo-network/account-model": "~2.100.1",
+    "@xyo-network/address-payload-plugin": "~2.100.1",
+    "@xyo-network/module-events": "~2.100.1",
+    "@xyo-network/module-model": "~2.100.1",
+    "@xyo-network/payload-model": "~2.100.1"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.10.0",
@@ -61,6 +63,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.99.6",
+  "version": "2.100.1",
   "type": "module"
 }

package/src/ChildCertification.ts

@@ -0,0 +1,12 @@
+import { Address } from '@xylabs/hex'
+import { Payload } from '@xyo-network/payload-model'
+
+export const ChildCertificationSchema = 'network.xyo.child.certification' as const
+export type ChildCertificationSchema = typeof ChildCertificationSchema
+
+export interface ChildCertificationFields {
+  address: Address
+  expiration: number
+}
+
+export type ChildCertification = Payload<ChildCertificationFields, ChildCertificationSchema>

package/src/Node.ts

@@ -1,17 +1,8 @@
-import { Address } from '@xylabs/hex'
-import { Promisable } from '@xylabs/promise'
-import { AttachableModuleInstance, Module, ModuleEventData, ModuleIdentifier, ModuleInstance } from '@xyo-network/module-model'
+import { Module, ModuleEventData } from '@xyo-network/module-model'
 
 import { ModuleAttachedEventData, ModuleDetachedEventData, ModuleRegisteredEventData, ModuleUnregisteredEventData } from './EventsModels'
 import { NodeParams } from './Params'
 
-export interface NodeQueryFunctions {
-  attach: (nameOrAddress: ModuleIdentifier, external?: boolean) => Promisable<Address | undefined>
-  attached: () => Promisable<Address[]>
-  detach: (nameOrAddress: ModuleIdentifier) => Promisable<Address | undefined>
-  registered: () => Promisable<Address[]>
-}
-
 export interface NodeModuleEventData
   extends ModuleAttachedEventData,
     ModuleDetachedEventData,
@@ -21,12 +12,3 @@ export interface NodeModuleEventData
 
 export interface NodeModule<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
   extends Module<TParams, TEventData> {}
-
-export interface NodeInstance<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
-  extends NodeModule<TParams, TEventData>,
-    NodeQueryFunctions,
-    ModuleInstance<TParams, TEventData> {
-  register?: (mod: AttachableModuleInstance) => Promisable<void>
-  registeredModules?: () => Promisable<ModuleInstance[]>
-  unregister?: (mod: ModuleInstance) => Promisable<ModuleInstance>
-}

package/src/Queries/Attach.ts

@@ -1,3 +1,4 @@
+import { ModuleIdentifier } from '@xyo-network/module-model'
 import { Query } from '@xyo-network/payload-model'
 
 export type NodeAttachQuerySchema = 'network.xyo.query.node.attach'
@@ -5,6 +6,6 @@ export const NodeAttachQuerySchema: NodeAttachQuerySchema = 'network.xyo.query.n
 
 export type NodeAttachQuery = Query<{
   external?: boolean
-  nameOrAddress: string
+  id: ModuleIdentifier
   schema: NodeAttachQuerySchema
 }>

package/src/Queries/Certify.ts

@@ -0,0 +1,10 @@
+import { ModuleIdentifier } from '@xyo-network/module-model'
+import { Query } from '@xyo-network/payload-model'
+
+export type NodeCertifyQuerySchema = 'network.xyo.query.node.certify'
+export const NodeCertifyQuerySchema: NodeCertifyQuerySchema = 'network.xyo.query.node.certify'
+
+export type NodeCertifyQuery = Query<{
+  id: ModuleIdentifier
+  schema: NodeCertifyQuerySchema
+}>

package/src/Queries/Detach.ts

@@ -1,9 +1,10 @@
+import { ModuleIdentifier } from '@xyo-network/module-model'
 import { Query } from '@xyo-network/payload-model'
 
 export type NodeDetachQuerySchema = 'network.xyo.query.node.detach'
 export const NodeDetachQuerySchema: NodeDetachQuerySchema = 'network.xyo.query.node.detach'
 
 export type NodeDetachQuery = Query<{
-  nameOrAddress: string
+  id: ModuleIdentifier
   schema: NodeDetachQuerySchema
 }>

package/src/Queries/index.ts

@@ -2,13 +2,15 @@ import { ModuleQueries } from '@xyo-network/module-model'
 
 import { NodeAttachQuery } from './Attach'
 import { NodeAttachedQuery } from './Attached'
+import { NodeCertifyQuery } from './Certify'
 import { NodeDetachQuery } from './Detach'
 import { NodeRegisteredQuery } from './Registered'
 
 export * from './Attach'
 export * from './Attached'
+export * from './Certify'
 export * from './Detach'
 export * from './Registered'
 
-export type NodeQueries = NodeAttachQuery | NodeDetachQuery | NodeAttachedQuery | NodeRegisteredQuery
+export type NodeQueries = NodeAttachQuery | NodeCertifyQuery | NodeDetachQuery | NodeAttachedQuery | NodeRegisteredQuery
 export type NodeModuleQueries = ModuleQueries | NodeQueries

package/src/attachable/AttachableInstance.ts

@@ -1,7 +1,8 @@
 import { IsObjectFactory, TypeCheck } from '@xylabs/object'
 import { AttachableModuleInstance } from '@xyo-network/module-model'
 
-import { NodeInstance, NodeModule, NodeModuleEventData } from '../Node'
+import { NodeInstance } from '../instance'
+import { NodeModule, NodeModuleEventData } from '../Node'
 import { NodeParams } from '../Params'
 
 export interface AttachableNodeInstance<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>

package/src/index.ts

@@ -1,6 +1,8 @@
 export * from './attachable'
+export * from './ChildCertification'
 export * from './Config'
 export * from './EventsModels'
+export * from './instance'
 export * from './Node'
 export * from './Params'
 export * from './Queries'

package/src/instance.ts

@@ -0,0 +1,33 @@
+import { Address } from '@xylabs/hex'
+import { AccountInstance } from '@xyo-network/account-model'
+import { AddressPayload } from '@xyo-network/address-payload-plugin'
+import { AttachableModuleInstance, ModuleIdentifier, ModuleInstance, ModuleQueryResult } from '@xyo-network/module-model'
+
+import { ChildCertification, ChildCertificationFields } from './ChildCertification'
+import { NodeModule, NodeModuleEventData } from './Node'
+import { NodeParams } from './Params'
+
+export interface NodeQueryFunctions {
+  attach: (id: ModuleIdentifier, external?: boolean) => Promise<Address | undefined>
+  attachQuery: (id: ModuleIdentifier, external?: boolean, account?: AccountInstance) => Promise<ModuleQueryResult<AddressPayload>>
+  attached: () => Promise<Address[]>
+  attachedQuery: (account?: AccountInstance) => Promise<ModuleQueryResult<AddressPayload>>
+  certify: (id: ModuleIdentifier) => Promise<ChildCertificationFields | undefined>
+  certifyQuery: (id: ModuleIdentifier, account?: AccountInstance) => Promise<ModuleQueryResult<ChildCertification>>
+  detach: (id: ModuleIdentifier) => Promise<Address | undefined>
+  detachQuery: (id: ModuleIdentifier, account?: AccountInstance) => Promise<ModuleQueryResult<AddressPayload>>
+  registered: () => Promise<Address[]>
+  registeredQuery: (account?: AccountInstance) => Promise<ModuleQueryResult<AddressPayload>>
+}
+
+export interface NodeRegistrationFunctions {
+  register?: (mod: AttachableModuleInstance) => Promise<void>
+  registeredModules?: () => AttachableModuleInstance[]
+  unregister?: (mod: ModuleInstance) => Promise<ModuleInstance>
+}
+
+export interface NodeInstance<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>
+  extends NodeModule<TParams, TEventData>,
+    NodeQueryFunctions,
+    NodeRegistrationFunctions,
+    ModuleInstance<TParams, TEventData> {}

package/src/typeChecks.ts

@@ -1,7 +1,8 @@
 import { AsObjectFactory } from '@xylabs/object'
 import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model'
 
-import { NodeInstance, NodeModule } from './Node'
+import { NodeInstance } from './instance'
+import { NodeModule } from './Node'
 import { NodeAttachedQuerySchema, NodeAttachQuerySchema, NodeDetachQuerySchema, NodeRegisteredQuerySchema } from './Queries'
 
 const instanceFactory = new IsInstanceFactory<NodeInstance>()