Merge branch 'master' into dp/numbers-docs

FuelLabs · Feb 22, 2024 · 8877468 · 8877468
2 parents 1926798 + bade56c
commit 8877468
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 84 deletions.
diff --git a/.changeset/curvy-owls-think.md b/.changeset/curvy-owls-think.md
@@ -0,0 +1,5 @@
+---
+"@fuel-ts/transactions": patch
+---
+
+Fixed encoding/decoding of specific parts of a transaction and its inputs
diff --git a/.changeset/wet-knives-reflect.md b/.changeset/wet-knives-reflect.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/.github/workflows/rc-release.yaml b/.github/workflows/rc-release.yaml
diff --git a/packages/transactions/src/coders/input.ts b/packages/transactions/src/coders/input.ts
@@ -284,9 +284,9 @@ export class InputMessageCoder extends Coder<InputMessage, InputMessage> {
     parts.push(new ByteArrayCoder(32).encode(value.nonce));
     parts.push(new NumberCoder('u8').encode(value.witnessIndex));
     parts.push(new U64Coder().encode(value.predicateGasUsed));
-    parts.push(new NumberCoder('u16').encode(data.length));
-    parts.push(new NumberCoder('u16').encode(value.predicateLength));
-    parts.push(new NumberCoder('u16').encode(value.predicateDataLength));
+    parts.push(new NumberCoder('u32').encode(data.length));
+    parts.push(new NumberCoder('u32').encode(value.predicateLength));
+    parts.push(new NumberCoder('u32').encode(value.predicateDataLength));
     parts.push(new ByteArrayCoder(data.length).encode(data));
     parts.push(new ByteArrayCoder(value.predicateLength).encode(value.predicate));
     parts.push(new ByteArrayCoder(value.predicateDataLength).encode(value.predicateData));
@@ -318,11 +318,11 @@ export class InputMessageCoder extends Coder<InputMessage, InputMessage> {
     const witnessIndex = Number(decoded);
     [decoded, o] = new U64Coder().decode(data, o);
     const predicateGasUsed = decoded;
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
-    const predicateLength = decoded;
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const dataLength = decoded;
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
+    const predicateLength = decoded;
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const predicateDataLength = decoded;
     [decoded, o] = new ByteArrayCoder(dataLength).decode(data, o);
     const messageData = decoded;

diff --git a/packages/transactions/src/coders/transaction.ts b/packages/transactions/src/coders/transaction.ts
@@ -80,8 +80,8 @@ export class TransactionScriptCoder extends Coder<TransactionScript, Transaction
     const parts: Uint8Array[] = [];
 
     parts.push(new U64Coder().encode(value.scriptGasLimit));
-    parts.push(new NumberCoder('u16').encode(value.scriptLength));
-    parts.push(new NumberCoder('u16').encode(value.scriptDataLength));
+    parts.push(new NumberCoder('u32').encode(value.scriptLength));
+    parts.push(new NumberCoder('u32').encode(value.scriptDataLength));
     parts.push(new NumberCoder('u32').encode(value.policyTypes));
     parts.push(new NumberCoder('u8').encode(value.inputsCount));
     parts.push(new NumberCoder('u8').encode(value.outputsCount));
@@ -102,9 +102,9 @@ export class TransactionScriptCoder extends Coder<TransactionScript, Transaction
     let o = offset;
     [decoded, o] = new U64Coder().decode(data, o);
     const scriptGasLimit = decoded;
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const scriptLength = decoded;
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const scriptDataLength = decoded;
     [decoded, o] = new NumberCoder('u32').decode(data, o);
     const policyTypes = decoded;
@@ -203,7 +203,7 @@ export class TransactionCreateCoder extends Coder<TransactionCreate, Transaction
   encode(value: TransactionCreate): Uint8Array {
     const parts: Uint8Array[] = [];
 
-    parts.push(new NumberCoder('u16').encode(value.bytecodeLength));
+    parts.push(new NumberCoder('u32').encode(value.bytecodeLength));
     parts.push(new NumberCoder('u8').encode(value.bytecodeWitnessIndex));
     parts.push(new NumberCoder('u32').encode(value.policyTypes));
     parts.push(new NumberCoder('u16').encode(value.storageSlotsCount));
@@ -226,7 +226,7 @@ export class TransactionCreateCoder extends Coder<TransactionCreate, Transaction
     let decoded;
     let o = offset;
 
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const bytecodeLength = decoded;
     [decoded, o] = new NumberCoder('u8').decode(data, o);
     const bytecodeWitnessIndex = decoded;

diff --git a/packages/transactions/src/coders/witness.ts b/packages/transactions/src/coders/witness.ts
@@ -23,7 +23,7 @@ export class WitnessCoder extends Coder<Witness, Witness> {
   encode(value: Witness): Uint8Array {
     const parts: Uint8Array[] = [];
 
-    parts.push(new NumberCoder('u16').encode(value.dataLength));
+    parts.push(new NumberCoder('u32').encode(value.dataLength));
     parts.push(new ByteArrayCoder(value.dataLength).encode(value.data));
 
     return concat(parts);
@@ -33,7 +33,7 @@ export class WitnessCoder extends Coder<Witness, Witness> {
     let decoded;
     let o = offset;
 
-    [decoded, o] = new NumberCoder('u16').decode(data, o);
+    [decoded, o] = new NumberCoder('u32').decode(data, o);
     const dataLength = decoded;
     [decoded, o] = new ByteArrayCoder(dataLength).decode(data, o);
     const witnessData = decoded;