refactor(cip2): use AssetSerializer from core package

input-output-hk · Sep 23, 2021 · dc25a5c · dc25a5c
1 parent c11ad17
commit dc25a5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 52 deletions.
diff --git a/packages/cip2/src/util.ts b/packages/cip2/src/util.ts
@@ -1,13 +1,7 @@
 // TODO: move all of these utils to core package
 import { CardanoSerializationLib } from '@cardano-sdk/cardano-serialization-lib';
 import { Asset, BigIntMath } from '@cardano-sdk/core';
-import {
-  AssetName,
-  ScriptHash,
-  TransactionOutput,
-  TransactionOutputs,
-  Value
-} from '@emurgo/cardano-serialization-lib-nodejs';
+import { TransactionOutput, TransactionOutputs, Value } from '@emurgo/cardano-serialization-lib-nodejs';
 import { Value as OgmiosValue } from '@cardano-ogmios/schema';
 
 /**
@@ -33,38 +27,10 @@ export const transactionOutputsToArray = (outputs: TransactionOutputs): Transact
   return result;
 };
 
-export const createAssetSerializer = (csl: CardanoSerializationLib) => {
-  const bech32Prefix = 'b32_';
-  const encoder = new TextEncoder();
-  const decoder = new TextDecoder();
-  return {
-    /**
-     * Combine script hash and asset name into unique asset identifier.
-     * Operation can be reversed with *parse(assetId)*
-     */
-    createId: (scriptHash: ScriptHash, assetName: AssetName): string =>
-      // TODO: I suggest to move this to @cardano-sdk/core so it's together with
-      // policyIdFromAssetId and assetNameFromAssetId, because it's
-      // relying on bech32 length and it can have different length prefix.
-      scriptHash.to_bech32(bech32Prefix) + decoder.decode(assetName.name()),
-    /**
-     * Get asset scripthash bech32 and asset name
-     * from id created by *create(scriptHashBech32, assetName)*.
-     */
-    parseId: (id: string) => {
-      const scriptHashBech32 = Asset.util.policyIdFromAssetId(id);
-      const assetName = Asset.util.assetNameFromAssetId(id);
-      return {
-        scriptHash: csl.ScriptHash.from_bech32(scriptHashBech32),
-        assetName: csl.AssetName.new(encoder.encode(assetName))
-      };
-    }
-  };
-};
-
-export type AssetSerializer = ReturnType<typeof createAssetSerializer>;
-
-export const createCslUtils = (csl: CardanoSerializationLib, assetSerializer = createAssetSerializer(csl)) => {
+export const createCslUtils = (
+  csl: CardanoSerializationLib,
+  assetSerializer = Asset.util.createAssetSerializer(csl)
+) => {
   const valueToValueQuantities = (value: Value): ValueQuantities => {
     const result: ValueQuantities = {
       coins: BigInt(value.coin().to_str())

diff --git a/packages/cip2/test/tsconfig.json b/packages/cip2/test/tsconfig.json
@@ -6,5 +6,8 @@
       "@src/*": ["../src/*"]
     }
   },
-  "references": [{ "path": "../src" }]
+  "references": [
+    { "path": "../src" },
+    { "path": "../../cardano-serialization-lib/src" }
+  ]
 }
diff --git a/packages/cip2/test/util.test.ts b/packages/cip2/test/util.test.ts
@@ -1,9 +1,8 @@
 import { CardanoSerializationLib, loadCardanoSerializationLib } from '@cardano-sdk/cardano-serialization-lib';
+import { Asset } from '@cardano-sdk/core';
 import {
-  AssetSerializer,
   coalesceValueQuantities,
   computeMinUtxoValue,
-  createAssetSerializer,
   createCslUtils,
   CslUtils,
   transactionOutputsToArray,
@@ -15,23 +14,15 @@ describe('util', () => {
   let CSL: CardanoSerializationLib;
   let cslUtils: CslUtils;
   let testUtils: TestUtils;
-  let assetSerializer: AssetSerializer;
+  let assetSerializer: Asset.util.AssetSerializer;
   beforeAll(async () => {
     CSL = await loadCardanoSerializationLib();
-    assetSerializer = createAssetSerializer(CSL);
+    assetSerializer = Asset.util.createAssetSerializer(CSL);
     cslUtils = createCslUtils(CSL, assetSerializer);
     testUtils = createCslTestUtils(CSL);
   });
 
   describe('createCslUtils', () => {
-    it('createAssetSerializer', () => {
-      const serializer = createAssetSerializer(CSL);
-      const tsla = serializer.parseId(TSLA_Asset);
-      expect(new TextDecoder().decode(tsla.assetName.name())).toEqual('TSLA');
-      expect(tsla.scriptHash.to_bech32('b32_')).toEqual('b32_1vk0jj9lmv0cjkvmxw337u467atqcgkauwd4eczaugzagyghp25l');
-      expect(serializer.createId(tsla.scriptHash, tsla.assetName)).toEqual(TSLA_Asset);
-    });
-
     describe('valueQuantitiesToValue', () => {
       it('coin only', () => {
         const quantities = { coins: 100_000n };