fix regression caused by CSL serializing TransactionWitnessSet fields out of order

Author: itsfarseen

conway-cddl/yaml/conway.yaml

@@ -866,7 +866,6 @@ PreBabbageTransactionOutput:
       type: DataHash
       optional: true
 
-
 # script_data_hash = $hash32
 # ; This is a hash of data which may affect evaluation of a script.
 # ; This data consists of:
@@ -1714,22 +1713,22 @@ TransactionWitnessSet:
       name: plutus_scripts_v1
       type: PlutusScripts
       optional: true
-    - id: 4
-      name: inner_plutus_data
-      type: PlutusSet
-      optional: true
     - id: 6
       name: plutus_scripts_v2
       type: PlutusScripts
       optional: true
-    - id: 5
-      name: redeemers
-      type: Redeemers
-      optional: true
     - id: 7
       name: plutus_scripts_v3
       type: PlutusScripts
       optional: true
+    - id: 4
+      name: inner_plutus_data
+      type: PlutusSet
+      optional: true
+    - id: 5
+      name: redeemers
+      type: Redeemers
+      optional: true
   methods:
     new: null
   extra_methods: |
@@ -2541,7 +2540,6 @@ PlutusMap:
       return ret;
     }
 
-
 PlutusMapValues:
   type: array
   item: PlutusData

src/generated.ts

@@ -17960,29 +17960,29 @@ export class TransactionWitnessSet {
   private _native_scripts: NativeScripts | undefined;
   private _bootstraps: BootstrapWitnesses | undefined;
   private _plutus_scripts_v1: PlutusScripts | undefined;
-  private _inner_plutus_data: PlutusSet | undefined;
   private _plutus_scripts_v2: PlutusScripts | undefined;
-  private _redeemers: Redeemers | undefined;
   private _plutus_scripts_v3: PlutusScripts | undefined;
+  private _inner_plutus_data: PlutusSet | undefined;
+  private _redeemers: Redeemers | undefined;
 
   constructor(
     vkeys: Vkeywitnesses | undefined,
     native_scripts: NativeScripts | undefined,
     bootstraps: BootstrapWitnesses | undefined,
     plutus_scripts_v1: PlutusScripts | undefined,
-    inner_plutus_data: PlutusSet | undefined,
     plutus_scripts_v2: PlutusScripts | undefined,
-    redeemers: Redeemers | undefined,
     plutus_scripts_v3: PlutusScripts | undefined,
+    inner_plutus_data: PlutusSet | undefined,
+    redeemers: Redeemers | undefined,
   ) {
     this._vkeys = vkeys;
     this._native_scripts = native_scripts;
     this._bootstraps = bootstraps;
     this._plutus_scripts_v1 = plutus_scripts_v1;
-    this._inner_plutus_data = inner_plutus_data;
     this._plutus_scripts_v2 = plutus_scripts_v2;
-    this._redeemers = redeemers;
     this._plutus_scripts_v3 = plutus_scripts_v3;
+    this._inner_plutus_data = inner_plutus_data;
+    this._redeemers = redeemers;
   }
 
   vkeys(): Vkeywitnesses | undefined {
@@ -18017,14 +18017,6 @@ export class TransactionWitnessSet {
     this._plutus_scripts_v1 = plutus_scripts_v1;
   }
 
-  inner_plutus_data(): PlutusSet | undefined {
-    return this._inner_plutus_data;
-  }
-
-  set_inner_plutus_data(inner_plutus_data: PlutusSet | undefined): void {
-    this._inner_plutus_data = inner_plutus_data;
-  }
-
   plutus_scripts_v2(): PlutusScripts | undefined {
     return this._plutus_scripts_v2;
   }
@@ -18033,14 +18025,6 @@ export class TransactionWitnessSet {
     this._plutus_scripts_v2 = plutus_scripts_v2;
   }
 
-  redeemers(): Redeemers | undefined {
-    return this._redeemers;
-  }
-
-  set_redeemers(redeemers: Redeemers | undefined): void {
-    this._redeemers = redeemers;
-  }
-
   plutus_scripts_v3(): PlutusScripts | undefined {
     return this._plutus_scripts_v3;
   }
@@ -18049,6 +18033,22 @@ export class TransactionWitnessSet {
     this._plutus_scripts_v3 = plutus_scripts_v3;
   }
 
+  inner_plutus_data(): PlutusSet | undefined {
+    return this._inner_plutus_data;
+  }
+
+  set_inner_plutus_data(inner_plutus_data: PlutusSet | undefined): void {
+    this._inner_plutus_data = inner_plutus_data;
+  }
+
+  redeemers(): Redeemers | undefined {
+    return this._redeemers;
+  }
+
+  set_redeemers(redeemers: Redeemers | undefined): void {
+    this._redeemers = redeemers;
+  }
+
   static deserialize(
     reader: CBORReader,
     path: string[],
@@ -18081,29 +18081,29 @@ export class TransactionWitnessSet {
           break;
         }
 
-        case 4: {
-          const new_path = [...path, "PlutusSet(inner_plutus_data)"];
-          fields.inner_plutus_data = PlutusSet.deserialize(r, new_path);
-          break;
-        }
-
         case 6: {
           const new_path = [...path, "PlutusScripts(plutus_scripts_v2)"];
           fields.plutus_scripts_v2 = PlutusScripts.deserialize(r, new_path);
           break;
         }
 
-        case 5: {
-          const new_path = [...path, "Redeemers(redeemers)"];
-          fields.redeemers = Redeemers.deserialize(r, new_path);
-          break;
-        }
-
         case 7: {
           const new_path = [...path, "PlutusScripts(plutus_scripts_v3)"];
           fields.plutus_scripts_v3 = PlutusScripts.deserialize(r, new_path);
           break;
         }
+
+        case 4: {
+          const new_path = [...path, "PlutusSet(inner_plutus_data)"];
+          fields.inner_plutus_data = PlutusSet.deserialize(r, new_path);
+          break;
+        }
+
+        case 5: {
+          const new_path = [...path, "Redeemers(redeemers)"];
+          fields.redeemers = Redeemers.deserialize(r, new_path);
+          break;
+        }
       }
     }, path);
 
