@xyo-network/core 2.20.45 → 2.21.0

package/dist/esm/lib/dns/domainResolve.d.ts

@@ -1,8 +1,8 @@
-import { DnsRecordType } from './DnsRecordType';
-/**
- * Resolves DNS information (resolves using DNS)
- * @param domain - string
- * @returns GoogleDnsResult
- */
-declare const domainResolve: (domain?: string, type?: DnsRecordType) => Promise<import("./GoogleDnsResult").GoogleDnsResult | undefined>;
-export { domainResolve };
+import { DnsRecordType } from './DnsRecordType';
+/**
+ * Resolves DNS information (resolves using DNS)
+ * @param domain - string
+ * @returns GoogleDnsResult
+ */
+declare const domainResolve: (domain?: string, type?: DnsRecordType) => Promise<import("./GoogleDnsResult").GoogleDnsResult | undefined>;
+export { domainResolve };

package/dist/esm/lib/dns/domainResolve.js

@@ -1,15 +1,15 @@
-import { DnsRecordType } from './DnsRecordType';
-import { googleDnsOverHttps } from './googleDnsOverHttps';
-/**
- * Resolves DNS information (resolves using DNS)
- * @param domain - string
- * @returns GoogleDnsResult
- */
-const domainResolve = async (domain, type = DnsRecordType.A) => {
-    if (domain) {
-        const dnsResult = await googleDnsOverHttps(domain, type);
-        return dnsResult;
-    }
-};
-export { domainResolve };
+import { DnsRecordType } from './DnsRecordType';
+import { googleDnsOverHttps } from './googleDnsOverHttps';
+/**
+ * Resolves DNS information (resolves using DNS)
+ * @param domain - string
+ * @returns GoogleDnsResult
+ */
+const domainResolve = async (domain, type = DnsRecordType.A) => {
+    if (domain) {
+        const dnsResult = await googleDnsOverHttps(domain, type);
+        return dnsResult;
+    }
+};
+export { domainResolve };
 //# sourceMappingURL=domainResolve.js.map

package/dist/esm/lib/dns/googleDnsOverHttps.d.ts

@@ -1,4 +1,4 @@
-import { DnsRecordType } from './DnsRecordType';
-import { GoogleDnsResult } from './GoogleDnsResult';
-declare const googleDnsOverHttps: (name: string, type?: DnsRecordType) => Promise<GoogleDnsResult>;
-export { googleDnsOverHttps };
+import { DnsRecordType } from './DnsRecordType';
+import { GoogleDnsResult } from './GoogleDnsResult';
+declare const googleDnsOverHttps: (name: string, type?: DnsRecordType) => Promise<GoogleDnsResult>;
+export { googleDnsOverHttps };

package/dist/esm/lib/dns/googleDnsOverHttps.js

@@ -1,7 +1,7 @@
-import axios from 'axios';
-import { DnsRecordType } from './DnsRecordType';
-const googleDnsOverHttps = async (name, type = DnsRecordType.A) => {
-    return (await axios.get(`https://dns.google/resolve?name=${name}&type=${type}`)).data;
-};
-export { googleDnsOverHttps };
+import axios from 'axios';
+import { DnsRecordType } from './DnsRecordType';
+const googleDnsOverHttps = async (name, type = DnsRecordType.A) => {
+    return (await axios.get(`https://dns.google/resolve?name=${name}&type=${type}`)).data;
+};
+export { googleDnsOverHttps };
 //# sourceMappingURL=googleDnsOverHttps.js.map

package/dist/esm/lib/dns/index.d.ts

@@ -1,8 +1,8 @@
-export * from './DnsRecordType';
-export * from './DnsReturnCode';
-export * from './domainExists';
-export * from './domainResolve';
-export * from './googleDnsOverHttps';
-export * from './GoogleDnsResult';
-export * from './GoogleDnsResultAnswer';
-export * from './GoogleDnsResultQuestion';
+export * from './DnsRecordType';
+export * from './DnsReturnCode';
+export * from './domainExists';
+export * from './domainResolve';
+export * from './googleDnsOverHttps';
+export * from './GoogleDnsResult';
+export * from './GoogleDnsResultAnswer';
+export * from './GoogleDnsResultQuestion';

