retrying to implement exact expiry

migration/Cargo.toml

@@ -25,5 +25,6 @@ sea-orm-migration = { version = "=0.12.14", default-features = false, features =
     "sqlx-mysql",
     "sqlx-postgres",
     "sqlx-sqlite",
-    "runtime-async-std-native-tls"
+    "runtime-async-std-native-tls",
+    "cli",
 ] }

migration/src/m20230608_071249_init_db.rs

@@ -124,6 +124,7 @@ impl MigrationTrait for Migration {
                             .not_null(),
                     )
                     .col(ColumnDef::new(BatchTransfer::Expiration).big_unsigned())
+                    .col(ColumnDef::new(BatchTransfer::ExactExpiry).boolean())
                     .col(
                         ColumnDef::new(BatchTransfer::MinConfirmations)
                             .tiny_unsigned()
@@ -646,6 +647,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/database/mod.rs

@@ -279,6 +279,7 @@ pub(crate) struct TransferData {
     pub(crate) created_at: i64,
     pub(crate) updated_at: i64,
     pub(crate) expiration: Option<i64>,
+    pub(crate) exact_expiry: Option<bool>,
 }
 
 pub struct RgbLibDatabase {
@@ -936,6 +937,7 @@ impl RgbLibDatabase {
             created_at: batch_transfer.created_at,
             updated_at: batch_transfer.updated_at,
             expiration: batch_transfer.expiration,
+            exact_expiry: batch_transfer.exact_expiry,
         })
     }
 

src/wallet/mod.rs

@@ -1093,7 +1093,7 @@ pub struct Transfer {
     /// Change UTXO of an outgoing transfer
     pub change_utxo: Option<Outpoint>,
     /// Expiration of the transfer
-    pub expiration: Option<i64>,
+    pub expiration: Option<(i64, bool)>,
     /// Transport endpoints for the transfer
     pub transport_endpoints: Vec<TransferTransportEndpoint>,
 }
@@ -1119,7 +1119,7 @@ impl Transfer {
             recipient_id: x.recipient_id.clone(),
             receive_utxo: td.receive_utxo,
             change_utxo: td.change_utxo,
-            expiration: td.expiration,
+            expiration: td.expiration.map(|e| (e, td.exact_expiry.unwrap())),
             transport_endpoints,
         }
     }