Handle in RN codegen multiple fields in enum variant (#453)

* Update RN example

* Handle enum variants with multiple fields

lib/bindings/langs/react-native/src/gen_kotlin/templates/EnumTemplate.kt

@@ -13,7 +13,10 @@ fun as{{ type_name }}({{ type_name|var_name|unquote }}: ReadableMap): {{ type_na
     {% for variant in e.variants() -%}
         if (type == "{{ variant.name()|var_name|unquote }}") {
             {% if variant.has_fields() -%}
-            return {{ type_name }}.{{ variant.name() }}( {{ variant.fields()[0].type_()|render_from_map(ci, type_name|var_name|unquote, variant.fields()[0].name()|var_name|unquote, false) }})                         
+            {%- for field in variant.fields() %}
+            val {{field.name()|var_name|unquote}} = {{ field.type_()|render_from_map(ci, type_name|var_name|unquote, field.name()|var_name|unquote, false) }}    
+            {%- endfor %}
+            return {{ type_name }}.{{ variant.name() }}( {%- call kt::field_list(variant) -%} )    
             {%- else %}
             return {{ type_name }}.{{ variant.name() }}          
             {%- endif %}       

lib/bindings/langs/react-native/src/gen_kotlin/templates/macros.kt

@@ -21,7 +21,7 @@
 {%- endmacro %}
 
 {%- macro field_list(rec) %}
-    {%- for f in rec.fields() %}
+    {%- for f in rec.fields() -%}
         {{ f.name()|var_name|unquote }},
     {%- endfor %}
 {%- endmacro -%}

lib/bindings/langs/react-native/src/gen_swift/templates/EnumTemplate.swift

@@ -38,7 +38,7 @@ static func as{{ type_name }}({{ type_name|var_name|unquote }}: [String: Any?])
     {%- for variant in e.variants() %}
         if (type == "{{ variant.name()|var_name|unquote }}") {
             {%- if variant.has_fields() %}
-            {% let field = variant.fields()[0] %}
+                {%- for field in variant.fields() %}
                 {%- match field.type_() %}         
                 {%- when Type::Optional(_) %}
                     {% if field.type_()|inline_optional_field(ci) -%}
@@ -61,7 +61,8 @@ static func as{{ type_name }}({{ type_name|var_name|unquote }}: [String: Any?])
             let _{{field.name()|var_name|unquote}} = {{field.type_()|render_from_map(ci, field.name()|var_name|unquote|temporary)}}
             {% endif -%}        
             {% endmatch %}    
-            return {{ type_name }}.{{ variant.name()|var_name|unquote }}({{ variant.fields()[0].name()|var_name|unquote }}: _{{field.name()|var_name|unquote}})                         
+            {%- endfor %}            
+            return {{ type_name }}.{{ variant.name()|var_name|unquote }}({%- call swift::field_list(variant, "_") -%})                         
             {%- else %}
             return {{ type_name }}.{{ variant.name()|var_name|unquote }}          
             {%- endif %}       

lib/bindings/langs/react-native/src/gen_swift/templates/RecordTemplate.swift

@@ -30,7 +30,7 @@ static func as{{ type_name }}({{ type_name|var_name|unquote }}: [String: Any?])
     {% endmatch %}
     {%- endfor %}
     
-    return {{ type_name }}({%- call swift::field_list(rec) -%})    
+    return {{ type_name }}({%- call swift::field_list(rec, "") -%})    
 }
 
 static func  dictionaryOf({{ type_name|var_name|unquote }}: {{ type_name }}) -> [String: Any?] {

lib/bindings/langs/react-native/src/gen_swift/templates/macros.swift

@@ -29,9 +29,9 @@
     {%- if func.arguments().len() >= 1 -%}resolve:{%- endif -%}reject:
 {%- endmacro %}
 
-{%- macro field_list(rec) %}
+{%- macro field_list(rec, prefix) %}
-    {%- for f in rec.fields() %}
+    {%- for f in rec.fields() -%}
-        {{ f.name()|var_name|unquote }}: {{ f.name()|var_name|unquote }}{%- if !loop.last %}, {% endif -%}
+        {{ f.name()|var_name|unquote }}: {{ prefix }}{{ f.name()|var_name|unquote }}{%- if !loop.last %}, {% endif -%}
     {%- endfor %}
 {%- endmacro -%}
 

packages/react-native/android/src/main/java/com/breezsdkliquid/BreezSDKLiquidMapper.kt

@@ -16,10 +16,7 @@ fun asAesSuccessActionDataDecrypted(aesSuccessActionDataDecrypted: ReadableMap):
     }
     val description = aesSuccessActionDataDecrypted.getString("description")!!
     val plaintext = aesSuccessActionDataDecrypted.getString("plaintext")!!
-    return AesSuccessActionDataDecrypted(
+    return AesSuccessActionDataDecrypted(description, plaintext)
-        description,
-        plaintext,
-    )
 }
 
 fun readableMapOf(aesSuccessActionDataDecrypted: AesSuccessActionDataDecrypted): ReadableMap =
@@ -48,9 +45,7 @@ fun asBackupRequest(backupRequest: ReadableMap): BackupRequest? {
         return null
     }
     val backupPath = if (hasNonNullKey(backupRequest, "backupPath")) backupRequest.getString("backupPath") else null
-    return BackupRequest(
+    return BackupRequest(backupPath)
-        backupPath,
-    )
 }
 
 fun readableMapOf(backupRequest: BackupRequest): ReadableMap =
@@ -85,13 +80,7 @@ fun asBitcoinAddressData(bitcoinAddressData: ReadableMap): BitcoinAddressData? {
     val amountSat = if (hasNonNullKey(bitcoinAddressData, "amountSat")) bitcoinAddressData.getDouble("amountSat").toULong() else null
     val label = if (hasNonNullKey(bitcoinAddressData, "label")) bitcoinAddressData.getString("label") else null
     val message = if (hasNonNullKey(bitcoinAddressData, "message")) bitcoinAddressData.getString("message") else null
-    return BitcoinAddressData(
+    return BitcoinAddressData(address, network, amountSat, label, message)
-        address,
-        network,
-        amountSat,
-        label,
-        message,
-    )
 }
 
 fun readableMapOf(bitcoinAddressData: BitcoinAddressData): ReadableMap =
@@ -126,10 +115,7 @@ fun asBuyBitcoinRequest(buyBitcoinRequest: ReadableMap): BuyBitcoinRequest? {
     }
     val prepareResponse = buyBitcoinRequest.getMap("prepareResponse")?.let { asPrepareBuyBitcoinResponse(it) }!!
     val redirectUrl = if (hasNonNullKey(buyBitcoinRequest, "redirectUrl")) buyBitcoinRequest.getString("redirectUrl") else null
-    return BuyBitcoinRequest(
+    return BuyBitcoinRequest(prepareResponse, redirectUrl)
-        prepareResponse,
-        redirectUrl,
-    )
 }
 
 fun readableMapOf(buyBitcoinRequest: BuyBitcoinRequest): ReadableMap =
@@ -230,10 +216,7 @@ fun asConnectRequest(connectRequest: ReadableMap): ConnectRequest? {
     }
     val config = connectRequest.getMap("config")?.let { asConfig(it) }!!
     val mnemonic = connectRequest.getString("mnemonic")!!
-    return ConnectRequest(
+    return ConnectRequest(config, mnemonic)
-        config,
-        mnemonic,
-    )
 }
 
 fun readableMapOf(connectRequest: ConnectRequest): ReadableMap =
@@ -273,15 +256,7 @@ fun asCurrencyInfo(currencyInfo: ReadableMap): CurrencyInfo? {
     val uniqSymbol = if (hasNonNullKey(currencyInfo, "uniqSymbol")) currencyInfo.getMap("uniqSymbol")?.let { asSymbol(it) } else null
     val localizedName = currencyInfo.getArray("localizedName")?.let { asLocalizedNameList(it) }!!
     val localeOverrides = currencyInfo.getArray("localeOverrides")?.let { asLocaleOverridesList(it) }!!
-    return CurrencyInfo(
+    return CurrencyInfo(name, fractionSize, spacing, symbol, uniqSymbol, localizedName, localeOverrides)
-        name,
-        fractionSize,
-        spacing,
-        symbol,
-        uniqSymbol,
-        localizedName,
-        localeOverrides,
-    )
 }
 
 fun readableMapOf(currencyInfo: CurrencyInfo): ReadableMap =
@@ -319,10 +294,7 @@ fun asFiatCurrency(fiatCurrency: ReadableMap): FiatCurrency? {
     }
     val id = fiatCurrency.getString("id")!!
     val info = fiatCurrency.getMap("info")?.let { asCurrencyInfo(it) }!!
-    return FiatCurrency(
+    return FiatCurrency(id, info)
-        id,
-        info,
-    )
 }
 
 fun readableMapOf(fiatCurrency: FiatCurrency): ReadableMap =
@@ -359,12 +331,7 @@ fun asGetInfoResponse(getInfoResponse: ReadableMap): GetInfoResponse? {
     val pendingSendSat = getInfoResponse.getDouble("pendingSendSat").toULong()
     val pendingReceiveSat = getInfoResponse.getDouble("pendingReceiveSat").toULong()
     val pubkey = getInfoResponse.getString("pubkey")!!
-    return GetInfoResponse(
+    return GetInfoResponse(balanceSat, pendingSendSat, pendingReceiveSat, pubkey)
-        balanceSat,
-        pendingSendSat,
-        pendingReceiveSat,
-        pubkey,
-    )
 }
 
 fun readableMapOf(getInfoResponse: GetInfoResponse): ReadableMap =
@@ -472,10 +439,7 @@ fun asLightningPaymentLimitsResponse(lightningPaymentLimitsResponse: ReadableMap
     }
     val send = lightningPaymentLimitsResponse.getMap("send")?.let { asLimits(it) }!!
     val receive = lightningPaymentLimitsResponse.getMap("receive")?.let { asLimits(it) }!!
-    return LightningPaymentLimitsResponse(
+    return LightningPaymentLimitsResponse(send, receive)
-        send,
-        receive,
-    )
 }
 
 fun readableMapOf(lightningPaymentLimitsResponse: LightningPaymentLimitsResponse): ReadableMap =
