Add param to SelectedUtxosFeeRequest

dfinity · Oct 1, 2024 · 5c54e80 · 5c54e80
1 parent 6acbb54
commit 5c54e80
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 3 deletions.
diff --git a/src/backend/backend.did b/src/backend/backend.did
@@ -124,6 +124,7 @@ type SelectedUtxosFeeRequest = record {
   network : BitcoinNetwork;
   amount_satoshis : nat64;
   source_address : text;
+  min_confirmations : opt nat32;
 };
 type SelectedUtxosFeeResponse = record {
   fee_satoshis : nat64;

diff --git a/src/backend/src/lib.rs b/src/backend/src/lib.rs
@@ -294,7 +294,11 @@ async fn btc_select_user_utxos_fee(
     let all_utxos = bitcoin_api::get_all_utxos(
         params.network,
         params.source_address,
-        Some(MIN_CONFIRMATIONS_ACCEPTED_BTC_TX),
+        Some(
+            params
+                .min_confirmations
+                .unwrap_or(MIN_CONFIRMATIONS_ACCEPTED_BTC_TX),
+        ),
     )
     .await
     .map_err(|msg| SelectedUtxosFeeError::InternalError { msg })?;

diff --git a/src/backend/tests/it/bitcoin.rs b/src/backend/tests/it/bitcoin.rs
@@ -19,6 +19,8 @@ fn test_select_user_utxos_fee_returns_zero_when_user_has_insufficient_funds() {
         amount_satoshis: 100_000_000u64,
         source_address: "bcrt1qpg7udjvq7gx2fp480pgt4hnhj3qc4nhrkstc33".to_string(),
         network: BitcoinNetwork::Regtest,
+        // Until bitcoin is supported in pocket-ic it only works with 1.
+        min_confirmations: Some(1),
     };
     let response = pic_setup.update::<Result<SelectedUtxosFeeResponse, SelectedUtxosFeeError>>(
         caller,

diff --git a/src/declarations/backend/backend.did b/src/declarations/backend/backend.did
@@ -124,6 +124,7 @@ type SelectedUtxosFeeRequest = record {
   network : BitcoinNetwork;
   amount_satoshis : nat64;
   source_address : text;
+  min_confirmations : opt nat32;
 };
 type SelectedUtxosFeeResponse = record {
   fee_satoshis : nat64;

diff --git a/src/declarations/backend/backend.did.d.ts b/src/declarations/backend/backend.did.d.ts
@@ -136,6 +136,7 @@ export interface SelectedUtxosFeeRequest {
 	network: BitcoinNetwork;
 	amount_satoshis: bigint;
 	source_address: string;
+	min_confirmations: [] | [number];
 }
 export interface SelectedUtxosFeeResponse {
 	fee_satoshis: bigint;

diff --git a/src/declarations/backend/backend.factory.certified.did.js b/src/declarations/backend/backend.factory.certified.did.js
@@ -54,7 +54,8 @@ export const idlFactory = ({ IDL }) => {
 	const SelectedUtxosFeeRequest = IDL.Record({
 		network: BitcoinNetwork,
 		amount_satoshis: IDL.Nat64,
-		source_address: IDL.Text
+		source_address: IDL.Text,
+		min_confirmations: IDL.Opt(IDL.Nat32)
 	});
 	const Outpoint = IDL.Record({
 		txid: IDL.Vec(IDL.Nat8),

diff --git a/src/declarations/backend/backend.factory.did.js b/src/declarations/backend/backend.factory.did.js
@@ -54,7 +54,8 @@ export const idlFactory = ({ IDL }) => {
 	const SelectedUtxosFeeRequest = IDL.Record({
 		network: BitcoinNetwork,
 		amount_satoshis: IDL.Nat64,
-		source_address: IDL.Text
+		source_address: IDL.Text,
+		min_confirmations: IDL.Opt(IDL.Nat32)
 	});
 	const Outpoint = IDL.Record({
 		txid: IDL.Vec(IDL.Nat8),

diff --git a/src/shared/src/types.rs b/src/shared/src/types.rs
@@ -170,6 +170,7 @@ pub mod bitcoin {
         pub amount_satoshis: u64,
         pub source_address: String,
         pub network: BitcoinNetwork,
+        pub min_confirmations: Option<u32>,
     }
 
     #[derive(CandidType, Deserialize, Clone, Eq, PartialEq, Debug)]