@leofcoin/peernet 1.2.22 → 1.2.23

package/exports/browser/{browser-tK3uOLQV.js → browser-BKlRwB0A.js}

@@ -1,4 +1,4 @@
-import { m as getDefaultExportFromCjs } from './identity-CjBX8cWv.js';
+import { m as getDefaultExportFromCjs } from './identity-BS_eDrwh.js';
 
 function _mergeNamespaces(n, m) {
 	m.forEach(function (e) {

package/exports/browser/{browser-DEjI2nFg.js → browser-Dx3X9MHO.js}

@@ -1,4 +1,4 @@
-import { m as getDefaultExportFromCjs } from './identity-CjBX8cWv.js';
+import { m as getDefaultExportFromCjs } from './identity-BS_eDrwh.js';
 
 function _mergeNamespaces(n, m) {
 	m.forEach(function (e) {

package/exports/browser/{client-Ba1cHcxF.js → client-eYBPUrVq.js}

@@ -1,5 +1,5 @@
-import { L as LittlePubSub, d as deflate_1, i as inflate_1, c as createDebugger } from './peernet-D3z5pEBD.js';
-import './identity-CjBX8cWv.js';
+import { L as LittlePubSub, d as deflate_1, i as inflate_1, c as createDebugger } from './peernet-CgU-ZdIe.js';
+import './identity-BS_eDrwh.js';
 import 'crypto';
 import './value-C3vAp-wb.js';
 
@@ -232,7 +232,7 @@ class SocketRequestClient {
             const init = async () => {
                 // @ts-ignore
                 if (!globalThis.WebSocket && !this.#experimentalWebsocket)
-                    globalThis.WebSocket = (await import('./browser-tK3uOLQV.js').then(function (n) { return n.b; })).default.w3cwebsocket;
+                    globalThis.WebSocket = (await import('./browser-BKlRwB0A.js').then(function (n) { return n.b; })).default.w3cwebsocket;
                 const client = new WebSocket(this.#url, this.#protocol);
                 if (this.#experimentalWebsocket) {
                     client.addEventListener('error', this.onerror);
@@ -1303,7 +1303,7 @@ class Client {
         }
     }
     async #loadNodeWebrtcImplementation() {
-        const koushWrtcModule = await import('./browser-DEjI2nFg.js').then(function (n) { return n.b; });
+        const koushWrtcModule = await import('./browser-Dx3X9MHO.js').then(function (n) { return n.b; });
         const koushWrtc = koushWrtcModule.default;
         if (!isWrtcImplementation(koushWrtc)) {
             throw new Error('@koush/wrtc does not match required wrtc contract');

package/exports/browser/{identity-CjBX8cWv.js → identity-BS_eDrwh.js}

@@ -8261,6 +8261,7 @@ var qrcode = /*@__PURE__*/getDefaultExportFromCjs(browserExports);
 
 class Identity {
     #wallet;
+    #accountWallets = new Map();
     network;
     id;
     selectedAccount;
@@ -8298,7 +8299,7 @@ class Identity {
             this.selectedAccount = new TextDecoder().decode(selected);
         }
         else {
-            const importee = await import(/* webpackChunkName: "generate-account" */ './index-DIhxISkU.js');
+            const importee = await import(/* webpackChunkName: "generate-account" */ './index-B91mcwxm.js');
             const { identity, accounts } = await importee.default(password, this.network);
             await globalThis.accountStore.put('public', JSON.stringify({ walletId: identity.walletId }));
             await globalThis.walletStore.put('version', String(1));
@@ -8312,13 +8313,36 @@ class Identity {
         this.#wallet = new MultiWallet(this.network);
         const multiWIF = await decrypt(password, base58$1.decode(identity.multiWIF));
         await this.#wallet.fromMultiWif(multiWIF);
+        await this.#loadAccountWallets();
+    }
+    async #loadAccountWallets() {
+        this.#accountWallets.clear();
+        const accounts = await this.getAccounts();
+        for (const [index, [, externalAddress, internalAddress]] of accounts.entries()) {
+            const account = this.#wallet.account(index + 1);
+            const external = (await account.external(1));
+            const internal = (await account.internal(1));
+            if ((await external.address) !== externalAddress || (await internal.address) !== internalAddress) {
+                throw new Error(`stored account ${index + 1} does not match this identity`);
+            }
+            this.#accountWallets.set(externalAddress, external);
+            this.#accountWallets.set(internalAddress, internal);
+        }
+        if (!this.#accountWallets.has(this.selectedAccount)) {
+            throw new Error(`selected account ${this.selectedAccount} is not part of this identity`);
+        }
     }
     selectAccount(account) {
+        if (!this.#accountWallets.has(account))
+            throw new Error(`unknown identity account ${account}`);
         this.selectedAccount = account;
         return walletStore.put('selected-account', account);
     }
     sign(hash) {
-        return this.#wallet.sign(hash.subarray(0, 32));
+        const wallet = this.#accountWallets.get(this.selectedAccount);
+        if (!wallet)
+            throw new Error(`no signer available for selected account ${this.selectedAccount}`);
+        return wallet.sign(hash.subarray(0, 32));
     }
     lock(password) {
         this.#wallet.lock(password);

package/exports/browser/identity.js

@@ -1,2 +1,2 @@
-export { I as default } from './identity-CjBX8cWv.js';
+export { I as default } from './identity-BS_eDrwh.js';
 import 'crypto';

package/exports/browser/{index-DIhxISkU.js → index-B91mcwxm.js}

@@ -1,4 +1,4 @@
-import { M as MultiWallet, l as encrypt, a as base58$1 } from './identity-CjBX8cWv.js';
+import { M as MultiWallet, l as encrypt, a as base58$1 } from './identity-BS_eDrwh.js';
 import 'crypto';
 
 /**

package/exports/browser/{messages-BX59GgBQ.js → messages-D0Goitr6.js}

@@ -1,5 +1,5 @@
-import { F as FormatInterface } from './peernet-D3z5pEBD.js';
-import './identity-CjBX8cWv.js';
+import { F as FormatInterface } from './peernet-CgU-ZdIe.js';
+import './identity-BS_eDrwh.js';
 import 'crypto';
 import './value-C3vAp-wb.js';
 

package/exports/browser/{peernet-D3z5pEBD.js → peernet-CgU-ZdIe.js}

@@ -1,4 +1,4 @@
-import { i as index$2, b as base, a as base58$1, c as index$3, d as index$4, e as index$5, f as createSHA512, g as createSHA384, h as createSHA256, j as createSHA224, k as createSHA1, I as Identity } from './identity-CjBX8cWv.js';
+import { i as index$2, b as base, a as base58$1, c as index$3, d as index$4, e as index$5, f as createSHA512, g as createSHA384, h as createSHA256, j as createSHA224, k as createSHA1, I as Identity } from './identity-BS_eDrwh.js';
 import { K as KeyPath, a as KeyValue } from './value-C3vAp-wb.js';
 
 const getTargets = () => Array.from([]);
@@ -8615,7 +8615,7 @@ class Peernet {
         await getAddress();
         this.storePrefix = options.storePrefix;
         this.root = options.root;
-        const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile } = await import(/* webpackChunkName: "messages" */ './messages-BX59GgBQ.js');
+        const { RequestMessage, ResponseMessage, PeerMessage, PeerMessageResponse, PeernetMessage, DHTMessage, DHTMessageResponse, DataMessage, DataMessageResponse, PsMessage, ChatMessage, PeernetFile } = await import(/* webpackChunkName: "messages" */ './messages-D0Goitr6.js');
         /**
          * proto Object containing protos
          * @type {Object}
@@ -8662,7 +8662,7 @@ class Peernet {
         if (this.#starting || this.#started)
             return;
         this.#starting = true;
-        const importee = await import('./client-Ba1cHcxF.js');
+        const importee = await import('./client-eYBPUrVq.js');
         /**
          * @access public
          * @type {PeernetClient}

package/exports/browser/peernet.js

@@ -1,4 +1,4 @@
-export { P as default } from './peernet-D3z5pEBD.js';
-import './identity-CjBX8cWv.js';
+export { P as default } from './peernet-CgU-ZdIe.js';
+import './identity-BS_eDrwh.js';
 import './value-C3vAp-wb.js';
 import 'crypto';

package/exports/identity.js

@@ -6,6 +6,7 @@ import qrcode from 'qrcode';
 
 class Identity {
     #wallet;
+    #accountWallets = new Map();
     network;
     id;
     selectedAccount;
@@ -57,13 +58,36 @@ class Identity {
         this.#wallet = new MultiWallet(this.network);
         const multiWIF = await decrypt(password, base58.decode(identity.multiWIF));
         await this.#wallet.fromMultiWif(multiWIF);
+        await this.#loadAccountWallets();
+    }
+    async #loadAccountWallets() {
+        this.#accountWallets.clear();
+        const accounts = await this.getAccounts();
+        for (const [index, [, externalAddress, internalAddress]] of accounts.entries()) {
+            const account = this.#wallet.account(index + 1);
+            const external = (await account.external(1));
+            const internal = (await account.internal(1));
+            if ((await external.address) !== externalAddress || (await internal.address) !== internalAddress) {
+                throw new Error(`stored account ${index + 1} does not match this identity`);
+            }
+            this.#accountWallets.set(externalAddress, external);
+            this.#accountWallets.set(internalAddress, internal);
+        }
+        if (!this.#accountWallets.has(this.selectedAccount)) {
+            throw new Error(`selected account ${this.selectedAccount} is not part of this identity`);
+        }
     }
     selectAccount(account) {
+        if (!this.#accountWallets.has(account))
+            throw new Error(`unknown identity account ${account}`);
         this.selectedAccount = account;
         return walletStore.put('selected-account', account);
     }
     sign(hash) {
-        return this.#wallet.sign(hash.subarray(0, 32));
+        const wallet = this.#accountWallets.get(this.selectedAccount);
+        if (!wallet)
+            throw new Error(`no signer available for selected account ${this.selectedAccount}`);
+        return wallet.sign(hash.subarray(0, 32));
     }
     lock(password) {
         this.#wallet.lock(password);

package/exports/types/identity.d.ts

@@ -9,7 +9,7 @@ export default class Identity {
     getAccounts(): Promise<[[name: string, externalAddress: string, internalAddress: string]]>;
     load(password?: string): Promise<void>;
     selectAccount(account: string): Promise<unknown>;
-    sign(hash: Uint8Array): any;
+    sign(hash: Uint8Array): Promise<Uint8Array<ArrayBufferLike>>;
     lock(password: string): void;
     unlock(password: string): void;
     export(password: string): Promise<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "1.2.22",
+  "version": "1.2.23",
   "description": "",
   "browser": "./exports/browser/peernet.js",
   "exports": {
@@ -107,7 +107,7 @@
     "@leofcoin/multi-wallet": "^3.1.8",
     "@leofcoin/storage": "^3.5.38",
     "@mapbox/node-pre-gyp": "^2.0.3",
-    "@netpeer/swarm": "^0.9.8",
+    "@netpeer/swarm": "^0.9.9",
     "@vandeurenglenn/base58": "^1.1.9",
     "@vandeurenglenn/debug": "^1.4.0",
     "@vandeurenglenn/little-pubsub": "^1.5.2",

package/src/identity.ts

@@ -7,6 +7,7 @@ import qrcode from 'qrcode'
 
 export default class Identity {
   #wallet: MultiWallet
+  #accountWallets = new Map<string, { sign: (hash: Uint8Array) => Promise<Uint8Array> }>()
   network
   id: string
   selectedAccount: string
@@ -63,15 +64,43 @@ export default class Identity {
     this.#wallet = new MultiWallet(this.network)
     const multiWIF = await decrypt(password, base58.decode(identity.multiWIF))
     await this.#wallet.fromMultiWif(multiWIF)
+    await this.#loadAccountWallets()
+  }
+
+  async #loadAccountWallets() {
+    this.#accountWallets.clear()
+    const accounts = await this.getAccounts()
+    for (const [index, [, externalAddress, internalAddress]] of accounts.entries()) {
+      const account = this.#wallet.account(index + 1)
+      const external = (await account.external(1)) as unknown as {
+        address: Promise<string>
+        sign: (hash: Uint8Array) => Promise<Uint8Array>
+      }
+      const internal = (await account.internal(1)) as unknown as {
+        address: Promise<string>
+        sign: (hash: Uint8Array) => Promise<Uint8Array>
+      }
+      if ((await external.address) !== externalAddress || (await internal.address) !== internalAddress) {
+        throw new Error(`stored account ${index + 1} does not match this identity`)
+      }
+      this.#accountWallets.set(externalAddress, external)
+      this.#accountWallets.set(internalAddress, internal)
+    }
+    if (!this.#accountWallets.has(this.selectedAccount)) {
+      throw new Error(`selected account ${this.selectedAccount} is not part of this identity`)
+    }
   }
 
   selectAccount(account: string) {
+    if (!this.#accountWallets.has(account)) throw new Error(`unknown identity account ${account}`)
     this.selectedAccount = account
     return walletStore.put('selected-account', account)
   }
 
   sign(hash: Uint8Array) {
-    return this.#wallet.sign(hash.subarray(0, 32))
+    const wallet = this.#accountWallets.get(this.selectedAccount)
+    if (!wallet) throw new Error(`no signer available for selected account ${this.selectedAccount}`)
+    return wallet.sign(hash.subarray(0, 32))
   }
 
   lock(password: string) {

package/test/peernet.test.js

@@ -3,11 +3,13 @@ import assert from 'node:assert/strict'
 
 import Peernet from '../exports/peernet.js'
 import Identity from '../exports/identity.js'
+import MultiWallet from '@leofcoin/multi-wallet'
+import { fromBase58, toBase58 } from '@vandeurenglenn/typed-array-utils'
 
 const options = {
   network: 'leofcoin:peach',
   stars: [],
-  root: '.testnet',
+  root: `.testnet-${process.pid}`,
   version: '1.0.0',
   storePrefix: 'test',
   autoStart: false
@@ -234,6 +236,14 @@ test('selected account is set', () => {
   assert.ok(typeof peernet.identity.selectedAccount === 'string')
 })
 
+test('identity signatures authenticate the selected account', async () => {
+  const payload = new Uint8Array(32).fill(7)
+  const signature = toBase58(await peernet.identity.sign(payload))
+  const verifier = new MultiWallet(peernet.network)
+  await verifier.fromAddress(peernet.selectedAccount, null, peernet.network)
+  assert.equal(await verifier.verify(fromBase58(signature), payload), true)
+})
+
 test('error handling methods exist', () => {
   assert.equal(typeof peernet.handleDHT, 'function')
   assert.equal(typeof peernet.handleData, 'function')