package/dist/esm/lib/dns/index.js

@@ -1,9 +1,9 @@
-export * from './DnsRecordType';
-export * from './DnsReturnCode';
-export * from './domainExists';
-export * from './domainResolve';
-export * from './googleDnsOverHttps';
-export * from './GoogleDnsResult';
-export * from './GoogleDnsResultAnswer';
-export * from './GoogleDnsResultQuestion';
+export * from './DnsRecordType';
+export * from './DnsReturnCode';
+export * from './domainExists';
+export * from './domainResolve';
+export * from './googleDnsOverHttps';
+export * from './GoogleDnsResult';
+export * from './GoogleDnsResultAnswer';
+export * from './GoogleDnsResultQuestion';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/dumpErrors.d.ts

@@ -1,2 +1,2 @@
-declare const dumpErrors: (errors: Error[]) => void;
-export { dumpErrors };
+declare const dumpErrors: (errors: Error[]) => void;
+export { dumpErrors };

package/dist/esm/lib/dumpErrors.js

@@ -1,7 +1,7 @@
-const dumpErrors = (errors) => {
-    errors.forEach((error) => {
-        console.log(error);
-    });
-};
-export { dumpErrors };
+const dumpErrors = (errors) => {
+    errors.forEach((error) => {
+        console.log(error);
+    });
+};
+export { dumpErrors };
 //# sourceMappingURL=dumpErrors.js.map

package/dist/esm/lib/exists.d.ts

@@ -1 +1 @@
-export declare const exists: <T>(x: T | null | undefined) => x is T;
+export declare const exists: <T>(x: T | null | undefined) => x is T;

package/dist/esm/lib/exists.js

@@ -1,4 +1,4 @@
-export const exists = (x) => {
-    return !!x;
-};
+export const exists = (x) => {
+    return !!x;
+};
 //# sourceMappingURL=exists.js.map

package/dist/esm/lib/index.d.ts

@@ -1,4 +1,7 @@
-export * from './dns';
-export * from './dumpErrors';
-export * from './isBrowser';
-export * from './typeOf';
+export * from './dns';
+export * from './dumpErrors';
+export * from './isBrowser';
+export * from './StringKeyObject';
+export * from './typeOf';
+export * from './XyoObject';
+export * from './XyoValidator';

package/dist/esm/lib/index.js

@@ -1,5 +1,8 @@
-export * from './dns';
-export * from './dumpErrors';
-export * from './isBrowser';
-export * from './typeOf';
+export * from './dns';
+export * from './dumpErrors';
+export * from './isBrowser';
+export * from './StringKeyObject';
+export * from './typeOf';
+export * from './XyoObject';
+export * from './XyoValidator';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/index.ts"],"names":[],"mappings":"AAAA,cAAc,OAAO,CAAA;AACrB,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,mBAAmB,CAAA;AACjC,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}

package/dist/esm/lib/isBrowser.d.ts

@@ -1 +1 @@
-export declare const isBrowser: () => boolean;
+export declare const isBrowser: () => boolean;

package/dist/esm/lib/isBrowser.js

@@ -1,4 +1,4 @@
-export const isBrowser = () => {
-    return typeof process === 'undefined';
-};
+export const isBrowser = () => {
+    return typeof process === 'undefined';
+};
 //# sourceMappingURL=isBrowser.js.map

package/dist/esm/lib/isXyoPayloadOfSchemaType.d.ts

@@ -1,6 +1,6 @@
-import { XyoBoundWitness } from '../BoundWitness';
-import { XyoPayload } from '../Payload';
-import { XyoSchemaPayload } from '../Schema';
-export declare const isXyoPayloadOfSchemaType: <T extends import("../Payload").XyoPayloadFull>(schema: string) => (x: XyoPayload) => x is T;
-export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;
-export declare const isXyoBoundWitnessPayload: (x: XyoPayload) => x is XyoBoundWitness;
+import { XyoBoundWitness } from '../BoundWitness';
+import { XyoPayload } from '../models';
+import { XyoSchemaPayload } from '../Schema';
+export declare const isXyoPayloadOfSchemaType: <T extends XyoPayload<object>>(schema: string) => (x: XyoPayload) => x is T;
+export declare const isXyoSchemaPayload: (x: XyoPayload) => x is XyoSchemaPayload;
+export declare const isXyoBoundWitnessPayload: (x: XyoPayload) => x is XyoBoundWitness<import("../BoundWitness").XyoBoundWitnessBase>;