@@ -510,11 +474,7 @@ fun asLimits(limits: ReadableMap): Limits? {
     val minSat = limits.getDouble("minSat").toULong()
     val maxSat = limits.getDouble("maxSat").toULong()
     val maxZeroConfSat = limits.getDouble("maxZeroConfSat").toULong()
-    return Limits(
+    return Limits(minSat, maxSat, maxZeroConfSat)
-        minSat,
-        maxSat,
-        maxZeroConfSat,
-    )
 }
 
 fun readableMapOf(limits: Limits): ReadableMap =
@@ -552,14 +512,7 @@ fun asLiquidAddressData(liquidAddressData: ReadableMap): LiquidAddressData? {
     val amountSat = if (hasNonNullKey(liquidAddressData, "amountSat")) liquidAddressData.getDouble("amountSat").toULong() else null
     val label = if (hasNonNullKey(liquidAddressData, "label")) liquidAddressData.getString("label") else null
     val message = if (hasNonNullKey(liquidAddressData, "message")) liquidAddressData.getString("message") else null
-    return LiquidAddressData(
+    return LiquidAddressData(address, network, assetId, amountSat, label, message)
-        address,
-        network,
-        assetId,
-        amountSat,
-        label,
-        message,
-    )
 }
 
 fun readableMapOf(liquidAddressData: LiquidAddressData): ReadableMap =
@@ -612,13 +565,7 @@ fun asListPaymentsRequest(listPaymentsRequest: ReadableMap): ListPaymentsRequest
     val toTimestamp = if (hasNonNullKey(listPaymentsRequest, "toTimestamp")) listPaymentsRequest.getDouble("toTimestamp").toLong() else null
     val offset = if (hasNonNullKey(listPaymentsRequest, "offset")) listPaymentsRequest.getInt("offset").toUInt() else null
     val limit = if (hasNonNullKey(listPaymentsRequest, "limit")) listPaymentsRequest.getInt("limit").toUInt() else null
-    return ListPaymentsRequest(
+    return ListPaymentsRequest(filters, fromTimestamp, toTimestamp, offset, limit)
-        filters,
-        fromTimestamp,
-        toTimestamp,
-        offset,
-        limit,
-    )
 }
 
 fun readableMapOf(listPaymentsRequest: ListPaymentsRequest): ReadableMap =
@@ -657,12 +604,7 @@ fun asLnUrlAuthRequestData(lnUrlAuthRequestData: ReadableMap): LnUrlAuthRequestD
     val domain = lnUrlAuthRequestData.getString("domain")!!
     val url = lnUrlAuthRequestData.getString("url")!!
     val action = if (hasNonNullKey(lnUrlAuthRequestData, "action")) lnUrlAuthRequestData.getString("action") else null
-    return LnUrlAuthRequestData(
+    return LnUrlAuthRequestData(k1, domain, url, action)
-        k1,
-        domain,
-        url,
-        action,
-    )
 }
 
 fun readableMapOf(lnUrlAuthRequestData: LnUrlAuthRequestData): ReadableMap =
@@ -695,9 +637,7 @@ fun asLnUrlErrorData(lnUrlErrorData: ReadableMap): LnUrlErrorData? {
         return null
     }
     val reason = lnUrlErrorData.getString("reason")!!
-    return LnUrlErrorData(
+    return LnUrlErrorData(reason)
-        reason,
-    )
 }
 
 fun readableMapOf(lnUrlErrorData: LnUrlErrorData): ReadableMap =
@@ -729,10 +669,7 @@ fun asLnUrlPayErrorData(lnUrlPayErrorData: ReadableMap): LnUrlPayErrorData? {
     }
     val paymentHash = lnUrlPayErrorData.getString("paymentHash")!!
     val reason = lnUrlPayErrorData.getString("reason")!!
-    return LnUrlPayErrorData(
+    return LnUrlPayErrorData(paymentHash, reason)
-        paymentHash,
-        reason,
-    )
 }
 
 fun readableMapOf(lnUrlPayErrorData: LnUrlPayErrorData): ReadableMap =
@@ -777,13 +714,7 @@ fun asLnUrlPayRequest(lnUrlPayRequest: ReadableMap): LnUrlPayRequest? {
         } else {
             null
         }
-    return LnUrlPayRequest(
+    return LnUrlPayRequest(data, amountMsat, comment, paymentLabel, validateSuccessActionUrl)
-        data,
-        amountMsat,
-        comment,
-        paymentLabel,
-        validateSuccessActionUrl,
-    )
 }
 
 fun readableMapOf(lnUrlPayRequest: LnUrlPayRequest): ReadableMap =
@@ -887,10 +818,7 @@ fun asLnUrlPaySuccessData(lnUrlPaySuccessData: ReadableMap): LnUrlPaySuccessData
             null
         }
     val payment = lnUrlPaySuccessData.getMap("payment")?.let { asPayment(it) }!!
-    return LnUrlPaySuccessData(
+    return LnUrlPaySuccessData(successAction, payment)
-        successAction,
-        payment,
-    )
 }
 
 fun readableMapOf(lnUrlPaySuccessData: LnUrlPaySuccessData): ReadableMap =
@@ -924,11 +852,7 @@ fun asLnUrlWithdrawRequest(lnUrlWithdrawRequest: ReadableMap): LnUrlWithdrawRequ
     val data = lnUrlWithdrawRequest.getMap("data")?.let { asLnUrlWithdrawRequestData(it) }!!
     val amountMsat = lnUrlWithdrawRequest.getDouble("amountMsat").toULong()
     val description = if (hasNonNullKey(lnUrlWithdrawRequest, "description")) lnUrlWithdrawRequest.getString("description") else null
-    return LnUrlWithdrawRequest(
+    return LnUrlWithdrawRequest(data, amountMsat, description)
-        data,
-        amountMsat,
-        description,
-    )
 }
 
 fun readableMapOf(lnUrlWithdrawRequest: LnUrlWithdrawRequest): ReadableMap =
@@ -968,13 +892,7 @@ fun asLnUrlWithdrawRequestData(lnUrlWithdrawRequestData: ReadableMap): LnUrlWith
     val defaultDescription = lnUrlWithdrawRequestData.getString("defaultDescription")!!
     val minWithdrawable = lnUrlWithdrawRequestData.getDouble("minWithdrawable").toULong()
     val maxWithdrawable = lnUrlWithdrawRequestData.getDouble("maxWithdrawable").toULong()
-    return LnUrlWithdrawRequestData(
+    return LnUrlWithdrawRequestData(callback, k1, defaultDescription, minWithdrawable, maxWithdrawable)
-        callback,
-        k1,
-        defaultDescription,
-        minWithdrawable,
-        maxWithdrawable,
-    )
 }
 
 fun readableMapOf(lnUrlWithdrawRequestData: LnUrlWithdrawRequestData): ReadableMap =
@@ -1008,9 +926,7 @@ fun asLnUrlWithdrawSuccessData(lnUrlWithdrawSuccessData: ReadableMap): LnUrlWith
         return null
     }
     val invoice = lnUrlWithdrawSuccessData.getMap("invoice")?.let { asLnInvoice(it) }!!
-    return LnUrlWithdrawSuccessData(
+    return LnUrlWithdrawSuccessData(invoice)
-        invoice,
-    )
 }
 
 fun readableMapOf(lnUrlWithdrawSuccessData: LnUrlWithdrawSuccessData): ReadableMap =
@@ -1043,11 +959,7 @@ fun asLocaleOverrides(localeOverrides: ReadableMap): LocaleOverrides? {
     val locale = localeOverrides.getString("locale")!!
     val spacing = if (hasNonNullKey(localeOverrides, "spacing")) localeOverrides.getInt("spacing").toUInt() else null
     val symbol = localeOverrides.getMap("symbol")?.let { asSymbol(it) }!!
-    return LocaleOverrides(
+    return LocaleOverrides(locale, spacing, symbol)
-        locale,
-        spacing,
-        symbol,
-    )
 }
 
 fun readableMapOf(localeOverrides: LocaleOverrides): ReadableMap =
@@ -1081,10 +993,7 @@ fun asLocalizedName(localizedName: ReadableMap): LocalizedName? {
     }
     val locale = localizedName.getString("locale")!!
     val name = localizedName.getString("name")!!
-    return LocalizedName(
+    return LocalizedName(locale, name)
-        locale,
-        name,
-    )
 }
 
 fun readableMapOf(localizedName: LocalizedName): ReadableMap =
@@ -1117,10 +1026,7 @@ fun asLogEntry(logEntry: ReadableMap): LogEntry? {
     }
     val line = logEntry.getString("line")!!
     val level = logEntry.getString("level")!!
-    return LogEntry(
+    return LogEntry(line, level)
-        line,
-        level,
-    )
 }
 
 fun readableMapOf(logEntry: LogEntry): ReadableMap =
@@ -1151,9 +1057,7 @@ fun asMessageSuccessActionData(messageSuccessActionData: ReadableMap): MessageSu
         return null
     }
     val message = messageSuccessActionData.getString("message")!!
-    return MessageSuccessActionData(
+    return MessageSuccessActionData(message)
-        message,
-    )
 }
 
 fun readableMapOf(messageSuccessActionData: MessageSuccessActionData): ReadableMap =
@@ -1185,10 +1089,7 @@ fun asOnchainPaymentLimitsResponse(onchainPaymentLimitsResponse: ReadableMap): O
     }
     val send = onchainPaymentLimitsResponse.getMap("send")?.let { asLimits(it) }!!
     val receive = onchainPaymentLimitsResponse.getMap("receive")?.let { asLimits(it) }!!
-    return OnchainPaymentLimitsResponse(
+    return OnchainPaymentLimitsResponse(send, receive)
-        send,
-        receive,
-    )
 }
 
 fun readableMapOf(onchainPaymentLimitsResponse: OnchainPaymentLimitsResponse): ReadableMap =
@@ -1221,10 +1122,7 @@ fun asPayOnchainRequest(payOnchainRequest: ReadableMap): PayOnchainRequest? {
     }
     val address = payOnchainRequest.getString("address")!!
     val prepareResponse = payOnchainRequest.getMap("prepareResponse")?.let { asPreparePayOnchainResponse(it) }!!
-    return PayOnchainRequest(
+    return PayOnchainRequest(address, prepareResponse)
-        address,
-        prepareResponse,
-    )
 }
 
 fun readableMapOf(payOnchainRequest: PayOnchainRequest): ReadableMap =
