@celo/wallet-hsm-azure 5.1.1 → 5.1.2-beta.0

package/.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: '../../../../.eslintrc.js',
+}

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @celo/wallet-hsm-azure
 
+## 5.1.2-beta.0
+
+### Patch Changes
+
+- [#94](https://github.com/celo-org/developer-tooling/pull/94) [`45d156d`](https://github.com/celo-org/developer-tooling/commit/45d156d03c03399bef51a00fe2b5cfb5e5669642) Thanks [@aaronmgdr](https://github.com/aaronmgdr)! - Bump all @azure packages to latest versions. These includes several major bumps which should not affect use in this library. For More details
+  - https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/CHANGELOG.md
+  - https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/identity/identity/BREAKING_CHANGES.md
+  - https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/keyvault/keyvault-secrets/CHANGELOG.md
+  - https://github.com/Azure/azure-sdk-for-js/blob/main/sdk/keyvault/keyvault-keys/CHANGELOG.md
+- Updated dependencies [[`6b2e34c`](https://github.com/celo-org/developer-tooling/commit/6b2e34c973290da221aaabdc2bf4c6654ef9f99c)]:
+  - @celo/utils@6.0.0-beta.0
+  - @celo/connect@5.1.2-beta.0
+  - @celo/wallet-base@5.1.2-beta.0
+  - @celo/wallet-remote@5.1.2-beta.0
+  - @celo/wallet-hsm@5.1.2-beta.0
+
 ## 5.1.1
 
 ### Patch Changes

package/eslint.tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": []
+}

package/lib/azure-hsm-signer.js

@@ -31,130 +31,76 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureHSMSigner = void 0;
-var address_1 = require("@celo/base/lib/address");
-var sign_typed_data_utils_1 = require("@celo/utils/lib/sign-typed-data-utils");
-var wallet_base_1 = require("@celo/wallet-base");
-var ethUtil = __importStar(require("@ethereumjs/util"));
+const address_1 = require("@celo/base/lib/address");
+const sign_typed_data_utils_1 = require("@celo/utils/lib/sign-typed-data-utils");
+const wallet_base_1 = require("@celo/wallet-base");
+const ethUtil = __importStar(require("@ethereumjs/util"));
 /**
  * Signs the EVM transaction using an HSM key in Azure Key Vault
  */
-var AzureHSMSigner = /** @class */ (function () {
-    function AzureHSMSigner(keyVaultClient, keyName) {
+class AzureHSMSigner {
+    constructor(keyVaultClient, keyName) {
         if (!AzureHSMSigner.keyVaultClient) {
             AzureHSMSigner.keyVaultClient = keyVaultClient;
         }
         this.keyName = keyName;
     }
-    AzureHSMSigner.prototype.signTransaction = function (addToV, encodedTx) {
-        return __awaiter(this, void 0, void 0, function () {
-            var hash, bufferedMessage, signature, sigV;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        hash = (0, wallet_base_1.getHashFromEncoded)(encodedTx.rlpEncode);
-                        bufferedMessage = Buffer.from((0, address_1.trimLeading0x)(hash), 'hex');
-                        return [4 /*yield*/, AzureHSMSigner.keyVaultClient.signMessage(bufferedMessage, this.keyName)];
-                    case 1:
-                        signature = _a.sent();
-                        sigV = addToV + signature.v;
-                        return [2 /*return*/, {
-                                v: sigV,
-                                r: signature.r,
-                                s: signature.s,
-                            }];
-                }
-            });
+    signTransaction(addToV, encodedTx) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const hash = (0, wallet_base_1.getHashFromEncoded)(encodedTx.rlpEncode);
+            const bufferedMessage = Buffer.from((0, address_1.trimLeading0x)(hash), 'hex');
+            const signature = yield AzureHSMSigner.keyVaultClient.signMessage(bufferedMessage, this.keyName);
+            const sigV = addToV + signature.v;
+            return {
+                v: sigV,
+                r: signature.r,
+                s: signature.s,
+            };
         });
-    };
-    AzureHSMSigner.prototype.signPersonalMessage = function (data) {
-        return __awaiter(this, void 0, void 0, function () {
-            var dataBuff, msgHashBuff, signature, sigV;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        dataBuff = ethUtil.toBuffer((0, address_1.ensureLeading0x)(data));
-                        msgHashBuff = ethUtil.hashPersonalMessage(dataBuff);
-                        return [4 /*yield*/, AzureHSMSigner.keyVaultClient.signMessage(Buffer.from(msgHashBuff), this.keyName)
-                            // Recovery ID should be a byte prefix
-                            // https://bitcoin.stackexchange.com/questions/38351/ecdsa-v-r-s-what-is-v
-                        ];
-                    case 1:
-                        signature = _a.sent();
-                        sigV = signature.v + 27;
-                        return [2 /*return*/, {
-                                v: sigV,
-                                r: signature.r,
-                                s: signature.s,
-                            }];
-                }
-            });
+    }
+    signPersonalMessage(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dataBuff = ethUtil.toBuffer((0, address_1.ensureLeading0x)(data));
+            const msgHashBuff = ethUtil.hashPersonalMessage(dataBuff);
+            const signature = yield AzureHSMSigner.keyVaultClient.signMessage(Buffer.from(msgHashBuff), this.keyName);
+            // Recovery ID should be a byte prefix
+            // https://bitcoin.stackexchange.com/questions/38351/ecdsa-v-r-s-what-is-v
+            const sigV = signature.v + 27;
+            return {
+                v: sigV,
+                r: signature.r,
+                s: signature.s,
+            };
         });
-    };
-    AzureHSMSigner.prototype.signTypedData = function (typedData) {
-        return __awaiter(this, void 0, void 0, function () {
-            var dataBuff, signature, sigV;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        dataBuff = (0, sign_typed_data_utils_1.generateTypedDataHash)(typedData);
-                        return [4 /*yield*/, AzureHSMSigner.keyVaultClient.signMessage(dataBuff, this.keyName)
-                            // Recovery ID should be a byte prefix
-                            // https://bitcoin.stackexchange.com/questions/38351/ecdsa-v-r-s-what-is-v
-                        ];
-                    case 1:
-                        signature = _a.sent();
-                        sigV = signature.v + 27;
-                        return [2 /*return*/, {
-                                v: sigV,
-                                r: signature.r,
-                                s: signature.s,
-                            }];
-                }
-            });
+    }
+    signTypedData(typedData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const dataBuff = (0, sign_typed_data_utils_1.generateTypedDataHash)(typedData);
+            const signature = yield AzureHSMSigner.keyVaultClient.signMessage(dataBuff, this.keyName);
+            // Recovery ID should be a byte prefix
+            // https://bitcoin.stackexchange.com/questions/38351/ecdsa-v-r-s-what-is-v
+            const sigV = signature.v + 27;
+            return {
+                v: sigV,
+                r: signature.r,
+                s: signature.s,
+            };
         });
