initial patch

packages/ripple-binary-codec/src/binary.ts

@@ -66,6 +66,7 @@ function serializeObject(object: JsonObject, opts: OptionObject = {}): Buffer {
   const filter = signingFieldsOnly
     ? (f: FieldInstance): boolean => f.isSigningField
     : undefined
+
   coreTypes.STObject.from(object, filter).toBytesSink(bytesList)
 
   if (suffix) {

packages/ripple-binary-codec/src/enums/index.ts

@@ -29,7 +29,7 @@ function fieldHeader(type: number, nth: number): Buffer {
 /*
  * @brief: Bytes, name, and ordinal representing one type, ledger_type, transaction type, or result
  */
-class Bytes {
+export class Bytes {
   readonly bytes: Uint8Array
 
   constructor(

packages/ripple-binary-codec/src/serdes/binary-serializer.ts

@@ -126,15 +126,21 @@ class BinarySerializer {
    * @param field field to write to BinarySerializer
    * @param value value to write to BinarySerializer
    */
-  writeFieldAndValue(field: FieldInstance, value: SerializedType): void {
+  writeFieldAndValue(
+    field: FieldInstance,
+    value: SerializedType,
+    isUnlModifyWorkaround = false,
+  ): void {
     const associatedValue = field.associatedType.from(value)
     assert.ok(associatedValue.toBytesSink !== undefined)
     assert.ok(field.name !== undefined)
 
     this.sink.put(field.header)
 
+    console.log(field.name, field.isVariableLengthEncoded)
+
     if (field.isVariableLengthEncoded) {
-      this.writeLengthEncoded(associatedValue)
+      this.writeLengthEncoded(associatedValue, isUnlModifyWorkaround)
     } else {
       associatedValue.toBytesSink(this.sink)
     }
@@ -145,9 +151,12 @@ class BinarySerializer {
    *
    * @param value length encoded value to write to BytesList
    */
-  public writeLengthEncoded(value: SerializedType): void {
+  public writeLengthEncoded(
+    value: SerializedType,
+    isUnlModifyWorkaround = false,
+  ): void {
     const bytes = new BytesList()
-    value.toBytesSink(bytes)
+    if (!isUnlModifyWorkaround) value.toBytesSink(bytes)
     this.put(this.encodeVariableLength(bytes.getLength()))
     this.writeBytesList(bytes)
   }

packages/ripple-binary-codec/src/types/st-object.ts

@@ -1,4 +1,4 @@
-import { Field, FieldInstance } from '../enums'
+import { Field, FieldInstance, Bytes } from '../enums'
 import { SerializedType, JsonObject } from './serialized-type'
 import { xAddressToClassicAddress, isValidXAddress } from 'ripple-address-codec'
 import { BinaryParser } from '../serdes/binary-parser'
@@ -92,10 +92,13 @@ class STObject extends SerializedType {
     if (value instanceof STObject) {
       return value
     }
+    console.log('HIIIIIIIIIIIIIIII')
 
     const list: BytesList = new BytesList()
     const bytes: BinarySerializer = new BinarySerializer(list)
 
+    let isUnlModify = false
+
     const xAddressDecoded = Object.entries(value).reduce((acc, [key, val]) => {
       let handled: JsonObject | undefined = undefined
       if (val && isValidXAddress(val.toString())) {
@@ -120,13 +123,19 @@ class STObject extends SerializedType {
     if (filter !== undefined) {
       sorted = sorted.filter(filter)
     }
+    // console.log(sorted)
 
     sorted.forEach((field) => {
       const associatedValue = field.associatedType.from(
         xAddressDecoded[field.name],
       )
-
-      bytes.writeFieldAndValue(field, associatedValue)
+      // console.log(field, associatedValue)
+      if ((associatedValue as unknown as Bytes).name === 'UNLModify') {
+        isUnlModify = true
+      }
+      const isUnlModifyWorkaround = field.name == 'Account' && isUnlModify
+      console.log(isUnlModify, field.name, isUnlModifyWorkaround)
+      bytes.writeFieldAndValue(field, associatedValue, isUnlModifyWorkaround)
       if (field.type.name === ST_OBJECT) {
         bytes.put(OBJECT_END_MARKER_BYTE)
       }

packages/ripple-binary-codec/test/fixtures/negative-unl.json

@@ -1,12 +1,12 @@
 {
-    "binary": "120066240000000026000003006840000000000000007300701321ED9D593004CC501CACD261BD8E31E863F2B3F6CA69505E7FD54DA8F5690BEFB7AE8114000000000000000000000000000000000000000000101101",
+    "binary": "120066240000000026040B52006840000000000000007300701321EDB6FC8E803EE8EDC2793F1EC917B2EE41D35255618DEB91D3F9B1FC89B75D4539810000101101",
     "tx": {
         "UNLModifyDisabling": 1,
-        "LedgerSequence": 768,
-        "UNLModifyValidator": "ED9D593004CC501CACD261BD8E31E863F2B3F6CA69505E7FD54DA8F5690BEFB7AE",
+        "LedgerSequence": 67850752,
+        "UNLModifyValidator": "EDB6FC8E803EE8EDC2793F1EC917B2EE41D35255618DEB91D3F9B1FC89B75D4539",
         "TransactionType": "UNLModify",
         "Account": "rrrrrrrrrrrrrrrrrrrrrhoLvTp",
         "Sequence": 0,
         "Fee": "0",
         "SigningPubKey": ""}
-}
+}