@xyo-network/abstract-witness 2.67.0-rc.1 → 2.67.0-rc.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -10,7 +10,7 @@ const error_1 = require("@xyo-network/error");
10
10
  const module_1 = require("@xyo-network/module");
11
11
  const witness_model_1 = require("@xyo-network/witness-model");
12
12
  (0, module_1.creatableModule)();
13
- class AbstractWitness extends module_1.AbstractModule {
13
+ class AbstractWitness extends module_1.AbstractModuleInstance {
14
14
  get queries() {
15
15
  return [witness_model_1.WitnessObserveQuerySchema, ...super.queries];
16
16
  }
@@ -23,16 +23,6 @@ class AbstractWitness extends module_1.AbstractModule {
23
23
  'network.xyo.query.witness.observe': '1/1',
24
24
  };
25
25
  }
26
- loadAccount() {
27
- const _super = Object.create(null, {
28
- loadAccount: { get: () => super.loadAccount }
29
- });
30
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
31
- const account = yield _super.loadAccount.call(this);
32
- this.downResolver.add(this);
33
- return account;
34
- });
35
- }
36
26
  observe(payloads) {
37
27
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
38
28
  yield this.started('throw');
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,10 @@ import { HDWallet } from '@xyo-network/account';
3
3
  import { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder';
4
4
  import { PayloadHasher } from '@xyo-network/core';
5
5
  import { handleErrorAsync } from '@xyo-network/error';
6
- import { AbstractModule, creatableModule, ModuleErrorBuilder } from '@xyo-network/module';
6
+ import { AbstractModuleInstance, creatableModule, ModuleErrorBuilder } from '@xyo-network/module';
7
7
  import { WitnessConfigSchema, WitnessObserveQuerySchema, } from '@xyo-network/witness-model';
8
8
  creatableModule();
9
- export class AbstractWitness extends AbstractModule {
9
+ export class AbstractWitness extends AbstractModuleInstance {
10
10
  static configSchemas = [WitnessConfigSchema];
11
11
  get queries() {
12
12
  return [WitnessObserveQuerySchema, ...super.queries];
@@ -19,11 +19,6 @@ export class AbstractWitness extends AbstractModule {
19
19
  'network.xyo.query.witness.observe': '1/1',
20
20
  };
21
21
  }
22
- async loadAccount() {
23
- const account = await super.loadAccount();
24
- this.downResolver.add(this);
25
- return account;
26
- }
27
22
  async observe(payloads) {
28
23
  await this.started('throw');
29
24
  const payloadList = assertEx(await this.observeHandler(payloads), 'Trying to witness nothing');
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,15 @@
1
1
  import { QueryBoundWitness } from '@xyo-network/boundwitness-builder';
2
- import { AbstractModule, ModuleConfig, ModuleQueryResult } from '@xyo-network/module';
2
+ import { AbstractModuleInstance, ModuleConfig, ModuleQueryResult } from '@xyo-network/module';
3
3
  import { Payload } from '@xyo-network/payload-model';
4
4
  import { Promisable } from '@xyo-network/promise';
5
5
  import { CustomWitnessModule, WitnessModule, WitnessModuleEventData, WitnessParams, WitnessQueryBase } from '@xyo-network/witness-model';
6
- export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData<WitnessModule<TParams>> = WitnessModuleEventData<WitnessModule<TParams>>> extends AbstractModule<TParams, TEventData> implements CustomWitnessModule<TParams, TEventData> {
6
+ export declare abstract class AbstractWitness<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData<WitnessModule<TParams>> = WitnessModuleEventData<WitnessModule<TParams>>> extends AbstractModuleInstance<TParams, TEventData> implements CustomWitnessModule<TParams, TEventData> {
7
7
  static readonly configSchemas: string[];
8
8
  get queries(): string[];
9
9
  get targetSet(): (import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/payload-model").PayloadSet & {
10
10
  schema: "network.xyo.payload.set";
11
11
  }) | undefined;
12
12
  protected get _queryAccountPaths(): Record<WitnessQueryBase['schema'], string>;
13
- loadAccount(): Promise<import("@xyo-network/account-model").AccountInstance>;
14
13
  observe(payloads?: Payload[]): Promise<Payload[]>;
15
14
  protected queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(query: T, payloads?: Payload[], queryConfig?: TConfig): Promise<ModuleQueryResult>;
16
15
  protected abstract observeHandler(payloads?: Payload[]): Promisable<Payload[]>;
@@ -1 +1 @@
1
- {"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAG/F,OAAO,EAAE,cAAc,EAAmB,YAAY,EAAsB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAC1H,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACL,mBAAmB,EAEnB,aAAa,EACb,sBAAsB,EAEtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAEpH,SAAQ,cAAc,CAAC,OAAO,EAAE,UAAU,CAC1C,YAAW,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC;IAEnD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IAExE,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAEc,WAAW;IAMpB,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAQ9B,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAkC7B,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAC/E"}
1
+ {"version":3,"file":"AbstractWitness.d.ts","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAA4B,MAAM,mCAAmC,CAAA;AAG/F,OAAO,EAAE,sBAAsB,EAAmB,YAAY,EAAsB,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAClI,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EACL,mBAAmB,EAEnB,aAAa,EACb,sBAAsB,EAEtB,aAAa,EAEb,gBAAgB,EACjB,MAAM,4BAA4B,CAAA;AAGnC,8BAAsB,eAAe,CACjC,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,UAAU,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAEpH,SAAQ,sBAAsB,CAAC,OAAO,EAAE,UAAU,CAClD,YAAW,mBAAmB,CAAC,OAAO,EAAE,UAAU,CAAC;IAEnD,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAwB;IAExE,IAAa,OAAO,IAAI,MAAM,EAAE,CAE/B;IAED,IAAI,SAAS;;mBAEZ;IAED,cAAuB,kBAAkB,IAAI,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAItF;IAEK,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;cAQ9B,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,iBAAiB,EAAE,OAAO,SAAS,YAAY,GAAG,YAAY,EAChI,KAAK,EAAE,CAAC,EACR,QAAQ,CAAC,EAAE,OAAO,EAAE,EACpB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,iBAAiB,CAAC;IAkC7B,SAAS,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;CAC/E"}
package/package.json CHANGED
@@ -11,14 +11,14 @@
11
11
  },
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.9.3",
14
- "@xyo-network/account": "~2.67.0-rc.1",
15
- "@xyo-network/boundwitness-builder": "~2.67.0-rc.1",
16
- "@xyo-network/core": "~2.67.0-rc.1",
17
- "@xyo-network/error": "~2.67.0-rc.1",
18
- "@xyo-network/module": "~2.67.0-rc.1",
19
- "@xyo-network/payload-model": "~2.67.0-rc.1",
20
- "@xyo-network/promise": "~2.67.0-rc.1",
21
- "@xyo-network/witness-model": "~2.67.0-rc.1"
14
+ "@xyo-network/account": "~2.67.0-rc.2",
15
+ "@xyo-network/boundwitness-builder": "~2.67.0-rc.2",
16
+ "@xyo-network/core": "~2.67.0-rc.2",
17
+ "@xyo-network/error": "~2.67.0-rc.2",
18
+ "@xyo-network/module": "~2.67.0-rc.2",
19
+ "@xyo-network/payload-model": "~2.67.0-rc.2",
20
+ "@xyo-network/promise": "~2.67.0-rc.2",
21
+ "@xyo-network/witness-model": "~2.67.0-rc.2"
22
22
  },
23
23
  "devDependencies": {
24
24
  "@xylabs/ts-scripts-yarn3": "^2.19.0",
@@ -58,6 +58,6 @@
58
58
  },
59
59
  "sideEffects": false,
60
60
  "types": "dist/types/index.d.ts",
61
- "version": "2.67.0-rc.1",
61
+ "version": "2.67.0-rc.2",
62
62
  "stableVersion": "2.66.9"
63
63
  }
@@ -3,7 +3,7 @@ import { HDWallet } from '@xyo-network/account'
3
3
  import { QueryBoundWitness, QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'
4
4
  import { PayloadHasher } from '@xyo-network/core'
5
5
  import { handleErrorAsync } from '@xyo-network/error'
6
- import { AbstractModule, creatableModule, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
6
+ import { AbstractModuleInstance, creatableModule, ModuleConfig, ModuleErrorBuilder, ModuleQueryResult } from '@xyo-network/module'
7
7
  import { Payload } from '@xyo-network/payload-model'
8
8
  import { Promisable } from '@xyo-network/promise'
9
9
  import {
@@ -22,7 +22,7 @@ export abstract class AbstractWitness<
22
22
  TParams extends WitnessParams = WitnessParams,
23
23
  TEventData extends WitnessModuleEventData<WitnessModule<TParams>> = WitnessModuleEventData<WitnessModule<TParams>>,
24
24
  >
25
- extends AbstractModule<TParams, TEventData>
25
+ extends AbstractModuleInstance<TParams, TEventData>
26
26
  implements CustomWitnessModule<TParams, TEventData>
27
27
  {
28
28
  static override readonly configSchemas: string[] = [WitnessConfigSchema]
@@ -41,12 +41,6 @@ export abstract class AbstractWitness<
41
41
  }
42
42
  }
43
43
 
44
- override async loadAccount() {
45
- const account = await super.loadAccount()
46
- this.downResolver.add(this)
47
- return account
48
- }
49
-
50
44
  async observe(payloads?: Payload[]): Promise<Payload[]> {
51
45
  await this.started('throw')
52
46
  const payloadList = assertEx(await this.observeHandler(payloads), 'Trying to witness nothing')