@@ -1266,16 +1164,7 @@ fun asPayment(payment: ReadableMap): Payment? {
     val paymentType = payment.getString("paymentType")?.let { asPaymentType(it) }!!
     val status = payment.getString("status")?.let { asPaymentState(it) }!!
     val details = if (hasNonNullKey(payment, "details")) payment.getMap("details")?.let { asPaymentDetails(it) } else null
-    return Payment(
+    return Payment(destination, txId, timestamp, amountSat, feesSat, paymentType, status, details)
-        destination,
-        txId,
-        timestamp,
-        amountSat,
-        feesSat,
-        paymentType,
-        status,
-        details,
-    )
 }
 
 fun readableMapOf(payment: Payment): ReadableMap =
@@ -1314,10 +1203,7 @@ fun asPrepareBuyBitcoinRequest(prepareBuyBitcoinRequest: ReadableMap): PrepareBu
     }
     val provider = prepareBuyBitcoinRequest.getString("provider")?.let { asBuyBitcoinProvider(it) }!!
     val amountSat = prepareBuyBitcoinRequest.getDouble("amountSat").toULong()
-    return PrepareBuyBitcoinRequest(
+    return PrepareBuyBitcoinRequest(provider, amountSat)
-        provider,
-        amountSat,
-    )
 }
 
 fun readableMapOf(prepareBuyBitcoinRequest: PrepareBuyBitcoinRequest): ReadableMap =
@@ -1352,11 +1238,7 @@ fun asPrepareBuyBitcoinResponse(prepareBuyBitcoinResponse: ReadableMap): Prepare
     val provider = prepareBuyBitcoinResponse.getString("provider")?.let { asBuyBitcoinProvider(it) }!!
     val amountSat = prepareBuyBitcoinResponse.getDouble("amountSat").toULong()
     val feesSat = prepareBuyBitcoinResponse.getDouble("feesSat").toULong()
-    return PrepareBuyBitcoinResponse(
+    return PrepareBuyBitcoinResponse(provider, amountSat, feesSat)
-        provider,
-        amountSat,
-        feesSat,
-    )
 }
 
 fun readableMapOf(prepareBuyBitcoinResponse: PrepareBuyBitcoinResponse): ReadableMap =
@@ -1398,10 +1280,7 @@ fun asPreparePayOnchainRequest(preparePayOnchainRequest: ReadableMap): PreparePa
         } else {
             null
         }
-    return PreparePayOnchainRequest(
+    return PreparePayOnchainRequest(receiverAmountSat, satPerVbyte)
-        receiverAmountSat,
-        satPerVbyte,
-    )
 }
 
 fun readableMapOf(preparePayOnchainRequest: PreparePayOnchainRequest): ReadableMap =
@@ -1436,11 +1315,7 @@ fun asPreparePayOnchainResponse(preparePayOnchainResponse: ReadableMap): Prepare
     val receiverAmountSat = preparePayOnchainResponse.getDouble("receiverAmountSat").toULong()
     val claimFeesSat = preparePayOnchainResponse.getDouble("claimFeesSat").toULong()
     val totalFeesSat = preparePayOnchainResponse.getDouble("totalFeesSat").toULong()
-    return PreparePayOnchainResponse(
+    return PreparePayOnchainResponse(receiverAmountSat, claimFeesSat, totalFeesSat)
-        receiverAmountSat,
-        claimFeesSat,
-        totalFeesSat,
-    )
 }
 
 fun readableMapOf(preparePayOnchainResponse: PreparePayOnchainResponse): ReadableMap =
@@ -1482,10 +1357,7 @@ fun asPrepareReceiveRequest(prepareReceiveRequest: ReadableMap): PrepareReceiveR
             null
         }
     val paymentMethod = prepareReceiveRequest.getString("paymentMethod")?.let { asPaymentMethod(it) }!!
-    return PrepareReceiveRequest(
+    return PrepareReceiveRequest(payerAmountSat, paymentMethod)
-        payerAmountSat,
-        paymentMethod,
-    )
 }
 
 fun readableMapOf(prepareReceiveRequest: PrepareReceiveRequest): ReadableMap =
@@ -1528,11 +1400,7 @@ fun asPrepareReceiveResponse(prepareReceiveResponse: ReadableMap): PrepareReceiv
         }
     val paymentMethod = prepareReceiveResponse.getString("paymentMethod")?.let { asPaymentMethod(it) }!!
     val feesSat = prepareReceiveResponse.getDouble("feesSat").toULong()
-    return PrepareReceiveResponse(
+    return PrepareReceiveResponse(payerAmountSat, paymentMethod, feesSat)
-        payerAmountSat,
-        paymentMethod,
-        feesSat,
-    )
 }
 
 fun readableMapOf(prepareReceiveResponse: PrepareReceiveResponse): ReadableMap =
@@ -1568,11 +1436,7 @@ fun asPrepareRefundRequest(prepareRefundRequest: ReadableMap): PrepareRefundRequ
     val swapAddress = prepareRefundRequest.getString("swapAddress")!!
     val refundAddress = prepareRefundRequest.getString("refundAddress")!!
     val satPerVbyte = prepareRefundRequest.getInt("satPerVbyte").toUInt()
-    return PrepareRefundRequest(
+    return PrepareRefundRequest(swapAddress, refundAddress, satPerVbyte)
-        swapAddress,
-        refundAddress,
-        satPerVbyte,
-    )
 }
 
 fun readableMapOf(prepareRefundRequest: PrepareRefundRequest): ReadableMap =
@@ -1607,11 +1471,7 @@ fun asPrepareRefundResponse(prepareRefundResponse: ReadableMap): PrepareRefundRe
     val txVsize = prepareRefundResponse.getInt("txVsize").toUInt()
     val txFeeSat = prepareRefundResponse.getDouble("txFeeSat").toULong()
     val refundTxId = if (hasNonNullKey(prepareRefundResponse, "refundTxId")) prepareRefundResponse.getString("refundTxId") else null
-    return PrepareRefundResponse(
+    return PrepareRefundResponse(txVsize, txFeeSat, refundTxId)
-        txVsize,
-        txFeeSat,
-        refundTxId,
-    )
 }
 
 fun readableMapOf(prepareRefundResponse: PrepareRefundResponse): ReadableMap =
@@ -1644,10 +1504,7 @@ fun asPrepareSendRequest(prepareSendRequest: ReadableMap): PrepareSendRequest? {
     }
     val destination = prepareSendRequest.getString("destination")!!
     val amountSat = if (hasNonNullKey(prepareSendRequest, "amountSat")) prepareSendRequest.getDouble("amountSat").toULong() else null
-    return PrepareSendRequest(
+    return PrepareSendRequest(destination, amountSat)
-        destination,
-        amountSat,
-    )
 }
 
 fun readableMapOf(prepareSendRequest: PrepareSendRequest): ReadableMap =
@@ -1680,10 +1537,7 @@ fun asPrepareSendResponse(prepareSendResponse: ReadableMap): PrepareSendResponse
     }
     val destination = prepareSendResponse.getMap("destination")?.let { asSendDestination(it) }!!
     val feesSat = prepareSendResponse.getDouble("feesSat").toULong()
-    return PrepareSendResponse(
+    return PrepareSendResponse(destination, feesSat)
-        destination,
-        feesSat,
-    )
 }
 
 fun readableMapOf(prepareSendResponse: PrepareSendResponse): ReadableMap =
@@ -1716,10 +1570,7 @@ fun asRate(rate: ReadableMap): Rate? {
     }
     val coin = rate.getString("coin")!!
     val value = rate.getDouble("value")
-    return Rate(
+    return Rate(coin, value)
-        coin,
-        value,
-    )
 }
 
 fun readableMapOf(rate: Rate): ReadableMap =
@@ -1751,10 +1602,7 @@ fun asReceivePaymentRequest(receivePaymentRequest: ReadableMap): ReceivePaymentR
     }
     val prepareResponse = receivePaymentRequest.getMap("prepareResponse")?.let { asPrepareReceiveResponse(it) }!!
     val description = if (hasNonNullKey(receivePaymentRequest, "description")) receivePaymentRequest.getString("description") else null
-    return ReceivePaymentRequest(
+    return ReceivePaymentRequest(prepareResponse, description)
-        prepareResponse,
-        description,
-    )
 }
 
 fun readableMapOf(receivePaymentRequest: ReceivePaymentRequest): ReadableMap =
@@ -1785,9 +1633,7 @@ fun asReceivePaymentResponse(receivePaymentResponse: ReadableMap): ReceivePaymen
         return null
     }
     val destination = receivePaymentResponse.getString("destination")!!
-    return ReceivePaymentResponse(
+    return ReceivePaymentResponse(destination)
-        destination,
-    )
 }
 
 fun readableMapOf(receivePaymentResponse: ReceivePaymentResponse): ReadableMap =
@@ -1825,13 +1671,7 @@ fun asRecommendedFees(recommendedFees: ReadableMap): RecommendedFees? {
     val hourFee = recommendedFees.getDouble("hourFee").toULong()
     val economyFee = recommendedFees.getDouble("economyFee").toULong()
     val minimumFee = recommendedFees.getDouble("minimumFee").toULong()
-    return RecommendedFees(
+    return RecommendedFees(fastestFee, halfHourFee, hourFee, economyFee, minimumFee)
-        fastestFee,
-        halfHourFee,
-        hourFee,
-        economyFee,
-        minimumFee,
-    )
 }
 
 fun readableMapOf(recommendedFees: RecommendedFees): ReadableMap =
@@ -1869,11 +1709,7 @@ fun asRefundRequest(refundRequest: ReadableMap): RefundRequest? {
     val swapAddress = refundRequest.getString("swapAddress")!!
     val refundAddress = refundRequest.getString("refundAddress")!!
     val satPerVbyte = refundRequest.getInt("satPerVbyte").toUInt()
-    return RefundRequest(
+    return RefundRequest(swapAddress, refundAddress, satPerVbyte)
-        swapAddress,
-        refundAddress,
-        satPerVbyte,
-    )
 }
 
 fun readableMapOf(refundRequest: RefundRequest): ReadableMap =
@@ -1905,9 +1741,7 @@ fun asRefundResponse(refundResponse: ReadableMap): RefundResponse? {
         return null
     }
     val refundTxId = refundResponse.getString("refundTxId")!!
-    return RefundResponse(
+    return RefundResponse(refundTxId)
-        refundTxId,
-    )
 }
 
 fun readableMapOf(refundResponse: RefundResponse): ReadableMap =