-    };
-    AzureHSMSigner.prototype.getNativeKey = function () {
+    }
+    getNativeKey() {
         return this.keyName;
-    };
-    AzureHSMSigner.prototype.decrypt = function (_ciphertext) {
+    }
+    decrypt(_ciphertext) {
         throw new Error('Decryption operation is not supported on this signer');
         // To make the compiler happy
         return Promise.resolve(_ciphertext);
-    };
-    AzureHSMSigner.prototype.computeSharedSecret = function (_publicKey) {
+    }
+    computeSharedSecret(_publicKey) {
         throw new Error('Not implemented');
         return Promise.resolve(Buffer.from([]));
-    };
-    return AzureHSMSigner;
-}());
+    }
+}
 exports.AzureHSMSigner = AzureHSMSigner;
 //# sourceMappingURL=azure-hsm-signer.js.map

package/lib/azure-hsm-wallet.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -23,123 +8,66 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureHSMWallet = void 0;
-var address_1 = require("@celo/utils/lib/address");
-var wallet_remote_1 = require("@celo/wallet-remote");
-var debug_1 = __importDefault(require("debug"));
-var azure_hsm_signer_1 = require("./azure-hsm-signer");
-var azure_key_vault_client_1 = require("./azure-key-vault-client");
-var debug = (0, debug_1.default)('kit:wallet:aws-hsm-wallet');
+const address_1 = require("@celo/utils/lib/address");
+const wallet_remote_1 = require("@celo/wallet-remote");
+const debug_1 = __importDefault(require("debug"));
+const azure_hsm_signer_1 = require("./azure-hsm-signer");
+const azure_key_vault_client_1 = require("./azure-key-vault-client");
+const debug = (0, debug_1.default)('kit:wallet:aws-hsm-wallet');
 // Azure Key Vault implementation of a RemoteWallet
