Fix form txn serialization (#637)

helium · Apr 19, 2024 · 6348a29 · 6348a29
1 parent 5e0be10
commit 6348a29
Showing 1 changed file with 17 additions and 16 deletions.
diff --git a/packages/distributor-oracle/src/client.ts b/packages/distributor-oracle/src/client.ts
@@ -518,7 +518,7 @@ export async function formTransaction({
     true
   );
 
-  const instructions: TransactionInstruction[] = [];
+  let instructions: TransactionInstruction[] = [];
   const recipientAcc =
     await lazyDistributorProgram.account.recipientV0.fetchNullable(recipient);
   if (!recipientAcc) {
@@ -564,14 +564,7 @@ export async function formTransaction({
       .instruction();
   });
   const ixs = await Promise.all(ixPromises);
-  instructions.push(
-    ...(await withPriorityFees({
-      connection: provider.connection,
-      computeUnits: recipientAcc ? RECIPIENT_EXISTS_CU : MISSING_RECIPIENT_CU,
-      instructions: ixs,
-      basePriorityFee,
-    }))
-  );
+  instructions.push(...ixs);
 
   if (
     recipientAcc &&
@@ -630,20 +623,28 @@ export async function formTransaction({
       .instruction();
     instructions.push(distributeIx);
   }
-  const tx = toVersionedTx(
-    await populateMissingDraftInfo(provider.connection, {
-      instructions,
-      feePayer: payer ? payer : provider.wallet.publicKey,
-    })
-  );
+
+  const fullDraft = await populateMissingDraftInfo(provider.connection, {
+    instructions,
+    feePayer: payer ? payer : provider.wallet.publicKey,
+  });
+  instructions = await withPriorityFees({
+    connection: provider.connection,
+    basePriorityFee,
+    ...fullDraft,
+  });
+  const tx = toVersionedTx({
+    ...fullDraft,
+    instructions,
+  });
   // @ts-ignore
   const oracleUrls = lazyDistributorAcc.oracles.map((x: any) => x.url);
 
   let serTx = tx.serialize();
   if (!skipOracleSign) {
     for (const oracle of oracleUrls) {
       const res = await axios.post(`${oracle}`, {
-        transaction: serTx,
+        transaction: Buffer.from(serTx).toJSON(),
       });
       serTx = Buffer.from(res.data.transaction);
     }