package/dist/esm/lib/isXyoPayloadOfSchemaType.js

@@ -1,6 +1,6 @@
-export const isXyoPayloadOfSchemaType = (schema) => {
-    return (x) => x.schema === schema;
-};
-export const isXyoSchemaPayload = isXyoPayloadOfSchemaType('network.xyo.schema');
-export const isXyoBoundWitnessPayload = isXyoPayloadOfSchemaType('network.xyo.boundwitness');
+export const isXyoPayloadOfSchemaType = (schema) => {
+    return (x) => x.schema === schema;
+};
+export const isXyoSchemaPayload = isXyoPayloadOfSchemaType('network.xyo.schema');
+export const isXyoBoundWitnessPayload = isXyoPayloadOfSchemaType('network.xyo.boundwitness');
 //# sourceMappingURL=isXyoPayloadOfSchemaType.js.map

package/dist/esm/lib/typeOf/TypeOfTypes.d.ts

@@ -1 +1 @@
-export declare type TypeOfTypes = 'string' | 'number' | 'object' | 'array' | 'buffer' | 'null' | 'undefined' | 'bigint' | 'boolean' | 'function' | 'symbol';
+export declare type TypeOfTypes = 'string' | 'number' | 'object' | 'array' | 'buffer' | 'null' | 'undefined' | 'bigint' | 'boolean' | 'function' | 'symbol';

package/dist/esm/lib/typeOf/TypeOfTypes.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=TypeOfTypes.js.map

package/dist/esm/lib/typeOf/ifDefined.d.ts

@@ -1 +1 @@
-export declare const ifDefined: <T>(value: T, func: (value: T) => void) => T | undefined;
+export declare const ifDefined: <T>(value: T, func: (value: T) => void) => T | undefined;

package/dist/esm/lib/typeOf/ifDefined.js

@@ -1,12 +1,12 @@
-import { typeOf } from './typeOf';
-export const ifDefined = (value, func) => {
-    switch (typeOf(value)) {
-        case 'undefined':
-        case 'null':
-            break;
-        default:
-            func(value);
-            return value;
-    }
-};
+import { typeOf } from './typeOf';
+export const ifDefined = (value, func) => {
+    switch (typeOf(value)) {
+        case 'undefined':
+        case 'null':
+            break;
+        default:
+            func(value);
+            return value;
+    }
+};
 //# sourceMappingURL=ifDefined.js.map

package/dist/esm/lib/typeOf/ifTypeOf.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const ifTypeOf: <T, R>(typeName: TypeOfTypes, value: unknown, trueFunc: (value: T) => R, isFunc?: ((value: T) => boolean) | undefined) => R | undefined;
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const ifTypeOf: <T, R>(typeName: TypeOfTypes, value: unknown, trueFunc: (value: T) => R, isFunc?: ((value: T) => boolean) | undefined) => R | undefined;

package/dist/esm/lib/typeOf/ifTypeOf.js

@@ -1,8 +1,8 @@
-import { typeOf } from './typeOf';
-export const ifTypeOf = (typeName, value, trueFunc, isFunc) => {
-    switch (typeOf(value)) {
-        case typeName:
-            return !isFunc || isFunc(value) ? trueFunc(value) : undefined;
-    }
-};
+import { typeOf } from './typeOf';
+export const ifTypeOf = (typeName, value, trueFunc, isFunc) => {
+    switch (typeOf(value)) {
+        case typeName:
+            return !isFunc || isFunc(value) ? trueFunc(value) : undefined;
+    }
+};
 //# sourceMappingURL=ifTypeOf.js.map

package/dist/esm/lib/typeOf/index.d.ts

@@ -1,5 +1,5 @@
-export * from './ifDefined';
-export * from './ifTypeOf';
-export * from './typeOf';
-export * from './TypeOfTypes';
-export * from './validateType';
+export * from './ifDefined';
+export * from './ifTypeOf';
+export * from './typeOf';
+export * from './TypeOfTypes';
+export * from './validateType';