@@ -1941,11 +1775,7 @@ fun asRefundableSwap(refundableSwap: ReadableMap): RefundableSwap? {
     val swapAddress = refundableSwap.getString("swapAddress")!!
     val timestamp = refundableSwap.getInt("timestamp").toUInt()
     val amountSat = refundableSwap.getDouble("amountSat").toULong()
-    return RefundableSwap(
+    return RefundableSwap(swapAddress, timestamp, amountSat)
-        swapAddress,
-        timestamp,
-        amountSat,
-    )
 }
 
 fun readableMapOf(refundableSwap: RefundableSwap): ReadableMap =
@@ -1975,9 +1805,7 @@ fun asRestoreRequest(restoreRequest: ReadableMap): RestoreRequest? {
         return null
     }
     val backupPath = if (hasNonNullKey(restoreRequest, "backupPath")) restoreRequest.getString("backupPath") else null
-    return RestoreRequest(
+    return RestoreRequest(backupPath)
-        backupPath,
-    )
 }
 
 fun readableMapOf(restoreRequest: RestoreRequest): ReadableMap =
@@ -2007,9 +1835,7 @@ fun asRouteHint(routeHint: ReadableMap): RouteHint? {
         return null
     }
     val hops = routeHint.getArray("hops")?.let { asRouteHintHopList(it) }!!
-    return RouteHint(
+    return RouteHint(hops)
-        hops,
-    )
 }
 
 fun readableMapOf(routeHint: RouteHint): ReadableMap =
@@ -2093,9 +1919,7 @@ fun asSendPaymentRequest(sendPaymentRequest: ReadableMap): SendPaymentRequest? {
         return null
     }
     val prepareResponse = sendPaymentRequest.getMap("prepareResponse")?.let { asPrepareSendResponse(it) }!!
-    return SendPaymentRequest(
+    return SendPaymentRequest(prepareResponse)
-        prepareResponse,
-    )
 }
 
 fun readableMapOf(sendPaymentRequest: SendPaymentRequest): ReadableMap =
@@ -2125,9 +1949,7 @@ fun asSendPaymentResponse(sendPaymentResponse: ReadableMap): SendPaymentResponse
         return null
     }
     val payment = sendPaymentResponse.getMap("payment")?.let { asPayment(it) }!!
-    return SendPaymentResponse(
+    return SendPaymentResponse(payment)
-        payment,
-    )
 }
 
 fun readableMapOf(sendPaymentResponse: SendPaymentResponse): ReadableMap =
@@ -2158,12 +1980,7 @@ fun asSymbol(symbol: ReadableMap): Symbol? {
     val template = if (hasNonNullKey(symbol, "template")) symbol.getString("template") else null
     val rtl = if (hasNonNullKey(symbol, "rtl")) symbol.getBoolean("rtl") else null
     val position = if (hasNonNullKey(symbol, "position")) symbol.getInt("position").toUInt() else null
-    return Symbol(
+    return Symbol(grapheme, template, rtl, position)
-        grapheme,
-        template,
-        rtl,
-        position,
-    )
 }
 
 fun readableMapOf(symbol: Symbol): ReadableMap =
@@ -2200,11 +2017,7 @@ fun asUrlSuccessActionData(urlSuccessActionData: ReadableMap): UrlSuccessActionD
     val description = urlSuccessActionData.getString("description")!!
     val url = urlSuccessActionData.getString("url")!!
     val matchesCallbackDomain = urlSuccessActionData.getBoolean("matchesCallbackDomain")
-    return UrlSuccessActionData(
+    return UrlSuccessActionData(description, url, matchesCallbackDomain)
-        description,
-        url,
-        matchesCallbackDomain,
-    )
 }
 
 fun readableMapOf(urlSuccessActionData: UrlSuccessActionData): ReadableMap =
@@ -2229,12 +2042,12 @@ fun asAesSuccessActionDataResult(aesSuccessActionDataResult: ReadableMap): AesSu
     val type = aesSuccessActionDataResult.getString("type")
 
     if (type == "decrypted") {
-        return AesSuccessActionDataResult.Decrypted(
+        val data = aesSuccessActionDataResult.getMap("data")?.let { asAesSuccessActionDataDecrypted(it) }!!
-            aesSuccessActionDataResult.getMap("data")?.let { asAesSuccessActionDataDecrypted(it) }!!,
+        return AesSuccessActionDataResult.Decrypted(data)
-        )
     }
     if (type == "errorStatus") {
-        return AesSuccessActionDataResult.ErrorStatus(aesSuccessActionDataResult.getString("reason")!!)
+        val reason = aesSuccessActionDataResult.getString("reason")!!
+        return AesSuccessActionDataResult.ErrorStatus(reason)
     }
     return null
 }
@@ -2282,31 +2095,40 @@ fun asInputType(inputType: ReadableMap): InputType? {
     val type = inputType.getString("type")
 
     if (type == "bitcoinAddress") {
-        return InputType.BitcoinAddress(inputType.getMap("address")?.let { asBitcoinAddressData(it) }!!)
+        val address = inputType.getMap("address")?.let { asBitcoinAddressData(it) }!!
+        return InputType.BitcoinAddress(address)
     }
     if (type == "liquidAddress") {
-        return InputType.LiquidAddress(inputType.getMap("address")?.let { asLiquidAddressData(it) }!!)
+        val address = inputType.getMap("address")?.let { asLiquidAddressData(it) }!!
+        return InputType.LiquidAddress(address)
     }
     if (type == "bolt11") {
-        return InputType.Bolt11(inputType.getMap("invoice")?.let { asLnInvoice(it) }!!)
+        val invoice = inputType.getMap("invoice")?.let { asLnInvoice(it) }!!
+        return InputType.Bolt11(invoice)
     }
     if (type == "nodeId") {
-        return InputType.NodeId(inputType.getString("nodeId")!!)
+        val nodeId = inputType.getString("nodeId")!!
+        return InputType.NodeId(nodeId)
     }
     if (type == "url") {
-        return InputType.Url(inputType.getString("url")!!)
+        val url = inputType.getString("url")!!
+        return InputType.Url(url)
     }
     if (type == "lnUrlPay") {
-        return InputType.LnUrlPay(inputType.getMap("data")?.let { asLnUrlPayRequestData(it) }!!)
+        val data = inputType.getMap("data")?.let { asLnUrlPayRequestData(it) }!!
+        return InputType.LnUrlPay(data)
     }
     if (type == "lnUrlWithdraw") {
-        return InputType.LnUrlWithdraw(inputType.getMap("data")?.let { asLnUrlWithdrawRequestData(it) }!!)
+        val data = inputType.getMap("data")?.let { asLnUrlWithdrawRequestData(it) }!!
+        return InputType.LnUrlWithdraw(data)
     }
     if (type == "lnUrlAuth") {
-        return InputType.LnUrlAuth(inputType.getMap("data")?.let { asLnUrlAuthRequestData(it) }!!)
+        val data = inputType.getMap("data")?.let { asLnUrlAuthRequestData(it) }!!
+        return InputType.LnUrlAuth(data)
     }
     if (type == "lnUrlError") {
-        return InputType.LnUrlError(inputType.getMap("data")?.let { asLnUrlErrorData(it) }!!)
+        val data = inputType.getMap("data")?.let { asLnUrlErrorData(it) }!!
+        return InputType.LnUrlError(data)
     }
     return null
 }
@@ -2385,7 +2207,8 @@ fun asLnUrlCallbackStatus(lnUrlCallbackStatus: ReadableMap): LnUrlCallbackStatus
         return LnUrlCallbackStatus.Ok
     }
     if (type == "errorStatus") {
-        return LnUrlCallbackStatus.ErrorStatus(lnUrlCallbackStatus.getMap("data")?.let { asLnUrlErrorData(it) }!!)
+        val data = lnUrlCallbackStatus.getMap("data")?.let { asLnUrlErrorData(it) }!!
+        return LnUrlCallbackStatus.ErrorStatus(data)
     }
     return null
 }
@@ -2419,13 +2242,16 @@ fun asLnUrlPayResult(lnUrlPayResult: ReadableMap): LnUrlPayResult? {
     val type = lnUrlPayResult.getString("type")
 
     if (type == "endpointSuccess") {
-        return LnUrlPayResult.EndpointSuccess(lnUrlPayResult.getMap("data")?.let { asLnUrlPaySuccessData(it) }!!)
+        val data = lnUrlPayResult.getMap("data")?.let { asLnUrlPaySuccessData(it) }!!
+        return LnUrlPayResult.EndpointSuccess(data)
     }
     if (type == "endpointError") {
-        return LnUrlPayResult.EndpointError(lnUrlPayResult.getMap("data")?.let { asLnUrlErrorData(it) }!!)
+        val data = lnUrlPayResult.getMap("data")?.let { asLnUrlErrorData(it) }!!
+        return LnUrlPayResult.EndpointError(data)
     }
     if (type == "payError") {
-        return LnUrlPayResult.PayError(lnUrlPayResult.getMap("data")?.let { asLnUrlPayErrorData(it) }!!)
+        val data = lnUrlPayResult.getMap("data")?.let { asLnUrlPayErrorData(it) }!!
+        return LnUrlPayResult.PayError(data)
     }
     return null
 }
@@ -2464,13 +2290,16 @@ fun asLnUrlWithdrawResult(lnUrlWithdrawResult: ReadableMap): LnUrlWithdrawResult
     val type = lnUrlWithdrawResult.getString("type")
 
     if (type == "ok") {
-        return LnUrlWithdrawResult.Ok(lnUrlWithdrawResult.getMap("data")?.let { asLnUrlWithdrawSuccessData(it) }!!)
+        val data = lnUrlWithdrawResult.getMap("data")?.let { asLnUrlWithdrawSuccessData(it) }!!
+        return LnUrlWithdrawResult.Ok(data)
     }
     if (type == "timeout") {
-        return LnUrlWithdrawResult.Timeout(lnUrlWithdrawResult.getMap("data")?.let { asLnUrlWithdrawSuccessData(it) }!!)
+        val data = lnUrlWithdrawResult.getMap("data")?.let { asLnUrlWithdrawSuccessData(it) }!!
+        return LnUrlWithdrawResult.Timeout(data)
     }
     if (type == "errorStatus") {
-        return LnUrlWithdrawResult.ErrorStatus(lnUrlWithdrawResult.getMap("data")?.let { asLnUrlErrorData(it) }!!)
+        val data = lnUrlWithdrawResult.getMap("data")?.let { asLnUrlErrorData(it) }!!
+        return LnUrlWithdrawResult.ErrorStatus(data)
     }
     return null
 }
