fix: Update post conditions input in transactions

hirosystems · Oct 23, 2024 · f239c21 · f239c21
1 parent 2b264b5
commit f239c21
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/packages/transactions/src/builders.ts b/packages/transactions/src/builders.ts
@@ -248,7 +248,7 @@ export type BaseContractDeployOptions = {
    * transfered assets */
   postConditionMode?: PostConditionModeName | PostConditionMode;
   /** a list of post conditions to add to the transaction */
-  postConditions?: PostConditionWire[];
+  postConditions?: PostCondition[] | PostConditionWire[];
   /** set to true if another account is sponsoring the transaction (covering the transaction fee) */
   sponsored?: boolean;
 } & NetworkClientParam;
@@ -370,12 +370,10 @@ export async function makeUnsignedContractDeploy(
     ? createSponsoredAuth(spendingCondition)
     : createStandardAuth(spendingCondition);
 
-  const postConditions: PostConditionWire[] = [];
-  if (options.postConditions && options.postConditions.length > 0) {
-    options.postConditions.forEach(postCondition => {
-      postConditions.push(postCondition);
-    });
-  }
+  const postConditions: PostConditionWire[] = (options.postConditions ?? []).map(pc => {
+    if (typeof pc.type === 'string') return postConditionToWire(pc);
+    return pc;
+  });
   const lpPostConditions = createLPList(postConditions);
 
   const transaction = new StacksTransactionWire({
@@ -522,9 +520,10 @@ export async function makeUnsignedContractCall(
     ? createSponsoredAuth(spendingCondition)
     : createStandardAuth(spendingCondition);
 
-  const postConditions = (options.postConditions ?? []).map(
-    postConditionToWire as (post: PostCondition) => PostConditionWire
-  );
+  const postConditions: PostConditionWire[] = (options.postConditions ?? []).map(pc => {
+    if (typeof pc.type === 'string') return postConditionToWire(pc);
+    return pc;
+  });
   const lpPostConditions = createLPList(postConditions);
 
   const transaction = new StacksTransactionWire({

diff --git a/packages/transactions/src/postcondition.ts b/packages/transactions/src/postcondition.ts
@@ -11,7 +11,7 @@ import {
   StacksWireType,
   parseAssetString,
   parsePrincipalString,
-  serializePostCondition,
+  serializePostConditionWire,
 } from './wire';
 
 const FUNGIBLE_COMPARATOR_MAPPING = {
@@ -90,7 +90,7 @@ export function postConditionToWire(postcondition: PostCondition): PostCondition
  */
 export function postConditionToHex(postcondition: PostCondition): string {
   const wire = postConditionToWire(postcondition);
-  return serializePostCondition(wire);
+  return serializePostConditionWire(wire);
 }
 
 /** @internal */

diff --git a/packages/transactions/src/wire/serialization.ts b/packages/transactions/src/wire/serialization.ts
@@ -93,7 +93,7 @@ export function serializeStacksWireBytes(wire: StacksWire): Uint8Array {
     case StacksWireType.Asset:
       return serializeAssetBytes(wire);
     case StacksWireType.PostCondition:
-      return serializePostConditionBytes(wire);
+      return serializePostConditionWireBytes(wire);
     case StacksWireType.PublicKey:
       return serializePublicKeyBytes(wire);
     case StacksWireType.LengthPrefixedList:
@@ -341,11 +341,12 @@ export function deserializeLPList(
   return createLPList(l, lengthPrefixBytes);
 }
 
-export function serializePostCondition(postCondition: PostConditionWire): string {
-  return bytesToHex(serializePostConditionBytes(postCondition));
+export function serializePostConditionWire(postCondition: PostConditionWire): string {
+  return bytesToHex(serializePostConditionWireBytes(postCondition));
 }
+
 /** @internal */
-export function serializePostConditionBytes(postCondition: PostConditionWire): Uint8Array {
+export function serializePostConditionWireBytes(postCondition: PostConditionWire): Uint8Array {
   const bytesArray = [];
   bytesArray.push(postCondition.conditionType);
   bytesArray.push(serializePrincipalBytes(postCondition.principal));

diff --git a/packages/transactions/tests/builder.test.ts b/packages/transactions/tests/builder.test.ts
@@ -42,7 +42,7 @@ import {
   publicKeyIsCompressed,
   publicKeyToHex,
   serializePayloadBytes,
-  serializePostConditionBytes,
+  serializePostConditionWireBytes,
   serializePublicKeyBytes,
 } from '../src';
 import { BytesReader } from '../src/BytesReader';
@@ -2146,11 +2146,11 @@ test('Post-conditions with amount larger than 8 bytes throw an error', () => {
   };
 
   expect(() => {
-    serializePostConditionBytes(postConditionToWire(stxPc));
+    serializePostConditionWireBytes(postConditionToWire(stxPc));
   }).toThrowError('The post-condition amount may not be larger than 8 bytes');
 
   expect(() => {
-    serializePostConditionBytes(postConditionToWire(fungiblePc));
+    serializePostConditionWireBytes(postConditionToWire(fungiblePc));
   }).toThrowError('The post-condition amount may not be larger than 8 bytes');
 });