@leofcoin/peernet 1.1.55 → 1.1.57

package/exports/browser/peernet.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import '@vandeurenglenn/debug';
+import PubSub from '@vandeurenglenn/little-pubsub';
 import PeerDiscovery from './discovery/peer-discovery.js';
 import DHT from './dht/dht.js';
 import MessageHandler from './handlers/message.js';
@@ -7,6 +8,18 @@ import LeofcoinStorageClass from '@leofcoin/storage';
 import Identity from './identity.js';
 import swarm from '@netpeer/p2pt-swarm';
 import P2PTPeer from '@netpeer/p2pt-swarm/peer';
+declare global {
+    var LeofcoinStorage: typeof LeofcoinStorageClass;
+    var peernet: Peernet;
+    var pubsub: PubSub;
+    var globalSub: PubSub;
+    var blockStore: LeofcoinStorageClass;
+    var transactionStore: LeofcoinStorageClass;
+    var messageStore: LeofcoinStorageClass;
+    var dataStore: LeofcoinStorageClass;
+    var walletStore: LeofcoinStorageClass;
+    var chainStore: LeofcoinStorageClass;
+}
 /**
  * @access public
  * @example
@@ -54,8 +67,10 @@ export default class Peernet {
      */
     constructor(options: any, password: any);
     get id(): string;
+    get selectedAccount(): string;
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     get defaultStores(): string[];
+    selectAccount(account: string): Promise<void> | Promise<IDBValidKey> | Promise<any[]>;
     addProto(name: any, proto: any): void;
     addCodec(codec: any): any;
     addStore(name: any, prefix: any, root: any, isPrivate?: boolean): Promise<void>;