-var AzureHSMWallet = /** @class */ (function (_super) {
-    __extends(AzureHSMWallet, _super);
-    function AzureHSMWallet(vaultName) {
-        var _this = _super.call(this) || this;
-        _this.vaultName = vaultName;
-        return _this;
+class AzureHSMWallet extends wallet_remote_1.RemoteWallet {
+    constructor(vaultName) {
+        super();
+        this.vaultName = vaultName;
     }
-    AzureHSMWallet.prototype.loadAccountSigners = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var keys, addressToSigner, _i, keys_1, key, address, e_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.keyVaultClient) {
-                            this.keyVaultClient = this.generateNewKeyVaultClient(this.vaultName);
-                        }
-                        return [4 /*yield*/, this.keyVaultClient.getKeys()];
-                    case 1:
-                        keys = _a.sent();
-                        addressToSigner = new Map();
-                        _i = 0, keys_1 = keys;
-                        _a.label = 2;
-                    case 2:
-                        if (!(_i < keys_1.length)) return [3 /*break*/, 7];
-                        key = keys_1[_i];
-                        _a.label = 3;
-                    case 3:
-                        _a.trys.push([3, 5, , 6]);
-                        return [4 /*yield*/, this.getAddressFromKeyName(key)];
-                    case 4:
-                        address = _a.sent();
-                        addressToSigner.set(address, new azure_hsm_signer_1.AzureHSMSigner(this.keyVaultClient, key));
-                        return [3 /*break*/, 6];
-                    case 5:
-                        e_1 = _a.sent();
-                        // Safely ignore non-secp256k1 keys
-                        if (!e_1.message.includes('Invalid secp256k1')) {
-                            throw e_1;
-                        }
-                        else {
-                            debug("Ignoring non-secp256k1 key ".concat(key));
-                        }
-                        return [3 /*break*/, 6];
-                    case 6:
-                        _i++;
-                        return [3 /*break*/, 2];
-                    case 7: return [2 /*return*/, addressToSigner];
+    loadAccountSigners() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.keyVaultClient) {
+                this.keyVaultClient = this.generateNewKeyVaultClient(this.vaultName);
+            }
+            const keys = yield this.keyVaultClient.getKeys();
+            const addressToSigner = new Map();
+            for (const key of keys) {
+                try {
+                    const address = yield this.getAddressFromKeyName(key);
+                    addressToSigner.set(address, new azure_hsm_signer_1.AzureHSMSigner(this.keyVaultClient, key));
+                }
+                catch (e) {
+                    // Safely ignore non-secp256k1 keys
+                    if (!e.message.includes('Invalid secp256k1')) {
+                        throw e;
+                    }
+                    else {
+                        debug(`Ignoring non-secp256k1 key ${key}`);
+                    }
                 }
-            });
+            }
+            return addressToSigner;
         });
-    };
+    }
     // Extracted for testing purpose
-    AzureHSMWallet.prototype.generateNewKeyVaultClient = function (vaultName) {
+    generateNewKeyVaultClient(vaultName) {
         return new azure_key_vault_client_1.AzureKeyVaultClient(vaultName);
-    };
+    }
     /**
      * Returns the EVM address for the given key
      * Useful for initially getting the 'from' field given a keyName
      * @param keyName Azure KeyVault key name
      */
-    AzureHSMWallet.prototype.getAddressFromKeyName = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var publicKey;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.keyVaultClient) {
-                            throw new Error('AzureHSMWallet needs to be initialized first');
-                        }
-                        return [4 /*yield*/, this.keyVaultClient.getPublicKey(keyName)];
-                    case 1:
-                        publicKey = _a.sent();
-                        return [2 /*return*/, (0, address_1.publicKeyToAddress)(publicKey.toString(16))];
-                }
-            });
+    getAddressFromKeyName(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.keyVaultClient) {
+                throw new Error('AzureHSMWallet needs to be initialized first');
+            }
+            const publicKey = yield this.keyVaultClient.getPublicKey(keyName);
+            return (0, address_1.publicKeyToAddress)(publicKey.toString(16));
         });
