Skip to content

Commit 391a8f2

Browse files
AngelCastilloBAngelCastilloB
committed
refactor!: hoist Opaque types, hexBlob, Base64Blob and related utils
from core package to utils package.
1 parent 6f89fb7 commit 391a8f2

File tree

79 files changed

+298
-282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+298
-282
lines changed

Diff for: ‎packages/cardano-services/src/ChainHistory/DbSyncChainHistory/mappers.ts

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Asset, Cardano } from '@cardano-sdk/core';
2-
import { BigIntMath } from '@cardano-sdk/util';
2+
import { BigIntMath, Hash32ByteBase16, HexBlob } from '@cardano-sdk/util';
33
import {
44
BlockModel,
55
BlockOutputModel,
@@ -83,9 +83,7 @@ export const mapTxOut = (txOut: TxOutput): Cardano.TxOut => ({
8383

8484
export const mapTxOutModel = (txOutModel: TxOutputModel, assets?: Cardano.TokenMap): TxOutput => ({
8585
address: txOutModel.address as unknown as Cardano.Address,
86-
datumHash: txOutModel.datum
87-
? (txOutModel.datum.toString('hex') as unknown as Cardano.util.Hash32ByteBase16)
88-
: undefined,
86+
datumHash: txOutModel.datum ? (txOutModel.datum.toString('hex') as unknown as Hash32ByteBase16) : undefined,
8987
index: txOutModel.index,
9088
txId: txOutModel.tx_id.toString('hex') as unknown as Cardano.TransactionId,
9189
value: {
@@ -100,7 +98,7 @@ export const mapWithdrawal = (withdrawalModel: WithdrawalModel): Cardano.Withdra
10098
});
10199

102100
export const mapRedeemer = (redeemerModel: RedeemerModel): Cardano.Redeemer => ({
103-
data: redeemerModel.script_hash.toString('hex') as unknown as Cardano.util.HexBlob,
101+
data: redeemerModel.script_hash.toString('hex') as unknown as HexBlob,
104102
executionUnits: {
105103
memory: Number(redeemerModel.unit_mem),
106104
steps: Number(redeemerModel.unit_steps)

Diff for: ‎packages/cardano-services/src/StakePool/DbSyncStakePoolProvider/mappers.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import {
2626
StakePoolResults,
2727
StakePoolStatsModel
2828
} from './types';
29-
import { bufferToHexString, isNotNil } from '@cardano-sdk/util';
29+
import { Hash32ByteBase16, bufferToHexString, isNotNil } from '@cardano-sdk/util';
3030
import Fraction from 'fraction.js';
3131

3232
const getPoolStatus = (
@@ -191,7 +191,7 @@ export const mapPoolData = (poolDataModel: PoolDataModel): PoolData => {
191191
};
192192
if (poolDataModel.metadata_hash) {
193193
toReturn.metadataJson = {
194-
hash: bufferToHexString(poolDataModel.metadata_hash) as unknown as Cardano.util.Hash32ByteBase16,
194+
hash: bufferToHexString(poolDataModel.metadata_hash) as unknown as Hash32ByteBase16,
195195
url: poolDataModel.metadata_url
196196
};
197197
}

Diff for: ‎packages/cardano-services/src/Utxo/DbSyncUtxoProvider/mappers.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Cardano, SerializationError, SerializationFailure, createUtxoId, jsonToNativeScript } from '@cardano-sdk/core';
2+
import { Hash32ByteBase16, HexBlob, isNotNil } from '@cardano-sdk/util';
23
import { ReferenceScriptType, UtxoModel } from './types';
34
import { generateAssetId } from './util';
4-
import { isNotNil } from '@cardano-sdk/util';
55

66
/**
77
* Parse the reference script from the UtxoModel
@@ -29,7 +29,7 @@ const parseReferenceScript = (model: UtxoModel): Cardano.Script => {
2929
);
3030
script = {
3131
__type: Cardano.ScriptType.Plutus,
32-
bytes: model.reference_script_bytes as unknown as Cardano.util.HexBlob,
32+
bytes: model.reference_script_bytes as unknown as HexBlob,
3333
version: Cardano.PlutusLanguageVersion.V1
3434
};
3535
break;
@@ -41,7 +41,7 @@ const parseReferenceScript = (model: UtxoModel): Cardano.Script => {
4141
);
4242
script = {
4343
__type: Cardano.ScriptType.Plutus,
44-
bytes: model.reference_script_bytes as unknown as Cardano.util.HexBlob,
44+
bytes: model.reference_script_bytes as unknown as HexBlob,
4545
version: Cardano.PlutusLanguageVersion.V2
4646
};
4747
break;
@@ -82,8 +82,8 @@ export const utxosToCore = (utxosModels: UtxoModel[]): Cardano.Utxo[] => {
8282
coins: BigInt(current.coins)
8383
}
8484
};
85-
if (isNotNil(current.data_hash)) txOut.datumHash = current.data_hash as unknown as Cardano.util.Hash32ByteBase16;
86-
if (isNotNil(current.inline_datum)) txOut.datum = current.inline_datum as unknown as Cardano.util.HexBlob;
85+
if (isNotNil(current.data_hash)) txOut.datumHash = current.data_hash as unknown as Hash32ByteBase16;
86+
if (isNotNil(current.inline_datum)) txOut.datum = current.inline_datum as unknown as HexBlob;
8787
if (isNotNil(current.reference_script_type)) txOut.scriptReference = parseReferenceScript(current);
8888

8989
if (isNotNil(current.asset_name) && current.asset_policy && current.asset_quantity) {

Diff for: ‎packages/cardano-services/test/ChainHistory/ChainHistoryHttpService.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ChainHistoryHttpService, DbSyncChainHistoryProvider, HttpServer, HttpSe
99
import { CreateHttpProviderConfig, chainHistoryHttpProvider } from '@cardano-sdk/cardano-services-client';
1010
import { DB_MAX_SAFE_INTEGER } from '../../src/ChainHistory/DbSyncChainHistory/queries';
1111
import { DataMocks } from '../data-mocks';
12+
import { HexBlob } from '@cardano-sdk/util';
1213
import { LedgerTipModel, findLedgerTip } from '../../src/util/DbSyncProvider';
1314
import { OgmiosCardanoNode } from '@cardano-sdk/ogmios';
1415
import { Pool } from 'pg';
@@ -305,7 +306,7 @@ describe('ChainHistoryHttpService', () => {
305306
expect(response.length).toEqual(1);
306307
expect(tx.witness).toMatchShapeOf(DataMocks.Tx.witnessRedeemers);
307308
expect(tx.witness.redeemers!.length).toBeGreaterThan(0);
308-
expect(() => Cardano.util.HexBlob(tx.witness.redeemers![0].data as unknown as string)).not.toThrow();
309+
expect(() => HexBlob(tx.witness.redeemers![0].data as unknown as string)).not.toThrow();
309310
});
310311

311312
it('has auxiliary data', async () => {

Diff for: ‎packages/cardano-services/test/ChainHistory/DbSyncChainHistoryProvider/mappers.test.ts

+6-5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
WithdrawalModel
2626
} from '../../../src/ChainHistory/DbSyncChainHistory/types';
2727
import { Cardano } from '@cardano-sdk/core';
28+
import { Hash32ByteBase16, HexBlob } from '@cardano-sdk/util';
2829

2930
const blockHash = '7a48b034645f51743550bbaf81f8a14771e58856e031eb63844738ca8ad72298';
3031
const poolId = 'pool1zuevzm3xlrhmwjw87ec38mzs02tlkwec9wxpgafcaykmwg7efhh';
@@ -64,7 +65,7 @@ const txInputModel: TxInputModel = {
6465

6566
const txOutput: TxOutput = {
6667
address: Cardano.Address(address),
67-
datumHash: Cardano.util.Hash32ByteBase16(hash32ByteBase16),
68+
datumHash: Hash32ByteBase16(hash32ByteBase16),
6869
index: 1,
6970
txId: Cardano.TransactionId(transactionHash),
7071
value: { coins: 20_000_000n }
@@ -286,7 +287,7 @@ describe('chain history mappers', () => {
286287
test('map RedeemerModel to Cardano.Redeemer', () => {
287288
const result = mappers.mapRedeemer(redeemerModel);
288289
expect(result).toEqual<Cardano.Redeemer>({
289-
data: Cardano.util.HexBlob(hash28ByteBase16),
290+
data: HexBlob(hash28ByteBase16),
290291
executionUnits: {
291292
memory: 2000,
292293
steps: 5000
@@ -303,7 +304,7 @@ describe('chain history mappers', () => {
303304
const outputs: Cardano.TxOut[] = [{ address: Cardano.Address(address), value: { assets, coins: 20_000_000n } }];
304305
const redeemers: Cardano.Redeemer[] = [
305306
{
306-
data: Cardano.util.HexBlob(hash28ByteBase16),
307+
data: HexBlob(hash28ByteBase16),
307308
executionUnits: { memory: 1, steps: 2 },
308309
index: 1,
309310
purpose: Cardano.RedeemerPurpose.spend
@@ -388,7 +389,7 @@ describe('chain history mappers', () => {
388389
const result = mappers.mapTxOutModel(txOutModel, assets);
389390
expect(result).toEqual<TxOutput>({
390391
address: Cardano.Address(address),
391-
datumHash: Cardano.util.Hash32ByteBase16(hash32ByteBase16),
392+
datumHash: Hash32ByteBase16(hash32ByteBase16),
392393
index: 1,
393394
txId: Cardano.TransactionId(transactionHash),
394395
value: { assets, coins: 20_000_000n }
@@ -398,7 +399,7 @@ describe('chain history mappers', () => {
398399
const result = mappers.mapTxOutModel(txOutModel);
399400
expect(result).toEqual<TxOutput>({
400401
address: Cardano.Address(address),
401-
datumHash: Cardano.util.Hash32ByteBase16(hash32ByteBase16),
402+
datumHash: Hash32ByteBase16(hash32ByteBase16),
402403
index: 1,
403404
txId: Cardano.TransactionId(transactionHash),
404405
value: { coins: 20_000_000n }

Diff for: ‎packages/cardano-services/test/StakePool/DbSyncStakePoolProvider/mappers.test.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
mapRelay,
1616
toStakePoolResults
1717
} from '../../../src';
18+
import { Hash32ByteBase16 } from '@cardano-sdk/util';
1819
import { mockStakeDistribution } from '../../../../core/test/CardanoNode/mocks';
1920

2021
// eslint-disable-next-line max-statements
@@ -151,7 +152,7 @@ describe('mappers', () => {
151152
margin: { denominator: 10_000, numerator: 1 },
152153
metadata: poolDataModel.offline_data,
153154
metadataJson: {
154-
hash: Cardano.util.Hash32ByteBase16(metadataHash),
155+
hash: Hash32ByteBase16(metadataHash),
155156
url: poolDataModel.metadata_url
156157
},
157158
pledge: BigInt(poolDataModel.pledge),

Diff for: ‎packages/cardano-services/test/StakePool/StakePoolHttpService.test.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
UNLIMITED_CACHE_TTL,
2121
createHttpStakePoolExtMetadataService
2222
} from '../../src';
23+
import { Hash32ByteBase16 } from '@cardano-sdk/util';
2324
import { INFO, createLogger } from 'bunyan';
2425
import { LedgerTipModel, findLedgerTip } from '../../src/util/DbSyncProvider';
2526
import { OgmiosCardanoNode } from '@cardano-sdk/ogmios';
@@ -1189,9 +1190,7 @@ describe('StakePoolHttpService', () => {
11891190
});
11901191

11911192
expect(() => Cardano.PoolId(firstNoMetadataPoolId as unknown as string)).not.toThrow();
1192-
expect(() =>
1193-
Cardano.util.Hash32ByteBase16(pageResults[0].metadataJson!.hash as unknown as string)
1194-
).not.toThrow();
1193+
expect(() => Hash32ByteBase16(pageResults[0].metadataJson!.hash as unknown as string)).not.toThrow();
11951194
expect(pageResults.length).toBeGreaterThan(0);
11961195
expect(pageResults[pageResults.length - 1].metadata?.name).toBeUndefined();
11971196
expect(pageResults.map(({ id }) => id)).toEqual(stakePoolIdsSorted);

Diff for: ‎packages/cardano-services/test/Utxo/UtxoHttpService.test.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { Asset, Cardano, ProviderError, ProviderFailure, UtxoProvider } from '@c
44
import { CreateHttpProviderConfig, utxoHttpProvider } from '@cardano-sdk/cardano-services-client';
55
import { DataMocks } from '../data-mocks';
66
import { DbSyncUtxoProvider, HttpServer, HttpServerConfig, UtxoHttpService } from '../../src';
7+
import { Hash32ByteBase16, HexBlob } from '@cardano-sdk/util';
78
import { INFO, createLogger } from 'bunyan';
89
import { LedgerTipModel, findLedgerTip } from '../../src/util/DbSyncProvider';
910
import { OgmiosCardanoNode } from '@cardano-sdk/ogmios';
@@ -178,8 +179,8 @@ describe('UtxoHttpService', () => {
178179

179180
expect(res.length).toBeGreaterThan(0);
180181
expect(res[0]).toMatchShapeOf([DataMocks.Tx.input, DataMocks.Tx.outputWithInlineDatum]);
181-
expect(() => Cardano.util.HexBlob(firstTxOut.datum! as unknown as string)).not.toThrow();
182-
expect(() => Cardano.util.Hash32ByteBase16(firstTxOut.datumHash! as unknown as string)).not.toThrow();
182+
expect(() => HexBlob(firstTxOut.datum! as unknown as string)).not.toThrow();
183+
expect(() => Hash32ByteBase16(firstTxOut.datumHash! as unknown as string)).not.toThrow();
183184
});
184185

185186
it('return UTxO with time lock reference script', async () => {

Diff for: ‎packages/cardano-services/test/data-mocks/tx.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Cardano } from '@cardano-sdk/core';
2+
import { Hash32ByteBase16 } from '@cardano-sdk/util';
23
import merge from 'lodash/merge';
34

45
export const valueWithCoinOnly: Cardano.Value = {
@@ -18,7 +19,7 @@ export const txOutBase: Omit<Cardano.TxOut, 'value' | 'datum'> = {
1819

1920
export const txOutBaseWithDatum: Omit<Cardano.TxOut, 'value'> = {
2021
...txOutBase,
21-
datumHash: Cardano.util.Hash32ByteBase16('c5dfa8c3cbd5a959829618a7b46e163078cb3f1b39f152514d0c3686d553529a')
22+
datumHash: Hash32ByteBase16('c5dfa8c3cbd5a959829618a7b46e163078cb3f1b39f152514d0c3686d553529a')
2223
};
2324

2425
export const txOutWithCoinOnly: Cardano.TxOut = { ...txOutBase, value: valueWithCoinOnly };

Diff for: ‎packages/core/src/Asset/types/NftMetadata.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/* eslint-disable wrap-regex */
2-
import { InvalidStringError } from '../../errors';
3-
import { Metadatum, util } from '../../Cardano';
2+
import { Metadatum } from '../../Cardano';
3+
import { InvalidStringError, OpaqueString } from '@cardano-sdk/util';
44

5-
export type Uri = util.OpaqueString<'Uri'>;
5+
export type Uri = OpaqueString<'Uri'>;
66
export const Uri = (uri: string) => {
77
if (/^[a-z]+:\/\/.+/.test(uri)) {
88
return uri as unknown as Uri;
@@ -15,15 +15,15 @@ export const Uri = (uri: string) => {
1515
);
1616
};
1717

18-
export type ImageMediaType = util.OpaqueString<'ImageMediaType'>;
18+
export type ImageMediaType = OpaqueString<'ImageMediaType'>;
1919
export const ImageMediaType = (mediaType: string) => {
2020
if (/^image\/.+$/.test(mediaType)) {
2121
return mediaType as unknown as ImageMediaType;
2222
}
2323
throw new InvalidStringError('Expected media type to be "image/*"');
2424
};
2525

26-
export type MediaType = util.OpaqueString<'MediaType'>;
26+
export type MediaType = OpaqueString<'MediaType'>;
2727
export const MediaType = (mediaType: string) => {
2828
if (/^[a-z]+\/.+$/.test(mediaType)) {
2929
return mediaType as unknown as MediaType;

Diff for: ‎packages/core/src/CML/cmlToCore/certificate.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ import {
1515
StakeDelegationCertificate,
1616
VrfVkHex
1717
} from '../../Cardano/types';
18-
import { Hash28ByteBase16, Hash32ByteBase16 } from '../../Cardano/util/primitives';
18+
import { Hash28ByteBase16, Hash32ByteBase16, usingAutoFree } from '@cardano-sdk/util';
1919
import { NetworkId } from '../../Cardano/ChainId';
2020
import { NotImplementedError, SerializationError, SerializationFailure } from '../../errors';
21-
import { usingAutoFree } from '@cardano-sdk/util';
2221

2322
const stakeRegistration = (certificate: CML.StakeRegistration): StakeAddressCertificate =>
2423
usingAutoFree((scope) => ({

Diff for: ‎packages/core/src/CML/cmlToCore/cmlToCore.ts

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import * as Cardano from '../../Cardano';
2-
import * as util from '../../Cardano/util/primitives';
2+
import { Base64Blob, Hash32ByteBase16, HexBlob, ManagedFreeableScope, usingAutoFree } from '@cardano-sdk/util';
33
import { CML } from '../CML';
4-
import { ManagedFreeableScope, usingAutoFree } from '@cardano-sdk/util';
54
import { PlutusLanguageVersion, ScriptType } from '../../Cardano';
65
import { ScriptKind } from '@dcspark/cardano-multiplatform-lib-nodejs';
76
import { SerializationError, SerializationFailure } from '../../errors';
@@ -157,14 +156,14 @@ export const getCoreScript = (scope: ManagedFreeableScope, script: CML.Script):
157156
case ScriptKind.PlutusScriptV1:
158157
coreScriptRef = {
159158
__type: ScriptType.Plutus,
160-
bytes: util.HexBlob.fromBytes(scope.manage(script.as_plutus_v1()!).to_bytes()),
159+
bytes: HexBlob.fromBytes(scope.manage(script.as_plutus_v1()!).to_bytes()),
161160
version: PlutusLanguageVersion.V1
162161
};
163162
break;
164163
case ScriptKind.PlutusScriptV2:
165164
coreScriptRef = {
166165
__type: ScriptType.Plutus,
167-
bytes: util.HexBlob.fromBytes(scope.manage(script.as_plutus_v2()!).to_bytes()),
166+
bytes: HexBlob.fromBytes(scope.manage(script.as_plutus_v2()!).to_bytes()),
168167
version: PlutusLanguageVersion.V2
169168
};
170169
break;
@@ -189,7 +188,7 @@ export const txOut = (output: CML.TransactionOutput): Cardano.TxOut =>
189188
return {
190189
address: Cardano.Address(address),
191190
datum: inlineDatum ? bytesToHex(inlineDatum) : undefined,
192-
datumHash: dataHashBytes ? Cardano.util.Hash32ByteBase16.fromHexBlob(bytesToHex(dataHashBytes)) : undefined,
191+
datumHash: dataHashBytes ? Hash32ByteBase16.fromHexBlob(bytesToHex(dataHashBytes)) : undefined,
193192
scriptReference: scriptRef ? getCoreScript(scope, scope.manage(scriptRef.script())) : undefined,
194193
value: value(scope.manage(output.amount()))
195194
};
@@ -282,7 +281,7 @@ export const txBody = (body: CML.TransactionBody): Cardano.TxBody =>
282281
referenceInputs: cslReferenceInputs ? txInputs(cslReferenceInputs) : undefined,
283282
requiredExtraSignatures: txRequiredExtraSignatures(scope.manage(body.required_signers())),
284283
scriptIntegrityHash:
285-
cslScriptDataHash && Cardano.util.Hash32ByteBase16(Buffer.from(cslScriptDataHash.to_bytes()).toString('hex')),
284+
cslScriptDataHash && Hash32ByteBase16(Buffer.from(cslScriptDataHash.to_bytes()).toString('hex')),
286285
totalCollateral: cslTotalCollateral ? BigInt(cslTotalCollateral.to_str()) : undefined,
287286
validityInterval: validityInterval(scope, body),
288287
withdrawals: txWithdrawals(scope.manage(body.withdrawals()))
@@ -298,8 +297,8 @@ export const txWitnessBootstrap = (bootstraps?: CML.BootstrapWitnesses): Cardano
298297
const attributes = scope.manage(bootstrap.attributes()).to_bytes();
299298
const chainCode = bootstrap.chain_code();
300299
result.push({
301-
addressAttributes: attributes?.length > 0 ? Cardano.util.Base64Blob.fromBytes(attributes) : undefined,
302-
chainCode: chainCode?.length > 0 ? Cardano.util.HexBlob.fromBytes(chainCode) : undefined,
300+
addressAttributes: attributes?.length > 0 ? Base64Blob.fromBytes(attributes) : undefined,
301+
chainCode: chainCode?.length > 0 ? HexBlob.fromBytes(chainCode) : undefined,
303302
key: Cardano.Ed25519PublicKey(
304303
Buffer.from(scope.manage(scope.manage(bootstrap.vkey()).public_key()).as_bytes()).toString('hex')
305304
),
@@ -324,7 +323,7 @@ export const txWitnessRedeemers = (redeemers?: CML.Redeemers): Cardano.Redeemer[
324323
const redeemerTagKind = scope.manage(reedeemer.tag()).kind();
325324

326325
result.push({
327-
data: Cardano.util.HexBlob.fromBytes(scope.manage(reedeemer.data()).to_bytes()),
326+
data: HexBlob.fromBytes(scope.manage(reedeemer.data()).to_bytes()),
328327
executionUnits: {
329328
memory: Number(scope.manage(exUnits.mem()).to_str()),
330329
steps: Number(scope.manage(exUnits.steps()).to_str())
@@ -341,7 +340,7 @@ export const txWitnessDatums = (datums?: CML.PlutusList): Cardano.Datum[] | unde
341340
if (!datums) return;
342341
const result: Cardano.Datum[] = [];
343342
for (let j = 0; j < datums.len(); j++) {
344-
result.push(Cardano.util.HexBlob.fromBytes(scope.manage(datums.get(j)).to_bytes()));
343+
result.push(HexBlob.fromBytes(scope.manage(datums.get(j)).to_bytes()));
345344
}
346345
return result;
347346
});
@@ -357,7 +356,7 @@ export const txWitnessScripts = (witnessSet: CML.TransactionWitnessSet): Cardano
357356
for (let i = 0; i < plutusScriptsV1.len(); ++i) {
358357
scripts.push({
359358
__type: Cardano.ScriptType.Plutus,
360-
bytes: Cardano.util.HexBlob(scope.manage(plutusScriptsV1.get(i)).to_js_value()),
359+
bytes: HexBlob(scope.manage(plutusScriptsV1.get(i)).to_js_value()),
361360
version: Cardano.PlutusLanguageVersion.V1
362361
});
363362
}
@@ -366,7 +365,7 @@ export const txWitnessScripts = (witnessSet: CML.TransactionWitnessSet): Cardano
366365
for (let i = 0; i < plutusScriptsV2.len(); ++i) {
367366
scripts.push({
368367
__type: Cardano.ScriptType.Plutus,
369-
bytes: Cardano.util.HexBlob(scope.manage(plutusScriptsV2.get(i)).to_js_value()),
368+
bytes: HexBlob(scope.manage(plutusScriptsV2.get(i)).to_js_value()),
370369
version: Cardano.PlutusLanguageVersion.V2
371370
});
372371
}

Diff for: ‎packages/core/src/CML/util.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* eslint-disable prettier/prettier */
22
import { BigNum } from '@dcspark/cardano-multiplatform-lib-nodejs';
33
import { CML } from './CML';
4-
import { HexBlob } from '../Cardano/util';
5-
import { ManagedFreeableScope, usingAutoFree } from '@cardano-sdk/util';
4+
import { HexBlob, ManagedFreeableScope, usingAutoFree } from '@cardano-sdk/util';
65
import { Tx, TxBody } from '../Cardano';
76
import { newTx } from './cmlToCore';
87

Diff for: ‎packages/core/src/Cardano/types/Address.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
import { usingAutoFree } from '@cardano-sdk/util';
2-
31
import { CML } from '../../CML';
4-
import { InvalidStringError } from '../../errors';
5-
import { OpaqueString, assertIsBech32WithPrefix, assertIsHexString } from '../util/primitives';
2+
import {
3+
InvalidStringError,
4+
OpaqueString,
5+
assertIsBech32WithPrefix,
6+
assertIsHexString,
7+
usingAutoFree
8+
} from '@cardano-sdk/util';
69
import { isAddress } from '../util/address';
710

811
/**

Diff for: ‎packages/core/src/Cardano/types/Asset.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as cip14 from '@emurgo/cip14-js';
2-
import { Hash28ByteBase16, OpaqueString, assertIsHexString, typedBech32 } from '../util/primitives';
3-
import { InvalidStringError } from '../../errors';
2+
import { Hash28ByteBase16, InvalidStringError, OpaqueString, assertIsHexString, typedBech32 } from '@cardano-sdk/util';
43

54
export type AssetId = OpaqueString<'AssetId'>;
65

Diff for: ‎packages/core/src/Cardano/types/AuxiliaryData.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Hash32ByteBase16 } from '../util/primitives';
1+
import { Hash32ByteBase16 } from '@cardano-sdk/util';
22
import { Script } from './Script';
33

44
// eslint-disable-next-line no-use-before-define

0 commit comments

Comments
 (0)