@@ -74,7 +89,7 @@ export default class Peernet {
     /**
      * @return {String} id - peerId
      */
-    getConnection(id: any): any;
+    getConnection(id: any): P2PTPeer;
     /**
      * @private
      *
@@ -83,7 +98,10 @@ export default class Peernet {
      *
      * @return {Promise} instance of Peernet
      */
-    _init(options: any, password: any): Promise<Peernet>;
+    _init(options: {
+        storePrefix?: string;
+        root?: string;
+    }, password: string): Promise<Peernet>;
     start(): Promise<void>;
     addRequestHandler(name: any, method: any): void;
     sendMessage(peer: any, id: any, data: any): Promise<void>;
@@ -111,13 +129,13 @@ export default class Peernet {
     providersFor(hash: string, store?: undefined): Promise<import("./dht/dht.js").DHTProviderMapValue>;
     get block(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<any>;
-        has: (hash: string) => Promise<any>;
+        put: (hash: string, data: Uint8Array) => Promise<void | any[] | IDBValidKey>;
+        has: (hash: string) => Promise<boolean | any[]>;
     };
     get transaction(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<any>;
-        has: (hash: string) => Promise<any>;
+        put: (hash: string, data: Uint8Array) => Promise<void | any[] | IDBValidKey>;
+        has: (hash: string) => Promise<boolean | any[]>;
     };
     requestData(hash: any, store: any): any;
     get message(): {
@@ -133,12 +151,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} message
          */
-        put: (hash: any, message: any) => Promise<any>;
+        put: (hash: any, message: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     get data(): {
         /**
@@ -153,12 +171,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<any>;
+        put: (hash: any, data: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     get folder(): {
         /**
@@ -173,12 +191,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<any>;
+        put: (hash: any, data: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     addFolder(files: any): Promise<any>;
     ls(hash: any, options: any): Promise<any[]>;
@@ -203,7 +221,7 @@ export default class Peernet {
      * @param {Buffer} data
      * @param {String} storeName - storeName to access
      */
-    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<any>;
+    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<void | any[] | IDBValidKey>;
     /**
      * @param {String} hash
      * @return {Boolean}
@@ -221,6 +239,6 @@ export default class Peernet {
      * @param {Method} cb
      */
     subscribe(topic: string, callback: Function): Promise<void>;
-    removePeer(peer: any): Promise<any>;
+    removePeer(peer: any): Promise<boolean>;
     get Buffer(): BufferConstructor;
 }

package/exports/browser/peernet.js

@@ -1,2 +1,2 @@
-export { P as default } from './peernet-d5023a29.js';
+export { P as default } from './peernet-bfbe6fff.js';
 import './value-4e80eeeb.js';

package/exports/peernet.js

@@ -5,7 +5,7 @@ import LeofcoinStorageClass from '@leofcoin/storage';
 import { utils } from '@leofcoin/codecs';
 import MultiWallet from '@leofcoin/multi-wallet';
 import base58 from '@vandeurenglenn/base58';
-import { decrypt, encrypt } from '@leofcoin/identity-utils';
+import { decrypt } from '@leofcoin/identity-utils';
 import QrScanner from 'qr-scanner';
 import qrcode from 'qrcode';
 
@@ -308,6 +308,7 @@ class Identity {
     #wallet;
     network;
     id;
+    selectedAccount;
     constructor(network) {
         this.network = network;
     }
@@ -330,6 +331,7 @@ class Identity {
             }
         }
         if (!password) {
+            // @ts-ignore
             const importee = await import('./src/prompts/password.js');
             password = await importee.default();
         }
@@ -338,7 +340,7 @@ class Identity {
             const pub = await globalThis.accountStore.get('public');
             this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
             const selected = await globalThis.walletStore.get('selected-account');
-            globalThis.peernet.selectedAccount = new TextDecoder().decode(selected);
+            this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
             const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account');
@@ -348,7 +350,7 @@ class Identity {
             await globalThis.walletStore.put('accounts', JSON.stringify(accounts));
             await globalThis.walletStore.put('selected-account', accounts[0][1]);
             await globalThis.walletStore.put('identity', JSON.stringify(identity));
-            globalThis.peernet.selectedAccount = accounts[0][1];
+            this.selectedAccount = accounts[0][1];
             this.id = identity.walletId;
         }
         const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')));
@@ -356,25 +358,31 @@ class Identity {
         const multiWIF = await decrypt(password, base58.decode(identity.multiWIF));
         await this.#wallet.fromMultiWif(multiWIF);
     }
+    selectAccount(account) {
+        this.selectedAccount = account;
+        return walletStore.put('selected-account', account);
+    }
     sign(hash) {
         return this.#wallet.sign(hash.subarray(0, 32));
     }
+    lock(password) {
+        this.#wallet.lock(password);
+    }
+    unlock(password) {
+        this.#wallet.unlock(password);
+    }
     async export(password) {
-        const multiWIF = this.#wallet.toMultiWif();
-        const encypted = await encrypt(password, multiWIF);
-        return base58.encode(encypted);
+        return this.#wallet.export(password);
     }
     async import(password, encrypted) {
-        this.#wallet = new MultiWallet(this.network);
-        const decrypted = await decrypt(password, base58.decode(encrypted));
-        await this.#wallet.fromMultiWif(decrypted);
+        await this.#wallet.import(password, encrypted);
     }
     async exportQR(password) {
         const exported = await this.export(password);
         return globalThis.navigator ? await qrcode.toDataURL(exported) : await qrcode.toString(exported, { type: 'terminal' });
     }
     async importQR(image, password) {
-        const multiWIF = QrScanner.scanImage(image);
+        const multiWIF = await QrScanner.default.scanImage(image);
         return this.import(password, multiWIF);
     }
 }
@@ -454,12 +462,18 @@ class Peernet {
     get id() {
         return this.identity.id;
     }
+    get selectedAccount() {
+        return this.identity.selectedAccount;
+    }
     get accounts() {
         return this.identity.accounts;
     }
     get defaultStores() {
         return ['account', 'wallet', 'block', 'transaction', 'chain', 'data', 'message'];
     }
+    selectAccount(account) {
+        return this.identity.selectAccount(account);
+    }
     addProto(name, proto) {
         if (!globalThis.peernet.protos[name])
             globalThis.peernet.protos[name] = proto;
@@ -505,7 +519,7 @@ class Peernet {
      * @return {String} id - peerId
      */
     getConnection(id) {
-        return this.client.connections[id];
+        return this.connections[id];
     }
     /**
      * @private
@@ -757,7 +771,7 @@ class Peernet {
                     return;
                 return await blockStore.put(hash, data);
             },
-            has: async (hash) => await blockStore.has(hash, 'block'),
+            has: async (hash) => await blockStore.has(hash),
         };
     }
     get transaction() {

package/exports/store.js

@@ -77,15 +77,17 @@ class KeyValue {
 }
 
 const init = (root, home = true) => {
-  let _root = root;
-  if (home) _root = join(homedir(), root);
-  if (readdirSync) try {
-    readdirSync(_root);
-  } catch (e) {
-    mkdirp(_root);
-  }
-
-  return _root
+    let _root = root;
+    if (home)
+        _root = join(homedir(), root);
+    if (readdirSync)
+        try {
+            readdirSync(_root);
+        }
+        catch (e) {
+            mkdirp(_root);
+        }
+    return _root;
 };
 
 class Store {

package/exports/types/identity.d.ts

@@ -1,15 +1,18 @@
-import MultiWallet from '@leofcoin/multi-wallet';
 export default class Identity {
     #private;
-    network: MultiWallet.network;
+    network: any;
     id: string;
+    selectedAccount: string;
     constructor(network: string);
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     load(password?: string): Promise<void>;
+    selectAccount(account: string): Promise<void> | Promise<IDBValidKey> | Promise<any[]>;
     sign(hash: Uint8Array): any;
-    export(password: string): Promise<string>;
+    lock(password: string): void;
+    unlock(password: string): void;
+    export(password: string): Promise<any>;
     import(password: any, encrypted: base58String): Promise<void>;
-    exportQR(password: string): Promise<any>;
+    exportQR(password: string): Promise<string>;
     importQR(image: File | Blob, password: string): Promise<void>;
 }

package/exports/types/messages/chat.d.ts

@@ -1,4 +1,4 @@
-declare const ChatMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const ChatMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class ChatMessage extends ChatMessage_base {
     constructor(buffer: any);
     get messageName(): string;

package/exports/types/messages/data-response.d.ts

@@ -1,4 +1,4 @@
-declare const DataMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const DataMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class DataMessageResponse extends DataMessageResponse_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/messages/dht-response.d.ts

@@ -1,4 +1,4 @@
-declare const DHTMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const DHTMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class DHTMessageResponse extends DHTMessageResponse_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/messages/dht.d.ts

@@ -1,4 +1,4 @@
-declare const DHTMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const DHTMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 /**
  * @example `
    new DHTMessage(hash, store)

package/exports/types/messages/peer-response.d.ts

@@ -1,4 +1,4 @@
-declare const PeerMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const PeerMessageResponse_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class PeerMessageResponse extends PeerMessageResponse_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/messages/peer.d.ts

@@ -1,4 +1,4 @@
-declare const PeerMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const PeerMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class PeerMessage extends PeerMessage_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/messages/peernet.d.ts

@@ -1,4 +1,4 @@
-declare const PeernetMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const PeernetMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class PeernetMessage extends PeernetMessage_base {
     constructor(buffer: any);
     get messageName(): string;

package/exports/types/messages/ps.d.ts

@@ -1,4 +1,4 @@
-declare const PsMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const PsMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class PsMessage extends PsMessage_base {
     constructor(buffer: any);
     get messageName(): string;

package/exports/types/messages/request.d.ts

@@ -1,4 +1,4 @@
-declare const RequestMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const RequestMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class RequestMessage extends RequestMessage_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/messages/response.d.ts

@@ -1,4 +1,4 @@
-declare const ResponseMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/dist/codec-format-interface.js").default;
+declare const ResponseMessage_base: typeof import("../../node_modules/@leofcoin/codec-format-interface/exports/codec-format-interface.js").default;
 export default class ResponseMessage extends ResponseMessage_base {
     constructor(data: any);
     get messageName(): string;

package/exports/types/peernet.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import '@vandeurenglenn/debug';
+import PubSub from '@vandeurenglenn/little-pubsub';
 import PeerDiscovery from './discovery/peer-discovery.js';
 import DHT from './dht/dht.js';
 import MessageHandler from './handlers/message.js';
@@ -7,6 +8,18 @@ import LeofcoinStorageClass from '@leofcoin/storage';
 import Identity from './identity.js';
 import swarm from '@netpeer/p2pt-swarm';
 import P2PTPeer from '@netpeer/p2pt-swarm/peer';
+declare global {
+    var LeofcoinStorage: typeof LeofcoinStorageClass;
+    var peernet: Peernet;
+    var pubsub: PubSub;
+    var globalSub: PubSub;
+    var blockStore: LeofcoinStorageClass;
+    var transactionStore: LeofcoinStorageClass;
+    var messageStore: LeofcoinStorageClass;
+    var dataStore: LeofcoinStorageClass;
+    var walletStore: LeofcoinStorageClass;
+    var chainStore: LeofcoinStorageClass;
+}
 /**
  * @access public
  * @example
@@ -54,8 +67,10 @@ export default class Peernet {
      */
     constructor(options: any, password: any);
     get id(): string;
+    get selectedAccount(): string;
     get accounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     get defaultStores(): string[];
+    selectAccount(account: string): Promise<void> | Promise<IDBValidKey> | Promise<any[]>;
     addProto(name: any, proto: any): void;
     addCodec(codec: any): any;
     addStore(name: any, prefix: any, root: any, isPrivate?: boolean): Promise<void>;
@@ -74,7 +89,7 @@ export default class Peernet {
     /**
      * @return {String} id - peerId
      */
-    getConnection(id: any): any;
+    getConnection(id: any): P2PTPeer;
     /**
      * @private
      *
@@ -83,7 +98,10 @@ export default class Peernet {
      *
      * @return {Promise} instance of Peernet
      */
-    _init(options: any, password: any): Promise<Peernet>;
+    _init(options: {
+        storePrefix?: string;
+        root?: string;
+    }, password: string): Promise<Peernet>;
     start(): Promise<void>;
     addRequestHandler(name: any, method: any): void;
     sendMessage(peer: any, id: any, data: any): Promise<void>;
@@ -111,13 +129,13 @@ export default class Peernet {
     providersFor(hash: string, store?: undefined): Promise<import("./dht/dht.js").DHTProviderMapValue>;
     get block(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<any>;
-        has: (hash: string) => Promise<any>;
+        put: (hash: string, data: Uint8Array) => Promise<void | any[] | IDBValidKey>;
+        has: (hash: string) => Promise<boolean | any[]>;
     };
     get transaction(): {
         get: (hash: string) => Promise<any>;
-        put: (hash: string, data: Uint8Array) => Promise<any>;
-        has: (hash: string) => Promise<any>;
+        put: (hash: string, data: Uint8Array) => Promise<void | any[] | IDBValidKey>;
+        has: (hash: string) => Promise<boolean | any[]>;
     };
     requestData(hash: any, store: any): any;
     get message(): {
@@ -133,12 +151,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} message
          */
-        put: (hash: any, message: any) => Promise<any>;
+        put: (hash: any, message: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     get data(): {
         /**
@@ -153,12 +171,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<any>;
+        put: (hash: any, data: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     get folder(): {
         /**
@@ -173,12 +191,12 @@ export default class Peernet {
          * @param {String} hash
          * @param {Buffer} data
          */
-        put: (hash: any, data: any) => Promise<any>;
+        put: (hash: any, data: any) => Promise<void | any[] | IDBValidKey>;
         /**
          * @param {String} hash
          * @return {Boolean}
          */
-        has: (hash: any) => Promise<any>;
+        has: (hash: any) => Promise<boolean | any[]>;
     };
     addFolder(files: any): Promise<any>;
     ls(hash: any, options: any): Promise<any[]>;
@@ -203,7 +221,7 @@ export default class Peernet {
      * @param {Buffer} data
      * @param {String} storeName - storeName to access
      */
-    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<any>;
+    put(hash: string, data: Uint8Array, storeName?: string | LeofcoinStorageClass): Promise<void | any[] | IDBValidKey>;
     /**
      * @param {String} hash
      * @return {Boolean}
@@ -221,6 +239,6 @@ export default class Peernet {
      * @param {Method} cb
      */
     subscribe(topic: string, callback: Function): Promise<void>;
-    removePeer(peer: any): Promise<any>;
+    removePeer(peer: any): Promise<boolean>;
     get Buffer(): BufferConstructor;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.1.55",
+  "version": "1.1.57",
   "description": "",
   "main": "src/peernet.js",
   "exports": {
@@ -31,8 +31,8 @@
     "@leofcoin/codec-format-interface": "^1.6.0",
     "@leofcoin/codecs": "^1.0.0",
     "@leofcoin/generate-account": "^2.0.0",
-    "@leofcoin/identity-utils": "^1.0.0",
-    "@leofcoin/multi-wallet": "^3.0.1",
+    "@leofcoin/identity-utils": "^1.0.2",
+    "@leofcoin/multi-wallet": "^3.1.4",
     "@leofcoin/peernet-swarm": "^1.1.0",
     "@leofcoin/storage": "^3.0.0",
     "@netpeer/p2pt-swarm": "^1.3.2",
@@ -56,6 +56,7 @@
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@rollup/plugin-wasm": "^6.1.1",
     "@types/bs58check": "^2.1.0",
+    "@types/qrcode": "^1.5.2",
     "@types/secp256k1": "^4.0.3",
     "@types/varint": "^6.0.1",
     "browserify": "^17.0.0",

package/src/identity.ts

@@ -6,8 +6,9 @@ import qrcode from 'qrcode'
 
 export default class Identity {
   #wallet: MultiWallet
-  network: MultiWallet.network
+  network
   id: string
+  selectedAccount: string
 
   constructor(network: string) {
     this.network = network
@@ -34,6 +35,7 @@ export default class Identity {
       }
     } 
     if (!password) {
+      // @ts-ignore
       const importee: { default: () => Promise<string> } = await import('./prompts/password.js')
       password = await importee.default()
     }
@@ -43,7 +45,7 @@ export default class Identity {
       const pub = await globalThis.accountStore.get('public')
       this.id = JSON.parse(new TextDecoder().decode(pub)).walletId;
       const selected = await globalThis.walletStore.get('selected-account')
-      globalThis.peernet.selectedAccount = new TextDecoder().decode(selected)
+      this.selectedAccount = new TextDecoder().decode(selected)
     } else {
       const importee = await import(/* webpackChunkName: "generate-account" */ '@leofcoin/generate-account')
       const {identity, accounts} = await importee.default(password, this.network)
@@ -54,7 +56,7 @@ export default class Identity {
       await globalThis.walletStore.put('selected-account', accounts[0][1])
       await globalThis.walletStore.put('identity', JSON.stringify(identity))
 
-      globalThis.peernet.selectedAccount = accounts[0][1]
+      this.selectedAccount = accounts[0][1]
       this.id = identity.walletId
     }
     const identity = JSON.parse(new TextDecoder().decode(await globalThis.walletStore.get('identity')))
@@ -63,20 +65,29 @@ export default class Identity {
     await this.#wallet.fromMultiWif(multiWIF)
   }
 
+  selectAccount(account: string) {
+    this.selectedAccount = account
+    return walletStore.put('selected-account', account)
+  }
+
   sign(hash: Uint8Array) {
     return this.#wallet.sign(hash.subarray(0, 32))
   }
 
+  lock(password: string) {
+    this.#wallet.lock(password)
+  }
+
+  unlock(password: string) {
+    this.#wallet.unlock(password)
+  }
+
   async export(password: string) {
-    const multiWIF =  this.#wallet.toMultiWif()
-    const encypted = await encrypt(password, multiWIF)
-    return base58.encode(encypted)
+    return this.#wallet.export(password)
   }
 
   async import(password, encrypted: base58String) {
-    this.#wallet = new MultiWallet(this.network)
-    const decrypted = await decrypt(password, base58.decode(encrypted))
-    await this.#wallet.fromMultiWif(decrypted)
+    await this.#wallet.import(password, encrypted)
   }
 
   async exportQR(password: string) {
@@ -85,7 +96,7 @@ export default class Identity {
   }
 
   async importQR(image: File | Blob , password: string) {
-    const multiWIF = QrScanner.scanImage(image)
+    const multiWIF = await QrScanner.default.scanImage(image)
     return this.import(password, multiWIF)
   }
 }