Merge pull request #40 from SatoshiPortal/develop

v0.2.1

Author: ethicnology

CHANGELOG.md

@@ -28,3 +28,7 @@
 - fix: added into() for submarine limits.
 - Added lnurl freezed. Updated generated files 
 - feat: claim/refund sizes
+
+# 0.2.1
+- fix: do not build swap tx for chain claim and coop close
+- fix: Update to latest boltz-rust commit

ios/Classes/frb_generated.h

@@ -302,7 +302,6 @@ void frbgen_boltz_wire__crate__api__chain_swap__chain_swap_broadcast_local(int64
 void frbgen_boltz_wire__crate__api__chain_swap__chain_swap_claim(int64_t port_,
                                                                  struct wire_cst_chain_swap *that,
                                                                  struct wire_cst_list_prim_u_8_strict *out_address,
-                                                                 struct wire_cst_list_prim_u_8_strict *refund_address,
                                                                  struct wire_cst_tx_fee *miner_fee,
                                                                  bool try_cooperate);
 

lib/src/generated/api/btc_ln.dart

@@ -11,7 +11,6 @@ import 'types.dart';
 // These functions are ignored because they are not marked as `pub`: `extract_id`
 // These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_receiver_is_total_eq`, `clone`, `eq`
 
-/// Bitcoin-Lightning Swap Class
 class BtcLnSwap {
   final String id;
   final SwapType kind;

lib/src/generated/api/chain_swap.dart

@@ -66,13 +66,11 @@ class ChainSwap {
   /// Claim a successful swap
   Future<String> claim(
           {required String outAddress,
-          required String refundAddress,
           required TxFee minerFee,
           required bool tryCooperate}) =>
       BoltzCore.instance.api.crateApiChainSwapChainSwapClaim(
           that: this,
           outAddress: outAddress,
-          refundAddress: refundAddress,
           minerFee: minerFee,
           tryCooperate: tryCooperate);
 

lib/src/generated/frb_generated.dart

@@ -182,7 +182,6 @@ abstract class BoltzCoreApi extends BaseApi {
   Future<String> crateApiChainSwapChainSwapClaim(
       {required ChainSwap that,
       required String outAddress,
-      required String refundAddress,
       required TxFee minerFee,
       required bool tryCooperate});
 
@@ -1014,39 +1013,31 @@ class BoltzCoreApiImpl extends BoltzCoreApiImplPlatform
   Future<String> crateApiChainSwapChainSwapClaim(
       {required ChainSwap that,
       required String outAddress,
-      required String refundAddress,
       required TxFee minerFee,
       required bool tryCooperate}) {
     return handler.executeNormal(NormalTask(
       callFfi: (port_) {
         var arg0 = cst_encode_box_autoadd_chain_swap(that);
         var arg1 = cst_encode_String(outAddress);
-        var arg2 = cst_encode_String(refundAddress);
-        var arg3 = cst_encode_box_autoadd_tx_fee(minerFee);
-        var arg4 = cst_encode_bool(tryCooperate);
+        var arg2 = cst_encode_box_autoadd_tx_fee(minerFee);
+        var arg3 = cst_encode_bool(tryCooperate);
         return wire.wire__crate__api__chain_swap__chain_swap_claim(
-            port_, arg0, arg1, arg2, arg3, arg4);
+            port_, arg0, arg1, arg2, arg3);
       },
       codec: DcoCodec(
         decodeSuccessData: dco_decode_String,
         decodeErrorData: dco_decode_boltz_error,
       ),
       constMeta: kCrateApiChainSwapChainSwapClaimConstMeta,
-      argValues: [that, outAddress, refundAddress, minerFee, tryCooperate],
+      argValues: [that, outAddress, minerFee, tryCooperate],
       apiImpl: this,
     ));
   }
 
   TaskConstMeta get kCrateApiChainSwapChainSwapClaimConstMeta =>
       const TaskConstMeta(
         debugName: "chain_swap_claim",
-        argNames: [
-          "that",
-          "outAddress",
-          "refundAddress",
-          "minerFee",
-          "tryCooperate"
-        ],
+        argNames: ["that", "outAddress", "minerFee", "tryCooperate"],
       );
 
   @override

lib/src/generated/frb_generated.io.dart

@@ -1544,15 +1544,13 @@ class BoltzCoreWire implements BaseWire {
     int port_,
     ffi.Pointer<wire_cst_chain_swap> that,
     ffi.Pointer<wire_cst_list_prim_u_8_strict> out_address,
-    ffi.Pointer<wire_cst_list_prim_u_8_strict> refund_address,
     ffi.Pointer<wire_cst_tx_fee> miner_fee,
     bool try_cooperate,
   ) {
     return _wire__crate__api__chain_swap__chain_swap_claim(
       port_,
       that,
       out_address,
-      refund_address,
       miner_fee,
       try_cooperate,
     );
@@ -1564,7 +1562,6 @@ class BoltzCoreWire implements BaseWire {
                   ffi.Int64,
                   ffi.Pointer<wire_cst_chain_swap>,
                   ffi.Pointer<wire_cst_list_prim_u_8_strict>,
-                  ffi.Pointer<wire_cst_list_prim_u_8_strict>,
                   ffi.Pointer<wire_cst_tx_fee>,
                   ffi.Bool)>>(
       'frbgen_boltz_wire__crate__api__chain_swap__chain_swap_claim');
@@ -1574,7 +1571,6 @@ class BoltzCoreWire implements BaseWire {
               int,
               ffi.Pointer<wire_cst_chain_swap>,
               ffi.Pointer<wire_cst_list_prim_u_8_strict>,
-              ffi.Pointer<wire_cst_list_prim_u_8_strict>,
               ffi.Pointer<wire_cst_tx_fee>,
               bool)>();
 

macos/Classes/frb_generated.h

@@ -302,7 +302,6 @@ void frbgen_boltz_wire__crate__api__chain_swap__chain_swap_broadcast_local(int64
 void frbgen_boltz_wire__crate__api__chain_swap__chain_swap_claim(int64_t port_,
                                                                  struct wire_cst_chain_swap *that,
                                                                  struct wire_cst_list_prim_u_8_strict *out_address,
-                                                                 struct wire_cst_list_prim_u_8_strict *refund_address,
                                                                  struct wire_cst_tx_fee *miner_fee,
                                                                  bool try_cooperate);
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: boltz
 description: A dart/flutter library for boltz swaps
-version: 0.2.0
+version: 0.2.1
 homepage: https://github.com/SatoshiPortal/boltz-dart
 
 environment:

rust/Cargo.toml

@@ -12,7 +12,7 @@ doctest = false
 crate-type = ["staticlib", "cdylib"]
 
 [dependencies]
-boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust.git", ref = "d0f5e29278e9b267d87799ecfa3ca1df10308ff7", features = ["lnurl", "electrum"] }
+boltz-client = { git = "https://github.com/SatoshiPortal/boltz-rust.git", ref = "ced38e7a60ee96fa8b480015271f1ad2ff194884", features = ["lnurl", "electrum"] }
 flutter_rust_bridge = "=2.9.0"
 anyhow = "1.0.68"
 serde = { version = "1.0.0", features = ["derive"] }

rust/src/api/btc_ln.rs

@@ -11,14 +11,14 @@ use boltz_client::{
     },
     boltz::Cooperative,
     network::{electrum::ElectrumBitcoinClient, BitcoinClient, Chain as AllChains},
-    swaps::{boltz::BoltzApiClientV2, magic_routing},
+    swaps::{boltz::BoltzApiClientV2, magic_routing, SwapScriptCommon},
     util::secrets::Preimage,
     BtcSwapScript, BtcSwapTx, Keypair, PublicKey, ToHex,
 };
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-/// Bitcoin-Lightning Swap Class
+// / Bitcoin-Lightning Swap Class
 #[derive(Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct BtcLnSwap {
     pub id: String,
@@ -162,38 +162,13 @@ impl BtcLnSwap {
     /// If this function is not called within ~1 hour, the swap will be closed via the script path.
     /// The benefit of a cooperative close is that the onchain footprint is smaller and makes the transaction look like a single sig tx, while the script path spend is clearly a swap tx.
     pub async fn coop_close_submarine(&self) -> Result<(), BoltzError> {
-        let all_chains: AllChains = self.network.into();
-        let bitcoin_chain = match all_chains {
-            AllChains::Bitcoin(inner_chain) => inner_chain,
-            _ => {
-                return Err(BoltzError::new(
-                    "ChainType".to_string(),
-                    "Expected Bitcoin chain but got Liquid chain".to_string(),
-                ))
-            }
-        };
-        let network_config =
-            ElectrumBitcoinClient::new(bitcoin_chain, &self.electrum_url, true, true, 10)?;
         let boltz_client = BoltzApiClientV2::new(ensure_http_prefix(&self.boltz_url), None);
         let swap_script: BtcSwapScript = self.swap_script.clone().try_into()?;
-        // WE SHOULD NOT NEED TO MAKE A TX, JUST A SCRIPT
-        let tx = match BtcSwapTx::new_refund(
-            swap_script,
-            &self.script_address,
-            &network_config,
-            &boltz_client,
-            self.id.clone(),
-        )
-        .await
-        {
-            Ok(result) => result,
-            Err(e) => return Err(e.into()),
-        };
         let ckp: Keypair = self.keys.clone().try_into()?;
         let claim_tx_response = boltz_client
             .get_submarine_claim_tx_details(&self.id)
             .await?;
-        let (partial_sig, pub_nonce) = tx.partial_sign(
+        let (partial_sig, pub_nonce) = swap_script.partial_sign(
             &ckp,
             &claim_tx_response.pub_nonce,
             &claim_tx_response.transaction_hash,
@@ -245,31 +220,33 @@ impl BtcLnSwap {
         let create_reverse_req = if out_address.is_some() {
             let address = out_address.unwrap();
             boltz_client::swaps::boltz::CreateReverseRequest {
-                invoice_amount: out_amount as u64,
+                invoice_amount: Some(out_amount as u64),
                 from: "BTC".to_string(),
                 to: "BTC".to_string(),
-                preimage_hash: preimage.sha256,
+                preimage_hash: Some(preimage.sha256),
                 claim_public_key,
                 referral_id: referral_id.clone(),
                 address: Some(address.clone()),
                 address_signature: Some(magic_routing::sign_address(&address, &ckp)?.to_string()),
                 webhook: None,
                 description: description,
                 description_hash: None,
+                invoice: None,
             }
         } else {
             boltz_client::swaps::boltz::CreateReverseRequest {
-                invoice_amount: out_amount,
+                invoice_amount: Some(out_amount),
                 from: "BTC".to_string(),
                 to: "BTC".to_string(),
-                preimage_hash: preimage.sha256,
+                preimage_hash: Some(preimage.sha256),
                 claim_public_key,
                 referral_id: referral_id.clone(),
                 address: None,
                 address_signature: None,
                 description: None,
                 description_hash: None,
                 webhook: None,
+                invoice: None,
             }
         };
         let all_chains: AllChains = network.into();
@@ -295,7 +272,7 @@ impl BtcLnSwap {
             index,
             preimage.into(),
             swap_script.into(),
-            create_swap_response.invoice,
+            create_swap_response.invoice.unwrap_or_default(),
             script_address,
             out_amount,
             strip_tcp_prefix(&electrum_url),