@nadohq/shared 0.1.0-alpha.45 → 0.1.0-alpha.47

package/src/utils/orders/appendix/packOrderAppendix.ts

@@ -43,6 +43,8 @@ function mapOrderAppendixToBitValues(
 
   return {
     value,
+    builderId: appendix.builder?.builderId ?? 0,
+    builderFeeRate: appendix.builder?.builderFeeRate ?? 0,
     reserved: 0,
     trigger,
     reduceOnly: appendix.reduceOnly ? 1 : 0,
@@ -61,7 +63,9 @@ export function packOrderAppendix(appendix: OrderAppendix): bigint {
 
   // Ensure value is within 64 bits
   let packed = bitMaskValue(bits.value, 64);
-  packed = (packed << 50n) | bitMaskValue(bits.reserved, 50);
+  packed = (packed << 16n) | bitMaskValue(bits.builderId, 16);
+  packed = (packed << 10n) | bitMaskValue(bits.builderFeeRate, 10);
+  packed = (packed << 24n) | bitMaskValue(bits.reserved, 24);
   packed = (packed << 2n) | bitMaskValue(bits.trigger, 2);
   packed = (packed << 1n) | bitMaskValue(bits.reduceOnly, 1);
   packed = (packed << 2n) | bitMaskValue(bits.orderType, 2);

package/src/utils/orders/appendix/types.ts

@@ -1,14 +1,16 @@
 /**
  * Bit layout for OrderAppendix packing (MSB → LSB):
  *
- * |   value   | reserved | trigger | reduceOnly | orderType | isolated | version |
- * |-----------|----------|---------|------------|-----------|----------|---------|
- * | 127..64   | 63..14   | 13..12  | 11         | 10..9     | 8        | 7..0    |
- * |  64 bits  | 50 bits  | 2 bits  | 1 bit      | 2 bits    | 1 bit    | 8 bits  |
+ * |   value   | builderId | builderFeeRate | reserved | trigger | reduceOnly | orderType | isolated | version |
+ * |-----------|-----------|----------------|----------|---------|------------|-----------|----------|---------|
+ * | 127..64   | 63..48    | 47..38         | 37..14   | 13..12  | 11         | 10..9     | 8        | 7..0    |
+ * |  64 bits  | 16 bits   | 10 bits        | 24 bits  | 2 bits  | 1 bit      | 2 bits    | 1 bit    | 8 bits  |
  */
 export interface PackedOrderAppendixBits {
   value: bigint; // 64 bits
-  reserved: number; // 50 bits, set to 0
+  builderId: number; // 16 bits
+  builderFeeRate: number; // 10 bits
+  reserved: number; // 24 bits, set to 0
   trigger: number; // 2 bits
   reduceOnly: number; // 1 bit
   orderType: number; // 2 bits

package/src/utils/orders/appendix/unpackOrderAppendix.ts

@@ -45,6 +45,15 @@ function mapBitValuesToAppendix(bits: PackedOrderAppendixBits): OrderAppendix {
       return unpackTwapOrderAppendixValue(bits.value);
     }
   })();
+  const builderFields = (() => {
+    if (bits.builderId) {
+      return {
+        builderId: bits.builderId,
+        builderFeeRate: bits.builderFeeRate,
+      };
+    }
+    return undefined;
+  })();
 
   return {
     reduceOnly: !!bits.reduceOnly,
@@ -52,6 +61,7 @@ function mapBitValuesToAppendix(bits: PackedOrderAppendixBits): OrderAppendix {
     triggerType,
     isolated: isolatedFields,
     twap: twapFields,
+    builder: builderFields,
   };
 }
 
@@ -74,13 +84,19 @@ export function unpackOrderAppendix(packed: BigDecimalish): OrderAppendix {
   temp >>= 1n;
   const trigger = Number(bitMaskValue(temp, 2));
   temp >>= 2n;
-  const reserved = Number(bitMaskValue(temp, 50));
-  temp >>= 50n;
+  const reserved = Number(bitMaskValue(temp, 24));
+  temp >>= 24n;
+  const builderFeeRate = Number(bitMaskValue(temp, 10));
+  temp >>= 10n;
+  const builderId = Number(bitMaskValue(temp, 16));
+  temp >>= 16n;
   // The remaining bits are the value, which should be 64 bits
   const value = bitMaskValue(temp, 64);
 
   return mapBitValuesToAppendix({
     value,
+    builderId,
+    builderFeeRate,
     reserved,
     trigger,
     reduceOnly,

package/src/utils/toPrintableObject.ts

@@ -4,8 +4,17 @@ import { BigDecimal } from './math/bigDecimal';
  * Util for converting any BigDecimal types into a string so that it can be logged nicely.
  * Handles cyclic references by returning '[Circular]' for already-visited objects.
  */
+export function toPrintableObject(
+  obj: null | undefined,
+  seen?: WeakSet<object>,
+): null;
+export function toPrintableObject(
+  obj: BigDecimal | bigint,
+  seen?: WeakSet<object>,
+): string;
+export function toPrintableObject(obj: unknown, seen?: WeakSet<object>): object;
 export function toPrintableObject(obj: unknown, seen = new WeakSet()): unknown {
-  if (obj == null) {
+  if (obj === null || obj === undefined) {
     return null;
   }
   if (obj instanceof BigDecimal || typeof obj === 'bigint') {
@@ -29,7 +38,7 @@ export function toPrintableObject(obj: unknown, seen = new WeakSet()): unknown {
         ]),
       );
     } catch {
-      return '[Unserializable Object]';
+      return { error: '[Unserializable Object]' };
     }
   }
   return obj;