@@ -18115,23 +18115,23 @@ export class TransactionWitnessSet {
 
     let plutus_scripts_v1 = fields.plutus_scripts_v1;
 
-    let inner_plutus_data = fields.inner_plutus_data;
-
     let plutus_scripts_v2 = fields.plutus_scripts_v2;
 
-    let redeemers = fields.redeemers;
-
     let plutus_scripts_v3 = fields.plutus_scripts_v3;
 
+    let inner_plutus_data = fields.inner_plutus_data;
+
+    let redeemers = fields.redeemers;
+
     return new TransactionWitnessSet(
       vkeys,
       native_scripts,
       bootstraps,
       plutus_scripts_v1,
-      inner_plutus_data,
       plutus_scripts_v2,
-      redeemers,
       plutus_scripts_v3,
+      inner_plutus_data,
+      redeemers,
     );
   }
 
@@ -18141,10 +18141,10 @@ export class TransactionWitnessSet {
     if (this._native_scripts === undefined) len -= 1;
     if (this._bootstraps === undefined) len -= 1;
     if (this._plutus_scripts_v1 === undefined) len -= 1;
-    if (this._inner_plutus_data === undefined) len -= 1;
     if (this._plutus_scripts_v2 === undefined) len -= 1;
-    if (this._redeemers === undefined) len -= 1;
     if (this._plutus_scripts_v3 === undefined) len -= 1;
+    if (this._inner_plutus_data === undefined) len -= 1;
+    if (this._redeemers === undefined) len -= 1;
     writer.writeMapTag(len);
     if (this._vkeys !== undefined) {
       writer.writeInt(0n);
@@ -18162,22 +18162,22 @@ export class TransactionWitnessSet {
       writer.writeInt(3n);
       this._plutus_scripts_v1.serialize(writer);
     }
-    if (this._inner_plutus_data !== undefined) {
-      writer.writeInt(4n);
-      this._inner_plutus_data.serialize(writer);
-    }
     if (this._plutus_scripts_v2 !== undefined) {
       writer.writeInt(6n);
       this._plutus_scripts_v2.serialize(writer);
     }
-    if (this._redeemers !== undefined) {
-      writer.writeInt(5n);
-      this._redeemers.serialize(writer);
-    }
     if (this._plutus_scripts_v3 !== undefined) {
       writer.writeInt(7n);
       this._plutus_scripts_v3.serialize(writer);
     }
+    if (this._inner_plutus_data !== undefined) {
+      writer.writeInt(4n);
+      this._inner_plutus_data.serialize(writer);
+    }
+    if (this._redeemers !== undefined) {
+      writer.writeInt(5n);
+      this._redeemers.serialize(writer);
+    }
   }
 
   // no-op