@@ -2522,13 +2351,43 @@ fun asPaymentDetails(paymentDetails: ReadableMap): PaymentDetails? {
     val type = paymentDetails.getString("type")
 
     if (type == "lightning") {
-        return PaymentDetails.Lightning(paymentDetails.getString("swapId")!!)
+        val swapId = paymentDetails.getString("swapId")!!
+        val description = paymentDetails.getString("description")!!
+        val preimage = if (hasNonNullKey(paymentDetails, "preimage")) paymentDetails.getString("preimage") else null
+        val bolt11 = if (hasNonNullKey(paymentDetails, "bolt11")) paymentDetails.getString("bolt11") else null
+        val refundTxId = if (hasNonNullKey(paymentDetails, "refundTxId")) paymentDetails.getString("refundTxId") else null
+        val refundTxAmountSat =
+            if (hasNonNullKey(
+                    paymentDetails,
+                    "refundTxAmountSat",
+                )
+            ) {
+                paymentDetails.getDouble("refundTxAmountSat").toULong()
+            } else {
+                null
+            }
+        return PaymentDetails.Lightning(swapId, description, preimage, bolt11, refundTxId, refundTxAmountSat)
     }
     if (type == "liquid") {
-        return PaymentDetails.Liquid(paymentDetails.getString("destination")!!)
+        val destination = paymentDetails.getString("destination")!!
+        val description = paymentDetails.getString("description")!!
+        return PaymentDetails.Liquid(destination, description)
     }
     if (type == "bitcoin") {
-        return PaymentDetails.Bitcoin(paymentDetails.getString("swapId")!!)
+        val swapId = paymentDetails.getString("swapId")!!
+        val description = paymentDetails.getString("description")!!
+        val refundTxId = if (hasNonNullKey(paymentDetails, "refundTxId")) paymentDetails.getString("refundTxId") else null
+        val refundTxAmountSat =
+            if (hasNonNullKey(
+                    paymentDetails,
+                    "refundTxAmountSat",
+                )
+            ) {
+                paymentDetails.getDouble("refundTxAmountSat").toULong()
+            } else {
+                null
+            }
+        return PaymentDetails.Bitcoin(swapId, description, refundTxId, refundTxAmountSat)
     }
     return null
 }
@@ -2615,22 +2474,28 @@ fun asSdkEvent(sdkEvent: ReadableMap): SdkEvent? {
     val type = sdkEvent.getString("type")
 
     if (type == "paymentFailed") {
-        return SdkEvent.PaymentFailed(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentFailed(details)
     }
     if (type == "paymentPending") {
-        return SdkEvent.PaymentPending(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentPending(details)
     }
     if (type == "paymentRefunded") {
-        return SdkEvent.PaymentRefunded(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentRefunded(details)
     }
     if (type == "paymentRefundPending") {
-        return SdkEvent.PaymentRefundPending(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentRefundPending(details)
     }
     if (type == "paymentSucceeded") {
-        return SdkEvent.PaymentSucceeded(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentSucceeded(details)
     }
     if (type == "paymentWaitingConfirmation") {
-        return SdkEvent.PaymentWaitingConfirmation(sdkEvent.getMap("details")?.let { asPayment(it) }!!)
+        val details = sdkEvent.getMap("details")?.let { asPayment(it) }!!
+        return SdkEvent.PaymentWaitingConfirmation(details)
     }
     if (type == "synced") {
         return SdkEvent.Synced
@@ -2687,10 +2552,12 @@ fun asSendDestination(sendDestination: ReadableMap): SendDestination? {
     val type = sendDestination.getString("type")
 
     if (type == "liquidAddress") {
-        return SendDestination.LiquidAddress(sendDestination.getMap("addressData")?.let { asLiquidAddressData(it) }!!)
+        val addressData = sendDestination.getMap("addressData")?.let { asLiquidAddressData(it) }!!
+        return SendDestination.LiquidAddress(addressData)
     }
     if (type == "bolt11") {
-        return SendDestination.Bolt11(sendDestination.getMap("invoice")?.let { asLnInvoice(it) }!!)
+        val invoice = sendDestination.getMap("invoice")?.let { asLnInvoice(it) }!!
+        return SendDestination.Bolt11(invoice)
     }
     return null
 }
@@ -2725,13 +2592,16 @@ fun asSuccessActionProcessed(successActionProcessed: ReadableMap): SuccessAction
     val type = successActionProcessed.getString("type")
 
     if (type == "aes") {
-        return SuccessActionProcessed.Aes(successActionProcessed.getMap("result")?.let { asAesSuccessActionDataResult(it) }!!)
+        val result = successActionProcessed.getMap("result")?.let { asAesSuccessActionDataResult(it) }!!
+        return SuccessActionProcessed.Aes(result)
     }
     if (type == "message") {
-        return SuccessActionProcessed.Message(successActionProcessed.getMap("data")?.let { asMessageSuccessActionData(it) }!!)
+        val data = successActionProcessed.getMap("data")?.let { asMessageSuccessActionData(it) }!!
+        return SuccessActionProcessed.Message(data)
     }
     if (type == "url") {
-        return SuccessActionProcessed.Url(successActionProcessed.getMap("data")?.let { asUrlSuccessActionData(it) }!!)
+        val data = successActionProcessed.getMap("data")?.let { asUrlSuccessActionData(it) }!!
+        return SuccessActionProcessed.Url(data)
     }
     return null
 }

packages/react-native/example/App.js

@@ -19,7 +19,8 @@ import {
     prepareReceivePayment,
     prepareSendPayment,
     receivePayment,
-    sendPayment
+    sendPayment,
+    PaymentMethod
 } from "@breeztech/react-native-breez-sdk-liquid"
 import { generateMnemonic } from "@dreson4/react-native-quick-bip39"
 import { getSecureItem, setSecureItem } from "./utils/storage"
@@ -83,26 +84,26 @@ const App = () => {
 
                 /* Receive lightning payment */
 
-                let prepareReceiveRes = await prepareReceivePayment({ payerAmountSat: 1000 })
+                let prepareReceiveRes = await prepareReceivePayment({ payerAmountSat: 1000, paymentMethod: PaymentMethod.LIGHTNING })
                 addLine("prepareReceivePayment", JSON.stringify(prepareReceiveRes))
                 // Get the fees required for this payment
                 addLine("Payment fees", `${prepareReceiveRes.feesSat}`)
 
-                let receivePaymentRes = await receivePayment({prepareRes: prepareReceiveRes})
+                let receivePaymentRes = await receivePayment({ prepareResponse: prepareReceiveRes })
                 addLine("receivePayment", JSON.stringify(receivePaymentRes))
                 // Wait for payer to pay.... once successfully paid an event of `paymentSucceeded` will be emitted.
-                addLine("Bolt11 invoice", `${receivePaymentRes.invoice}`)
+                addLine("Bolt11 invoice", `${receivePaymentRes.destination}`)
 
                 /* Send lightning payment */
 
                 // Set the `bolt11Invoice` to enable sending in the example app
                 if (bolt11Invoice) {
-                    let prepareSendRes = await prepareSendPayment({ invoice: bolt11Invoice })
+                    let prepareSendRes = await prepareSendPayment({ destination: bolt11Invoice })
                     addLine("prepareSendPayment", JSON.stringify(prepareSendRes))
                     // Get the fees required for this payment
                     addLine("Payment fees", `${prepareSendRes.feesSat}`)
 
-                    let sendPaymentRes = await sendPayment(prepareSendRes)
+                    let sendPaymentRes = await sendPayment({ prepareResponse: prepareSendRes })
                     addLine("sendPayment", JSON.stringify(sendPaymentRes))
                     // Once successfully paid an event of `paymentSucceeded` will be emitted.
                     addLine("Payment", `${sendPaymentRes.payment}`)

packages/react-native/example/ios/Podfile.lock

@@ -1,11 +1,11 @@
 PODS:
   - boost (1.76.0)
-  - breez_sdk_liquid (0.1.1-dev1):
+  - breez_sdk_liquid (0.2.2-dev9):
-    - BreezSDKLiquid (= 0.1.1-dev1)
+    - BreezSDKLiquid (= 0.2.2-dev9)
     - React-Core
-  - breez_sdk_liquidFFI (0.1.1-dev1)
+  - breez_sdk_liquidFFI (0.2.2-dev9)
-  - BreezSDKLiquid (0.1.1-dev1):
+  - BreezSDKLiquid (0.2.2-dev9):
-    - breez_sdk_liquidFFI (= 0.1.1-dev1)
+    - breez_sdk_liquidFFI (= 0.2.2-dev9)
   - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.70.15)
@@ -558,9 +558,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: 9fa78656d705f55b1220151d997e57e2a3f2cde0
-  breez_sdk_liquid: c714a5070588921e44ee4f980079f7b5162f1f11
+  breez_sdk_liquid: 9a0f8f1827dc3fd47f0319b34a657278e6a03f10
-  breez_sdk_liquidFFI: d01a5daa6b72967c04dce366479dec90fbcdc165
+  breez_sdk_liquidFFI: ba5620cdfd34d3cd2b3adf32c8ed1e3b61c80670
-  BreezSDKLiquid: dac9addd0109e4d6d893c66be708cfe373e8edd3
+  BreezSDKLiquid: d2a466cfdf36bdcfe8a80f7c62a79417bfe87409
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 9cf707e46f9bd90816b7c91b2c1c8b8a2f549527
@@ -614,6 +614,6 @@ SPEC CHECKSUMS:
   Yoga: d6134eb3d6e3675afc1d6d65ccb3169b60e21980
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 8741374df2d18c097f581557ec59033aefb561e8
+PODFILE CHECKSUM: aa18360f01c2d457ab24a8f42acc05ce22067077
 
 COCOAPODS: 1.15.2

packages/react-native/example/package.json

@@ -13,7 +13,7 @@
     "rebuild": "rm -rf node_modules && yarn && yarn pods"
   },
   "dependencies": {
-    "@breeztech/react-native-breez-sdk-liquid": "0.2.1",
+    "@breeztech/react-native-breez-sdk-liquid": "0.2.2-dev9",
     "@dreson4/react-native-quick-bip39": "^0.0.5",
     "react": "18.1.0",
     "react-native": "0.70.15",

packages/react-native/example/yarn.lock

@@ -964,10 +964,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@breeztech/react-native-breez-sdk-liquid@0.1.1-dev1":
+"@breeztech/react-native-breez-sdk-liquid@0.2.2-dev9":
-  version "0.1.1-dev1"
+  version "0.2.2-dev9"
-  resolved "https://registry.yarnpkg.com/@breeztech/react-native-breez-sdk-liquid/-/react-native-breez-sdk-liquid-0.1.1-dev1.tgz#2d66acdb90f2ba5ffcc1a00cfe54d1b2e83ad58d"
+  resolved "https://registry.yarnpkg.com/@breeztech/react-native-breez-sdk-liquid/-/react-native-breez-sdk-liquid-0.2.2-dev9.tgz#11730805bedcdc9838cdbb975b03ae13e9741046"
-  integrity sha512-Znna0CZ2hm/Ux0doSdqHkt1jxJcG1RJGrblYnZeroAub6jexLqDuAxAbZLzM2xWE19+Pd7JiKSUBI58hjmqbzQ==
+  integrity sha512-OLtLknG17jtX0rZYGXwf17kvXxR2+cRF0gupR8mxNFf5NLoVrBjHonXvf0x4tBzqohdVr67In5FhnCEhi2oc0g==
 
 "@cnakazawa/watch@^1.0.3":
   version "1.0.4"

packages/react-native/ios/BreezSDKLiquidMapper.swift

@@ -10,10 +10,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "plaintext", typeName: "AesSuccessActionDataDecrypted"))
         }
 
-        return AesSuccessActionDataDecrypted(
+        return AesSuccessActionDataDecrypted(description: description, plaintext: plaintext)
-            description: description,
-            plaintext: plaintext
-        )
     }
 
     static func dictionaryOf(aesSuccessActionDataDecrypted: AesSuccessActionDataDecrypted) -> [String: Any?] {
@@ -49,8 +46,7 @@ enum BreezSDKLiquidMapper {
             backupPath = backupPathTmp
         }
 
-        return BackupRequest(
+        return BackupRequest(backupPath: backupPath)
-            backupPath: backupPath)
     }
 
     static func dictionaryOf(backupRequest: BackupRequest) -> [String: Any?] {
@@ -107,13 +103,7 @@ enum BreezSDKLiquidMapper {
             message = messageTmp
         }
 
-        return BitcoinAddressData(
+        return BitcoinAddressData(address: address, network: network, amountSat: amountSat, label: label, message: message)
-            address: address,
-            network: network,
-            amountSat: amountSat,
-            label: label,
-            message: message
-        )
     }
 
     static func dictionaryOf(bitcoinAddressData: BitcoinAddressData) -> [String: Any?] {
@@ -157,10 +147,7 @@ enum BreezSDKLiquidMapper {
             redirectUrl = redirectUrlTmp
         }
 
-        return BuyBitcoinRequest(
+        return BuyBitcoinRequest(prepareResponse: prepareResponse, redirectUrl: redirectUrl)
-            prepareResponse: prepareResponse,
-            redirectUrl: redirectUrl
-        )
     }
 
     static func dictionaryOf(buyBitcoinRequest: BuyBitcoinRequest) -> [String: Any?] {
@@ -219,16 +206,7 @@ enum BreezSDKLiquidMapper {
             zeroConfMaxAmountSat = zeroConfMaxAmountSatTmp
         }
 
-        return Config(
+        return Config(liquidElectrumUrl: liquidElectrumUrl, bitcoinElectrumUrl: bitcoinElectrumUrl, mempoolspaceUrl: mempoolspaceUrl, workingDir: workingDir, network: network, paymentTimeoutSec: paymentTimeoutSec, zeroConfMinFeeRateMsat: zeroConfMinFeeRateMsat, zeroConfMaxAmountSat: zeroConfMaxAmountSat)
-            liquidElectrumUrl: liquidElectrumUrl,
-            bitcoinElectrumUrl: bitcoinElectrumUrl,
-            mempoolspaceUrl: mempoolspaceUrl,
-            workingDir: workingDir,
-            network: network,
-            paymentTimeoutSec: paymentTimeoutSec,
-            zeroConfMinFeeRateMsat: zeroConfMinFeeRateMsat,
-            zeroConfMaxAmountSat: zeroConfMaxAmountSat
-        )
     }
 
     static func dictionaryOf(config: Config) -> [String: Any?] {
@@ -271,10 +249,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "mnemonic", typeName: "ConnectRequest"))
         }
 
-        return ConnectRequest(
+        return ConnectRequest(config: config, mnemonic: mnemonic)
-            config: config,
-            mnemonic: mnemonic
-        )
     }
 
     static func dictionaryOf(connectRequest: ConnectRequest) -> [String: Any?] {
@@ -335,15 +310,7 @@ enum BreezSDKLiquidMapper {
         }
         let localeOverrides = try asLocaleOverridesList(arr: localeOverridesTmp)
 
-        return CurrencyInfo(
+        return CurrencyInfo(name: name, fractionSize: fractionSize, spacing: spacing, symbol: symbol, uniqSymbol: uniqSymbol, localizedName: localizedName, localeOverrides: localeOverrides)
-            name: name,
-            fractionSize: fractionSize,
-            spacing: spacing,
-            symbol: symbol,
-            uniqSymbol: uniqSymbol,
-            localizedName: localizedName,
-            localeOverrides: localeOverrides
-        )
     }
 
     static func dictionaryOf(currencyInfo: CurrencyInfo) -> [String: Any?] {
@@ -384,10 +351,7 @@ enum BreezSDKLiquidMapper {
         }
         let info = try asCurrencyInfo(currencyInfo: infoTmp)
 
-        return FiatCurrency(
+        return FiatCurrency(id: id, info: info)
-            id: id,
-            info: info
-        )
     }
 
     static func dictionaryOf(fiatCurrency: FiatCurrency) -> [String: Any?] {
@@ -428,12 +392,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "pubkey", typeName: "GetInfoResponse"))
         }
 
