@xyo-network/diviner 2.44.1 → 2.45.0-rc.1

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.
Files changed (16) hide show
  1. package/dist/cjs/AddressHistory/MemoryAddressHistoryDiviner.js +46 -30
  2. package/dist/cjs/AddressHistory/MemoryAddressHistoryDiviner.js.map +1 -1
  3. package/dist/cjs/Payload/Archivist/Diviner.js +6 -10
  4. package/dist/cjs/Payload/Archivist/Diviner.js.map +1 -1
  5. package/dist/docs.json +10184 -9835
  6. package/dist/esm/AddressHistory/MemoryAddressHistoryDiviner.js +40 -29
  7. package/dist/esm/AddressHistory/MemoryAddressHistoryDiviner.js.map +1 -1
  8. package/dist/esm/Payload/Archivist/Diviner.js +5 -7
  9. package/dist/esm/Payload/Archivist/Diviner.js.map +1 -1
  10. package/dist/types/AddressHistory/MemoryAddressHistoryDiviner.d.ts +14 -2
  11. package/dist/types/AddressHistory/MemoryAddressHistoryDiviner.d.ts.map +1 -1
  12. package/dist/types/Payload/Archivist/Diviner.d.ts +1 -2
  13. package/dist/types/Payload/Archivist/Diviner.d.ts.map +1 -1
  14. package/package.json +17 -16
  15. package/src/AddressHistory/MemoryAddressHistoryDiviner.ts +60 -31
  16. package/src/Payload/Archivist/Diviner.ts +5 -8
package/dist/esm/AddressHistory/MemoryAddressHistoryDiviner.js CHANGED
@@ -4,44 +4,55 @@ import { ArchivistWrapper } from '@xyo-network/archivist-wrapper';
4
4
  import { XyoBoundWitnessSchema } from '@xyo-network/boundwitness-model';
5
5
  import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper';
6
6
  import { AbstractDiviner } from '../AbstractDiviner';
