Update SignMultisigTransaction flow to Albatross PoS SDK

client/src/PublicRequest.ts

@@ -198,16 +198,14 @@ export type EncryptionKeyParams = {
 
 export type MultisigConfig = {
     publicKeys: Uint8Array[],
-    numberOfSigners: number,
-    signerPublicKeys: Uint8Array[],
-    secret: {
-        aggregatedSecret: Uint8Array,
-    } | {
-        encryptedSecrets: Uint8Array[],
-        bScalar: Uint8Array,
+    signers: Array<{
+        publicKey: Uint8Array,
+        commitments: Uint8Array[],
+    }>,
+    secrets: Uint8Array[] | {
+        encrypted: Uint8Array[],
         keyParams: EncryptionKeyParams,
     },
-    aggregatedCommitment: Uint8Array,
     userName?: string,
 };
 

demos/RSAKeys.html

@@ -109,9 +109,9 @@ <h1>RSA Keys</h1>
 
 				// Extend 32-byte entropy into 1024-byte seed
 				const entropyBuffer = Nimiq.BufferUtils.fromHex($entropy.value);
-				const seed = Nimiq.BufferUtils.toAscii(Nimiq.CryptoUtils.computePBKDF2sha512(
+				const seed = Nimiq.BufferUtils.toUtf8(Nimiq.CryptoUtils.computePBKDF2sha512(
 					entropyBuffer,
-					Nimiq.PublicKey.derive(Nimiq.PrivateKey.unserialize(entropyBuffer)).toAddress().serialize(),
+					Nimiq.PublicKey.derive(Nimiq.PrivateKey.deserialize(entropyBuffer)).toAddress().serialize(),
 					1024, // Iterations
 					1024, // Output size
 				));

demos/SignMultisigTransaction.html

@@ -9,7 +9,6 @@
     <script src="../src/lib/Key.js"></script>
     <script src="../src/lib/KeyStore.js"></script>
     <script src="../src/lib/multisig/MerkleTreePatch.js"></script>
-    <script src="../src/lib/multisig/MultisigUtils.js"></script>
     <script src="../node_modules/@nimiq/rpc/dist/rpc.umd.js"></script>
 
     <style>
@@ -175,7 +174,7 @@
             keyLabel: 'Demo Account',
 
             // Transaction information
-            sender: MultisigUtils.calculateAddress(publicKeys, numberOfSigners).serialize(),
+            sender: Nimiq.Address.fromPublicKeys(publicKeys, numberOfSigners).serialize(),
             senderLabel: 'Our Multisig Wallet',
             recipient: Nimiq.Address.fromUserFriendlyAddress('NQ82 HP54 C9D4 2FAG 69QD 6Q71 LURR 5187 0V3X').serialize(),
             recipientLabel: 'Best Friend',

package.json

@@ -38,7 +38,7 @@
   },
   "homepage": "https://github.com/nimiq/keyguard#readme",
   "devDependencies": {
-    "@nimiq/albatross-wasm": "npm:@nimiq/core@^2.0.5",
+    "@nimiq/albatross-wasm": "https://gitpkg.now.sh/nimiq/core-rs-albatross/web-client/dist?06999e1626b3312a906a0a490339d7feb781811b",
     "@nimiq/core-web": "1.6.3",
     "@nimiq/rpc": "^0.3.0",
     "@nimiq/style": "^0.8.3",

src/lib/Key.js

@@ -94,21 +94,28 @@ class Key {
      *
      * @param {string} path
      * @param {Uint8Array} data
-     * @param {Nimiq.PublicKey[]} signerPublicKeys
-     * @param {Nimiq.RandomSecret} secret
-     * @param {Nimiq.Commitment} aggregatedCommitment
+     * @param {Nimiq.CommitmentPair[]} ownCommitmentPairs
+     * @param {{publicKey: Nimiq.PublicKey, commitments: Nimiq.Commitment[]}[]} otherSigners
      * @returns {Nimiq.PartialSignature}
      */
-    signPartially(path, data, signerPublicKeys, secret, aggregatedCommitment) {
+    signPartially(path, data, ownCommitmentPairs, otherSigners) {
         const privateKey = this.derivePrivateKey(path);
         const publicKey = Nimiq.PublicKey.derive(privateKey);
-        signerPublicKeys.sort((a, b) => a.compare(b));
+        const [otherPublicKeys, otherCommitments] = otherSigners.reduce((acc, signer) => {
+            acc[0].push(signer.publicKey);
+            acc[1].push(signer.commitments);
+            return acc;
+        }, [
+            /** @type {Nimiq.PublicKey[]} */ ([]),
+            /** @type {Nimiq.Commitment[][]} */ ([]),
+        ]);
+
         return Nimiq.PartialSignature.create(
             privateKey,
             publicKey,
-            signerPublicKeys,
-            secret,
-            aggregatedCommitment,
+            ownCommitmentPairs,
+            otherPublicKeys,
+            otherCommitments,
             data,
         );
     }
@@ -215,7 +222,7 @@ class Key {
         }
 
         // Extend 32-byte secret into 1024-byte seed as bytestring
-        /** @type {Nimiq.SerialBuffer} */
+        /** @type {Uint8Array} */
         let seed;
         switch (keyParams.kdf) {
             case 'PBKDF2-SHA512':
@@ -233,7 +240,7 @@ class Key {
         // Send computation command to iframe
         iframe.contentWindow.postMessage({
             command: 'generateKey',
-            seed: Nimiq.BufferUtils.toAscii(seed), // seed is a bytestring
+            seed: Nimiq.BufferUtils.toUtf8(seed), // seed is a bytestring
             keySize: keyParams.keySize,
         }, '*');