Use new enableRbf field on EdgeSpendInfo

EdgeApp · Jun 7, 2024 · 66f07e0 · 66f07e0
1 parent 3a2cfec
commit 66f07e0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- changed: Use new `enableRbf` field on `EdgeSpendInfo` instead of unofficial field in `otherParams`
+
 ## 3.0.2 (2024-06-03)
 
 - fixed: Check transaction input sequence values for RBF transaction acceleration.

diff --git a/src/common/utxobased/engine/UtxoEngine.ts b/src/common/utxobased/engine/UtxoEngine.ts
@@ -617,6 +617,13 @@ export async function makeUtxoEngine(
         targets = []
       }
 
+      // Determine whether the transaction should enable RBF given that the
+      // currency supports RBF.
+      const enableRbf =
+        currencyInfo.canReplaceByFee === true
+          ? edgeSpendInfo.enableRbf ?? true
+          : false
+
       log.warn(`spend: Using fee rate ${feeRate} sat/B`)
       const subtractFee =
         txOptions.subtractFee != null ? txOptions.subtractFee : false
@@ -628,10 +635,7 @@ export async function makeUtxoEngine(
         feeRate,
         coin: coinInfo.name,
         currencyCode: currencyInfo.currencyCode,
-        enableRbf:
-          spendInfoOtherParams.enableRbf ??
-          currencyInfo.canReplaceByFee ??
-          false,
+        enableRbf,
         freshChangeAddress,
         subtractFee,
         log,

diff --git a/src/common/utxobased/engine/types.ts b/src/common/utxobased/engine/types.ts
@@ -48,7 +48,6 @@ export type UtxoSpendInfoOtherParams = ReturnType<
   typeof asUtxoSpendInfoOtherParams
 >
 export const asUtxoSpendInfoOtherParams = asObject({
-  enableRbf: asOptional(asBoolean),
   forceChangeAddress: asOptional(asString),
   outputSort: asOptional(asOutputSort, 'bip69'),
   txOptions: asOptional(asTxOptions),