swap: fixed validation of subtransactions

kabilovtoha · Jul 19, 2019 · dc2ba64 · dc2ba64
1 parent 04b244a
commit dc2ba64
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/wallet/swaps/swap_transaction.cpp b/wallet/swaps/swap_transaction.cpp
@@ -781,6 +781,7 @@ namespace beam::wallet
             auto transaction = lockTxBuilder->CreateTransaction();
             TxBase::Context::Params pars;
             TxBase::Context context(pars);
+            context.m_Height.m_Min = lockTxBuilder->GetMinHeight();
             if (!transaction->IsValid(context))
             {
                 OnSubTxFailed(TxFailureReason::InvalidTransaction, SubTxIndex::BEAM_LOCK_TX, true);
@@ -931,6 +932,7 @@ namespace beam::wallet
             auto transaction = builder.CreateTransaction();
             TxBase::Context::Params pars;
             TxBase::Context context(pars);
+            context.m_Height.m_Min = builder.GetMinHeight();
             if (!transaction->IsValid(context))
             {
                 OnSubTxFailed(TxFailureReason::InvalidTransaction, subTxID, true);

diff --git a/wallet/unittests/swap_test.cpp b/wallet/unittests/swap_test.cpp
@@ -127,7 +127,7 @@ namespace
     }
 }
 
-void TestSwapTransaction(bool isBeamOwnerStart)
+void TestSwapTransaction(bool isBeamOwnerStart, beam::Height fork1Height)
 {
     cout << "\nTesting atomic swap transaction...\n";
 
@@ -181,7 +181,7 @@ void TestSwapTransaction(bool isBeamOwnerStart)
     NodeObserver observer([&]()
     {
         auto cursor = node.get_Processor().m_Cursor;
-        if (cursor.m_Sid.m_Height == 5)
+        if (cursor.m_Sid.m_Height == fork1Height + 5)
         {
             if (isBeamOwnerStart)
             {
@@ -747,9 +747,11 @@ int main()
     auto logger = beam::Logger::create(logLevel, logLevel);
     Rules::get().FakePoW = true;
     Rules::get().UpdateChecksum();
+    beam::Height fork1Height = 10;
+    Rules::get().pForks[1].m_Height = fork1Height;
 
-    TestSwapTransaction(true);
-    TestSwapTransaction(false);
+    TestSwapTransaction(true, fork1Height);
+    TestSwapTransaction(false, fork1Height);
     TestSwapTransactionWithoutChange(true);
 
     TestSwapBTCRefundTransaction();