-        return GetInfoResponse(
+        return GetInfoResponse(balanceSat: balanceSat, pendingSendSat: pendingSendSat, pendingReceiveSat: pendingReceiveSat, pubkey: pubkey)
-            balanceSat: balanceSat,
-            pendingSendSat: pendingSendSat,
-            pendingReceiveSat: pendingReceiveSat,
-            pubkey: pubkey
-        )
     }
 
     static func dictionaryOf(getInfoResponse: GetInfoResponse) -> [String: Any?] {
@@ -516,20 +475,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "minFinalCltvExpiryDelta", typeName: "LnInvoice"))
         }
 
-        return LnInvoice(
+        return LnInvoice(bolt11: bolt11, network: network, payeePubkey: payeePubkey, paymentHash: paymentHash, description: description, descriptionHash: descriptionHash, amountMsat: amountMsat, timestamp: timestamp, expiry: expiry, routingHints: routingHints, paymentSecret: paymentSecret, minFinalCltvExpiryDelta: minFinalCltvExpiryDelta)
-            bolt11: bolt11,
-            network: network,
-            payeePubkey: payeePubkey,
-            paymentHash: paymentHash,
-            description: description,
-            descriptionHash: descriptionHash,
-            amountMsat: amountMsat,
-            timestamp: timestamp,
-            expiry: expiry,
-            routingHints: routingHints,
-            paymentSecret: paymentSecret,
-            minFinalCltvExpiryDelta: minFinalCltvExpiryDelta
-        )
     }
 
     static func dictionaryOf(lnInvoice: LnInvoice) -> [String: Any?] {
@@ -577,10 +523,7 @@ enum BreezSDKLiquidMapper {
         }
         let receive = try asLimits(limits: receiveTmp)
 
-        return LightningPaymentLimitsResponse(
+        return LightningPaymentLimitsResponse(send: send, receive: receive)
-            send: send,
-            receive: receive
-        )
     }
 
     static func dictionaryOf(lightningPaymentLimitsResponse: LightningPaymentLimitsResponse) -> [String: Any?] {
@@ -618,11 +561,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "maxZeroConfSat", typeName: "Limits"))
         }
 
-        return Limits(
+        return Limits(minSat: minSat, maxSat: maxSat, maxZeroConfSat: maxZeroConfSat)
-            minSat: minSat,
-            maxSat: maxSat,
-            maxZeroConfSat: maxZeroConfSat
-        )
     }
 
     static func dictionaryOf(limits: Limits) -> [String: Any?] {
@@ -688,14 +627,7 @@ enum BreezSDKLiquidMapper {
             message = messageTmp
         }
 
-        return LiquidAddressData(
+        return LiquidAddressData(address: address, network: network, assetId: assetId, amountSat: amountSat, label: label, message: message)
-            address: address,
-            network: network,
-            assetId: assetId,
-            amountSat: amountSat,
-            label: label,
-            message: message
-        )
     }
 
     static func dictionaryOf(liquidAddressData: LiquidAddressData) -> [String: Any?] {
@@ -761,13 +693,7 @@ enum BreezSDKLiquidMapper {
             limit = limitTmp
         }
 
-        return ListPaymentsRequest(
+        return ListPaymentsRequest(filters: filters, fromTimestamp: fromTimestamp, toTimestamp: toTimestamp, offset: offset, limit: limit)
-            filters: filters,
-            fromTimestamp: fromTimestamp,
-            toTimestamp: toTimestamp,
-            offset: offset,
-            limit: limit
-        )
     }
 
     static func dictionaryOf(listPaymentsRequest: ListPaymentsRequest) -> [String: Any?] {
@@ -815,12 +741,7 @@ enum BreezSDKLiquidMapper {
             action = actionTmp
         }
 
-        return LnUrlAuthRequestData(
+        return LnUrlAuthRequestData(k1: k1, domain: domain, url: url, action: action)
-            k1: k1,
-            domain: domain,
-            url: url,
-            action: action
-        )
     }
 
     static func dictionaryOf(lnUrlAuthRequestData: LnUrlAuthRequestData) -> [String: Any?] {
@@ -854,8 +775,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "reason", typeName: "LnUrlErrorData"))
         }
 
-        return LnUrlErrorData(
+        return LnUrlErrorData(reason: reason)
-            reason: reason)
     }
 
     static func dictionaryOf(lnUrlErrorData: LnUrlErrorData) -> [String: Any?] {
@@ -889,10 +809,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "reason", typeName: "LnUrlPayErrorData"))
         }
 