-    };
-    return AzureHSMWallet;
-}(wallet_remote_1.RemoteWallet));
+    }
+}
 exports.AzureHSMWallet = AzureHSMWallet;
 //# sourceMappingURL=azure-hsm-wallet.js.map

package/lib/azure-key-vault-client.js

@@ -8,33 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 var __asyncValues = (this && this.__asyncValues) || function (o) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var m = o[Symbol.asyncIterator], i;
@@ -44,266 +17,173 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureKeyVaultClient = void 0;
-var identity_1 = require("@azure/identity");
-var keyvault_keys_1 = require("@azure/keyvault-keys");
-var keyvault_secrets_1 = require("@azure/keyvault-secrets");
-var wallet_hsm_1 = require("@celo/wallet-hsm");
-var SUPPORTED_CURVES = ['P-256K', 'SECP256K1'];
-var SIGNING_ALGORITHM_FOR = {
+const identity_1 = require("@azure/identity");
+const keyvault_keys_1 = require("@azure/keyvault-keys");
+const keyvault_secrets_1 = require("@azure/keyvault-secrets");
+const wallet_hsm_1 = require("@celo/wallet-hsm");
+const SUPPORTED_CURVES = ['P-256K', 'SECP256K1'];
+const SIGNING_ALGORITHM_FOR = {
     'P-256K': 'ES256K',
     SECP256K1: 'ECDSA256',
 };
-var isSupportedCurve = function (curveName) {
+const isSupportedCurve = (curveName) => {
     return SUPPORTED_CURVES.indexOf(curveName) > -1;
 };
 /**
  * Provides an abstraction on Azure Key Vault for performing signing operations
  */
-var AzureKeyVaultClient = /** @class */ (function () {
-    function AzureKeyVaultClient(vaultName, credential) {
+class AzureKeyVaultClient {
+    constructor(vaultName, credential) {
         this.cryptographyClientSet = new Map();
         this.vaultName = vaultName;
-        this.vaultUri = "https://".concat(this.vaultName, ".vault.azure.net");
+        this.vaultUri = `https://${this.vaultName}.vault.azure.net`;
         // DefaultAzureCredential supports service principal or managed identity
         // If using a service principal, you must set the appropriate environment vars
         this.credential = credential || new identity_1.DefaultAzureCredential();
         this.keyClient = new keyvault_keys_1.KeyClient(this.vaultUri, this.credential);
         this.secretClient = new keyvault_secrets_1.SecretClient(this.vaultUri, this.credential);
     }
-    AzureKeyVaultClient.prototype.getKeys = function () {
-        var e_1, _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var keyNames, _b, _c, keyProperties, e_1_1;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        keyNames = new Array();
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 6, 7, 12]);
-                        _b = __asyncValues(this.keyClient.listPropertiesOfKeys());
-                        _d.label = 2;
-                    case 2: return [4 /*yield*/, _b.next()];
-                    case 3:
-                        if (!(_c = _d.sent(), !_c.done)) return [3 /*break*/, 5];
-                        keyProperties = _c.value;
-                        keyNames.push(keyProperties.name);
-                        _d.label = 4;
-                    case 4: return [3 /*break*/, 2];
-                    case 5: return [3 /*break*/, 12];
-                    case 6:
-                        e_1_1 = _d.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 12];
-                    case 7:
-                        _d.trys.push([7, , 10, 11]);
-                        if (!(_c && !_c.done && (_a = _b.return))) return [3 /*break*/, 9];
-                        return [4 /*yield*/, _a.call(_b)];
-                    case 8:
-                        _d.sent();
-                        _d.label = 9;
-                    case 9: return [3 /*break*/, 11];
-                    case 10:
-                        if (e_1) throw e_1.error;
-                        return [7 /*endfinally*/];
-                    case 11: return [7 /*endfinally*/];
-                    case 12: return [2 /*return*/, keyNames];
+    getKeys() {
+        var _a, e_1, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const keyNames = new Array();
+            try {
+                for (var _d = true, _e = __asyncValues(this.keyClient.listPropertiesOfKeys()), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
+                    _c = _f.value;
+                    _d = false;
+                    const keyProperties = _c;
+                    keyNames.push(keyProperties.name);
                 }
-            });
-        });
-    };
-    AzureKeyVaultClient.prototype.getPublicKey = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var signingKey, pubKeyPrefix, rawPublicKey, publicKey;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getKey(keyName)];
-                    case 1:
-                        signingKey = _a.sent();
-                        pubKeyPrefix = Buffer.from(new Uint8Array([wallet_hsm_1.publicKeyPrefix]));
-                        rawPublicKey = Buffer.concat([
-                            pubKeyPrefix,
-                            Buffer.from(signingKey.key.x),
-                            Buffer.from(signingKey.key.y),
-                        ]);
-                        publicKey = (0, wallet_hsm_1.bufferToBigNumber)(rawPublicKey);
-                        return [2 /*return*/, publicKey];
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
                 }