package/dist/esm/lib/typeOf/index.js

@@ -1,6 +1,6 @@
-export * from './ifDefined';
-export * from './ifTypeOf';
-export * from './typeOf';
-export * from './TypeOfTypes';
-export * from './validateType';
+export * from './ifDefined';
+export * from './ifTypeOf';
+export * from './typeOf';
+export * from './TypeOfTypes';
+export * from './validateType';
 //# sourceMappingURL=index.js.map

package/dist/esm/lib/typeOf/typeOf.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const typeOf: <T>(item: T) => TypeOfTypes;
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const typeOf: <T>(item: T) => TypeOfTypes;

package/dist/esm/lib/typeOf/typeOf.js

@@ -1,4 +1,4 @@
-export const typeOf = (item) => {
-    return Array.isArray(item) ? 'array' : typeof item;
-};
+export const typeOf = (item) => {
+    return Array.isArray(item) ? 'array' : typeof item;
+};
 //# sourceMappingURL=typeOf.js.map

package/dist/esm/lib/typeOf/validateType.d.ts

@@ -1,2 +1,2 @@
-import { TypeOfTypes } from './TypeOfTypes';
-export declare const validateType: <T>(typeName: TypeOfTypes, value: T, optional?: boolean) => [T | undefined, Error[]];
+import { TypeOfTypes } from './TypeOfTypes';
+export declare const validateType: <T>(typeName: TypeOfTypes, value: T, optional?: boolean) => [T | undefined, Error[]];

package/dist/esm/lib/typeOf/validateType.js

@@ -1,14 +1,14 @@
-import { typeOf } from './typeOf';
-export const validateType = (typeName, value, optional = false) => {
-    switch (typeOf(value)) {
-        case typeName:
-            return [value, []];
-        default: {
-            if (optional && typeOf(value) === 'undefined') {
-                return [value, []];
-            }
-            return [undefined, [Error(`value type is not '${typeName}:${typeof value}'`)]];
-        }
-    }
-};
+import { typeOf } from './typeOf';
+export const validateType = (typeName, value, optional = false) => {
+    switch (typeOf(value)) {
+        case typeName:
+            return [value, []];
+        default: {
+            if (optional && typeOf(value) === 'undefined') {
+                return [value, []];
+            }
+            return [undefined, [Error(`value type is not '${typeName}:${typeof value}'`)]];
+        }
+    }
+};
 //# sourceMappingURL=validateType.js.map

package/dist/esm/models/Base.d.ts

@@ -0,0 +1,6 @@
+export interface XyoPayloadBase {
+    schema: string;
+    previousHash?: string;
+    sources?: string[];
+    timestamp?: number;
+}

package/dist/esm/models/Base.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Base.js.map

package/dist/esm/models/Base.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Base.js","sourceRoot":"","sources":["../../../src/models/Base.ts"],"names":[],"mappings":""}

package/dist/esm/models/Meta.d.ts

@@ -0,0 +1,15 @@
+import { XyoPayloadBase } from './Base';
+import { XyoPayload } from './XyoPayload';
+export interface XyoPayloadMetaBase {
+    _hash: string;
+    _observeDuration?: number;
+    _archive: string;
+    _client?: string;
+    _reportedHash?: string;
+    _timestamp: number;
+    _sources?: XyoPayload[];
+}
+export declare type XyoPayloadMeta<T = unknown> = T & XyoPayloadMetaBase;
+export declare type XyoPartialPayloadMeta<T = unknown> = T & Partial<XyoPayloadMetaBase>;
+export declare type XyoPayloadWithMeta<T = unknown> = T & XyoPayloadMetaBase & XyoPayloadBase;
+export declare type XyoPayloadWithPartialMeta<T = unknown> = T & Partial<XyoPayloadMetaBase> & XyoPayloadBase;

package/dist/esm/models/Meta.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Meta.js.map

package/dist/esm/models/Meta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Meta.js","sourceRoot":"","sources":["../../../src/models/Meta.ts"],"names":[],"mappings":""}

package/dist/esm/models/WithStringIndex.d.ts

@@ -1 +1 @@
-export declare type WithStringIndex<T> = T & Record<string, unknown>;
+export declare type WithStringIndex<T> = T & Record<string, unknown>;