-        return LnUrlPayErrorData(
+        return LnUrlPayErrorData(paymentHash: paymentHash, reason: reason)
-            paymentHash: paymentHash,
-            reason: reason
-        )
     }
 
     static func dictionaryOf(lnUrlPayErrorData: LnUrlPayErrorData) -> [String: Any?] {
@@ -950,13 +867,7 @@ enum BreezSDKLiquidMapper {
             validateSuccessActionUrl = validateSuccessActionUrlTmp
         }
 
-        return LnUrlPayRequest(
+        return LnUrlPayRequest(data: data, amountMsat: amountMsat, comment: comment, paymentLabel: paymentLabel, validateSuccessActionUrl: validateSuccessActionUrl)
-            data: data,
-            amountMsat: amountMsat,
-            comment: comment,
-            paymentLabel: paymentLabel,
-            validateSuccessActionUrl: validateSuccessActionUrl
-        )
     }
 
     static func dictionaryOf(lnUrlPayRequest: LnUrlPayRequest) -> [String: Any?] {
@@ -1023,17 +934,7 @@ enum BreezSDKLiquidMapper {
             lnAddress = lnAddressTmp
         }
 
-        return LnUrlPayRequestData(
+        return LnUrlPayRequestData(callback: callback, minSendable: minSendable, maxSendable: maxSendable, metadataStr: metadataStr, commentAllowed: commentAllowed, domain: domain, allowsNostr: allowsNostr, nostrPubkey: nostrPubkey, lnAddress: lnAddress)
-            callback: callback,
-            minSendable: minSendable,
-            maxSendable: maxSendable,
-            metadataStr: metadataStr,
-            commentAllowed: commentAllowed,
-            domain: domain,
-            allowsNostr: allowsNostr,
-            nostrPubkey: nostrPubkey,
-            lnAddress: lnAddress
-        )
     }
 
     static func dictionaryOf(lnUrlPayRequestData: LnUrlPayRequestData) -> [String: Any?] {
@@ -1078,10 +979,7 @@ enum BreezSDKLiquidMapper {
         }
         let payment = try asPayment(payment: paymentTmp)
 
-        return LnUrlPaySuccessData(
+        return LnUrlPaySuccessData(successAction: successAction, payment: payment)
-            successAction: successAction,
-            payment: payment
-        )
     }
 
     static func dictionaryOf(lnUrlPaySuccessData: LnUrlPaySuccessData) -> [String: Any?] {
@@ -1125,11 +1023,7 @@ enum BreezSDKLiquidMapper {
             description = descriptionTmp
         }
 
-        return LnUrlWithdrawRequest(
+        return LnUrlWithdrawRequest(data: data, amountMsat: amountMsat, description: description)
-            data: data,
-            amountMsat: amountMsat,
-            description: description
-        )
     }
 
     static func dictionaryOf(lnUrlWithdrawRequest: LnUrlWithdrawRequest) -> [String: Any?] {
@@ -1174,13 +1068,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "maxWithdrawable", typeName: "LnUrlWithdrawRequestData"))
         }
 
-        return LnUrlWithdrawRequestData(
+        return LnUrlWithdrawRequestData(callback: callback, k1: k1, defaultDescription: defaultDescription, minWithdrawable: minWithdrawable, maxWithdrawable: maxWithdrawable)
-            callback: callback,
-            k1: k1,
-            defaultDescription: defaultDescription,
-            minWithdrawable: minWithdrawable,
-            maxWithdrawable: maxWithdrawable
-        )
     }
 
     static func dictionaryOf(lnUrlWithdrawRequestData: LnUrlWithdrawRequestData) -> [String: Any?] {
@@ -1216,8 +1104,7 @@ enum BreezSDKLiquidMapper {
         }
         let invoice = try asLnInvoice(lnInvoice: invoiceTmp)
 
-        return LnUrlWithdrawSuccessData(
+        return LnUrlWithdrawSuccessData(invoice: invoice)
-            invoice: invoice)
     }
 
     static func dictionaryOf(lnUrlWithdrawSuccessData: LnUrlWithdrawSuccessData) -> [String: Any?] {
@@ -1259,11 +1146,7 @@ enum BreezSDKLiquidMapper {
         }
         let symbol = try asSymbol(symbol: symbolTmp)
 
-        return LocaleOverrides(
+        return LocaleOverrides(locale: locale, spacing: spacing, symbol: symbol)
-            locale: locale,
-            spacing: spacing,
-            symbol: symbol
-        )
     }
 
     static func dictionaryOf(localeOverrides: LocaleOverrides) -> [String: Any?] {
@@ -1299,10 +1182,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "name", typeName: "LocalizedName"))
         }
 
-        return LocalizedName(
+        return LocalizedName(locale: locale, name: name)
-            locale: locale,
-            name: name
-        )
     }
 
     static func dictionaryOf(localizedName: LocalizedName) -> [String: Any?] {
@@ -1337,10 +1217,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "level", typeName: "LogEntry"))
         }
 
-        return LogEntry(
+        return LogEntry(line: line, level: level)
-            line: line,
-            level: level
-        )
     }
 
     static func dictionaryOf(logEntry: LogEntry) -> [String: Any?] {
@@ -1372,8 +1249,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "message", typeName: "MessageSuccessActionData"))
         }
 
-        return MessageSuccessActionData(
+        return MessageSuccessActionData(message: message)
-            message: message)
     }
 
     static func dictionaryOf(messageSuccessActionData: MessageSuccessActionData) -> [String: Any?] {
@@ -1410,10 +1286,7 @@ enum BreezSDKLiquidMapper {
         }
         let receive = try asLimits(limits: receiveTmp)
 
-        return OnchainPaymentLimitsResponse(
+        return OnchainPaymentLimitsResponse(send: send, receive: receive)
-            send: send,
-            receive: receive
-        )
     }
 
     static func dictionaryOf(onchainPaymentLimitsResponse: OnchainPaymentLimitsResponse) -> [String: Any?] {
@@ -1449,10 +1322,7 @@ enum BreezSDKLiquidMapper {
         }
         let prepareResponse = try asPreparePayOnchainResponse(preparePayOnchainResponse: prepareResponseTmp)
 
-        return PayOnchainRequest(
+        return PayOnchainRequest(address: address, prepareResponse: prepareResponse)
-            address: address,
-            prepareResponse: prepareResponse
-        )
     }
 
     static func dictionaryOf(payOnchainRequest: PayOnchainRequest) -> [String: Any?] {
@@ -1518,16 +1388,7 @@ enum BreezSDKLiquidMapper {
             details = try asPaymentDetails(paymentDetails: detailsTmp)
         }
 
-        return Payment(
+        return Payment(destination: destination, txId: txId, timestamp: timestamp, amountSat: amountSat, feesSat: feesSat, paymentType: paymentType, status: status, details: details)
-            destination: destination,
-            txId: txId,
-            timestamp: timestamp,
-            amountSat: amountSat,
-            feesSat: feesSat,
-            paymentType: paymentType,
-            status: status,
-            details: details
-        )
     }
 
     static func dictionaryOf(payment: Payment) -> [String: Any?] {
@@ -1570,10 +1431,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "amountSat", typeName: "PrepareBuyBitcoinRequest"))
         }
 
-        return PrepareBuyBitcoinRequest(
+        return PrepareBuyBitcoinRequest(provider: provider, amountSat: amountSat)
-            provider: provider,
-            amountSat: amountSat
-        )
     }
 
     static func dictionaryOf(prepareBuyBitcoinRequest: PrepareBuyBitcoinRequest) -> [String: Any?] {
@@ -1613,11 +1471,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "feesSat", typeName: "PrepareBuyBitcoinResponse"))
         }
 
-        return PrepareBuyBitcoinResponse(
+        return PrepareBuyBitcoinResponse(provider: provider, amountSat: amountSat, feesSat: feesSat)
-            provider: provider,
-            amountSat: amountSat,
-            feesSat: feesSat
-        )
     }
 
     static func dictionaryOf(prepareBuyBitcoinResponse: PrepareBuyBitcoinResponse) -> [String: Any?] {
@@ -1657,10 +1511,7 @@ enum BreezSDKLiquidMapper {
             satPerVbyte = satPerVbyteTmp
         }
 
-        return PreparePayOnchainRequest(
+        return PreparePayOnchainRequest(receiverAmountSat: receiverAmountSat, satPerVbyte: satPerVbyte)
-            receiverAmountSat: receiverAmountSat,
-            satPerVbyte: satPerVbyte
-        )
     }
 
     static func dictionaryOf(preparePayOnchainRequest: PreparePayOnchainRequest) -> [String: Any?] {
@@ -1698,11 +1549,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "totalFeesSat", typeName: "PreparePayOnchainResponse"))
         }
 
-        return PreparePayOnchainResponse(
+        return PreparePayOnchainResponse(receiverAmountSat: receiverAmountSat, claimFeesSat: claimFeesSat, totalFeesSat: totalFeesSat)
-            receiverAmountSat: receiverAmountSat,
-            claimFeesSat: claimFeesSat,
-            totalFeesSat: totalFeesSat
-        )
     }
 
     static func dictionaryOf(preparePayOnchainResponse: PreparePayOnchainResponse) -> [String: Any?] {
@@ -1743,10 +1590,7 @@ enum BreezSDKLiquidMapper {
         }
         let paymentMethod = try asPaymentMethod(paymentMethod: paymentMethodTmp)
 
-        return PrepareReceiveRequest(
+        return PrepareReceiveRequest(payerAmountSat: payerAmountSat, paymentMethod: paymentMethod)
-            payerAmountSat: payerAmountSat,
-            paymentMethod: paymentMethod
-        )
     }
 
     static func dictionaryOf(prepareReceiveRequest: PrepareReceiveRequest) -> [String: Any?] {
@@ -1790,11 +1634,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "feesSat", typeName: "PrepareReceiveResponse"))
         }
 
-        return PrepareReceiveResponse(
+        return PrepareReceiveResponse(payerAmountSat: payerAmountSat, paymentMethod: paymentMethod, feesSat: feesSat)
-            payerAmountSat: payerAmountSat,
-            paymentMethod: paymentMethod,
-            feesSat: feesSat
-        )
     }
 
     static func dictionaryOf(prepareReceiveResponse: PrepareReceiveResponse) -> [String: Any?] {
@@ -1833,11 +1673,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "satPerVbyte", typeName: "PrepareRefundRequest"))
         }
 
