@xyo-network/account-model 2.63.0 → 2.63.1

package/dist/types/Account.d.ts

@@ -1,5 +1,5 @@
 import { Data, DataLike } from '@xyo-network/core';
-import { AddressValueInstance, KeyPairInstance } from '@xyo-network/key-model';
+import { KeyPairInstance } from '@xyo-network/key-model';
 import { PreviousHashStore } from '@xyo-network/previous-hash-store-model';
 export declare const ethMessagePrefix = "\u0019Ethereum Signed Message:\n";
 export interface PhraseInitializationConfig {
@@ -19,21 +19,20 @@ export type InitializationConfig = PhraseInitializationConfig | PrivateKeyInitia
 export type AccountConfig = InitializationConfig & AccountOptions;
 export interface AccountInstance extends KeyPairInstance {
     address: string;
-    derivePath?: (path: string) => Promise<AccountInstance>;
-    loadPreviousHash: (previousHash?: Uint8Array | string) => Promise<AccountInstance>;
-    get addressValue(): AddressValueInstance;
-    get previousHash(): Data | undefined;
-    sign(hash: Uint8Array | string, previousHash: string | Data | undefined): Uint8Array | Promise<Uint8Array>;
-    verify(msg: Uint8Array | string, signature: Uint8Array | string): boolean | Promise<boolean>;
-    verifyUniqueAddress(): AccountInstance;
+    addressBytes: Data | undefined;
+    previousHash: string | undefined;
+    previousHashBytes: Data | undefined;
+    sign: (hash: DataLike, previousHash: DataLike | undefined) => Uint8Array | Promise<Uint8Array>;
+    verify: (msg: DataLike, signature: DataLike) => boolean | Promise<boolean>;
 }
-export interface AccountStatic {
+export interface AccountStatic<T extends AccountInstance = AccountInstance> {
     previousHashStore?: PreviousHashStore;
-    create(opts?: AccountConfig): Promise<AccountInstance>;
-    fromMnemonic(mnemonic: string, path?: string): Promise<AccountInstance>;
+    new (key: unknown, params?: AccountConfig): T;
+    create(opts?: AccountConfig): Promise<T>;
+    fromMnemonic(mnemonic: string, path?: string): Promise<T>;
     fromPhrase(phrase: string): Promise<AccountInstance>;
-    fromPrivateKey(key: Uint8Array | string): Promise<AccountInstance>;
-    isXyoWallet(value: unknown): boolean;
+    fromPrivateKey(key: DataLike): Promise<AccountInstance>;
+    is(value: unknown): T | undefined;
     random(): AccountInstance;
 }
 //# sourceMappingURL=Account.d.ts.map

package/dist/types/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAE1E,eAAO,MAAM,gBAAgB,qCAAmC,CAAA;AAEhE,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,8BAA8B;IAC7C,UAAU,EAAE,QAAQ,CAAA;CACrB;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AACD,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,GAAG,8BAA8B,GAAG,4BAA4B,CAAA;AAE7H,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,cAAc,CAAA;AAEjE,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;IACvD,gBAAgB,EAAE,CAAC,YAAY,CAAC,EAAE,UAAU,GAAG,MAAM,KAAK,OAAO,CAAC,eAAe,CAAC,CAAA;IAClF,IAAI,YAAY,IAAI,oBAAoB,CAAA;IACxC,IAAI,YAAY,IAAI,IAAI,GAAG,SAAS,CAAA;IACpC,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC1G,MAAM,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC5F,mBAAmB,IAAI,eAAe,CAAA;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACtD,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACvE,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACpD,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IAClE,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAA;IACpC,MAAM,IAAI,eAAe,CAAA;CAC1B"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../../src/Account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAA;AAE1E,eAAO,MAAM,gBAAgB,qCAAmC,CAAA;AAEhE,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,8BAA8B;IAC7C,UAAU,EAAE,QAAQ,CAAA;CACrB;AACD,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AACD,MAAM,WAAW,cAAc;IAC7B,YAAY,CAAC,EAAE,UAAU,GAAG,MAAM,CAAA;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG,0BAA0B,GAAG,8BAA8B,GAAG,4BAA4B,CAAA;AAE7H,MAAM,MAAM,aAAa,GAAG,oBAAoB,GAAG,cAAc,CAAA;AAEjE,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,IAAI,GAAG,SAAS,CAAA;IAC9B,YAAY,EAAE,MAAM,GAAG,SAAS,CAAA;IAChC,iBAAiB,EAAE,IAAI,GAAG,SAAS,CAAA;IACnC,IAAI,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,QAAQ,GAAG,SAAS,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAAA;IAC9F,MAAM,EAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;CAC3E;AAED,MAAM,WAAW,aAAa,CAAC,CAAC,SAAS,eAAe,GAAG,eAAe;IACxE,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;IACrC,KAAK,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,aAAa,GAAG,CAAC,CAAA;IAC7C,MAAM,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACxC,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACzD,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACpD,cAAc,CAAC,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,CAAA;IACvD,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,CAAC,GAAG,SAAS,CAAA;IACjC,MAAM,IAAI,eAAe,CAAA;CAC1B"}

package/package.json

@@ -10,9 +10,9 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "^2.63.0",
-    "@xyo-network/key-model": "^2.63.0",
-    "@xyo-network/previous-hash-store-model": "^2.63.0"
+    "@xyo-network/core": "^2.63.1",
+    "@xyo-network/key-model": "^2.63.1",
+    "@xyo-network/previous-hash-store-model": "^2.63.1"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "devDependencies": {
@@ -52,5 +52,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.63.0"
+  "version": "2.63.1"
 }

package/src/Account.ts

@@ -1,5 +1,5 @@
 import { Data, DataLike } from '@xyo-network/core'
-import { AddressValueInstance, KeyPairInstance } from '@xyo-network/key-model'
+import { KeyPairInstance } from '@xyo-network/key-model'
 import { PreviousHashStore } from '@xyo-network/previous-hash-store-model'
 
 export const ethMessagePrefix = '\x19Ethereum Signed Message:\n'
@@ -24,21 +24,20 @@ export type AccountConfig = InitializationConfig & AccountOptions
 
 export interface AccountInstance extends KeyPairInstance {
   address: string
-  derivePath?: (path: string) => Promise<AccountInstance>
-  loadPreviousHash: (previousHash?: Uint8Array | string) => Promise<AccountInstance>
-  get addressValue(): AddressValueInstance
-  get previousHash(): Data | undefined
-  sign(hash: Uint8Array | string, previousHash: string | Data | undefined): Uint8Array | Promise<Uint8Array>
-  verify(msg: Uint8Array | string, signature: Uint8Array | string): boolean | Promise<boolean>
-  verifyUniqueAddress(): AccountInstance
+  addressBytes: Data | undefined
+  previousHash: string | undefined
+  previousHashBytes: Data | undefined
+  sign: (hash: DataLike, previousHash: DataLike | undefined) => Uint8Array | Promise<Uint8Array>
+  verify: (msg: DataLike, signature: DataLike) => boolean | Promise<boolean>
 }
 
-export interface AccountStatic {
+export interface AccountStatic<T extends AccountInstance = AccountInstance> {
   previousHashStore?: PreviousHashStore
-  create(opts?: AccountConfig): Promise<AccountInstance>
-  fromMnemonic(mnemonic: string, path?: string): Promise<AccountInstance>
+  new (key: unknown, params?: AccountConfig): T
+  create(opts?: AccountConfig): Promise<T>
+  fromMnemonic(mnemonic: string, path?: string): Promise<T>
   fromPhrase(phrase: string): Promise<AccountInstance>
-  fromPrivateKey(key: Uint8Array | string): Promise<AccountInstance>
-  isXyoWallet(value: unknown): boolean
+  fromPrivateKey(key: DataLike): Promise<AccountInstance>
+  is(value: unknown): T | undefined
   random(): AccountInstance
 }