package/dist/esm/models/WithStringIndex.js

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=WithStringIndex.js.map

package/dist/esm/models/XyoPayload.d.ts

@@ -0,0 +1,2 @@
+import { XyoPayloadBase } from './Base';
+export declare type XyoPayload<T extends object = object> = T & XyoPayloadBase;

package/dist/esm/models/XyoPayload.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=XyoPayload.js.map

package/dist/esm/models/XyoPayload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"XyoPayload.js","sourceRoot":"","sources":["../../../src/models/XyoPayload.ts"],"names":[],"mappings":""}

package/dist/esm/models/index.d.ts

@@ -1 +1,3 @@
-export * from './WithStringIndex';
+export * from './Base';
+export * from './Meta';
+export * from './XyoPayload';

package/dist/esm/models/index.js

@@ -1,2 +1,4 @@
-export * from './WithStringIndex';
+export * from './Base';
+export * from './Meta';
+export * from './XyoPayload';
 //# sourceMappingURL=index.js.map

package/dist/esm/models/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/models/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAA;AACtB,cAAc,QAAQ,CAAA;AACtB,cAAc,cAAc,CAAA"}

package/dist/esm/nodeIndex.d.ts

@@ -1 +1 @@
-export * from './shared';
+export * from './shared';

package/dist/esm/nodeIndex.js

@@ -1,2 +1,2 @@
-export * from './shared';
+export * from './shared';
 //# sourceMappingURL=nodeIndex.js.map

package/dist/esm/shared.d.ts

@@ -1,11 +1,11 @@
-export * from './BoundWitness';
-export * from './Hasher';
-export * from './Huri';
-export * from './lib';
-export * from './models';
-export * from './Payload';
-export * from './Query';
-export * from './Schema';
-export * from './SchemaNameValidator';
-export * from './Wallet';
-export * from './Witness';
+export * from './BoundWitness';
+export * from './Hasher';
+export * from './Huri';
+export * from './lib';
+export * from './Payload';
+export * from './Query';
+export * from './Schema';
+export * from './SchemaNameValidator';
+export * from './Wallet';
+export * from './Witness';
+export * from './models';

package/dist/esm/shared.js

@@ -1,12 +1,12 @@
-export * from './BoundWitness';
-export * from './Hasher';
-export * from './Huri';
-export * from './lib';
-export * from './models';
-export * from './Payload';
-export * from './Query';
-export * from './Schema';
-export * from './SchemaNameValidator';
-export * from './Wallet';
-export * from './Witness';
+export * from './BoundWitness';
+export * from './Hasher';
+export * from './Huri';
+export * from './lib';
+export * from './Payload';
+export * from './Query';
+export * from './Schema';
+export * from './SchemaNameValidator';
+export * from './Wallet';
+export * from './Witness';
+export * from './models';
 //# sourceMappingURL=shared.js.map

package/dist/esm/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/shared.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,OAAO,CAAA;AACrB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,uBAAuB,CAAA;AACrC,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/shared.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,UAAU,CAAA;AACxB,cAAc,QAAQ,CAAA;AACtB,cAAc,OAAO,CAAA;AACrB,cAAc,WAAW,CAAA;AACzB,cAAc,SAAS,CAAA;AACvB,cAAc,UAAU,CAAA;AACxB,cAAc,uBAAuB,CAAA;AACrC,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,UAAU,CAAA"}

package/package.json

@@ -9,7 +9,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/sdk-js": "^2.5.7",
+    "@xylabs/sdk-js": "^2.5.9",
     "axios": "^0.27.2",
     "elliptic": "^6.5.4",
     "keccak256": "^1.0.6",
@@ -19,18 +19,12 @@
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
-    "@babel/core": "^7.18.2",
-    "@babel/preset-env": "^7.18.2",
     "@types/elliptic": "^6.4.14",
     "@types/lodash": "^4.14.182",
-    "@types/node": "^17.0.41",
+    "@types/node": "^18.0.0",
     "@types/sha.js": "^2.4.0",
     "@types/ua-parser-js": "^0.7.36",
