Merge pull request #37 from SatoshiPortal/develop

v0.2.0

Author: ethicnology

.gitignore

@@ -9,12 +9,12 @@
 .history
 .svn/
 
-# IntelliJ related
+# Code Editor related
 *.iml
 *.ipr
 *.iws
 .idea/
-
+.vscode/
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.

.vscode/launch.json

@@ -22,3 +22,9 @@
 - boltz-0.3.0: Updated fees
 - dep(update): using latest boltz-rust. added description to decoded invoice
 - fix: lock boltz-client version 
+
+# 0.2.0
+- upgrade: frb 2.9.0 (breaking)
+- fix: added into() for submarine limits.
+- Added lnurl freezed. Updated generated files 
+- feat: claim/refund sizes

CHANGELOG.md

@@ -40,7 +40,7 @@ Currently we do not use precompiled binaries with cargokit. So as the end user,
 # install rust
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 # install tools
-cargo install flutter_rust_bridge_codegen --version 2.0.0
+cargo install flutter_rust_bridge_codegen --version 2.9.0
 cargo install cargo-ndk
 cargo install cargo-lipo
 ```

README.md

@@ -3,4 +3,7 @@ dart_output: lib/src/generated/
 full_dep: true
 c_output: ios/Classes/frb_generated.h
 duplicated_c_output: [macos/Classes/frb_generated.h]
-dart_entrypoint_class_name: BoltzCore
+dart_entrypoint_class_name: BoltzCore
+stop_on_error: true
+web: false
+dart3: true

flutter_rust_bridge.yaml

@@ -7,6 +7,8 @@ export './src/generated/api/chain_swap.dart';
 export './src/generated/api/error.dart';
 export './src/generated/api/types.dart';
 export './src/generated/api/fees.dart';
+export './src/generated/api/lnurl.dart';
+
 export './src/root.dart';
 export './src/utils/loader.dart';
 export './src/utils/stream.dart';

ios/Classes/frb_generated.h

@@ -1,37 +1,47 @@
 // This file is automatically generated, so please do not edit it.
-// Generated by `flutter_rust_bridge`@ 2.0.0.
+// @generated by `flutter_rust_bridge`@ 2.9.0.
 
 // ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
 
 import '../frb_generated.dart';
 import 'error.dart';
 import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
-import 'package:freezed_annotation/freezed_annotation.dart' hide protected;
 import 'types.dart';
-part 'btc_ln.freezed.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
-@freezed
-class BtcLnSwap with _$BtcLnSwap {
-  const BtcLnSwap._();
-  const factory BtcLnSwap({
-    required String id,
-    required SwapType kind,
-    required Chain network,
-    required KeyPair keys,
-    required BigInt keyIndex,
-    required PreImage preimage,
-    required BtcSwapScriptStr swapScript,
-    required String invoice,
-    required String scriptAddress,
-    required BigInt outAmount,
-    required String electrumUrl,
-    required String boltzUrl,
-    String? referralId,
-  }) = _BtcLnSwap;
+class BtcLnSwap {
+  final String id;
+  final SwapType kind;
+  final Chain network;
+  final KeyPair keys;
+  final BigInt keyIndex;
+  final PreImage preimage;
+  final BtcSwapScriptStr swapScript;
+  final String invoice;
+  final String scriptAddress;
+  final BigInt outAmount;
+  final String electrumUrl;
+  final String boltzUrl;
+  final String? referralId;
+
+  const BtcLnSwap({
+    required this.id,
+    required this.kind,
+    required this.network,
+    required this.keys,
+    required this.keyIndex,
+    required this.preimage,
+    required this.swapScript,
+    required this.invoice,
+    required this.scriptAddress,
+    required this.outAmount,
+    required this.electrumUrl,
+    required this.boltzUrl,
+    this.referralId,
+  });
 
   /// Broadcast using boltz's electrum server
   Future<String> broadcastBoltz({required String signedHex}) => BoltzCore
@@ -54,6 +64,11 @@ class BtcLnSwap with _$BtcLnSwap {
           minerFee: minerFee,
           tryCooperate: tryCooperate);
 
+  /// Get the size of the claim transaction. Can be used to estimate the absolute miner fees required, given a fee rate.
+  Future<BigInt> claimTxSize({required bool isCooperative}) =>
+      BoltzCore.instance.api.crateApiBtcLnBtcLnSwapClaimTxSize(
+          that: this, isCooperative: isCooperative);
+
   /// After boltz completes a submarine swap, call this function to close the swap cooperatively using Musig.
   /// 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.
@@ -162,13 +177,49 @@ class BtcLnSwap with _$BtcLnSwap {
           minerFee: minerFee,
           tryCooperate: tryCooperate);
 
+  /// Get the size of the refund transaction. Can be used to estimate the absolute miner fees required, given a fee rate.
+  Future<BigInt> refundTxSize({required bool isCooperative}) =>
+      BoltzCore.instance.api.crateApiBtcLnBtcLnSwapRefundTxSize(
+          that: this, isCooperative: isCooperative);
+
   /// Convert instance to a JSON string.
   Future<String> toJson() =>
       BoltzCore.instance.api.crateApiBtcLnBtcLnSwapToJson(
         that: this,
       );
 
-  /// Get the size of the transaction. Can be used to estimate the absolute miner fees required, given a fee rate.
-  Future<BigInt> txSize({required bool isCooperative}) => BoltzCore.instance.api
-      .crateApiBtcLnBtcLnSwapTxSize(that: this, isCooperative: isCooperative);
+  @override
+  int get hashCode =>
+      id.hashCode ^
+      kind.hashCode ^
+      network.hashCode ^
+      keys.hashCode ^
+      keyIndex.hashCode ^
+      preimage.hashCode ^
+      swapScript.hashCode ^
+      invoice.hashCode ^
+      scriptAddress.hashCode ^
+      outAmount.hashCode ^
+      electrumUrl.hashCode ^
+      boltzUrl.hashCode ^
+      referralId.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is BtcLnSwap &&
+          runtimeType == other.runtimeType &&
+          id == other.id &&
+          kind == other.kind &&
+          network == other.network &&
+          keys == other.keys &&
+          keyIndex == other.keyIndex &&
+          preimage == other.preimage &&
+          swapScript == other.swapScript &&
+          invoice == other.invoice &&
+          scriptAddress == other.scriptAddress &&
+          outAmount == other.outAmount &&
+          electrumUrl == other.electrumUrl &&
+          boltzUrl == other.boltzUrl &&
+          referralId == other.referralId;
 }