clearing up minor, mostly formatting issues

vacuumlabs · Nov 22, 2021 · f6b04b6 · f6b04b6
1 parent f816a27
commit f6b04b6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/errors/invalidDataReason.ts b/src/errors/invalidDataReason.ts
@@ -132,7 +132,7 @@ export enum InvalidDataReason {
 
   VALIDITY_INTERVAL_START_INVALID = "invalid validity interval start",
 
-  SCRIPT_DATA_HASH_WRONG_LENGTH = "script data hash not 32 long",
+  SCRIPT_DATA_HASH_WRONG_LENGTH = "script data hash not 32 bytes long",
 
   SIGN_MODE_UNKNOWN = "unknown signing mode",
 

diff --git a/src/interactions/serialization/txOther.ts b/src/interactions/serialization/txOther.ts
@@ -1,5 +1,5 @@
 import { InvalidDataReason } from "../../errors/invalidDataReason"
-import type { Int64_str, ParsedAssetGroup, ParsedInput, ParsedToken, ParsedWithdrawal, ScriptDataHash, Uint32_t, Uint64_str, ValidBIP32Path, Version } from "../../types/internal"
+import type { Int64_str, ParsedAssetGroup, ParsedInput, ParsedToken, ParsedWithdrawal, Uint32_t, Uint64_str, ValidBIP32Path, Version } from "../../types/internal"
 import { StakeCredentialType } from "../../types/internal"
 import { assert } from "../../utils/assert"
 import { hex_to_buf, path_to_buf, stake_credential_to_buf,uint32_to_buf, uint64_to_buf } from "../../utils/serialize"

diff --git a/src/interactions/signTx.ts b/src/interactions/signTx.ts
@@ -29,9 +29,9 @@ const enum P1 {
   STAGE_CERTIFICATES = 0x06,
   STAGE_WITHDRAWALS = 0x07,
   STAGE_VALIDITY_INTERVAL_START = 0x09,
-  STAGE_CONFIRM = 0x0a,
   STAGE_MINT = 0x0b,
   STAGE_SCRIPT_DATA_HASH = 0x0c,
+  STAGE_CONFIRM = 0x0a,
   STAGE_WITNESSES = 0x0f,
 }
 
@@ -81,7 +81,7 @@ function* signTx_addOutput(
 ): Interaction<void> {
   const enum P2 {
     BASIC_DATA = 0x30,
-    SCRIPT_DATA_HASH = 0x34,
+    DATUM_HASH = 0x34,
     CONFIRM = 0x33,
   }
 
@@ -95,10 +95,10 @@ function* signTx_addOutput(
 
   yield* signTx_addTokenBundle(output.tokenBundle, P1.STAGE_OUTPUTS, uint64_to_buf)
 
-  if (output.datumHashHex) {
+  if (output.datumHashHex != null) {
       yield send({
           p1: P1.STAGE_OUTPUTS,
-          p2: P2.SCRIPT_DATA_HASH,
+          p2: P2.DATUM_HASH,
           data: hex_to_buf(output.datumHashHex),
           expectedResponseLength: 0,
       })

diff --git a/src/parsing/transaction.ts b/src/parsing/transaction.ts
@@ -211,15 +211,15 @@ function parseTxOutput(
 
     const destination = parseTxDestination(network, output.destination)
 
-    const datumHash = output.datumHashHex
-        ? parseHexStringOfLength(output.datumHashHex, SCRIPT_DATA_HASH_LENGTH, InvalidDataReason.SCRIPT_DATA_HASH_WRONG_LENGTH)
-        : null
+    const datumHashHex = output.datumHashHex == null
+        ? null
+        : parseHexStringOfLength(output.datumHashHex, SCRIPT_DATA_HASH_LENGTH, InvalidDataReason.SCRIPT_DATA_HASH_WRONG_LENGTH)
 
     return {
         amount,
         tokenBundle,
         destination,
-        datumHashHex: datumHash,
+        datumHashHex,
     }
 }