7
- import { isAddressHistoryQueryPayload } from './AddressHistoryDiviner';
7
+ export const MemoryAddressHistoryDivinerConfigSchema = 'network.xyo.diviner.address.history.memory.config';
8
+ // This diviner returns the most recent boundwitness signed by the address that can be found
9
+ // if multiple broken chains are found, all the heads are returned
8
10
  export class MemoryAddressHistoryDiviner extends AbstractDiviner {
11
+ static configSchema = MemoryAddressHistoryDivinerConfigSchema;
12
+ static async create(params) {
13
+ return (await super.create(params));
14
+ }
9
15
  async divine(payloads) {
10
- const query = payloads?.find(isAddressHistoryQueryPayload);
11
- // TODO: Support multiple queries
12
- if (!query)
13
- return [];
14
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
15
- const { address } = query;
16
- const assertedAddress = assertEx(address);
17
- //only supporting single address at this point
18
- const singleAddress = assertEx((Array.isArray(assertedAddress) ? assertedAddress : [assertedAddress]).shift());
16
+ assertEx(!payloads, 'MemoryAddressHistoryDiviner.divine does not allow payloads to be sent');
19
17
  const archivists = (await this.resolver?.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map((archivist) => new ArchivistWrapper(archivist)) ?? [];
20
18
  const bwLists = (await Promise.all(archivists.map((archivist) => {
19
+ //Todo: add address to filter
21
20
  return archivist.find({ limit: 10000, schema: XyoBoundWitnessSchema });
22
21
  }))).flat();
23
- const bwRecords = {};
24
- bwLists
25
- .filter((bw) => bw.addresses.includes(singleAddress))
26
- .reduce((bwRecords, bw) => {
27
- const wrapper = new BoundWitnessWrapper(bw);
28
- bwRecords[wrapper.hash] = [wrapper];
29
- return bwRecords;
30
- }, bwRecords);
31
- return Object.values(this.buildAddressLists(singleAddress, bwRecords)).flat();
22
+ const bwRecords = this.buildWrapperRecords(bwLists);
23
+ const chains = Object.values(this.buildAddressChains(this.config.address, bwRecords));
24
+ //return the heads of each chain (get the last bw on each chain)
25
+ return chains.map((chain) => assertEx(chain.pop()));
32
26
  }
33
- buildAddressLists(address, bwRecords) {
34
- Object.entries(bwRecords).forEach(([hash, bw]) => {
35
- const single = bw[0];
36
- const prev = single.prev(address);
37
- if (prev) {
38
- if (bwRecords[prev]) {
39
- bwRecords[prev].unshift(single);
40
- delete bwRecords[hash];
27
+ buildAddressChains(address, bwRecords) {
28
+ const arrayedResult = Object.entries(bwRecords).reduce((prev, [key, value]) => {
29
+ prev[key] = [value];
30
+ return prev;
31
+ }, {});
32
+ return Object.entries(bwRecords).reduce((prev, [key, value]) => {
33
+ //check if key is still there (may have been deleted as prevHash)
34
+ if (prev[key]) {
35
+ const previousHash = value.prev(address);
36
+ if (previousHash) {
37
+ //if we have the previousHash, move this bw to its chain
38
+ if (prev[previousHash]) {
39
+ prev[key].push(...prev[previousHash]);
40
+ delete prev[previousHash];
41
+ }
41
42
  }
42
43
  }
43
- });
44
- return bwRecords;
44
+ return prev;
45
+ }, arrayedResult);
46
+ }
47
+ //build object with hashes as keys and wrappers as values
48
+ buildWrapperRecords(lists) {
49
+ return lists
50
+ .filter((bw) => bw.addresses.includes(this.config.address))
51
+ .reduce((bwRecords, bw) => {
52
+ const wrapper = new BoundWitnessWrapper(bw);
53
+ bwRecords[wrapper.hash] = wrapper;
54
+ return bwRecords;
55
+ }, {});
45
56
  }
46
57
  }
47
58
  //# sourceMappingURL=MemoryAddressHistoryDiviner.js.map
package/dist/esm/AddressHistory/MemoryAddressHistoryDiviner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryAddressHistoryDiviner.js","sourceRoot":"","sources":["../../../src/AddressHistory/MemoryAddressHistoryDiviner.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemoryAddressHistoryDiviner.js","sourceRoot":"","sources":["../../../src/AddressHistory/MemoryAddressHistoryDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAmB,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AACxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAKvE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAIpD,MAAM,CAAC,MAAM,uCAAuC,GAAG,mDAAmD,CAAA;AAU1G,4FAA4F;AAC5F,kEAAkE;AAElE,MAAM,OAAO,2BAA4B,SAAQ,eAAkD;IACjG,MAAM,CAAU,YAAY,GAAG,uCAAuC,CAAA;IAEtE,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAiE;QAC5F,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAgC,CAAA;IACpE,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAuB;QAClC,QAAQ,CAAC,CAAC,QAAQ,EAAE,uEAAuE,CAAC,CAAA;QAC5F,MAAM,UAAU,GACd,CAAC,MAAM,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAA;QACnI,MAAM,OAAO,GAAG,CACd,MAAM,OAAO,CAAC,GAAG,CACf,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3B,6BAA6B;YAC7B,OAAO,SAAS,CAAC,IAAI,CAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAA;QACzF,CAAC,CAAC,CACH,CACF,CAAC,IAAI,EAAE,CAAA;QAER,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAEnD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAA;QAErF,gEAAgE;QAChE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;IACrD,CAAC;IAEO,kBAAkB,CAAC,OAAe,EAAE,SAA8C;QACxF,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAwC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACnH,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACnB,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,EAAE,CAAC,CAAA;QACN,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAwC,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACpG,iEAAiE;YACjE,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE;gBACb,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACxC,IAAI,YAAY,EAAE;oBAChB,wDAAwD;oBACxD,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE;wBACtB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,CAAA;wBACrC,OAAO,IAAI,CAAC,YAAY,CAAC,CAAA;qBAC1B;iBACF;aACF;YACD,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,aAAa,CAAC,CAAA;IACnB,CAAC;IAED,yDAAyD;IACjD,mBAAmB,CAAC,KAAwB;QAClD,OAAO,KAAK;aACT,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aAC1D,MAAM,CAAsC,CAAC,SAAS,EAAE,EAAE,EAAE,EAAE;YAC7D,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,EAAE,CAAC,CAAA;YAC3C,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAA;YACjC,OAAO,SAAS,CAAA;QAClB,CAAC,EAAE,EAAE,CAAC,CAAA;IACV,CAAC"}
package/dist/esm/Payload/Archivist/Diviner.js CHANGED
@@ -8,14 +8,13 @@ import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner';
8
8
  import { XyoHuriSchema } from '../XyoHuriPayload';
9
9
  export class ArchivistPayloadDiviner extends AbstractPayloadDiviner {
10
10
  static configSchema;
11
- archivist;
12
11
  static async create(params) {
13
12
  return (await super.create(params));
14
13
  }
15
14
  async divine(payloads) {
16
15
  const huriPayloads = assertEx(payloads?.filter((payload) => payload?.schema === XyoHuriSchema), `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`);
17
16
  const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri).hash)).flat();
18
- const activeArchivist = this.archivist;
17
+ const activeArchivist = await this.archivist();
19
18
  if (activeArchivist) {
20
19
  const queryPayload = PayloadWrapper.parse({ hashes, schema: ArchivistGetQuerySchema });
21
20
  const query = await this.bindQuery(queryPayload);
@@ -26,18 +25,17 @@ export class ArchivistPayloadDiviner extends AbstractPayloadDiviner {
26
25
  queries() {
27
26
  return [XyoDivinerDivineQuerySchema, ...super.queries()];
28
27
  }
29
- async start() {
30
- await super.start();
28
+ async archivist() {
31
29
  const configArchivistAddress = this.config?.archivist;
32
30
  if (configArchivistAddress) {
33
31
  const resolvedArchivist = configArchivistAddress
34
- ? (this.resolver?.resolve({ address: [configArchivistAddress] })).shift() ?? null
32
+ ? (await this.resolve({ address: [configArchivistAddress] })).shift() ?? null
35
33
  : null;
36
34
  if (resolvedArchivist) {
37
- this.archivist = resolvedArchivist ? new ArchivistWrapper(resolvedArchivist) : null;
35
+ return resolvedArchivist ? new ArchivistWrapper(resolvedArchivist) : null;
38
36
  }
39
37
  }
40
- return this;
38
+ return null;
41
39
  }
42
40
  }
43
41
  //# sourceMappingURL=Diviner.js.map
package/dist/esm/Payload/Archivist/Diviner.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAqB,uBAAuB,EAAoB,MAAM,wBAAwB,CAAA;AACrG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAGjE,MAAM,OAAO,uBAAwB,SAAQ,sBAAwD;IACnG,MAAM,CAAU,YAAY,CAAwC;IAE1D,SAAS,CAA0B;IAE7C,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAuD;QAClF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA4B,CAAA;IAChE,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAuB;QACzC,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC5G,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAA;QACtC,IAAI,eAAe,EAAE;YACnB,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAA;YACzG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;YAChD,OAAO,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEkB,KAAK,CAAC,KAAK;QAC5B,MAAM,KAAK,CAAC,KAAK,EAAE,CAAA;QACnB,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;QACrD,IAAI,sBAAsB,EAAE;YAC1B,MAAM,iBAAiB,GAA4B,sBAAsB;gBACvE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAmC,CAAA,CAAC,KAAK,EAAE,IAAI,IAAI;gBAClH,CAAC,CAAC,IAAI,CAAA;YACR,IAAI,iBAAiB,EAAE;gBACrB,IAAI,CAAC,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;aACpF;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
1
+ {"version":3,"file":"Diviner.js","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAqB,uBAAuB,EAAoB,MAAM,wBAAwB,CAAA;AACrG,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAA;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAGjE,MAAM,OAAO,uBAAwB,SAAQ,sBAAwD;IACnG,MAAM,CAAU,YAAY,CAAwC;IAEpE,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAuD;QAClF,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAA4B,CAAA;IAChE,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,QAAuB;QACzC,MAAM,YAAY,GAAG,QAAQ,CAC3B,QAAQ,EAAE,MAAM,CAAC,CAAC,OAAO,EAA6B,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,aAAa,CAAC,EAC3F,8BAA8B,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAClE,CAAA;QACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;QAC5G,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAA;QAC9C,IAAI,eAAe,EAAE;YACnB,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,uBAAuB,EAAE,CAAC,CAAA;YACzG,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;YAChD,OAAO,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QACD,OAAO,EAAE,CAAA;IACX,CAAC;IAEQ,OAAO;QACd,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAES,KAAK,CAAC,SAAS;QACvB,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;QACrD,IAAI,sBAAsB,EAAE;YAC1B,MAAM,iBAAiB,GAA4B,sBAAsB;gBACvE,CAAC,CAAE,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAmC,CAAC,KAAK,EAAE,IAAI,IAAI;gBAChH,CAAC,CAAC,IAAI,CAAA;YACR,IAAI,iBAAiB,EAAE;gBACrB,OAAO,iBAAiB,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;aAC1E;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF"}
package/dist/types/AddressHistory/MemoryAddressHistoryDiviner.d.ts CHANGED
@@ -1,8 +1,20 @@
1
+ import { XyoBoundWitness } from '@xyo-network/boundwitness-model';
2
+ import { DivinerConfig } from '@xyo-network/diviner-model';
3
+ import { ModuleParams } from '@xyo-network/module';
1
4
  import { XyoPayload } from '@xyo-network/payload-model';
2
5
  import { AbstractDiviner } from '../AbstractDiviner';
3
6
  import { AddressHistoryDiviner } from './AddressHistoryDiviner';
4
- export declare class MemoryAddressHistoryDiviner extends AbstractDiviner implements AddressHistoryDiviner {
7
+ export type MemoryAddressHistoryDivinerConfigSchema = 'network.xyo.diviner.address.history.memory.config';
8
+ export declare const MemoryAddressHistoryDivinerConfigSchema = "network.xyo.diviner.address.history.memory.config";
9
+ export type MemoryAddressHistoryDivinerConfig = DivinerConfig<XyoBoundWitness, {
10
+ address: string;
11
+ schema: MemoryAddressHistoryDivinerConfigSchema;
12
+ }>;
13
+ export declare class MemoryAddressHistoryDiviner extends AbstractDiviner<MemoryAddressHistoryDivinerConfig> implements AddressHistoryDiviner {
14
+ static configSchema: string;
15
+ static create(params?: Partial<ModuleParams<MemoryAddressHistoryDivinerConfig>>): Promise<MemoryAddressHistoryDiviner>;
5
16
  divine(payloads?: XyoPayload[]): Promise<XyoPayload[]>;
6
- private buildAddressLists;
17
+ private buildAddressChains;
18
+ private buildWrapperRecords;
7
19
  }
8
20
  //# sourceMappingURL=MemoryAddressHistoryDiviner.d.ts.map
package/dist/types/AddressHistory/MemoryAddressHistoryDiviner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryAddressHistoryDiviner.d.ts","sourceRoot":"","sources":["../../../src/AddressHistory/MemoryAddressHistoryDiviner.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAA4D,MAAM,yBAAyB,CAAA;AAEzH,qBAAa,2BAA4B,SAAQ,eAAgB,YAAW,qBAAqB;IACzF,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAgC5D,OAAO,CAAC,iBAAiB;CAa1B"}
1
+ {"version":3,"file":"MemoryAddressHistoryDiviner.d.ts","sourceRoot":"","sources":["../../../src/AddressHistory/MemoryAddressHistoryDiviner.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAyB,MAAM,iCAAiC,CAAA;AAExF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAE/D,MAAM,MAAM,uCAAuC,GAAG,mDAAmD,CAAA;AACzG,eAAO,MAAM,uCAAuC,sDAAsD,CAAA;AAE1G,MAAM,MAAM,iCAAiC,GAAG,aAAa,CAC3D,eAAe,EACf;IACE,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,uCAAuC,CAAA;CAChD,CACF,CAAA;AAKD,qBAAa,2BAA4B,SAAQ,eAAe,CAAC,iCAAiC,CAAE,YAAW,qBAAqB;IAClI,OAAgB,YAAY,SAA0C;WAEhD,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAI/H,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAqB5D,OAAO,CAAC,kBAAkB;IAsB1B,OAAO,CAAC,mBAAmB;CAS5B"}
package/dist/types/Payload/Archivist/Diviner.d.ts CHANGED
@@ -5,10 +5,9 @@ import { AbstractPayloadDiviner } from '../AbstractPayloadDiviner';
5
5
  import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchema } from './Config';
6
6
  export declare class ArchivistPayloadDiviner extends AbstractPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
7
7
  static configSchema: XyoArchivistPayloadDivinerConfigSchema;
8
- protected archivist?: PayloadArchivist | null;
9
8
  static create(params?: ModuleParams<XyoArchivistPayloadDivinerConfig>): Promise<ArchivistPayloadDiviner>;
10
9
  divine(payloads?: XyoPayload[]): Promise<XyoPayload[]>;
11
10
  queries(): string[];
12
- protected start(): Promise<this>;
11
+ protected archivist(): Promise<PayloadArchivist | null>;
13
12
  }
14
13
  //# sourceMappingURL=Diviner.d.ts.map
package/dist/types/Payload/Archivist/Diviner.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAA8C,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAIrG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,gCAAgC,EAAE,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,qBAAa,uBAAwB,SAAQ,sBAAsB,CAAC,gCAAgC,CAAC;IACnG,OAAgB,YAAY,EAAE,sCAAsC,CAAA;IAEpE,SAAS,CAAC,SAAS,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAA;WAEvB,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,gCAAgC,CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAI1G,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAe1D,OAAO;cAIS,KAAK;CAa/B"}
1
+ {"version":3,"file":"Diviner.d.ts","sourceRoot":"","sources":["../../../../src/Payload/Archivist/Diviner.ts"],"names":[],"mappings":"AACA,OAAO,EAA8C,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAIrG,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAA;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAElE,OAAO,EAAE,gCAAgC,EAAE,sCAAsC,EAAE,MAAM,UAAU,CAAA;AAEnG,qBAAa,uBAAwB,SAAQ,sBAAsB,CAAC,gCAAgC,CAAC;IACnG,OAAgB,YAAY,EAAE,sCAAsC,CAAA;WAE9C,MAAM,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,gCAAgC,CAAC,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAI1G,MAAM,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAe1D,OAAO;cAIA,SAAS,IAAI,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;CAY9D"}
package/package.json CHANGED
@@ -12,25 +12,25 @@
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.7.1",
14
14
  "@xylabs/promise": "^2.7.1",
15
- "@xyo-network/account": "^2.44.1",
16
- "@xyo-network/archivist": "^2.44.1",
17
- "@xyo-network/archivist-wrapper": "^2.44.1",
18
- "@xyo-network/boundwitness-model": "^2.44.1",
19
- "@xyo-network/boundwitness-wrapper": "^2.44.1",
20
- "@xyo-network/diviner-model": "^2.44.1",
21
- "@xyo-network/diviner-wrapper": "^2.44.1",
22
- "@xyo-network/huri": "^2.44.1",
23
- "@xyo-network/module": "^2.44.1",
24
- "@xyo-network/module-model": "^2.44.1",
25
- "@xyo-network/payload-model": "^2.44.1",
26
- "@xyo-network/payload-wrapper": "^2.44.1",
27
- "@xyo-network/promise": "^2.44.1",
15
+ "@xyo-network/account": "^2.45.0-rc.1",
16
+ "@xyo-network/archivist": "^2.45.0-rc.1",
17
+ "@xyo-network/archivist-wrapper": "^2.45.0-rc.1",
18
+ "@xyo-network/boundwitness-model": "^2.45.0-rc.1",
19
+ "@xyo-network/boundwitness-wrapper": "^2.45.0-rc.1",
20
+ "@xyo-network/diviner-model": "^2.45.0-rc.1",
21
+ "@xyo-network/diviner-wrapper": "^2.45.0-rc.1",
22
+ "@xyo-network/huri": "^2.45.0-rc.1",
23
+ "@xyo-network/module": "^2.45.0-rc.1",
24
+ "@xyo-network/module-model": "^2.45.0-rc.1",
25
+ "@xyo-network/payload-model": "^2.45.0-rc.1",
26
+ "@xyo-network/payload-wrapper": "^2.45.0-rc.1",
27
+ "@xyo-network/promise": "^2.45.0-rc.1",
28
28
  "lodash": "^4.17.21"
29
29
  },
30
30
  "devDependencies": {
31
31
  "@types/lodash": "^4.14.191",
32
- "@xylabs/ts-scripts-yarn3": "^2.14.14",
33
- "@xylabs/tsconfig": "^2.14.14",
32
+ "@xylabs/ts-scripts-yarn3": "^2.14.15",
33
+ "@xylabs/tsconfig": "^2.14.15",
34
34
  "typescript": "^4.9.5"
35
35
  },
36
36
  "description": "Primary SDK for using XYO Protocol 2.0",
@@ -66,5 +66,6 @@
66
66
  },
67
67
  "sideEffects": false,
68
68
  "types": "dist/types/index.d.ts",
69
- "version": "2.44.1"
69
+ "version": "2.45.0-rc.1",
70
+ "stableVersion": "2.44.1"
70
71
  }
package/src/AddressHistory/MemoryAddressHistoryDiviner.ts CHANGED
@@ -3,55 +3,84 @@ import { ArchivistGetQuerySchema } from '@xyo-network/archivist'
3
3
  import { ArchivistWrapper } from '@xyo-network/archivist-wrapper'
4
4
  import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness-model'
5
5
  import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
6
+ import { DivinerConfig } from '@xyo-network/diviner-model'
7
+ import { ModuleParams } from '@xyo-network/module'
6
8
  import { XyoPayload } from '@xyo-network/payload-model'
7
9
 
8
10
  import { AbstractDiviner } from '../AbstractDiviner'
9
- import { AddressHistoryDiviner, AddressHistoryQueryPayload, isAddressHistoryQueryPayload } from './AddressHistoryDiviner'
11
+ import { AddressHistoryDiviner } from './AddressHistoryDiviner'
10
12
 
11
- export class MemoryAddressHistoryDiviner extends AbstractDiviner implements AddressHistoryDiviner {
12
- async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
13
- const query = payloads?.find<AddressHistoryQueryPayload>(isAddressHistoryQueryPayload)
14
- // TODO: Support multiple queries
15
- if (!query) return []
16
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
17
- const { address } = query
18
- const assertedAddress = assertEx(address)
13
+ export type MemoryAddressHistoryDivinerConfigSchema = 'network.xyo.diviner.address.history.memory.config'
14
+ export const MemoryAddressHistoryDivinerConfigSchema = 'network.xyo.diviner.address.history.memory.config'
15
+
16
+ export type MemoryAddressHistoryDivinerConfig = DivinerConfig<
17
+ XyoBoundWitness,
18
+ {
19
+ address: string
20
+ schema: MemoryAddressHistoryDivinerConfigSchema
21
+ }
22
+ >
23
+
24
+ // This diviner returns the most recent boundwitness signed by the address that can be found
25
+ // if multiple broken chains are found, all the heads are returned
19
26
 
20
- //only supporting single address at this point
21
- const singleAddress = assertEx((Array.isArray(assertedAddress) ? assertedAddress : [assertedAddress]).shift())
27
+ export class MemoryAddressHistoryDiviner extends AbstractDiviner<MemoryAddressHistoryDivinerConfig> implements AddressHistoryDiviner {
28
+ static override configSchema = MemoryAddressHistoryDivinerConfigSchema
22
29
 
30
+ static override async create(params?: Partial<ModuleParams<MemoryAddressHistoryDivinerConfig>>): Promise<MemoryAddressHistoryDiviner> {
31
+ return (await super.create(params)) as MemoryAddressHistoryDiviner
32
+ }
33
+
34
+ async divine(payloads?: XyoPayload[]): Promise<XyoPayload[]> {
35
+ assertEx(!payloads, 'MemoryAddressHistoryDiviner.divine does not allow payloads to be sent')
23
36
  const archivists =
24
37
  (await this.resolver?.resolve({ query: [[ArchivistGetQuerySchema]] }))?.map((archivist) => new ArchivistWrapper(archivist)) ?? []
25
38
  const bwLists = (
26
39
  await Promise.all(
27
40
  archivists.map((archivist) => {
28
- return archivist.find({ limit: 10000, schema: XyoBoundWitnessSchema }) as Promise<XyoBoundWitness[]>
41
+ //Todo: add address to filter
42
+ return archivist.find<XyoBoundWitness>({ limit: 10000, schema: XyoBoundWitnessSchema })
29
43
  }),
30
44
  )
31
45
  ).flat()
32
- const bwRecords: Record<string, BoundWitnessWrapper[]> = {}
33
- bwLists
34
- .filter((bw) => bw.addresses.includes(singleAddress))
35
- .reduce((bwRecords, bw) => {
36
- const wrapper = new BoundWitnessWrapper(bw)
37
- bwRecords[wrapper.hash] = [wrapper]
38
- return bwRecords
39
- }, bwRecords)
40
46
 
41
- return Object.values(this.buildAddressLists(singleAddress, bwRecords)).flat()
47
+ const bwRecords = this.buildWrapperRecords(bwLists)
48
+
49
+ const chains = Object.values(this.buildAddressChains(this.config.address, bwRecords))
50
+
51
+ //return the heads of each chain (get the last bw on each chain)
52
+ return chains.map((chain) => assertEx(chain.pop()))
42
53
  }
43
54
 
44
- private buildAddressLists(address: string, bwRecords: Record<string, BoundWitnessWrapper[]>): Record<string, BoundWitnessWrapper[]> {
45
- Object.entries(bwRecords).forEach(([hash, bw]) => {
46
- const single = bw[0]
47
- const prev = single.prev(address)
48
- if (prev) {
49
- if (bwRecords[prev]) {
50
- bwRecords[prev].unshift(single)
51
- delete bwRecords[hash]
55
+ private buildAddressChains(address: string, bwRecords: Record<string, BoundWitnessWrapper>): Record<string, BoundWitnessWrapper[]> {
56
+ const arrayedResult = Object.entries(bwRecords).reduce<Record<string, BoundWitnessWrapper[]>>((prev, [key, value]) => {
57
+ prev[key] = [value]
58
+ return prev
59
+ }, {})
60
+ return Object.entries(bwRecords).reduce<Record<string, BoundWitnessWrapper[]>>((prev, [key, value]) => {
61
+ //check if key is still there (may have been deleted as prevHash)
62
+ if (prev[key]) {
63
+ const previousHash = value.prev(address)
64
+ if (previousHash) {
65
+ //if we have the previousHash, move this bw to its chain
66
+ if (prev[previousHash]) {
67
+ prev[key].push(...prev[previousHash])
68
+ delete prev[previousHash]
69
+ }
52
70
  }
53
71
  }
54
- })
55
- return bwRecords
72
+ return prev
73
+ }, arrayedResult)
74
+ }
75
+
76
+ //build object with hashes as keys and wrappers as values
77
+ private buildWrapperRecords(lists: XyoBoundWitness[]) {
78
+ return lists
79
+ .filter((bw) => bw.addresses.includes(this.config.address))
80
+ .reduce<Record<string, BoundWitnessWrapper>>((bwRecords, bw) => {
81
+ const wrapper = new BoundWitnessWrapper(bw)
82
+ bwRecords[wrapper.hash] = wrapper
83
+ return bwRecords
84
+ }, {})
56
85
  }
57
86
  }
package/src/Payload/Archivist/Diviner.ts CHANGED
@@ -14,8 +14,6 @@ import { XyoArchivistPayloadDivinerConfig, XyoArchivistPayloadDivinerConfigSchem
14
14
  export class ArchivistPayloadDiviner extends AbstractPayloadDiviner<XyoArchivistPayloadDivinerConfig> {
15
15
  static override configSchema: XyoArchivistPayloadDivinerConfigSchema
16
16
 
17
- protected archivist?: PayloadArchivist | null
18
-
19
17
  static override async create(params?: ModuleParams<XyoArchivistPayloadDivinerConfig>): Promise<ArchivistPayloadDiviner> {
20
18
  return (await super.create(params)) as ArchivistPayloadDiviner
21
19
  }
@@ -26,7 +24,7 @@ export class ArchivistPayloadDiviner extends AbstractPayloadDiviner<XyoArchivist
26
24
  `no huri payloads provided: ${JSON.stringify(payloads, null, 2)}`,
27
25
  )
28
26
  const hashes = huriPayloads.map((huriPayload) => huriPayload.huri.map((huri) => new Huri(huri).hash)).flat()
29
- const activeArchivist = this.archivist
27
+ const activeArchivist = await this.archivist()
30
28
  if (activeArchivist) {
31
29
  const queryPayload = PayloadWrapper.parse<ArchivistGetQuery>({ hashes, schema: ArchivistGetQuerySchema })
32
30
  const query = await this.bindQuery(queryPayload)
@@ -39,17 +37,16 @@ export class ArchivistPayloadDiviner extends AbstractPayloadDiviner<XyoArchivist
39
37
  return [XyoDivinerDivineQuerySchema, ...super.queries()]
40
38
  }
41
39
 
42
- protected override async start() {
43
- await super.start()
40
+ protected async archivist(): Promise<PayloadArchivist | null> {
44
41
  const configArchivistAddress = this.config?.archivist
45
42
  if (configArchivistAddress) {
46
43
  const resolvedArchivist: PayloadArchivist | null = configArchivistAddress
47
- ? (this.resolver?.resolve({ address: [configArchivistAddress] }) as unknown as PayloadArchivist[]).shift() ?? null
44
+ ? ((await this.resolve({ address: [configArchivistAddress] })) as unknown as PayloadArchivist[]).shift() ?? null
48
45
  : null
49
46
  if (resolvedArchivist) {
50
- this.archivist = resolvedArchivist ? new ArchivistWrapper(resolvedArchivist) : null
47
+ return resolvedArchivist ? new ArchivistWrapper(resolvedArchivist) : null
51
48
  }
52
49
  }
53
- return this
50
+ return null
54
51
  }
55
52
  }