-        return PrepareRefundRequest(
+        return PrepareRefundRequest(swapAddress: swapAddress, refundAddress: refundAddress, satPerVbyte: satPerVbyte)
-            swapAddress: swapAddress,
-            refundAddress: refundAddress,
-            satPerVbyte: satPerVbyte
-        )
     }
 
     static func dictionaryOf(prepareRefundRequest: PrepareRefundRequest) -> [String: Any?] {
@@ -1880,11 +1716,7 @@ enum BreezSDKLiquidMapper {
             refundTxId = refundTxIdTmp
         }
 
-        return PrepareRefundResponse(
+        return PrepareRefundResponse(txVsize: txVsize, txFeeSat: txFeeSat, refundTxId: refundTxId)
-            txVsize: txVsize,
-            txFeeSat: txFeeSat,
-            refundTxId: refundTxId
-        )
     }
 
     static func dictionaryOf(prepareRefundResponse: PrepareRefundResponse) -> [String: Any?] {
@@ -1924,10 +1756,7 @@ enum BreezSDKLiquidMapper {
             amountSat = amountSatTmp
         }
 
-        return PrepareSendRequest(
+        return PrepareSendRequest(destination: destination, amountSat: amountSat)
-            destination: destination,
-            amountSat: amountSat
-        )
     }
 
     static func dictionaryOf(prepareSendRequest: PrepareSendRequest) -> [String: Any?] {
@@ -1964,10 +1793,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "feesSat", typeName: "PrepareSendResponse"))
         }
 
-        return PrepareSendResponse(
+        return PrepareSendResponse(destination: destination, feesSat: feesSat)
-            destination: destination,
-            feesSat: feesSat
-        )
     }
 
     static func dictionaryOf(prepareSendResponse: PrepareSendResponse) -> [String: Any?] {
@@ -2002,10 +1828,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "value", typeName: "Rate"))
         }
 
-        return Rate(
+        return Rate(coin: coin, value: value)
-            coin: coin,
-            value: value
-        )
     }
 
     static func dictionaryOf(rate: Rate) -> [String: Any?] {
@@ -2046,10 +1869,7 @@ enum BreezSDKLiquidMapper {
             description = descriptionTmp
         }
 
-        return ReceivePaymentRequest(
+        return ReceivePaymentRequest(prepareResponse: prepareResponse, description: description)
-            prepareResponse: prepareResponse,
-            description: description
-        )
     }
 
     static func dictionaryOf(receivePaymentRequest: ReceivePaymentRequest) -> [String: Any?] {
@@ -2081,8 +1901,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "destination", typeName: "ReceivePaymentResponse"))
         }
 
-        return ReceivePaymentResponse(
+        return ReceivePaymentResponse(destination: destination)
-            destination: destination)
     }
 
     static func dictionaryOf(receivePaymentResponse: ReceivePaymentResponse) -> [String: Any?] {
@@ -2125,13 +1944,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "minimumFee", typeName: "RecommendedFees"))
         }
 
-        return RecommendedFees(
+        return RecommendedFees(fastestFee: fastestFee, halfHourFee: halfHourFee, hourFee: hourFee, economyFee: economyFee, minimumFee: minimumFee)
-            fastestFee: fastestFee,
-            halfHourFee: halfHourFee,
-            hourFee: hourFee,
-            economyFee: economyFee,
-            minimumFee: minimumFee
-        )
     }
 
     static func dictionaryOf(recommendedFees: RecommendedFees) -> [String: Any?] {
@@ -2172,11 +1985,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "satPerVbyte", typeName: "RefundRequest"))
         }
 
-        return RefundRequest(
+        return RefundRequest(swapAddress: swapAddress, refundAddress: refundAddress, satPerVbyte: satPerVbyte)
-            swapAddress: swapAddress,
-            refundAddress: refundAddress,
-            satPerVbyte: satPerVbyte
-        )
     }
 
     static func dictionaryOf(refundRequest: RefundRequest) -> [String: Any?] {
@@ -2209,8 +2018,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "refundTxId", typeName: "RefundResponse"))
         }
 
-        return RefundResponse(
+        return RefundResponse(refundTxId: refundTxId)
-            refundTxId: refundTxId)
     }
 
     static func dictionaryOf(refundResponse: RefundResponse) -> [String: Any?] {
@@ -2247,11 +2055,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "amountSat", typeName: "RefundableSwap"))
         }
 
-        return RefundableSwap(
+        return RefundableSwap(swapAddress: swapAddress, timestamp: timestamp, amountSat: amountSat)
-            swapAddress: swapAddress,
-            timestamp: timestamp,
-            amountSat: amountSat
-        )
     }
 
     static func dictionaryOf(refundableSwap: RefundableSwap) -> [String: Any?] {
@@ -2288,8 +2092,7 @@ enum BreezSDKLiquidMapper {
             backupPath = backupPathTmp
         }
 
-        return RestoreRequest(
+        return RestoreRequest(backupPath: backupPath)
-            backupPath: backupPath)
     }
 
     static func dictionaryOf(restoreRequest: RestoreRequest) -> [String: Any?] {
@@ -2321,8 +2124,7 @@ enum BreezSDKLiquidMapper {
         }
         let hops = try asRouteHintHopList(arr: hopsTmp)
 
-        return RouteHint(
+        return RouteHint(hops: hops)
-            hops: hops)
     }
 
     static func dictionaryOf(routeHint: RouteHint) -> [String: Any?] {
@@ -2379,15 +2181,7 @@ enum BreezSDKLiquidMapper {
             htlcMaximumMsat = htlcMaximumMsatTmp
         }
 
-        return RouteHintHop(
+        return RouteHintHop(srcNodeId: srcNodeId, shortChannelId: shortChannelId, feesBaseMsat: feesBaseMsat, feesProportionalMillionths: feesProportionalMillionths, cltvExpiryDelta: cltvExpiryDelta, htlcMinimumMsat: htlcMinimumMsat, htlcMaximumMsat: htlcMaximumMsat)
-            srcNodeId: srcNodeId,
-            shortChannelId: shortChannelId,
-            feesBaseMsat: feesBaseMsat,
-            feesProportionalMillionths: feesProportionalMillionths,
-            cltvExpiryDelta: cltvExpiryDelta,
-            htlcMinimumMsat: htlcMinimumMsat,
-            htlcMaximumMsat: htlcMaximumMsat
-        )
     }
 
     static func dictionaryOf(routeHintHop: RouteHintHop) -> [String: Any?] {
@@ -2425,8 +2219,7 @@ enum BreezSDKLiquidMapper {
         }
         let prepareResponse = try asPrepareSendResponse(prepareSendResponse: prepareResponseTmp)
 
-        return SendPaymentRequest(
+        return SendPaymentRequest(prepareResponse: prepareResponse)
-            prepareResponse: prepareResponse)
     }
 
     static func dictionaryOf(sendPaymentRequest: SendPaymentRequest) -> [String: Any?] {
@@ -2458,8 +2251,7 @@ enum BreezSDKLiquidMapper {
         }
         let payment = try asPayment(payment: paymentTmp)
 
-        return SendPaymentResponse(
+        return SendPaymentResponse(payment: payment)
-            payment: payment)
     }
 
     static func dictionaryOf(sendPaymentResponse: SendPaymentResponse) -> [String: Any?] {
@@ -2515,12 +2307,7 @@ enum BreezSDKLiquidMapper {
             position = positionTmp
         }
 
-        return Symbol(
+        return Symbol(grapheme: grapheme, template: template, rtl: rtl, position: position)
-            grapheme: grapheme,
-            template: template,
-            rtl: rtl,
-            position: position
-        )
     }
 
     static func dictionaryOf(symbol: Symbol) -> [String: Any?] {
@@ -2560,11 +2347,7 @@ enum BreezSDKLiquidMapper {
             throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "matchesCallbackDomain", typeName: "UrlSuccessActionData"))
         }
 
-        return UrlSuccessActionData(
+        return UrlSuccessActionData(description: description, url: url, matchesCallbackDomain: matchesCallbackDomain)
-            description: description,
-            url: url,
-            matchesCallbackDomain: matchesCallbackDomain
-        )
     }
 
     static func dictionaryOf(urlSuccessActionData: UrlSuccessActionData) -> [String: Any?] {
@@ -3146,19 +2929,40 @@ enum BreezSDKLiquidMapper {
             guard let _swapId = paymentDetails["swapId"] as? String else {
                 throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "swapId", typeName: "PaymentDetails"))
             }
-            return PaymentDetails.lightning(swapId: _swapId)
+            guard let _description = paymentDetails["description"] as? String else {
+                throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "description", typeName: "PaymentDetails"))
+            }
+            let _preimage = paymentDetails["preimage"] as? String
+
+            let _bolt11 = paymentDetails["bolt11"] as? String
+
+            let _refundTxId = paymentDetails["refundTxId"] as? String
+
+            let _refundTxAmountSat = paymentDetails["refundTxAmountSat"] as? UInt64
+
+            return PaymentDetails.lightning(swapId: _swapId, description: _description, preimage: _preimage, bolt11: _bolt11, refundTxId: _refundTxId, refundTxAmountSat: _refundTxAmountSat)
         }
         if type == "liquid" {
             guard let _destination = paymentDetails["destination"] as? String else {
                 throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "destination", typeName: "PaymentDetails"))
             }
-            return PaymentDetails.liquid(destination: _destination)
+            guard let _description = paymentDetails["description"] as? String else {
+                throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "description", typeName: "PaymentDetails"))
+            }
+            return PaymentDetails.liquid(destination: _destination, description: _description)
         }
         if type == "bitcoin" {
             guard let _swapId = paymentDetails["swapId"] as? String else {
                 throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "swapId", typeName: "PaymentDetails"))
             }
-            return PaymentDetails.bitcoin(swapId: _swapId)
+            guard let _description = paymentDetails["description"] as? String else {
+                throw SdkError.Generic(message: errMissingMandatoryField(fieldName: "description", typeName: "PaymentDetails"))
+            }
+            let _refundTxId = paymentDetails["refundTxId"] as? String
+
+            let _refundTxAmountSat = paymentDetails["refundTxAmountSat"] as? UInt64
+
+            return PaymentDetails.bitcoin(swapId: _swapId, description: _description, refundTxId: _refundTxId, refundTxAmountSat: _refundTxAmountSat)
         }
 
         throw SdkError.Generic(message: "Unexpected type \(type) for enum PaymentDetails")