Add the new field Expiry.

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,
 }
 

src/database/entities/batch_transfer.rs

@@ -21,6 +21,7 @@ pub struct Model {
     pub created_at: i64,
     pub updated_at: i64,
     pub expiration: Option<i64>,
+    pub exact_expiry: Option<bool>,
     pub min_confirmations: u8,
 }
 
@@ -32,6 +33,7 @@ pub enum Column {
     CreatedAt,
     UpdatedAt,
     Expiration,
+    ExactExpiry,
     MinConfirmations,
 }
 
@@ -62,6 +64,7 @@ impl ColumnTrait for Column {
             Self::CreatedAt => ColumnType::BigInteger.def(),
             Self::UpdatedAt => ColumnType::BigInteger.def(),
             Self::Expiration => ColumnType::BigInteger.def().null(),
+            Self::ExactExpiry => ColumnType::Boolean.def().null(),
             Self::MinConfirmations => ColumnType::SmallInteger.def(),
         }
     }

src/wallet/offline.rs

@@ -995,10 +995,14 @@
     pub recipient_id: Option<String>,
     /// UTXO of an incoming 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>,
 }
@@ -1021,10 +1025,13 @@
                 .expect("DB should contain a valid u64 value"),
             kind: td.kind,
             txid: td.txid,
             recipient_id: x.recipient_id.clone(),
             receive_utxo: td.receive_utxo,
             change_utxo: td.change_utxo,
-            expiration: td.expiration,
+             // before to branch issue37
+                //expiration: td.expiration,
+             // after to branch issue37
+             expiration: td.expiration.map(|e| Some((e, td.exact_expiry.unwrap()))),
             transport_endpoints,
         }
     }