diff --git a/migration/src/m20230608_071249_init_db.rs b/migration/src/m20230608_071249_init_db.rs index 0b628e8..872cc54 100644 --- 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 index a4a6e31..9c9ba15 100644 --- a/src/wallet/offline.rs +++ b/src/wallet/offline.rs @@ -997,8 +997,12 @@ pub struct Transfer { pub receive_utxo: Option, /// Change UTXO of an outgoing transfer pub change_utxo: Option, - /// Expiration of the transfer - pub expiration: Option, + // before to branch issue37 + /// Expiration of the transfer + //pub expiration: Option, + // 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, }