fixed KeyList init and some lint formatting after task build (hiero-l…

…edger#1348) Signed-off-by: Petar Tonev <petar.tonev@limechain.tech> Signed-off-by: Petar Tonev <petar.tonev@limechain.tech>
monostarter · Dec 5, 2022 · ac82a4c · ac82a4c
1 parent 5ea7d9d
commit ac82a4c
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 9 deletions.
diff --git a/packages/cryptography/src/KeyList.js b/packages/cryptography/src/KeyList.js
@@ -15,7 +15,12 @@ export default class KeyList extends Key {
          * @private
          * @type {Key[]}
          */
-        this._keys = keys == null ? [] : keys;
+        // @ts-ignore
+        if (keys == null) this._keys = [];
+        //checks if the value for `keys` is passed as a single key
+        //rather than a list that contains just one key
+        else if (keys instanceof Key) this._keys = [keys];
+        else this._keys = keys;
 
         /**
          * @type {?number}
@@ -103,6 +108,7 @@ export default class KeyList extends Key {
      * @returns {Key[]}
      */
     toArray() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return this._keys.slice();
     }
 

diff --git a/packages/cryptography/src/primitive/bip39.js b/packages/cryptography/src/primitive/bip39.js
@@ -8,7 +8,7 @@ import * as pbkdf2 from "./pbkdf2.js";
  */
 export async function toSeed(words, passphrase) {
     const input = words.join(" ");
-    const salt = (`mnemonic${passphrase}`).normalize("NFKD");
+    const salt = `mnemonic${passphrase}`.normalize("NFKD");
 
     return pbkdf2.deriveKey(hmac.HashAlgorithm.Sha512, input, salt, 2048, 64);
 }
diff --git a/packages/cryptography/test/unit/bip39.js b/packages/cryptography/test/unit/bip39.js
@@ -26,7 +26,7 @@ describe("bip39", function () {
         );
     });
 
-    it("mnemonic passphrase NFKD normalization compliant test", async function (){
+    it("mnemonic passphrase NFKD normalization compliant test", async function () {
         const words = [
             "inmate",
             "flip",
@@ -51,13 +51,15 @@ describe("bip39", function () {
             "replace",
             "reduce",
             "plate",
-            "home"
+            "home",
         ];
-
-        const unicodePassphrase = "\u0070\u0061\u0073\u0073\u0070\u0068\u0072\u0061\u0073\u0065";
-        const expectedPrivateKey = "1ed95521b3406aa1e34db78be696db32f09d9f8ec3115fc12314082a44a3e8d6d4551a1905758b45bc315430f7d9c095da93645f1b0004c393370e0a878dfd4c";
 
-        const seed = await bip39.toSeed(words, unicodePassphrase)
+        const unicodePassphrase =
+            "\u0070\u0061\u0073\u0073\u0070\u0068\u0072\u0061\u0073\u0065";
+        const expectedPrivateKey =
+            "1ed95521b3406aa1e34db78be696db32f09d9f8ec3115fc12314082a44a3e8d6d4551a1905758b45bc315430f7d9c095da93645f1b0004c393370e0a878dfd4c";
+
+        const seed = await bip39.toSeed(words, unicodePassphrase);
 
         expect(hex.encode(seed)).to.be.equal(expectedPrivateKey);
     });

diff --git a/src/KeyList.js b/src/KeyList.js
@@ -43,7 +43,12 @@ export default class KeyList extends Key {
          * @private
          * @type {Key[]}
          */
-        this._keys = keys == null ? [] : keys;
+        // @ts-ignore
+        if (keys == null) this._keys = [];
+        //checks if the value for `keys` is passed as a single key
+        //rather than a list that contains just one key
+        else if (keys instanceof Key) this._keys = [keys];
+        else this._keys = keys;
 
         /**
          * @type {?number}
@@ -131,6 +136,7 @@ export default class KeyList extends Key {
      * @returns {Key[]}
      */
     toArray() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return this._keys.slice();
     }
 
@@ -148,6 +154,7 @@ export default class KeyList extends Key {
      * @returns {HashgraphProto.proto.IKey}
      */
     _toProtobufKey() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-return
         const keys = this._keys.map((key) => key._toProtobufKey());
 
         if (this.threshold == null) {

diff --git a/test/integration/AccountCreateIntegrationTest.js b/test/integration/AccountCreateIntegrationTest.js
@@ -7,6 +7,7 @@ import {
     PrivateKey,
     Status,
     TransactionId,
+    KeyList,
 } from "../../src/exports.js";
 import IntegrationTestEnv from "./client/NodeIntegrationTestEnv.js";
 
@@ -202,6 +203,35 @@ describe("AccountCreate", function () {
         await (await transaction.execute(env.client)).getReceipt(env.client);
     });
 
+    it("should create account with a single key passed to `KeyList`", async function() {
+        const env = await IntegrationTestEnv.new();
+        const publicKey = PrivateKey.generateED25519().publicKey;
+        const thresholdKey = new KeyList(publicKey, 1);
+
+        let transaction = new AccountCreateTransaction()
+            .setKey(thresholdKey)
+            .setInitialBalance(Hbar.fromTinybars(1))
+            .freezeWith(env.client);
+
+        const txAccountCreate = await transaction.execute(env.client);
+        const txAccountCreateReceipt = await txAccountCreate.getReceipt(
+            env.client
+        );
+        const accountId = txAccountCreateReceipt.accountId;
+
+        expect(accountId).to.not.be.null;
+
+        const info = await new AccountInfoQuery()
+            .setNodeAccountIds([txAccountCreate.nodeId])
+            .setAccountId(accountId)
+            .execute(env.client);
+
+        expect(info.accountId.toString()).to.be.equal(accountId.toString());
+        expect(info.key.toArray()[0].toString()).to.be.equal(
+            publicKey.toString()
+        );
+    });
+
     after(async function () {
         await env.close();
     });