-            });
+                finally { if (e_1) throw e_1.error; }
+            }
+            return keyNames;
         });
-    };
-    AzureKeyVaultClient.prototype.getKeyId = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.hasKey(keyName)];
-                    case 1:
-                        if (!(_a.sent())) {
-                            throw new Error("Unable to locate key: ".concat(keyName));
-                        }
-                        return [4 /*yield*/, this.getKey(keyName)];
-                    case 2: return [2 /*return*/, (_a.sent()).id];
-                }
-            });
+    }
+    getPublicKey(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const signingKey = yield this.getKey(keyName);
+            const pubKeyPrefix = Buffer.from(new Uint8Array([wallet_hsm_1.publicKeyPrefix]));
+            const rawPublicKey = Buffer.concat([
+                pubKeyPrefix,
+                Buffer.from(signingKey.key.x),
+                Buffer.from(signingKey.key.y),
+            ]);
+            const publicKey = (0, wallet_hsm_1.bufferToBigNumber)(rawPublicKey);
+            return publicKey;
         });
-    };
-    AzureKeyVaultClient.prototype.signMessage = function (message, keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var curve, signingAlgorithm, cryptographyClient, signResult, rawSignature, R, S, rBuff, sBuff, canonicalizedSignature, publicKey, recoveryParam;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.hasKey(keyName)];
-                    case 1:
-                        if (!(_a.sent())) {
-                            throw new Error("Unable to locate key: ".concat(keyName));
-                        }
-                        return [4 /*yield*/, this.getKeyCurve(keyName)];
-                    case 2:
-                        curve = _a.sent();
-                        if (!isSupportedCurve(curve)) {
-                            throw new Error("Key curve ".concat(curve, " is not supported, must be one of: ").concat(SUPPORTED_CURVES));
-                        }
-                        signingAlgorithm = SIGNING_ALGORITHM_FOR[curve];
-                        return [4 /*yield*/, this.getCryptographyClient(keyName)];
-                    case 3:
-                        cryptographyClient = _a.sent();
-                        return [4 /*yield*/, cryptographyClient.sign(
-                            // @ts-ignore-next-line (ECDSA256 is not included in the client enum but is valid)
-                            signingAlgorithm, new Uint8Array(message))
-                            // The output of this will be a 64 byte array.
-                            // The first 32 are the value for R and the rest is S
-                        ];
-                    case 4:
-                        signResult = _a.sent();
-                        // The output of this will be a 64 byte array.
-                        // The first 32 are the value for R and the rest is S
-                        if (typeof signResult === 'undefined' ||
-                            typeof signResult.result === 'undefined' ||
-                            signResult.result.length !== wallet_hsm_1.sixtyFour) {
-                            throw new Error("Invalid signature returned from Azure: ".concat(signResult));
-                        }
-                        rawSignature = signResult.result;
-                        R = (0, wallet_hsm_1.bufferToBigNumber)(Buffer.from(rawSignature.slice(0, wallet_hsm_1.thirtyTwo)));
-                        S = (0, wallet_hsm_1.bufferToBigNumber)(Buffer.from(rawSignature.slice(wallet_hsm_1.thirtyTwo, wallet_hsm_1.sixtyFour)));
-                        S = (0, wallet_hsm_1.makeCanonical)(S);
-                        rBuff = (0, wallet_hsm_1.bigNumberToBuffer)(R, wallet_hsm_1.thirtyTwo);
-                        sBuff = (0, wallet_hsm_1.bigNumberToBuffer)(S, wallet_hsm_1.thirtyTwo);
-                        canonicalizedSignature = Buffer.concat([rBuff, sBuff]);
-                        return [4 /*yield*/, this.getPublicKey(keyName)
-                            // Azure doesn't provide the recovery key in the signature
-                        ];
-                    case 5:
-                        publicKey = _a.sent();
-                        recoveryParam = (0, wallet_hsm_1.recoverKeyIndex)(canonicalizedSignature, publicKey, message);
-                        return [2 /*return*/, new wallet_hsm_1.Signature(recoveryParam, rBuff, sBuff)];
-                }
-            });
+    }
+    getKeyId(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.hasKey(keyName))) {
+                throw new Error(`Unable to locate key: ${keyName}`);
+            }
+            return (yield this.getKey(keyName)).id;
         });
