Merge pull request #1630 from input-output-hk/refactor/bip32account-bip32ed25519-di

feat: bip32account bip32ed25519 dependency injection LW-12941

Author: mkazlauskas

packages/cardano-services/src/StakePool/HttpStakePoolMetadata/HttpStakePoolMetadataService.ts

@@ -69,7 +69,7 @@ export const createHttpStakePoolMetadataService = (
       const { data } = await axiosClient.get<Uint8Array>(url, { responseType: 'arraybuffer' });
 
       // Produce metadata hash
-      const metadataHash = Crypto.blake2b(Crypto.blake2b.BYTES).update(data).digest('hex');
+      const metadataHash = Crypto.blake2b.hash(HexBlob.fromBytes(data), 32);
 
       // Verify base hashes
       if (metadataHash !== hash) {

packages/cardano-services/test/StakePool/HttpStakePoolMetadataService/HttpMetadataService.test.ts

@@ -5,6 +5,7 @@ import { Cardano } from '@cardano-sdk/core';
 import { DataMocks } from '../../data-mocks';
 import { ExtMetadataFormat } from '../../../src/StakePool/types';
 import { Hash32ByteBase16 } from '@cardano-sdk/crypto';
+import { HexBlob } from '@cardano-sdk/util';
 import { IncomingMessage } from 'http';
 import {
   StakePoolMetadataServiceError,
@@ -90,15 +91,13 @@ describe('StakePoolMetadataService', () => {
 
       // Since the extended metadata URL will change each run and its part of the metadata, we must
       // recalculate metadata the hash.
-      const metadataHash = Crypto.blake2b(Crypto.blake2b.BYTES)
-        .update(Buffer.from(JSON.stringify(metadata), 'ascii'))
-        .digest('hex');
-
-      const resultMetadata = await metadataService.getStakePoolMetadata(
-        metadataHash as Hash32ByteBase16,
-        `${serverUrl}/metadata`
+      const metadataHash = Crypto.blake2b.hash<Hash32ByteBase16>(
+        HexBlob.fromBytes(Buffer.from(JSON.stringify(metadata), 'ascii')),
+        32
       );
 
+      const resultMetadata = await metadataService.getStakePoolMetadata(metadataHash, `${serverUrl}/metadata`);
+
       expect(resultMetadata).toEqual(metadata);
 
       const resultExtendedMetadata = await metadataService.getValidateStakePoolExtendedMetadata(
@@ -249,14 +248,9 @@ describe('StakePoolMetadataService', () => {
         extVkey: INVALID_KEY
       };
 
-      const metadataHash = Crypto.blake2b(Crypto.blake2b.BYTES)
-        .update(Buffer.from(JSON.stringify(metadata), 'ascii'))
-        .digest('hex');
+      const metadataHash = Crypto.blake2b.hash(HexBlob.fromBytes(Buffer.from(JSON.stringify(metadata), 'ascii')), 32);
 
-      const metadataResult = await metadataService.getStakePoolMetadata(
-        metadataHash as Hash32ByteBase16,
-        `${serverUrl}/metadata`
-      );
+      const metadataResult = await metadataService.getStakePoolMetadata(metadataHash, `${serverUrl}/metadata`);
 
       const result2 = await metadataService.getValidateStakePoolExtendedMetadata(
         metadataResult as Cardano.StakePoolMetadata

packages/core/src/Cardano/types/Asset.ts

@@ -64,11 +64,7 @@ export const AssetFingerprint = (value: string): AssetFingerprint => typedBech32
 AssetFingerprint.fromParts = (policyId: PolicyId, assetName: AssetName): AssetFingerprint => {
   const policyBuf = Buffer.from(policyId, 'hex');
   const assetNameBuf = Buffer.from(assetName, 'hex');
-  const hexDigest = HexBlob(
-    Crypto.blake2b(20)
-      .update(new Uint8Array([...policyBuf, ...assetNameBuf]))
-      .digest('hex')
-  );
+  const hexDigest = Crypto.blake2b.hash(HexBlob.fromBytes(new Uint8Array([...policyBuf, ...assetNameBuf])), 20);
 
   return AssetFingerprint(HexBlob.toTypedBech32<string>('asset', hexDigest));
 };

packages/core/src/Cardano/types/AuxiliaryData.ts

@@ -2,7 +2,6 @@ import * as Crypto from '@cardano-sdk/crypto';
 import * as Serialization from '../../Serialization/AuxiliaryData';
 import { Hash32ByteBase16 } from '@cardano-sdk/crypto';
 import { Script } from './Script';
-import { hexToBytes } from '../../util/misc';
 
 // eslint-disable-next-line no-use-before-define
 export type MetadatumMap = Map<Metadatum, Metadatum>;
@@ -17,10 +16,4 @@ export interface AuxiliaryData {
 }
 
 export const computeAuxiliaryDataHash = (data: AuxiliaryData | undefined): Hash32ByteBase16 | undefined =>
-  data
-    ? Hash32ByteBase16(
-        Crypto.blake2b(Crypto.blake2b.BYTES)
-          .update(hexToBytes(Serialization.AuxiliaryData.fromCore(data).toCbor()))
-          .digest('hex')
-      )
-    : undefined;
+  data ? Crypto.blake2b.hash<Hash32ByteBase16>(Serialization.AuxiliaryData.fromCore(data).toCbor(), 32) : undefined;

packages/core/src/Cardano/types/StakePool/primitives.ts

@@ -18,7 +18,7 @@ export const PoolId = (value: string): PoolId => typedBech32(value, 'pool', 45);
  * @param {string} value blake2b_224 digest of an operator verification key hash
  * @throws InvalidStringError
  */
-PoolId.fromKeyHash = (value: Crypto.Ed25519KeyHashHex): PoolId => HexBlob.toTypedBech32('pool', HexBlob(value));
+PoolId.fromKeyHash = (value: Crypto.Ed25519KeyHashHex): PoolId => HexBlob.toTypedBech32('pool', value);
 
 /** /** pool operator verification key hash as hex string */
 export type PoolIdHex = OpaqueString<'PoolIdHex'>;

packages/core/src/Cardano/types/Transaction.ts

@@ -13,7 +13,7 @@ import { RewardAccount } from '../Address';
 import { Script } from './Script';
 
 /** transaction hash as hex string */
-export type TransactionId = OpaqueString<'TransactionId'>;
+export type TransactionId = OpaqueString<'TransactionId'> & Crypto.Hash32ByteBase16;
 
 /**
  * @param {string} value transaction hash as hex string

packages/core/src/Cardano/util/computeImplicitCoin.ts

@@ -102,8 +102,7 @@ const computeConwayDeposits = (
       case Cardano.CertificateType.UnregisterDelegateRepresentative:
         if (
           !dRepKeyHash ||
-          (cert.dRepCredential.type === Address.CredentialType.KeyHash &&
-            cert.dRepCredential.hash === Crypto.Hash28ByteBase16.fromEd25519KeyHashHex(dRepKeyHash))
+          (cert.dRepCredential.type === Address.CredentialType.KeyHash && cert.dRepCredential.hash === dRepKeyHash)
         ) {
           cert.__typename === Cardano.CertificateType.RegisterDelegateRepresentative
             ? (deposit += cert.deposit)

packages/core/src/Serialization/PlutusData/PlutusData.ts

@@ -235,9 +235,7 @@ export class PlutusData {
    * @returns the plutus data hash.
    */
   hash(): Crypto.Hash32ByteBase16 {
-    const hash = Crypto.blake2b(HASH_LENGTH_IN_BYTES).update(Buffer.from(this.toCbor(), 'hex')).digest();
-
-    return Crypto.Hash32ByteBase16(HexBlob.fromBytes(hash));
+    return Crypto.blake2b.hash(this.toCbor(), HASH_LENGTH_IN_BYTES);
   }
 
   /**

packages/core/src/Serialization/Scripts/NativeScript/NativeScript.ts

@@ -182,11 +182,9 @@ export class NativeScript {
   hash(): Crypto.Hash28ByteBase16 {
     // To compute a script hash, note that you must prepend a tag to the bytes of
     // the script before hashing. The tags in the Babbage era for native scripts is "\x00"
-    const bytes = `00${this.toCbor()}`;
+    const bytes = `00${this.toCbor()}` as HexBlob;
 
-    const hash = Crypto.blake2b(HASH_LENGTH_IN_BYTES).update(Buffer.from(bytes, 'hex')).digest();
-
-    return Crypto.Hash28ByteBase16(HexBlob.fromBytes(hash));
+    return Crypto.blake2b.hash(bytes, HASH_LENGTH_IN_BYTES);
   }
 
   /**

packages/core/src/Serialization/Scripts/PlutusScript/PlutusV1Script.ts

@@ -89,11 +89,9 @@ export class PlutusV1Script {
   hash(): Crypto.Hash28ByteBase16 {
     // To compute a script hash, note that you must prepend a tag to the bytes of
     // the script before hashing. The tags in the Babbage era for PlutusV1 is "\x01"
-    const bytes = `01${this.rawBytes()}`;
+    const bytes = `01${this.rawBytes()}` as HexBlob;
 
-    const hash = Crypto.blake2b(HASH_LENGTH_IN_BYTES).update(Buffer.from(bytes, 'hex')).digest();
-
-    return Crypto.Hash28ByteBase16(HexBlob.fromBytes(hash));
+    return Crypto.blake2b.hash(bytes, HASH_LENGTH_IN_BYTES);
   }
 
   /**