@qevm/json-wallets - npm Package Compare versions

Comparing version 5.7.3 to 5.7.4

lib/_version.d.ts

@@ -1,2 +0,2 @@
-export declare const version = "json-wallets/5.7.3";
+export declare const version = "json-wallets/5.7.4";
 //# sourceMappingURL=_version.d.ts.map

lib/_version.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
-exports.version = "json-wallets/5.7.3";
+exports.version = "json-wallets/5.7.4";
 //# sourceMappingURL=_version.js.map

lib/keystore.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"keystore.d.ts","sourceRoot":"","sources":["../src.ts/keystore.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAY,KAAK,EAAE,SAAS,EAAmB,MAAM,aAAa,CAAC;AAK1E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,kBAAkB,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,eACT,SAAQ,WAAW,CAAC,gBAAgB,CACpC,YAAW,sBAAsB;IAEjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,iBAAiB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,eAAe;CAG1D;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IACzB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE;QACL,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACL,CAAC;AAiNF,wBAAgB,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,KAAK,GAAG,MAAM,GACzB,eAAe,CAKjB;AAED,wBAAsB,OAAO,CACzB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,KAAK,GAAG,MAAM,EACxB,gBAAgB,CAAC,EAAE,gBAAgB,GACpC,OAAO,CAAC,eAAe,CAAC,CAW1B;AAID,wBAAsB,OAAO,CACzB,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,KAAK,GAAG,MAAM,EACxB,OAAO,CAAC,EAAE,cAAc,EACxB,gBAAgB,CAAC,EAAE,gBAAgB,GACpC,OAAO,CAAC,MAAM,CAAC,CAgLjB"}
+{"version":3,"file":"keystore.d.ts","sourceRoot":"","sources":["../src.ts/keystore.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAY,KAAK,EAAE,SAAS,EAAmB,MAAM,aAAa,CAAC;AAK1E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAY/C,MAAM,WAAW,gBAAgB;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,kBAAkB,EAAE,OAAO,CAAC;CAC/B;AAED,qBAAa,eACT,SAAQ,WAAW,CAAC,gBAAgB,CACpC,YAAW,sBAAsB;IAEjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAE3B,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAErC,iBAAiB,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK,IAAI,eAAe;CAG1D;AAED,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzD,MAAM,MAAM,cAAc,GAAG;IACzB,EAAE,CAAC,EAAE,SAAS,CAAC;IACf,OAAO,CAAC,EAAE,SAAS,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE;QACL,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;QACX,CAAC,CAAC,EAAE,MAAM,CAAC;KACd,CAAC;CACL,CAAC;AAiNF,wBAAgB,WAAW,CACvB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,KAAK,GAAG,MAAM,GACzB,eAAe,CAKjB;AAED,wBAAsB,OAAO,CACzB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,KAAK,GAAG,MAAM,EACxB,gBAAgB,CAAC,EAAE,gBAAgB,GACpC,OAAO,CAAC,eAAe,CAAC,CAW1B;AAID,wBAAsB,OAAO,CACzB,OAAO,EAAE,sBAAsB,EAC/B,QAAQ,EAAE,KAAK,GAAG,MAAM,EACxB,OAAO,CAAC,EAAE,cAAc,EACxB,gBAAgB,CAAC,EAAE,gBAAgB,GACpC,OAAO,CAAC,MAAM,CAAC,CAgLjB"}

lib/keystore.js

@@ -12,2 +12,3 @@ "use strict";
 const scrypt_js_1 = __importDefault(require("scrypt-js"));
+const address_1 = require("@qevm/address");
 const bytes_1 = require("@qevm/bytes");
@@ -61,3 +62,3 @@ const keccak256_1 = require("@qevm/keccak256");
     const mnemonicKey = key.slice(32, 64);
-    const address = (0, transactions_1.computeAddress)(publickey);
+    const address = (0, address_1.getAddress)((0, transactions_1.computeAddress)(publickey));
     const account = {
@@ -69,6 +70,6 @@ _isKeystoreAccount: true,
     };
-    // Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
-    if ((0, utils_1.searchPath)(data, "x-ethers/version") === "0.1") {
-        const mnemonicCiphertext = (0, utils_1.looseArrayify)((0, utils_1.searchPath)(data, "x-ethers/mnemonicCiphertext"));
-        const mnemonicIv = (0, utils_1.looseArrayify)((0, utils_1.searchPath)(data, "x-ethers/mnemonicCounter"));
+    // Version 0.1 x-qethers metadata must contain an encrypted mnemonic phrase
+    if ((0, utils_1.searchPath)(data, "x-qethers/version") === "0.1") {
+        const mnemonicCiphertext = (0, utils_1.looseArrayify)((0, utils_1.searchPath)(data, "x-qethers/mnemonicCiphertext"));
+        const mnemonicIv = (0, utils_1.looseArrayify)((0, utils_1.searchPath)(data, "x-qethers/mnemonicCounter"));
         const mnemonicCounter = new aes_js_1.default.Counter(mnemonicIv);
@@ -150,3 +151,3 @@ const mnemonicAesCtr = new aes_js_1.default.ModeOfOperation.ctr(mnemonicKey, mnemonicCounter);
         // Check the address matches the public key
-        if (account.address !== (0, transactions_1.computeAddress)(account.publicKey)) {
+        if (account.address !== (0, address_1.getAddress)((0, transactions_1.computeAddress)(account.publicKey))) {
             throw new Error("address/publicKey mismatch");
@@ -183,3 +184,3 @@ }
     if (!client) {
-        client = "ethers.js";
+        client = "qethers.js";
     }
@@ -287,3 +288,3 @@ // Check/generate the salt
                 ".0Z";
-            data["x-ethers"] = {
+            data["x-qethers"] = {
                 client: client,
@@ -290,0 +291,0 @@ gethFilename: "UTC--" + timestamp + "--" + data.address,

lib/keystore.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../src.ts/keystore.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;;;;AA8Qb,kCAQC;AAED,0BAeC;AAID,0BAqLC;AA9dD,oDAAyB;AACzB,0DAA+B;AAG/B,uCAA0E;AAC1E,+CAA4C;AAC5C,2CAA0D;AAC1D,yCAAiD;AACjD,yCAA2C;AAC3C,iDAA+C;AAC/C,qDAAoD;AACpD,mDAA+C;AAE/C,mCAA+E;AAE/E,yCAAsC;AACtC,yCAAqC;AACrC,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,kBAAO,CAAC,CAAC;AAanC,MAAa,eACT,SAAQ,wBAA6B;IAUrC,iBAAiB,CAAC,KAAU;QACxB,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACjD,CAAC;CACJ;AAdD,0CAcC;AAiBD,SAAS,WAAW,CAAC,KAAU;IAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;IAChC,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED,SAAS,QAAQ,CACb,IAAS,EACT,GAAe,EACf,UAAsB;IAEtB,MAAM,MAAM,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,aAAa,EAAE,CAAC;QAC3B,MAAM,EAAE,GAAG,IAAA,qBAAa,EAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,IAAI,gBAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAEpC,MAAM,MAAM,GAAG,IAAI,gBAAG,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAEzD,OAAO,IAAA,gBAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,yBAAyB;AACzB,SAAS,WAAW,CAAC,IAAS,EAAE,GAAe;IAC3C,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC;IAExE,MAAM,WAAW,GAAG,IAAA,eAAO,EACvB,IAAA,qBAAS,EAAC,IAAA,cAAM,EAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CACrD,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACf,IAAI,WAAW,KAAK,IAAA,kBAAU,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;QAC/D,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;QACb,MAAM,CAAC,UAAU,CACb,oBAAoB,EACpB,eAAM,CAAC,MAAM,CAAC,qBAAqB,EACnC;YACI,SAAS,EAAE,SAAS;SACvB,CACJ,CAAC;IACN,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,IAAA,eAAO,EAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjD,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAA,6BAAc,EAAC,SAAS,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAqB;QAC9B,kBAAkB,EAAE,IAAI;QACxB,OAAO,EAAE,OAAO;QAChB,UAAU,EAAE,UAAU;QACtB,SAAS,EAAE,SAAS;KACvB,CAAC;IAEF,0EAA0E;IAC1E,IAAI,IAAA,kBAAU,EAAC,IAAI,EAAE,kBAAkB,CAAC,KAAK,KAAK,EAAE,CAAC;QACjD,MAAM,kBAAkB,GAAG,IAAA,qBAAa,EACpC,IAAA,kBAAU,EAAC,IAAI,EAAE,6BAA6B,CAAC,CAClD,CAAC;QACF,MAAM,UAAU,GAAG,IAAA,qBAAa,EAC5B,IAAA,kBAAU,EAAC,IAAI,EAAE,0BAA0B,CAAC,CAC/C,CAAC;QAEF,MAAM,eAAe,GAAG,IAAI,gBAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,cAAc,GAAG,IAAI,gBAAG,CAAC,eAAe,CAAC,GAAG,CAC9C,WAAW,EACX,eAAe,CAClB,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAA,sBAAY,EACzB,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAC7C,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAChC,CAAC;IAED,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AAmBD,SAAS,UAAU,CACf,aAAyB,EACzB,IAAgB,EAChB,KAAa,EACb,KAAa,EACb,OAAe;IAEf,OAAO,IAAA,gBAAQ,EAAC,IAAA,eAAO,EAAC,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,MAAM,CACX,aAAyB,EACzB,IAAgB,EAChB,KAAa,EACb,KAAa,EACb,OAAe;IAEf,OAAO,OAAO,CAAC,OAAO,CAClB,UAAU,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CACzD,CAAC;AACN,CAAC;AAED,SAAS,cAAc,CACnB,IAAS,EACT,QAAwB,EACxB,UAAyB,EACzB,UAAyB,EACzB,gBAAmC;IAEnC,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,GAAG,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAE3C,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACjC,MAAM,UAAU,GAAG,UAAU,IAAY,EAAE,KAAU;YACjD,OAAO,MAAM,CAAC,kBAAkB,CAC5B,4CAA4C,EAC5C,IAAI,EACJ,KAAK,CACR,CAAC;QACN,CAAC,CAAC;QAEF,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;YACjC,MAAM,IAAI,GAAG,IAAA,qBAAa,EACtB,IAAA,kBAAU,EAAC,IAAI,EAAE,uBAAuB,CAAC,CAC5C,CAAC;YACF,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;YAC3D,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;YAE3D,oCAAoC;YACpC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;gBACjB,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC3B,CAAC;YAED,8BAA8B;YAC9B,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtB,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACvB,CAAC;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;YACnE,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACf,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,OAAO,UAAU,CACb,aAAa,EACb,IAAI,EACJ,CAAC,EACD,CAAC,EACD,CAAC,EACD,EAAE,EACF,gBAAgB,CACnB,CAAC;QACN,CAAC;aAAM,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,GAAG,IAAA,qBAAa,EACtB,IAAA,kBAAU,EAAC,IAAI,EAAE,uBAAuB,CAAC,CAC5C,CAAC;YAEF,IAAI,OAAO,GAAW,IAAI,CAAC;YAC3B,MAAM,GAAG,GAAG,IAAA,kBAAU,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;YACrD,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBACxB,OAAO,GAAG,QAAQ,CAAC;YACvB,CAAC;iBAAM,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBAC/B,OAAO,GAAG,QAAQ,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACJ,UAAU,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YAC3B,CAAC;YAED,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC,CAAC;YAE/D,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAA,kBAAU,EAAC,IAAI,EAAE,wBAAwB,CAAC,CAAC,CAAC;YACnE,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;gBACf,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/B,CAAC;YAED,OAAO,UAAU,CAAC,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAClE,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,kBAAkB,CAC5B,qCAAqC,EACrC,KAAK,EACL,GAAG,CACN,CAAC;AACN,CAAC;AAED,SAAgB,WAAW,CACvB,IAAY,EACZ,QAAwB;IAExB,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE9B,MAAM,GAAG,GAAG,cAAc,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,mBAAM,CAAC,UAAU,CAAC,CAAC;IAC1E,OAAO,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,OAAO,CACzB,IAAY,EACZ,QAAwB,EACxB,gBAAmC;IAEnC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE9B,MAAM,GAAG,GAAG,MAAM,cAAc,CAC5B,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,mBAAM,CAAC,MAAM,EACb,gBAAgB,CACnB,CAAC;IACF,OAAO,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,gGAAgG;AAEzF,KAAK,UAAU,OAAO,CACzB,OAA+B,EAC/B,QAAwB,EACxB,OAAwB,EACxB,gBAAmC;IAEnC,IAAI,CAAC;QACD,2CAA2C;QAC3C,IAAI,OAAO,CAAC,OAAO,KAAK,IAAA,6BAAc,EAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,CAAC;QAED,8DAA8D;QAC9D,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,MAAM,GAAG,GAAG,MAAM,wBAAU,CAAC,qBAAqB,CAC9C,OAAO,CAAC,QAAQ,CACnB,CAAC;YAEF,IAAI,OAAO,CAAC,UAAU,KAAK,GAAG,CAAC,UAAU,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,OAAO,CAAC,SAAS,KAAK,GAAG,CAAC,SAAS,EAAE,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACnD,CAAC;QACL,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACT,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC;IAED,yDAAyD;IACzD,IAAI,OAAO,OAAO,KAAK,UAAU,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACrD,OAAO,GAAG,EAAE,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,GAAG,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,UAAU,GAAe,IAAA,gBAAQ,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAe,IAAA,gBAAQ,EAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAEvE,SAAS,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC7B,SAAS,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,QAAQ,CAAC,CAAC;IAE5C,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,GAAG,WAAW,CAAC;IACzB,CAAC;IAED,0BAA0B;IAC1B,IAAI,IAAI,GAAe,IAAI,CAAC;IAC5B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,IAAI,GAAG,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACJ,IAAI,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAED,iCAAiC;IACjC,IAAI,EAAE,GAAe,IAAI,CAAC;IAC1B,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;QACb,EAAE,GAAG,IAAA,gBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC1B,IAAI,EAAE,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,EAAE,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,oBAAoB;IACpB,IAAI,UAAU,GAAe,IAAI,CAAC;IAClC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,UAAU,GAAG,IAAA,gBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,UAAU,CAAC,MAAM,KAAK,EAAE,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QACpC,CAAC;IACL,CAAC;SAAM,CAAC;QACJ,UAAU,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,wEAAwE;IACxE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EACX,CAAC,GAAG,CAAC,EACL,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACnB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACnB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACzB,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;YACnB,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAED,oBAAoB;IACpB,+EAA+E;IAC/E,sFAAsF;IACtF,OAAO,mBAAM;SACR,MAAM,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,gBAAgB,CAAC;SAC1D,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACV,GAAG,GAAG,IAAA,gBAAQ,EAAC,GAAG,CAAC,CAAC;QAEpB,uEAAuE;QACvE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACpC,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAEpC,4DAA4D;QAC5D,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAEtC,mBAAmB;QACnB,MAAM,OAAO,GAAG,IAAI,gBAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,gBAAG,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,IAAA,gBAAQ,EAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;QAEvD,sEAAsE;QACtE,MAAM,GAAG,GAAG,IAAA,qBAAS,EAAC,IAAA,cAAM,EAAC,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;QAEvD,4EAA4E;QAC5E,MAAM,IAAI,GAA2B;YACjC,EAAE,EAAE,IAAA,cAAM,EAAC,UAAU,CAAC;YACtB,OAAO,EAAE,CAAC;YACV,MAAM,EAAE;gBACJ,MAAM,EAAE,aAAa;gBACrB,YAAY,EAAE;oBACV,EAAE,EAAE,IAAA,eAAO,EAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;iBAC/B;gBACD,UAAU,EAAE,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5C,GAAG,EAAE,QAAQ;gBACb,SAAS,EAAE;oBACP,IAAI,EAAE,IAAA,eAAO,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oBAChC,CAAC,EAAE,CAAC;oBACJ,KAAK,EAAE,EAAE;oBACT,CAAC,EAAE,CAAC;oBACJ,CAAC,EAAE,CAAC;iBACP;gBACD,GAAG,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;aACxB;SACJ,CAAC;QAEF,yDAAyD;QACzD,IAAI,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC;YACnC,MAAM,eAAe,GAAG,IAAI,gBAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACpD,MAAM,cAAc,GAAG,IAAI,gBAAG,CAAC,eAAe,CAAC,GAAG,CAC9C,WAAW,EACX,eAAe,CAClB,CAAC;YACF,MAAM,kBAAkB,GAAG,IAAA,gBAAQ,EAC/B,cAAc,CAAC,OAAO,CAAC,IAAA,qBAAW,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CACxD,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,GACX,GAAG,CAAC,cAAc,EAAE;gBACpB,GAAG;gBACH,IAAA,YAAI,EAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC9B,GAAG;gBACH,IAAA,YAAI,EAAC,GAAG,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBACzB,GAAG;gBACH,IAAA,YAAI,EAAC,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG;gBACH,IAAA,YAAI,EAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;gBAC5B,GAAG;gBACH,IAAA,YAAI,EAAC,GAAG,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;gBAC5B,KAAK,CAAC;YACV,IAAI,CAAC,UAAU,CAAC,GAAG;gBACf,MAAM,EAAE,MAAM;gBACd,YAAY,EAAE,OAAO,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,CAAC,OAAO;gBACvD,eAAe,EAAE,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBACjD,kBAAkB,EACd,IAAA,eAAO,EAAC,kBAAkB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5C,OAAO,EAAE,KAAK;aACjB,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"keystore.js","sourceRoot":"","sources":["../src.ts/keystore.ts"],"names":[],"mappings":"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"}

package.json

@@ -40,3 +40,3 @@ {
     "types": "./lib/index.d.ts",
-    "version": "5.7.3"
+    "version": "5.7.4"
 }

src.ts/_version.ts

@@ -1,1 +0,1 @@
-export const version = "json-wallets/5.7.3";
+export const version = "json-wallets/5.7.4";

src.ts/keystore.ts

@@ -7,2 +7,3 @@ "use strict";
 import { ExternallyOwnedAccount } from "@qevm/abstract-signer";
+import { getAddress } from "@qevm/address";
 import { arrayify, Bytes, BytesLike, concat, hexlify } from "@qevm/bytes";
@@ -115,3 +116,3 @@ import { keccak256 } from "@qevm/keccak256";
 
-    const address = computeAddress(publickey);
+    const address = getAddress(computeAddress(publickey));
     const account: _KeystoreAccount = {
@@ -124,9 +125,9 @@ _isKeystoreAccount: true,
 
-    // Version 0.1 x-ethers metadata must contain an encrypted mnemonic phrase
-    if (searchPath(data, "x-ethers/version") === "0.1") {
+    // Version 0.1 x-qethers metadata must contain an encrypted mnemonic phrase
+    if (searchPath(data, "x-qethers/version") === "0.1") {
         const mnemonicCiphertext = looseArrayify(
-            searchPath(data, "x-ethers/mnemonicCiphertext"),
+            searchPath(data, "x-qethers/mnemonicCiphertext"),
         );
         const mnemonicIv = looseArrayify(
-            searchPath(data, "x-ethers/mnemonicCounter"),
+            searchPath(data, "x-qethers/mnemonicCounter"),
         );
@@ -311,3 +312,3 @@
         // Check the address matches the public key
-        if (account.address !== computeAddress(account.publicKey)) {
+        if (account.address !== getAddress(computeAddress(account.publicKey))) {
             throw new Error("address/publicKey mismatch");
@@ -354,3 +355,3 @@ }
     if (!client) {
-        client = "ethers.js";
+        client = "qethers.js";
     }
@@ -474,3 +475,3 @@
                     ".0Z";
-                data["x-ethers"] = {
+                data["x-qethers"] = {
                     client: client,
@@ -477,0 +478,0 @@ gethFilename: "UTC--" + timestamp + "--" + data.address,

No alert changes

Improved metrics

Total package byte prevSize

72946

0.32%

Lines of code

1264

0.16%

No dependency changes