-    };
-    AzureKeyVaultClient.prototype.hasKey = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var e_2;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.keyClient.getKey(keyName)];
-                    case 1:
-                        _a.sent();
-                        return [3 /*break*/, 3];
-                    case 2:
-                        e_2 = _a.sent();
-                        if (e_2.message.includes('this is not a valid private key')) {
-                            return [2 /*return*/, false];
-                        }
-                        throw e_2;
-                    case 3: return [2 /*return*/, true];
-                }
-            });
+    }
+    signMessage(message, keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.hasKey(keyName))) {
+                throw new Error(`Unable to locate key: ${keyName}`);
+            }
+            const curve = yield this.getKeyCurve(keyName);
+            if (!isSupportedCurve(curve)) {
+                throw new Error(`Key curve ${curve} is not supported, must be one of: ${SUPPORTED_CURVES}`);
+            }
+            const signingAlgorithm = SIGNING_ALGORITHM_FOR[curve];
+            const cryptographyClient = yield this.getCryptographyClient(keyName);
+            const signResult = yield cryptographyClient.sign(signingAlgorithm, new Uint8Array(message));
+            // The output of this will be a 64 byte array.
+            // The first 32 are the value for R and the rest is S
+            if (typeof signResult === 'undefined' ||
+                typeof signResult.result === 'undefined' ||
+                signResult.result.length !== wallet_hsm_1.sixtyFour) {
+                throw new Error(`Invalid signature returned from Azure: ${signResult}`);
+            }
+            const rawSignature = signResult.result;
+            // Canonicalize signature
+            const R = (0, wallet_hsm_1.bufferToBigNumber)(Buffer.from(rawSignature.slice(0, wallet_hsm_1.thirtyTwo)));
+            let S = (0, wallet_hsm_1.bufferToBigNumber)(Buffer.from(rawSignature.slice(wallet_hsm_1.thirtyTwo, wallet_hsm_1.sixtyFour)));
+            S = (0, wallet_hsm_1.makeCanonical)(S);
+            const rBuff = (0, wallet_hsm_1.bigNumberToBuffer)(R, wallet_hsm_1.thirtyTwo);
+            const sBuff = (0, wallet_hsm_1.bigNumberToBuffer)(S, wallet_hsm_1.thirtyTwo);
+            const canonicalizedSignature = Buffer.concat([rBuff, sBuff]);
+            const publicKey = yield this.getPublicKey(keyName);
+            // Azure doesn't provide the recovery key in the signature
+            const recoveryParam = (0, wallet_hsm_1.recoverKeyIndex)(canonicalizedSignature, publicKey, message);
+            return new wallet_hsm_1.Signature(recoveryParam, rBuff, sBuff);
         });
