@fleet-sdk/common 0.3.4 → 0.6.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @fleet-sdk/common
 
+## 0.6.4
+
+### Patch Changes
+
+- 504974e: Fix `utxoDiff` miscalculation when tokens are present in subtrahend but not in minuend
+
+## 0.4.1
+
+### Patch Changes
+
+- 28e3467: Fix `ensureDefaults()` behavior with `undefined` fields
+
 ## 0.3.4
 
 ### Patch Changes

package/dist/index.d.mts

@@ -7,20 +7,6 @@ type SortingSelector<T> = (item: T) => string | number | bigint;
 type SortingDirection = "asc" | "desc";
 type FilterPredicate<T> = (item: T) => boolean;
 type BuildOutputType = "default" | "EIP-12";
-declare enum Network {
-    Mainnet = 0,
-    Testnet = 16
-}
-declare enum AddressType {
-    P2PK = 1,
-    P2SH = 2,
-    P2S = 3
-}
-declare const ergoTreeHeaderFlags: {
-    readonly sizeInclusion: 8;
-    readonly constantSegregation: 16;
-};
-type ErgoTreeHeaderFlag = (typeof ergoTreeHeaderFlags)[keyof typeof ergoTreeHeaderFlags];
 
 type NonMandatoryRegisters<T = HexString> = {
     R4?: T;
@@ -162,6 +148,23 @@ type Block = {
     size: number;
 };
 
+type EnumConst<T extends object> = T[keyof T];
+declare enum Network {
+    Mainnet = 0,
+    Testnet = 16
+}
+declare enum AddressType {
+    P2PK = 1,
+    P2SH = 2,
+    P2S = 3,
+    ADH = 4
+}
+declare const ergoTreeHeaderFlags: {
+    readonly sizeInclusion: 8;
+    readonly constantSegregation: 16;
+};
+type ErgoTreeHeaderFlag = EnumConst<typeof ergoTreeHeaderFlags>;
+
 type ObjectSelector<T> = (item: T) => T[keyof T];
 /**
  * Returns the first element of an array.
@@ -354,7 +357,7 @@ type ParsingOptions = {
 };
 /**
  * Parse a decimal string into a bigint with options
- * @param decimalStr
+ * @param input
  * @param options
  *
  * @example
@@ -362,7 +365,7 @@ type ParsingOptions = {
  * undecimalize("1", { decimals: 2 }) // 100n
  * undecimalize("1", 2) // 100n
  */
-declare function undecimalize(decimalStr: string, options?: ParsingOptions | number): bigint;
+declare function undecimalize(input: string, options?: ParsingOptions | number): bigint;
 type FormattingOptions = {
     /**
      * Number of decimals.
@@ -450,8 +453,8 @@ declare function max<T extends bigint | number>(...numbers: T[]): T;
  * // { nanoErgs: 30n, tokens: [{ tokenId: "test", amount: 50n }] }
  * ```
  */
-declare function utxoSum(boxes: MinimalBoxAmountsArray): BoxSummary;
-declare function utxoSum(boxes: MinimalBoxAmountsArray, tokenId: TokenId): bigint;
+declare function utxoSum(boxes: readonly BoxAmounts[]): BoxSummary;
+declare function utxoSum(boxes: readonly BoxAmounts[], tokenId: TokenId): bigint;
 /**
  * Calculates the difference between two utxos or utxo sets.
  * @param minuend
@@ -466,7 +469,7 @@ declare function utxoSum(boxes: MinimalBoxAmountsArray, tokenId: TokenId): bigin
  * // { nanoErgs: 20n, tokens: [{ tokenId: "test", amount: 30n }] }
  * ```
  */
-declare function utxoDiff(minuend: BoxSummary | Box<Amount>[], subtrahend: BoxSummary | Box<Amount>[]): BoxSummary;
+declare function utxoDiff(minuend: BoxSummary | Box<Amount>[], subtrahend: BoxSummary | Box<Amount>[], ignoreSubtrahendLeftoverTokens?: boolean): BoxSummary;
 /**
  * Checks if the given registers are densely packed.
  * @param registers
@@ -514,10 +517,10 @@ type BoxSummary = {
     nanoErgs: bigint;
     tokens: TokenAmount<bigint>[];
 };
-type MinimalBoxAmountsArray = readonly {
+type BoxAmounts = {
     value: Amount;
     assets: TokenAmount<Amount>[];
-}[];
+};
 /**
  * Ensures that the value and asset amounts of a given box are represented as BigInts.
  * @returns A new box object with BigInt representation for the value and asset amounts.
@@ -537,9 +540,12 @@ declare function ensureUTxOBigInt(candidate: BoxCandidate<Amount>): BoxCandidate
  * ```
  */
 declare function clearUndefined(value: Record<string, unknown>): Record<string, unknown>;
+type EnsureDefaultsOptions = {
+    keepUndefinedKeys: boolean;
+};
 /**
  * Ensure that the options object has all the default values
- * @param options
+ * @param partial
  * @param defaults
  *
  * @example
@@ -550,13 +556,13 @@ declare function clearUndefined(value: Record<string, unknown>): Record<string,
  * console.log(result); // { a: 1, b: 3 }
  * ```
  */
-declare function ensureDefaults<T extends object, R extends object>(options: T | undefined, defaults: R): R & T;
+declare function ensureDefaults<T extends object, R extends object>(partial: T | undefined, defaults: R, options?: EnsureDefaultsOptions): R & T;
 
-type AssertErrorMessageInput = string | Error | (() => string);
+type ErrorMessage = string | Error | (() => string);
 type Constructable = Function;
-type JSPrimitiveTypes = "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
-declare function assert(condition: boolean, error: AssertErrorMessageInput): asserts condition;
-declare function assertTypeOf<T>(obj: T, expected: JSPrimitiveTypes): asserts obj;
+type JSPrimitive = "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+declare function assert(condition: boolean, error: ErrorMessage): asserts condition;
+declare function assertTypeOf<T>(obj: T, expected: JSPrimitive): asserts obj;
 declare function assertInstanceOf<T>(obj: T, expected: Constructable): asserts obj;
 declare function isEmpty<T>(target: T | null | undefined): target is undefined | null;
 declare function some<T>(target: T | null | undefined): target is T;
@@ -639,10 +645,8 @@ declare class FleetError extends Error {
     constructor(message?: string, options?: ErrorOptions);
 }
 declare class NotSupportedError extends FleetError {
-    constructor(message?: string);
 }
 declare class BlockchainProviderError extends FleetError {
-    constructor(message?: string, options?: ErrorOptions);
 }
 
-export { AddressType, Amount, AssertErrorMessageInput, Base58String, Block, BlockHeader, BlockHeaderId, BlockTransactions, BlockchainProviderError, Box, BoxCandidate, BoxId, BoxSummary, BuildOutputType, Collection, CollectionAddOptions, ContextExtension, DataInput, EIP12UnsignedDataInput, EIP12UnsignedInput, EIP12UnsignedTransaction, ErgoTreeHeaderFlag, ErgoTreeHex, FilterPredicate, FleetError, HexString, MinimalBoxAmountsArray, Network, NewToken, NonMandatoryRegisters, NotSupportedError, OneOrMore, PoWSolution, ProverResult, SignedInput, SignedTransaction, SortingDirection, SortingSelector, TokenAmount, TokenId, TokenTargetAmount, TransactionId, UTxOFilterParams, UnsignedInput, UnsignedTransaction, _0n, _10n, _127n, _128n, _1n, _63n, _7n, areEqual, areEqualBy, areRegistersDenselyPacked, assert, assertInstanceOf, assertTypeOf, at, byteSizeOf, chunk, clearUndefined, concatBytes, decimalize, depthOf, endsWith, ensureBigInt, ensureDefaults, ensureUTxOBigInt, ergoTreeHeaderFlags, first, hasDuplicates, hasDuplicatesBy, hasKey, isDefined, isEmpty, isFalsy, isHex, isTruthy, isUndefined, last, max, min, orderBy, percent, some, startsWith, sumBy, undecimalize, uniq, uniqBy, utxoDiff, utxoFilter, utxoSum };
+export { AddressType, type Amount, type Base58String, type Block, type BlockHeader, type BlockHeaderId, type BlockTransactions, BlockchainProviderError, type Box, type BoxAmounts, type BoxCandidate, type BoxId, type BoxSummary, type BuildOutputType, Collection, type CollectionAddOptions, type ContextExtension, type DataInput, type EIP12UnsignedDataInput, type EIP12UnsignedInput, type EIP12UnsignedTransaction, type EnsureDefaultsOptions, type EnumConst, type ErgoTreeHeaderFlag, type ErgoTreeHex, type ErrorMessage, type FilterPredicate, FleetError, type HexString, Network, type NewToken, type NonMandatoryRegisters, NotSupportedError, type OneOrMore, type PoWSolution, type ProverResult, type SignedInput, type SignedTransaction, type SortingDirection, type SortingSelector, type TokenAmount, type TokenId, type TokenTargetAmount, type TransactionId, type UTxOFilterParams, type UnsignedInput, type UnsignedTransaction, _0n, _10n, _127n, _128n, _1n, _63n, _7n, areEqual, areEqualBy, areRegistersDenselyPacked, assert, assertInstanceOf, assertTypeOf, at, byteSizeOf, chunk, clearUndefined, concatBytes, decimalize, depthOf, endsWith, ensureBigInt, ensureDefaults, ensureUTxOBigInt, ergoTreeHeaderFlags, first, hasDuplicates, hasDuplicatesBy, hasKey, isDefined, isEmpty, isFalsy, isHex, isTruthy, isUndefined, last, max, min, orderBy, percent, some, startsWith, sumBy, undecimalize, uniq, uniqBy, utxoDiff, utxoFilter, utxoSum };

package/dist/index.d.ts

@@ -7,20 +7,6 @@ type SortingSelector<T> = (item: T) => string | number | bigint;
 type SortingDirection = "asc" | "desc";
 type FilterPredicate<T> = (item: T) => boolean;
 type BuildOutputType = "default" | "EIP-12";
-declare enum Network {
-    Mainnet = 0,
-    Testnet = 16
-}
-declare enum AddressType {
-    P2PK = 1,
-    P2SH = 2,
-    P2S = 3
-}
-declare const ergoTreeHeaderFlags: {
-    readonly sizeInclusion: 8;
-    readonly constantSegregation: 16;
-};
-type ErgoTreeHeaderFlag = (typeof ergoTreeHeaderFlags)[keyof typeof ergoTreeHeaderFlags];
 
 type NonMandatoryRegisters<T = HexString> = {
     R4?: T;
@@ -162,6 +148,23 @@ type Block = {
     size: number;
 };
 
+type EnumConst<T extends object> = T[keyof T];
+declare enum Network {
+    Mainnet = 0,
+    Testnet = 16
+}
+declare enum AddressType {
+    P2PK = 1,
+    P2SH = 2,
+    P2S = 3,
+    ADH = 4
+}
+declare const ergoTreeHeaderFlags: {
+    readonly sizeInclusion: 8;
+    readonly constantSegregation: 16;
+};
+type ErgoTreeHeaderFlag = EnumConst<typeof ergoTreeHeaderFlags>;
+
 type ObjectSelector<T> = (item: T) => T[keyof T];
 /**
  * Returns the first element of an array.
@@ -354,7 +357,7 @@ type ParsingOptions = {
 };
 /**
  * Parse a decimal string into a bigint with options
- * @param decimalStr
+ * @param input
  * @param options
  *
  * @example
@@ -362,7 +365,7 @@ type ParsingOptions = {
  * undecimalize("1", { decimals: 2 }) // 100n
  * undecimalize("1", 2) // 100n
  */
-declare function undecimalize(decimalStr: string, options?: ParsingOptions | number): bigint;
+declare function undecimalize(input: string, options?: ParsingOptions | number): bigint;
 type FormattingOptions = {
     /**
      * Number of decimals.
@@ -450,8 +453,8 @@ declare function max<T extends bigint | number>(...numbers: T[]): T;
  * // { nanoErgs: 30n, tokens: [{ tokenId: "test", amount: 50n }] }
  * ```
  */
-declare function utxoSum(boxes: MinimalBoxAmountsArray): BoxSummary;
-declare function utxoSum(boxes: MinimalBoxAmountsArray, tokenId: TokenId): bigint;
+declare function utxoSum(boxes: readonly BoxAmounts[]): BoxSummary;
+declare function utxoSum(boxes: readonly BoxAmounts[], tokenId: TokenId): bigint;
 /**
  * Calculates the difference between two utxos or utxo sets.
  * @param minuend
@@ -466,7 +469,7 @@ declare function utxoSum(boxes: MinimalBoxAmountsArray, tokenId: TokenId): bigin
  * // { nanoErgs: 20n, tokens: [{ tokenId: "test", amount: 30n }] }
  * ```
  */
-declare function utxoDiff(minuend: BoxSummary | Box<Amount>[], subtrahend: BoxSummary | Box<Amount>[]): BoxSummary;
+declare function utxoDiff(minuend: BoxSummary | Box<Amount>[], subtrahend: BoxSummary | Box<Amount>[], ignoreSubtrahendLeftoverTokens?: boolean): BoxSummary;
 /**
  * Checks if the given registers are densely packed.
  * @param registers
@@ -514,10 +517,10 @@ type BoxSummary = {
     nanoErgs: bigint;
     tokens: TokenAmount<bigint>[];
 };
-type MinimalBoxAmountsArray = readonly {
+type BoxAmounts = {
     value: Amount;
     assets: TokenAmount<Amount>[];
-}[];
+};
 /**
  * Ensures that the value and asset amounts of a given box are represented as BigInts.
  * @returns A new box object with BigInt representation for the value and asset amounts.
@@ -537,9 +540,12 @@ declare function ensureUTxOBigInt(candidate: BoxCandidate<Amount>): BoxCandidate
  * ```
  */
 declare function clearUndefined(value: Record<string, unknown>): Record<string, unknown>;
+type EnsureDefaultsOptions = {
+    keepUndefinedKeys: boolean;
+};
 /**
  * Ensure that the options object has all the default values
- * @param options
+ * @param partial
  * @param defaults
  *
  * @example
@@ -550,13 +556,13 @@ declare function clearUndefined(value: Record<string, unknown>): Record<string,
  * console.log(result); // { a: 1, b: 3 }
  * ```
  */
-declare function ensureDefaults<T extends object, R extends object>(options: T | undefined, defaults: R): R & T;
+declare function ensureDefaults<T extends object, R extends object>(partial: T | undefined, defaults: R, options?: EnsureDefaultsOptions): R & T;
 
-type AssertErrorMessageInput = string | Error | (() => string);
+type ErrorMessage = string | Error | (() => string);
 type Constructable = Function;
-type JSPrimitiveTypes = "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
-declare function assert(condition: boolean, error: AssertErrorMessageInput): asserts condition;
-declare function assertTypeOf<T>(obj: T, expected: JSPrimitiveTypes): asserts obj;
+type JSPrimitive = "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+declare function assert(condition: boolean, error: ErrorMessage): asserts condition;
+declare function assertTypeOf<T>(obj: T, expected: JSPrimitive): asserts obj;
 declare function assertInstanceOf<T>(obj: T, expected: Constructable): asserts obj;
 declare function isEmpty<T>(target: T | null | undefined): target is undefined | null;
 declare function some<T>(target: T | null | undefined): target is T;
@@ -639,10 +645,8 @@ declare class FleetError extends Error {
     constructor(message?: string, options?: ErrorOptions);
 }
 declare class NotSupportedError extends FleetError {
-    constructor(message?: string);
 }
 declare class BlockchainProviderError extends FleetError {
-    constructor(message?: string, options?: ErrorOptions);
 }
 
-export { AddressType, Amount, AssertErrorMessageInput, Base58String, Block, BlockHeader, BlockHeaderId, BlockTransactions, BlockchainProviderError, Box, BoxCandidate, BoxId, BoxSummary, BuildOutputType, Collection, CollectionAddOptions, ContextExtension, DataInput, EIP12UnsignedDataInput, EIP12UnsignedInput, EIP12UnsignedTransaction, ErgoTreeHeaderFlag, ErgoTreeHex, FilterPredicate, FleetError, HexString, MinimalBoxAmountsArray, Network, NewToken, NonMandatoryRegisters, NotSupportedError, OneOrMore, PoWSolution, ProverResult, SignedInput, SignedTransaction, SortingDirection, SortingSelector, TokenAmount, TokenId, TokenTargetAmount, TransactionId, UTxOFilterParams, UnsignedInput, UnsignedTransaction, _0n, _10n, _127n, _128n, _1n, _63n, _7n, areEqual, areEqualBy, areRegistersDenselyPacked, assert, assertInstanceOf, assertTypeOf, at, byteSizeOf, chunk, clearUndefined, concatBytes, decimalize, depthOf, endsWith, ensureBigInt, ensureDefaults, ensureUTxOBigInt, ergoTreeHeaderFlags, first, hasDuplicates, hasDuplicatesBy, hasKey, isDefined, isEmpty, isFalsy, isHex, isTruthy, isUndefined, last, max, min, orderBy, percent, some, startsWith, sumBy, undecimalize, uniq, uniqBy, utxoDiff, utxoFilter, utxoSum };
+export { AddressType, type Amount, type Base58String, type Block, type BlockHeader, type BlockHeaderId, type BlockTransactions, BlockchainProviderError, type Box, type BoxAmounts, type BoxCandidate, type BoxId, type BoxSummary, type BuildOutputType, Collection, type CollectionAddOptions, type ContextExtension, type DataInput, type EIP12UnsignedDataInput, type EIP12UnsignedInput, type EIP12UnsignedTransaction, type EnsureDefaultsOptions, type EnumConst, type ErgoTreeHeaderFlag, type ErgoTreeHex, type ErrorMessage, type FilterPredicate, FleetError, type HexString, Network, type NewToken, type NonMandatoryRegisters, NotSupportedError, type OneOrMore, type PoWSolution, type ProverResult, type SignedInput, type SignedTransaction, type SortingDirection, type SortingSelector, type TokenAmount, type TokenId, type TokenTargetAmount, type TransactionId, type UTxOFilterParams, type UnsignedInput, type UnsignedTransaction, _0n, _10n, _127n, _128n, _1n, _63n, _7n, areEqual, areEqualBy, areRegistersDenselyPacked, assert, assertInstanceOf, assertTypeOf, at, byteSizeOf, chunk, clearUndefined, concatBytes, decimalize, depthOf, endsWith, ensureBigInt, ensureDefaults, ensureUTxOBigInt, ergoTreeHeaderFlags, first, hasDuplicates, hasDuplicatesBy, hasKey, isDefined, isEmpty, isFalsy, isHex, isTruthy, isUndefined, last, max, min, orderBy, percent, some, startsWith, sumBy, undecimalize, uniq, uniqBy, utxoDiff, utxoFilter, utxoSum };

package/dist/index.js

@@ -2,8 +2,7 @@
 
 // src/utils/assertions.ts
 function assert(condition, error) {
-  if (condition)
-    return;
+  if (condition) return;
   let err = void 0;
   switch (typeof error) {
     case "string":
@@ -23,22 +22,21 @@ function assertTypeOf(obj, expected) {
     throw new Error(`Expected an object of type '${expected}', got '${type}'.`);
   }
 }
-var toString = (value) => Object.prototype.toString.call(value);
 function getTypeName(value) {
-  if (value === null)
-    return "null";
+  if (value === null) return "null";
   const type = typeof value;
-  return type === "object" || type === "function" ? toString(value).slice(8, -1) : type;
+  return type === "object" || type === "function" ? Object.prototype.toString.call(value).slice(8, -1) : type;
 }
 function assertInstanceOf(obj, expected) {
   const condition = obj instanceof expected;
   if (!condition) {
-    throw new Error(`Expected an instance of '${expected.name}', got '${getTypeName(obj)}'.`);
+    throw new Error(
+      `Expected an instance of '${expected.name}', got '${getTypeName(obj)}'.`
+    );
   }
 }
 function isEmpty(target) {
-  if (!target)
-    return true;
+  if (!target) return true;
   return Array.isArray(target) ? target.length === 0 : Object.keys(target).length === 0;
 }
 function some(target) {
@@ -62,21 +60,18 @@ function hasKey(o, key) {
 
 // src/utils/array.ts
 function first(array) {
-  if (!array)
-    return void 0;
+  if (!array) return void 0;
   assert(array.length > 0, "Empty array.");
   return array[0];
 }
 function last(array) {
-  if (!array)
-    return void 0;
+  if (!array) return void 0;
   assert(array.length > 0, "Empty array.");
   return at(array, -1);
 }
 function at(array, index) {
   const len = array?.length;
-  if (!len)
-    return void 0;
+  if (!len) return void 0;
   if (index < 0) {
     index += len;
   }
@@ -104,20 +99,16 @@ function chunk(array, size) {
 }
 function orderBy(array, iteratee, order = "asc") {
   return [...array].sort((a, b) => {
-    if (iteratee(a) > iteratee(b)) {
-      return order === "asc" ? 1 : -1;
-    } else if (iteratee(a) < iteratee(b)) {
-      return order === "asc" ? -1 : 1;
-    } else {
-      return 0;
-    }
+    if (iteratee(a) > iteratee(b)) return order === "asc" ? 1 : -1;
+    if (iteratee(a) < iteratee(b)) return order === "asc" ? -1 : 1;
+    return 0;
   });
 }
 function areEqual(array1, array2) {
   if (array1 === array2) {
     return true;
   }
-  if (array1.length != array2.length) {
+  if (array1.length !== array2.length) {
     return false;
   }
   for (let i = 0; i < array1.length; i++) {
@@ -131,7 +122,7 @@ function areEqualBy(array1, array2, selector) {
   if (array1 === array2) {
     return true;
   }
-  if (array1.length != array2.length) {
+  if (array1.length !== array2.length) {
     return false;
   }
   for (let i = 0; i < array1.length; i++) {
@@ -205,22 +196,20 @@ var _128n = BigInt(128);
 function ensureBigInt(number) {
   return typeof number === "bigint" ? number : BigInt(number);
 }
-function undecimalize(decimalStr, options) {
-  if (!decimalStr) {
-    return _0n;
-  }
-  options = typeof options == "number" ? { decimals: options } : options;
+function undecimalize(input, options) {
+  if (!input) return _0n;
+  options = typeof options === "number" ? { decimals: options } : options;
   if (isUndefined(options)) {
     options = {};
   }
   options.decimals = options.decimals || 0;
   options.decimalMark = options.decimalMark || ".";
-  const fragments = decimalStr.split(options.decimalMark);
+  const fragments = input.split(options.decimalMark);
   if (fragments.length > 2) {
     throw new Error("Invalid numeric string.");
   }
   let [integer, decimal] = fragments;
-  integer = _removeLeadingZeros(integer);
+  integer = removeLeadingZeros(integer);
   const negative = integer.startsWith("-") ? "-" : "";
   if (!decimal) {
     decimal = "0".repeat(options.decimals);
@@ -237,39 +226,36 @@ function decimalize(value, options) {
   if (!options) {
     return value.toString();
   }
-  options = typeof options == "number" ? { decimals: options } : options;
+  options = typeof options === "number" ? { decimals: options } : options;
   options.decimals = options.decimals || 0;
   options.decimalMark = options.decimalMark || ".";
   const pow = _10n ** BigInt(options.decimals);
   const integer = value / pow;
   const decimal = value - integer * pow;
-  return _buildFormattedDecimal(integer.toString(10), decimal.toString(10), options);
+  return buildFormattedDecimal(integer.toString(10), decimal.toString(10), options);
 }
 function percent(value, percentage, precision = 2n) {
   return value * percentage / 10n ** precision;
 }
-function _buildFormattedDecimal(integer, decimal, options) {
-  const integerPart = _addThousandMarks(integer, options.thousandMark);
-  const decimalPart = _stripTrailingZeros(decimal.padStart(options.decimals, "0"));
-  if (decimalPart) {
-    return `${integerPart}${options.decimalMark}${decimalPart}`;
-  } else {
-    return integerPart;
-  }
+function buildFormattedDecimal(integer, decimal, options) {
+  const int = addThousandMarks(integer, options.thousandMark);
+  const dec = stripTrailingZeros(decimal.padStart(options.decimals, "0"));
+  if (dec) return `${int}${options.decimalMark}${dec}`;
+  return int;
 }
-function _addThousandMarks(value, mark) {
+function addThousandMarks(value, mark) {
   if (!mark) {
     return value;
   }
   return value.replace(/\B(?=(\d{3})+(?!\d))/g, mark);
 }
-function _stripTrailingZeros(value) {
+function stripTrailingZeros(value) {
   if (!value.endsWith("0")) {
     return value;
   }
   return value.replace(/\.?0+$/, "");
 }
-function _removeLeadingZeros(value) {
+function removeLeadingZeros(value) {
   if (!value.startsWith("0")) {
     return value;
   }
@@ -331,20 +317,26 @@ function utxoSum(boxes, tokenId) {
     tokens: Object.keys(balances).filter((x) => x !== NANOERGS_TOKEN_ID).map((tokenId2) => ({ tokenId: tokenId2, amount: balances[tokenId2] }))
   };
 }
-function utxoDiff(minuend, subtrahend) {
-  if (Array.isArray(minuend)) {
-    minuend = utxoSum(minuend);
-  }
-  if (Array.isArray(subtrahend)) {
-    subtrahend = utxoSum(subtrahend);
-  }
+function utxoDiff(minuend, subtrahend, ignoreSubtrahendLeftoverTokens = false) {
+  if (Array.isArray(minuend)) minuend = utxoSum(minuend);
+  if (Array.isArray(subtrahend)) subtrahend = utxoSum(subtrahend);
   const tokens = [];
   const nanoErgs = minuend.nanoErgs - subtrahend.nanoErgs;
+  const subtrahendTokens = new Map(subtrahend.tokens.map((t) => [t.tokenId, t.amount]));
   for (const token of minuend.tokens) {
-    const balance = token.amount - (subtrahend.tokens.find((t) => t.tokenId === token.tokenId)?.amount || _0n);
+    const subtrahendAmount = subtrahendTokens.get(token.tokenId) || _0n;
+    const balance = token.amount - (subtrahendAmount || _0n);
     if (balance !== _0n) {
       tokens.push({ tokenId: token.tokenId, amount: balance });
     }
+    if (subtrahendAmount > _0n) {
+      subtrahendTokens.delete(token.tokenId);
+    }
+  }
+  if (!ignoreSubtrahendLeftoverTokens && subtrahendTokens.size > 0) {
+    for (const [tokenId, amount] of subtrahendTokens) {
+      tokens.push({ tokenId, amount: -amount });
+    }
   }
   return { nanoErgs, tokens };
 }
@@ -427,8 +419,14 @@ function clearUndefined(value) {
   }
   return result;
 }
-function ensureDefaults(options, defaults) {
-  return isEmpty(options) ? defaults : { ...defaults, ...options };
+function ensureDefaults(partial, defaults, options) {
+  if (isEmpty(partial)) return defaults;
+  if (options?.keepUndefinedKeys) return { ...defaults, ...partial };
+  const merged = { ...defaults, ...partial };
+  for (const key in merged) {
+    merged[key] = partial[key] ?? defaults[key];
+  }
+  return merged;
 }
 
 // src/utils/bytes.ts
@@ -443,18 +441,14 @@ function concatBytes(...arrays) {
   return r;
 }
 function isHex(value) {
-  if (!value || value.length % 2)
-    return false;
-  if (!value.startsWith("0x")) {
-    value = "0x" + value;
-  }
-  return !isNaN(Number(value));
+  if (!value || value.length % 2) return false;
+  return !Number.isNaN(Number(value.startsWith("0x") ? value : `0x${value}`));
 }
 function byteSizeOf(hex) {
   return hex.length / 2;
 }
 
-// src/types/common.ts
+// src/types/enums.ts
 var Network = /* @__PURE__ */ ((Network2) => {
   Network2[Network2["Mainnet"] = 0] = "Mainnet";
   Network2[Network2["Testnet"] = 16] = "Testnet";
@@ -464,6 +458,7 @@ var AddressType = /* @__PURE__ */ ((AddressType2) => {
   AddressType2[AddressType2["P2PK"] = 1] = "P2PK";
   AddressType2[AddressType2["P2SH"] = 2] = "P2SH";
   AddressType2[AddressType2["P2S"] = 3] = "P2S";
+  AddressType2[AddressType2["ADH"] = 4] = "ADH";
   return AddressType2;
 })(AddressType || {});
 var ergoTreeHeaderFlags = {
@@ -571,14 +566,8 @@ var FleetError = class extends Error {
   }
 };
 var NotSupportedError = class extends FleetError {
-  constructor(message) {
-    super(message);
-  }
 };
 var BlockchainProviderError = class extends FleetError {
-  constructor(message, options) {
-    super(message, options);
-  }
 };
 
 exports.AddressType = AddressType;
@@ -636,5 +625,5 @@ exports.uniqBy = uniqBy;
 exports.utxoDiff = utxoDiff;
 exports.utxoFilter = utxoFilter;
 exports.utxoSum = utxoSum;
-//# sourceMappingURL=out.js.map
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map