fix: merge conflicts

Signed-off-by: jaime-iobermudez <jaime.bermudez@io.builders>

Author: jaime-iobermudez

sdk/src/core/Constants.ts

@@ -345,6 +345,7 @@ export const GAS = {
   RECOVERY_ADDRESS: 7000000,
   ADD_AGENT: 7000000,
   REMOVE_AGENT: 7000000,
+  REDEEM_AT_MATURITY_BY_PARTITION_GAS: 700000,
 } as const;
 
 export const REDEEM_AT_MATURITY_BY_PARTITION_GAS = 700000;

sdk/src/port/out/hs/HederaTransactionAdapter.ts

@@ -3088,6 +3088,26 @@ export abstract class HederaTransactionAdapter extends TransactionAdapter {
     );
   }
 
+  async redeemAtMaturityByPartition(
+    security: EvmAddress,
+    partitionId: string,
+    sourceId: EvmAddress,
+    amount: BigDecimal,
+    securityId: ContractId | string,
+  ): Promise<TransactionResponse> {
+    LogService.logTrace(
+      `Redeeming at maturity by partition to address ${security.toString()}`,
+    );
+    const contract = new Contract(security.toString(), Bond__factory.abi);
+    return this.executeWithArgs(
+      contract,
+      'redeemAtMaturityByPartition',
+      securityId,
+      GAS.REDEEM_AT_MATURITY_BY_PARTITION_GAS,
+      [sourceId.toString(), partitionId, amount.toBigNumber()],
+    );
+  }
+
   // * Definition of the abstract methods
   abstract signAndSendTransaction(
     transaction: Transaction,

sdk/src/port/out/rpc/RPCTransactionAdapter.ts

@@ -2912,6 +2912,24 @@ export class RPCTransactionAdapter extends TransactionAdapter {
     );
   }
 
+  async redeemAtMaturityByPartition(
+    security: EvmAddress,
+    partitionId: string,
+    sourceId: EvmAddress,
+    amount: BigDecimal,
+  ): Promise<TransactionResponse> {
+    LogService.logTrace(
+      `Redeeming at maturity by partition to address ${security.toString()}`,
+    );
+
+    return this.executeTransaction(
+      Bond__factory.connect(security.toString(), this.getSignerOrProvider()),
+      'redeemAtMaturityByPartition',
+      [sourceId.toString(), partitionId, amount.toBigNumber()],
+      GAS.REDEEM_AT_MATURITY_BY_PARTITION_GAS,
+    );
+  }
+
   private async executeTransaction<T>(
     factory: any,
     method: string,