-    };
-    AzureKeyVaultClient.prototype.getSecret = function (secretName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var secret;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.secretClient.getSecret(secretName)];
-                    case 1:
-                        secret = _a.sent();
-                        if (!secret.value) {
-                            throw new Error("Could not locate secret ".concat(secretName, " in vault ").concat(this.vaultName));
-                        }
-                        return [2 /*return*/, secret.value];
+    }
+    hasKey(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.keyClient.getKey(keyName);
+            }
+            catch (e) {
+                if (e.message.includes('this is not a valid private key')) {
+                    return false;
                 }
-            });
+                throw e;
+            }
+            return true;
+        });
+    }
+    getSecret(secretName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const secret = yield this.secretClient.getSecret(secretName);
+            if (!secret.value) {
+                throw new Error(`Could not locate secret ${secretName} in vault ${this.vaultName}`);
+            }
+            return secret.value;
         });
-    };
-    AzureKeyVaultClient.prototype.getKey = function (keyName) {
+    }
+    getKey(keyName) {
         var _a, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var signingKey, e_3;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.keyClient.getKey(keyName)];
-                    case 1:
-                        signingKey = _c.sent();
-                        if (typeof (signingKey === null || signingKey === void 0 ? void 0 : signingKey.id) === 'undefined' ||
-                            typeof ((_a = signingKey === null || signingKey === void 0 ? void 0 : signingKey.key) === null || _a === void 0 ? void 0 : _a.x) === 'undefined' ||
-                            typeof ((_b = signingKey === null || signingKey === void 0 ? void 0 : signingKey.key) === null || _b === void 0 ? void 0 : _b.y) === 'undefined') {
-                            throw new Error("Invalid key data returned from Azure: ".concat(signingKey));
-                        }
-                        return [2 /*return*/, signingKey];
-                    case 2:
-                        e_3 = _c.sent();
-                        if (e_3.message.includes('Key not found')) {
-                            throw new Error("Key ".concat(keyName, " not found in KeyVault ").concat(this.vaultName));
-                        }
-                        throw new Error("Unexpected KeyVault error ".concat(e_3.message));
-                    case 3: return [2 /*return*/];
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const signingKey = yield this.keyClient.getKey(keyName);
+                if (typeof (signingKey === null || signingKey === void 0 ? void 0 : signingKey.id) === 'undefined' ||
+                    typeof ((_a = signingKey === null || signingKey === void 0 ? void 0 : signingKey.key) === null || _a === void 0 ? void 0 : _a.x) === 'undefined' ||
+                    typeof ((_b = signingKey === null || signingKey === void 0 ? void 0 : signingKey.key) === null || _b === void 0 ? void 0 : _b.y) === 'undefined') {
+                    throw new Error(`Invalid key data returned from Azure: ${signingKey}`);
                 }
-            });
-        });
-    };
-    AzureKeyVaultClient.prototype.getKeyCurve = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var key;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getKey(keyName)];
-                    case 1:
-                        key = _a.sent();
-                        if (key.key === undefined || key.key.crv === undefined) {
-                            throw new Error("Key or curve is undefined");
-                        }
-                        return [2 /*return*/, key.key.crv];
+                return signingKey;
+            }
+            catch (e) {
+                if (e.message.includes('Key not found')) {
+                    throw new Error(`Key ${keyName} not found in KeyVault ${this.vaultName}`);
                 }
-            });
+                throw new Error(`Unexpected KeyVault error ${e.message}`);
+            }
+        });
+    }
+    getKeyCurve(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const key = yield this.getKey(keyName);
+            if (key.key === undefined || key.key.crv === undefined) {
+                throw new Error(`Key or curve is undefined`);
+            }
+            return key.key.crv;
         });
-    };
+    }
     /**
      * Provides the CryptographyClient for the requested key
      * Creates a new client if it doesn't already exist
      */
-    AzureKeyVaultClient.prototype.getCryptographyClient = function (keyName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var keyId;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!!this.cryptographyClientSet.has(keyName)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.getKeyId(keyName)];
-                    case 1:
-                        keyId = _a.sent();
-                        this.cryptographyClientSet.set(keyName, new keyvault_keys_1.CryptographyClient(keyId, this.credential));
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, this.cryptographyClientSet.get(keyName)];
-                }
-            });
+    getCryptographyClient(keyName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.cryptographyClientSet.has(keyName)) {
+                const keyId = yield this.getKeyId(keyName);
+                this.cryptographyClientSet.set(keyName, new keyvault_keys_1.CryptographyClient(keyId, this.credential));
+            }
+            return this.cryptographyClientSet.get(keyName);
         });