-    "@xylabs/eslint-config": "^2.3.22",
-    "@xylabs/ts-scripts": "^1.0.66",
-    "license-checker": "^25.0.1",
-    "tslib": "^2.4.0",
-    "typescript": "^4.7.3"
+    "tslib": "^2.4.0"
   },
   "browser": "dist/esm/browserIndex.js",
   "docs": "dist/docs.json",
@@ -63,12 +57,8 @@
     "type": "git",
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
-  "scripts": {
-    "lint-pkg": "npmPkgJsonLint .",
-    "license": "yarn license-checker --exclude \"MIT, ISC, Apache-2.0, BSD, BSD-2-Clause, CC-BY-4.0, Unlicense, CC-BY-3.0, CC0-1.0\""
-  },
   "sideEffects": true,
   "types": "dist/esm/index.d.ts",
-  "version": "2.20.45",
+  "version": "2.21.0",
   "packageManager": "yarn@3.1.1"
 }

package/src/BoundWitness/Builder/Builder.spec.ts

@@ -1,12 +1,13 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix */
 /* eslint-disable sort-keys */
 import { XyoHasher } from '../../Hasher'
-import { XyoPayload } from '../../Payload'
+import { StringKeyObject } from '../../lib'
+import { XyoPayload } from '../../models'
 import { XyoAccount, XyoAddressValue } from '../../Wallet'
 import { XyoBoundWitnessBuilder } from './Builder'
 
 const schema = 'network.xyo.temp'
-const payload1: XyoPayload = {
+const payload1: XyoPayload<StringKeyObject> = {
   number_field: 1,
   object_field: {
     number_value: 2,
@@ -16,7 +17,7 @@ const payload1: XyoPayload = {
   string_field: 'there',
   timestamp: 1618603439107,
 }
-const payload2: XyoPayload = {
+const payload2: XyoPayload<StringKeyObject> = {
   timestamp: 1618603439107,
   string_field: 'there',
   schema,

package/src/BoundWitness/Builder/Builder.ts

@@ -1,9 +1,9 @@
 import { assertEx, Buffer } from '@xylabs/sdk-js'
 
 import { sortFields, XyoHasher } from '../../Hasher'
-import { XyoPayload, XyoPayloadBody } from '../../Payload'
+import { XyoPayload, XyoPayloadWithPartialMeta } from '../../models'
 import { XyoAccount } from '../../Wallet'
-import { XyoBoundWitness } from '../models'
+import { WithXyoBoundWitnessMeta, XyoBoundWitness, XyoBoundWitnessWithPartialMeta } from '../models'
 
 export interface XyoBoundWitnessBuilderConfig {
   /** Whether or not the payloads should be included in the metadata sent to and recorded by the ArchivistApi */
@@ -28,7 +28,7 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payloads(payloads: (XyoPayload | null)[]) {
+  public payloads(payloads: (XyoPayloadWithPartialMeta | null)[]) {
     payloads.forEach((payload) => {
       if (payload !== null) {
         this.payload(payload)
@@ -37,7 +37,7 @@ export class XyoBoundWitnessBuilder {
     return this
   }
 
-  public payload(payload?: XyoPayload) {
+  public payload(payload?: XyoPayloadWithPartialMeta) {
     if (payload) {
       this._payload_schemas.push(payload.schema)
       this._payloads.push(assertEx(sortFields(payload)))
@@ -62,7 +62,7 @@ export class XyoBoundWitnessBuilder {
   }
 
   private inlinePayloads() {
-    return this._payloads.map<XyoPayloadBody>((payload, index) => {
+    return this._payloads.map<XyoPayload>((payload, index) => {
       return {
         ...payload,
         schema: this._payload_schemas[index],
@@ -70,11 +70,11 @@ export class XyoBoundWitnessBuilder {
     })
   }
 
-  public build(): XyoBoundWitness {
+  public build(): XyoBoundWitnessWithPartialMeta {
     const hashableFields = this.hashableFields() as unknown as Record<string, unknown>
     const _hash = new XyoHasher(hashableFields).hash
 
-    const ret = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() } as XyoBoundWitness
+    const ret = { ...hashableFields, _client: 'js', _hash, _signatures: this.signatures(_hash), _timestamp: Date.now() } as WithXyoBoundWitnessMeta<XyoBoundWitness>
     if (this.config.inlinePayloads) {
       ret._payloads = this.inlinePayloads()
     }