Debugging payments with custom amounts

mycitadel · Mar 7, 2021 · 1e6381b · 1e6381b
1 parent 2acee16
commit 1e6381b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/libmycitadel/libmycitadel.h b/libmycitadel/libmycitadel.h
@@ -255,6 +255,7 @@ const char *mycitadel_address_pay(struct mycitadel_client_t *client,
 struct prepared_transfer_t mycitadel_invoice_pay(struct mycitadel_client_t *client,
                                                  const char *contract_id,
                                                  const char *invoice,
+                                                 uint64_t amount,
                                                  uint64_t fee,
                                                  uint64_t giveaway);
 

diff --git a/libmycitadel/src/capi/rpc.rs b/libmycitadel/src/capi/rpc.rs
@@ -346,6 +346,7 @@ pub extern "C" fn mycitadel_address_pay(
         client,
         ptr::null(),
         invoice.as_ptr() as *const c_char,
+        amount,
         fee,
         0,
     )
@@ -357,6 +358,7 @@ pub extern "C" fn mycitadel_invoice_pay(
     client: *mut mycitadel_client_t,
     contract_id: *const c_char,
     invoice: *const c_char,
+    amount: u64,
     fee: u64,
     giveaway: u64,
 ) -> prepared_transfer_t {
@@ -389,7 +391,7 @@ pub extern "C" fn mycitadel_invoice_pay(
         inner.invoice_pay(
             contract_id,
             invoice,
-            None,
+            if amount > 0 { Some(amount) } else { None },
             fee,
             if giveaway > 0 { Some(giveaway) } else { None },
         )

diff --git a/packages/MyCitadelKit/CAPI.swift b/packages/MyCitadelKit/CAPI.swift
@@ -206,8 +206,8 @@ extension CitadelVault {
     }
      */
 
-    internal func pay(from contractId: String, invoice: String, fee: UInt64, giveaway: UInt64? = nil) throws -> Transfer {
-        let transfer = mycitadel_invoice_pay(rpcClient, contractId, invoice, fee, giveaway ?? 0)
+    internal func pay(from contractId: String, invoice: String, value: UInt64? = nil, fee: UInt64, giveaway: UInt64? = nil) throws -> Transfer {
+        let transfer = mycitadel_invoice_pay(rpcClient, contractId, invoice, value ?? 0, fee, giveaway ?? 0)
         if !transfer.success {
             guard let err = self.lastError() else {
                 throw CitadelError("MyCitadel C API is broken")

diff --git a/packages/MyCitadelKit/Vault.swift b/packages/MyCitadelKit/Vault.swift
@@ -95,6 +95,7 @@ open class CitadelVault {
     ) throws {
         self.network = network
         dataDir = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!.appendingPathComponent(network.rawValue).path
+        print("Data directory: \(dataDir)")
         rpcClient = mycitadel_run_embedded(network.rawValue, self.dataDir, electrumServer)
         assets[network.nativeAssetId()] = NativeAsset(withCitadelVault: self)
     }

diff --git a/packages/MyCitadelKit/Wallet.swift b/packages/MyCitadelKit/Wallet.swift
@@ -123,8 +123,8 @@ public class WalletContract: Identifiable {
     }
      */
 
-    public func pay(invoice: String, fee: UInt64, giveaway: UInt64? = nil) throws -> PaymentResult {
-        let transfer = try vault.pay(from: id, invoice: invoice, fee: fee, giveaway: giveaway)
+    public func pay(invoice: String, value: UInt64? = nil, fee: UInt64, giveaway: UInt64? = nil) throws -> PaymentResult {
+        let transfer = try vault.pay(from: id, invoice: invoice, value: value, fee: fee, giveaway: giveaway)
         let signedPsbt = try vault.sign(psbt: transfer.psbt)
         let txid = try vault.publish(psbt: signedPsbt)
 

diff --git a/src/client/client.rs b/src/client/client.rs
@@ -340,7 +340,7 @@ impl Client {
             bitcoin_fee: fee,
             asset_value: invoice.amount().atomic_value().or(amount).ok_or(Error::ServerFailure(Failure {
                 code: 0,
-                info: s!("Amount must be specified for invoices which does not provide default amount value")
+                info: s!("Amount must be specified for invoices if they do not provide default amount value")
             }))?,
             transfer_info,
             invoice

diff --git a/src/server/runtime.rs b/src/server/runtime.rs
@@ -523,7 +523,7 @@ impl Runtime {
                             if transfer_info.is_rgb() {
                                 ""
                             } else {
-                                " on bitcoin outputs which does not have RGB assets on them"
+                                " on bitcoin outputs which do not have RGB assets on them"
                             }
                         )
                     }))?;