@celo/wallet-hsm-azure 8.0.2 → 8.0.4

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # @celo/wallet-hsm-azure
 
+## 8.0.4
+
+### Patch Changes
+
+- Updated dependencies [[`95a84a4`](https://github.com/celo-org/developer-tooling/commit/95a84a4ac6c18278e94ef98549c1606dcd5a496f), [`95a84a4`](https://github.com/celo-org/developer-tooling/commit/95a84a4ac6c18278e94ef98549c1606dcd5a496f), [`95a84a4`](https://github.com/celo-org/developer-tooling/commit/95a84a4ac6c18278e94ef98549c1606dcd5a496f)]:
+  - @celo/connect@8.0.0
+  - @celo/wallet-base@8.0.4
+  - @celo/wallet-remote@8.0.4
+  - @celo/wallet-hsm@8.0.4
+
+## 8.0.3
+
+### Patch Changes
+
+- Updated dependencies [[`fad32ac`](https://github.com/celo-org/developer-tooling/commit/fad32ac6748f7556359e62ea33ae0cf8299f1712)]:
+  - @celo/wallet-base@8.0.3
+  - @celo/wallet-hsm@8.0.3
+  - @celo/wallet-remote@8.0.3
+
 ## 8.0.2
 
 ### Patch Changes

package/lib/azure-hsm-signer.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { RLPEncodedTx, Signer } from '@celo/connect';
 import { EIP712TypedData } from '@celo/utils/lib/sign-typed-data-utils';
 import { AzureKeyVaultClient } from './azure-key-vault-client';
@@ -28,3 +29,4 @@ export declare class AzureHSMSigner implements Signer {
     decrypt(_ciphertext: Buffer): Promise<Buffer>;
     computeSharedSecret(_publicKey: string): Promise<Buffer>;
 }
+//# sourceMappingURL=azure-hsm-signer.d.ts.map

package/lib/azure-hsm-signer.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -36,7 +13,7 @@ exports.AzureHSMSigner = void 0;
 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"));
+const sha3_1 = require("@noble/hashes/sha3");
 /**
  * Signs the EVM transaction using an HSM key in Azure Key Vault
  */
@@ -62,9 +39,13 @@ class AzureHSMSigner {
     }
     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);
+            const dataBytes = Buffer.from((0, address_1.trimLeading0x)((0, address_1.ensureLeading0x)(data)), 'hex');
+            const prefix = Buffer.from(`\x19Ethereum Signed Message:\n${dataBytes.length}`);
+            const combined = new Uint8Array(prefix.length + dataBytes.length);
+            combined.set(prefix);
+            combined.set(dataBytes, prefix.length);
+            const msgHashBuff = Buffer.from((0, sha3_1.keccak_256)(combined));
+            const signature = yield AzureHSMSigner.keyVaultClient.signMessage(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;
@@ -103,4 +84,3 @@ class AzureHSMSigner {
     }
 }
 exports.AzureHSMSigner = AzureHSMSigner;
-//# sourceMappingURL=azure-hsm-signer.js.map

package/lib/azure-hsm-wallet.d.ts

@@ -15,3 +15,4 @@ export declare class AzureHSMWallet extends RemoteWallet<AzureHSMSigner> impleme
      */
     getAddressFromKeyName(keyName: string): Promise<Address>;
 }
+//# sourceMappingURL=azure-hsm-wallet.d.ts.map

package/lib/azure-hsm-wallet.js

@@ -13,11 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AzureHSMWallet = void 0;
-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 wallet_hsm_1 = require("@celo/wallet-hsm");
 const debug = (0, debug_1.default)('kit:wallet:aws-hsm-wallet');
 // Azure Key Vault implementation of a RemoteWallet
 class AzureHSMWallet extends wallet_remote_1.RemoteWallet {
@@ -65,9 +65,8 @@ class AzureHSMWallet extends wallet_remote_1.RemoteWallet {
                 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 (0, wallet_hsm_1.getAddressFromPublicKey)(publicKey);
         });
     }
 }
 exports.AzureHSMWallet = AzureHSMWallet;
-//# sourceMappingURL=azure-hsm-wallet.js.map

package/lib/azure-hsm-wallet.test.d.ts

@@ -1 +1,2 @@
 export {};
+//# sourceMappingURL=azure-hsm-wallet.test.d.ts.map

package/lib/azure-key-vault-client.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { TokenCredential } from '@azure/identity';
 import { Signature } from '@celo/wallet-hsm';
 import { BigNumber } from 'bignumber.js';
@@ -27,3 +28,4 @@ export declare class AzureKeyVaultClient {
      */
     private getCryptographyClient;
 }
+//# sourceMappingURL=azure-key-vault-client.d.ts.map

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

@@ -186,4 +186,3 @@ class AzureKeyVaultClient {
     }
 }
 exports.AzureKeyVaultClient = AzureKeyVaultClient;
-//# sourceMappingURL=azure-key-vault-client.js.map

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './azure-hsm-signer';
 export * from './azure-hsm-wallet';
 export * from './azure-key-vault-client';
+//# sourceMappingURL=index.d.ts.map

package/lib/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./azure-hsm-signer"), exports);
 __exportStar(require("./azure-hsm-wallet"), exports);
 __exportStar(require("./azure-key-vault-client"), exports);
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celo/wallet-hsm-azure",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Azure HSM wallet implementation",
   "author": "Celo",
   "license": "Apache-2.0",
@@ -29,12 +29,11 @@
     "@azure/keyvault-keys": "^4.7.2",
     "@azure/keyvault-secrets": "^4.7.0",
     "@celo/base": "^7.0.3",
-    "@celo/connect": "^7.0.0",
+    "@celo/connect": "^8.0.0",
     "@celo/utils": "^8.0.3",
-    "@celo/wallet-base": "^8.0.2",
-    "@celo/wallet-hsm": "^8.0.2",
-    "@celo/wallet-remote": "^8.0.2",
-    "@ethereumjs/util": "8.0.5",
+    "@celo/wallet-base": "^8.0.4",
+    "@celo/wallet-hsm": "^8.0.4",
+    "@celo/wallet-remote": "^8.0.4",
     "@types/secp256k1": "^4.0.0",
     "bignumber.js": "^9.0.0",
     "debug": "^4.1.1"
@@ -45,8 +44,7 @@
     "@noble/curves": "1.3.0",
     "@noble/hashes": "1.3.3",
     "@types/debug": "^4.1.12",
-    "dotenv": "^8.2.0",
-    "web3": "1.10.4"
+    "dotenv": "^8.2.0"
   },
   "engines": {
     "node": ">=20"