feat: Support IntegerType for unit conversions

hirosystems · Dec 4, 2024 · fe26977 · fe26977
1 parent fd0bf26
commit fe26977
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/packages/transactions/src/units.ts b/packages/transactions/src/units.ts
@@ -1,3 +1,5 @@
+import { IntegerType, intToBigInt } from '@stacks/common';
+
 export const MICROSTX_IN_STX = 1_000_000;
 
 /**
@@ -9,8 +11,8 @@ export const MICROSTX_IN_STX = 1_000_000;
  * microStxToStx(1000000n); // 1n
  * ```
  */
-export function microStxToStx(amountInMicroStx: number): number {
-  return amountInMicroStx / MICROSTX_IN_STX;
+export function microStxToStx(amountInMicroStx: IntegerType): number {
+  return Number(intToBigInt(amountInMicroStx)) / MICROSTX_IN_STX;
 }
 
 /**
@@ -22,6 +24,6 @@ export function microStxToStx(amountInMicroStx: number): number {
  * stxToMicroStx(1); // 1000000
  * ```
  */
-export function stxToMicroStx(amountInStx: number): number {
-  return amountInStx * MICROSTX_IN_STX;
+export function stxToMicroStx(amountInStx: IntegerType): number {
+  return Number(intToBigInt(amountInStx)) * MICROSTX_IN_STX;
 }
diff --git a/packages/transactions/tests/units.test.ts b/packages/transactions/tests/units.test.ts
@@ -5,17 +5,45 @@ test(stxToMicroStx.name, () => {
   expect(stxToMicroStx(1.23)).toBe(1230000);
   expect(stxToMicroStx(0.000001)).toBe(1);
 
+  expect(stxToMicroStx('1')).toBe(1000000);
+  expect(stxToMicroStx('1.23')).toBe(1230000);
+  expect(stxToMicroStx('0.000001')).toBe(1);
+
+  expect(stxToMicroStx(1n)).toBe(1000000);
+
   expect(stxToMicroStx(-1)).toBe(-1000000);
   expect(stxToMicroStx(-2.34)).toBe(-2340000);
   expect(stxToMicroStx(-0.000001)).toBe(-1);
+
+  expect(stxToMicroStx('-1')).toBe(-1000000);
+  expect(stxToMicroStx('-2.34')).toBe(-2340000);
+  expect(stxToMicroStx('-0.000001')).toBe(-1);
+
+  expect(stxToMicroStx(-1n)).toBe(-1000000);
 });
 
 test(microStxToStx.name, () => {
   expect(microStxToStx(1000000)).toBe(1);
   expect(microStxToStx(1230000)).toBe(1.23);
   expect(microStxToStx(1)).toBe(0.000001);
 
+  expect(microStxToStx('1000000')).toBe(1);
+  expect(microStxToStx('1230000')).toBe(1.23);
+  expect(microStxToStx('1')).toBe(0.000001);
+
+  expect(microStxToStx(1000000n)).toBe(1);
+  expect(microStxToStx(1230000n)).toBe(1.23);
+  expect(microStxToStx(1n)).toBe(0.000001);
+
   expect(microStxToStx(-1000000)).toBe(-1);
   expect(microStxToStx(-2340000)).toBe(-2.34);
   expect(microStxToStx(-1)).toBe(-0.000001);
+
+  expect(microStxToStx('-1000000')).toBe(-1);
+  expect(microStxToStx('-2340000')).toBe(-2.34);
+  expect(microStxToStx('-1')).toBe(-0.000001);
+
+  expect(microStxToStx(-1000000n)).toBe(-1);
+  expect(microStxToStx(-2340000n)).toBe(-2.34);
+  expect(microStxToStx(-1n)).toBe(-0.000001);
 });