only changed for expiry

RGB-Tools · Dec 15, 2024 · 086ba71 · 086ba71
1 parent f04ff8d
commit 086ba71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/migration/src/m20230608_071249_init_db.rs b/migration/src/m20230608_071249_init_db.rs
@@ -83,6 +83,7 @@ impl MigrationTrait for Migration {
                     .col(big_unsigned(BatchTransfer::CreatedAt))
                     .col(big_unsigned(BatchTransfer::UpdatedAt))
                     .col(big_unsigned_null(BatchTransfer::Expiration))
+                    .col(boolean_null(BatchTransfer::ExactExpiry))
                     .col(tiny_unsigned(BatchTransfer::MinConfirmations))
                     .to_owned(),
             )
@@ -473,6 +474,7 @@ pub enum BatchTransfer {
     CreatedAt,
     UpdatedAt,
     Expiration,
+    ExactExpiry,
     MinConfirmations,
 }
 

diff --git a/src/wallet/offline.rs b/src/wallet/offline.rs
@@ -997,8 +997,12 @@ pub struct Transfer {
     pub receive_utxo: Option<Outpoint>,
     /// Change UTXO of an outgoing transfer
     pub change_utxo: Option<Outpoint>,
-    /// Expiration of the transfer
-    pub expiration: Option<i64>,
+    // before to branch issue37
+        /// Expiration of the transfer
+        //pub expiration: Option<i64>,
+    // after to branch issue37
+    /// Expiration of the transfer and whether it should be exact
+    pub expiration: Option<(i64, bool)>,
     /// Transport endpoints for the transfer
     pub transport_endpoints: Vec<TransferTransportEndpoint>,
 }