-    };
-    return AzureKeyVaultClient;
-}());
+    }
+}
 exports.AzureKeyVaultClient = AzureKeyVaultClient;
 //# sourceMappingURL=azure-key-vault-client.js.map

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@celo/wallet-hsm-azure",
-  "version": "5.1.1",
+  "version": "5.1.2-beta.0",
   "description": "Azure HSM wallet implementation",
   "author": "Celo",
   "license": "Apache-2.0",
-  "repository": "https://github.com/celo-org/celo-monorepo/tree/master/packages/sdk/wallets/",
+  "repository": "https://github.com/celo-org/developer-tooling/tree/master/packages/sdk/wallets/",
   "homepage": "https://docs.celo.org",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -14,28 +14,28 @@
     "sdk"
   ],
   "scripts": {
-    "build": "tsc -b .",
-    "clean": "tsc -b . --clean",
-    "docs": "typedoc",
-    "test": "jest --runInBand",
-    "lint": "tslint -c tslint.json --project .",
+    "build": "yarn run --top-level tsc -b .",
+    "clean": "yarn run --top-level tsc -b . --clean",
+    "docs": "yarn run --top-level typedoc",
+    "test": "yarn run --top-level jest --runInBand",
+    "lint": "yarn run --top-level eslint -c .eslintrc.js ",
     "prepublishOnly": "yarn build"
   },
   "dependencies": {
-    "@azure/identity": "^1.1.0",
-    "@azure/keyvault-keys": "^4.1.0",
-    "@azure/keyvault-secrets": "^4.1.0",
+    "@azure/identity": "^4.0.1",
+    "@azure/keyvault-keys": "^4.7.2",
+    "@azure/keyvault-secrets": "^4.7.0",
     "@celo/base": "^6.0.0",
-    "@celo/utils": "^5.0.6",
-    "@celo/wallet-base": "^5.1.1",
-    "@celo/wallet-remote": "^5.1.1",
-    "@celo/wallet-hsm": "^5.1.1",
-    "@celo/connect": "^5.1.1",
-    "@types/secp256k1": "^4.0.0",
-    "eth-lib": "^0.2.8",
+    "@celo/connect": "^5.1.2-beta.0",
+    "@celo/utils": "^6.0.0-beta.0",
+    "@celo/wallet-base": "^5.1.2-beta.0",
+    "@celo/wallet-hsm": "^5.1.2-beta.0",
+    "@celo/wallet-remote": "^5.1.2-beta.0",
     "@ethereumjs/util": "8.0.5",
+    "@types/secp256k1": "^4.0.0",
     "bignumber.js": "^9.0.0",
     "debug": "^4.1.1",
+    "eth-lib": "^0.2.8",
     "secp256k1": "^4.0.0"
   },
   "devDependencies": {
@@ -46,4 +46,4 @@
   "engines": {
     "node": ">=8.14.2"
   }
-}
+}

package/typedoc.json

@@ -1,13 +1,19 @@
 {
-    "mode": "modules",
-    "exclude": ["**/*+(index|.test).ts"],
-    "excludeNotExported": true,
-    "excludePrivate": true,
-    "excludeProtected": true,
-    "includeDeclarations": false,
-    "ignoreCompilerErrors": true,
-    "hideGenerator": "true",
-    "out": "../../../docs/sdk/docs/wallet-hsm-azure",
-    "gitRevision": "master",
-    "readme": "none"
-  }
+  "exclude": [
+    "**/*+(index|.test).ts"
+  ],
+  "excludePrivate": true,
+  "excludeProtected": true,
+  "hideGenerator": true,
+  "out": "../../../docs/sdk/docs/wallet-hsm-azure",
+  "gitRevision": "master",
+  "readme": "none",
+  "entryPoints": [
+    "./src"
+  ],
+  "githubPages": false,
+  "plugin": [
+    "typedoc-plugin-markdown"
+  ],
+  "entryPointStrategy": "expand"
+}