@bsv/wallet-toolbox-client 2.6.4 → 2.6.5

package/out/index.client.cjs

@@ -10021,16 +10021,15 @@ async function createActionCore(storage, auth, vargs, parent) {
 	});
 	const feeModel = validateStorageFeeModel(storage.feeModel);
 	logger?.log(`validated fee model ${JSON.stringify(feeModel)}`);
-	const initialFundingPlan = await prepareFundingPlan(storage, [
+	const initialFundingPlan = await prepareFundingPlanWithSendingFallback(storage, [
 		userId,
 		vargs,
 		xinputs,
 		xoutputs,
 		changeBasket,
 		noSendChangeIn,
-		feeModel,
-		parent
-	]);
+		feeModel
+	], parent);
 	logger?.log(`planned funding from ${initialFundingPlan.availableChangeCount} change inputs`);
 	const allocatedBeefPrefetch = startAllocatedChangeBeefPrefetch(storage, vargs, initialFundingPlan.selected, beef, parent);
 	const storageBeefBytes = storageBeef.toBinary();
@@ -10630,8 +10629,7 @@ function makeFundingParams(vargs, xinputs, xoutputs, changeBasket, feeModel, ava
 	};
 }
 async function prepareFundingPlan(storage, context) {
-	const [userId, vargs, xinputs, xoutputs, changeBasket, noSendChangeIn, feeModel, parent, trx] = context;
-	const excludeSending = !vargs.isDelayed;
+	const [userId, vargs, xinputs, xoutputs, changeBasket, noSendChangeIn, feeModel, excludeSending, parent, trx] = context;
 	const candidates = await traceStorageStep(storage, "wallet.storage.create_action.funding_candidates", parent, { "funding.exclude_sending": excludeSending }, async (span) => {
 		const outputs = await storage.findAvailableManagedChangeInputCandidates(userId, changeBasket.basketId, excludeSending, trx);
 		span?.end({ attributes: {
@@ -10680,10 +10678,30 @@ async function prepareFundingPlan(storage, context) {
 			params,
 			result,
 			selected,
-			availableChangeCount: candidates.length
+			availableChangeCount: candidates.length,
+			excludeSending
 		};
 	});
 }
+async function prepareFundingPlanWithSendingFallback(storage, context, parent, trx) {
+	const excludeSending = !context[1].isDelayed;
+	try {
+		return await prepareFundingPlan(storage, [
+			...context,
+			excludeSending,
+			parent,
+			trx
+		]);
+	} catch (error) {
+		if (!excludeSending || !(error instanceof WERR_INSUFFICIENT_FUNDS)) throw error;
+		return await prepareFundingPlan(storage, [
+			...context,
+			false,
+			parent,
+			trx
+		]);
+	}
+}
 async function claimFundingPlan(storage, request) {
 	const [userId, basketId, excludeSending, transactionId, noSendChangeIn, plan, trx] = request;
 	if (plan.selected.length === 0) return {
@@ -10766,7 +10784,7 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx, initialPlan, p
 			const claim = await claimFundingPlan(storage, [
 				userId,
 				ctx.changeBasket.basketId,
-				!vargs.isDelayed,
+				plan.excludeSending,
 				ctx.transactionId,
 				ctx.noSendChangeIn,
 				plan,
@@ -10784,17 +10802,15 @@ async function fundNewTransactionSdk(storage, userId, vargs, ctx, initialPlan, p
 			}
 			if (claim.conflict === "noSendChange") throw new WERR_INVALID_PARAMETER("noSendChange", "outputs that remain spendable during action planning");
 			retryCount++;
-			plan = await prepareFundingPlan(storage, [
+			plan = await prepareFundingPlanWithSendingFallback(storage, [
 				userId,
 				vargs,
 				ctx.xinputs,
 				ctx.xoutputs,
 				ctx.changeBasket,
 				ctx.noSendChangeIn,
-				ctx.feeModel,
-				parent,
-				trx
-			]);
+				ctx.feeModel
+			], parent, trx);
 		}
 		throw new WERR_INVALID_OPERATION("wallet funding changed repeatedly during action planning; retry createAction");
 	});