block nonce

omgnetwork · Jan 26, 2021 · 17d7bb9 · 17d7bb9
1 parent ebb8f08
commit 17d7bb9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/apps/omg_watcher/lib/omg_watcher/exit_processor/exit_info.ex b/apps/omg_watcher/lib/omg_watcher/exit_processor/exit_info.ex
@@ -160,7 +160,7 @@ defmodule OMG.Watcher.ExitProcessor.ExitInfo do
   # `exitable` will be `false` if the exit was challenged
   # `exitable` will be `false` ALONG WITH the whole tuple holding zeroees, if the exit was processed successfully
   # **NOTE** one can only rely on the zero-nonzero of this data, since for processed exits this data will be all zeros
-  defp parse_contract_exit_status({exitable, _, _, _, _, _}), do: exitable
+  defp parse_contract_exit_status({exitable, _, _, _, _, _, _}), do: exitable
 
   # Based on the block number determines whether UTXO was created by a deposit.
   defguardp is_deposit(blknum, child_block_interval) when rem(blknum, child_block_interval) != 0

diff --git a/apps/omg_watcher/test/omg_watcher/integration/block_getter_2_test.exs b/apps/omg_watcher/test/omg_watcher/integration/block_getter_2_test.exs
@@ -27,6 +27,7 @@ defmodule OMG.Watcher.Integration.BlockGetter2Test do
 
   require OMG.Utxo
 
+  alias OMG.Eth.RootChain
   alias OMG.Eth.Support.BlockSubmission.Integration
   alias OMG.Watcher.BlockGetter
   alias OMG.Watcher.Event
@@ -93,7 +94,10 @@ defmodule OMG.Watcher.Integration.BlockGetter2Test do
     assert WatcherHelper.capture_log(fn ->
              # Here we're manually submitting invalid block to the root chain
              # THIS IS CHILDCHAIN CODE
-             {:ok, _} = Integration.submit_block(bad_block_hash, 2, 1)
+             gas_price = 1
+             nonce = RootChain.next_child_block() / 1000
+
+             {:ok, _} = Integration.submit_block(bad_block_hash, round(nonce - 1), gas_price)
 
              IntegrationTest.wait_for_byzantine_events(
                [%Event.InvalidExit{}.name, %Event.UnchallengedExit{}.name],

diff --git a/apps/omg_watcher/test/omg_watcher/integration/block_getter_3_test.exs b/apps/omg_watcher/test/omg_watcher/integration/block_getter_3_test.exs
@@ -85,8 +85,8 @@ defmodule OMG.Watcher.Integration.BlockGetter3Test do
   end
 
   defp get_next_blknum_nonce(blknum) do
-    child_block_interval = Application.fetch_env!(:omg_eth, :child_block_interval)
+    child_block_interval = 1000
     next_blknum = blknum + child_block_interval
-    {next_blknum, trunc(next_blknum / child_block_interval)}
+    {next_blknum, trunc(next_blknum / child_block_interval) - 1}
   end
 end
diff --git a/apps/omg_watcher/test/omg_watcher/integration/block_getter_4_test.exs b/apps/omg_watcher/test/omg_watcher/integration/block_getter_4_test.exs
@@ -74,7 +74,10 @@ defmodule OMG.Watcher.Integration.BlockGetter4Test do
 
     # checking if both machines and humans learn about the byzantine condition
     assert WatcherHelper.capture_log(fn ->
-             {:ok, _txhash} = Integration.submit_block(block_overclaiming_fees.hash, 1, 20_000_000_000)
+             gas_price = 20_000_000_000
+             nonce = RootChain.next_child_block() / 1000
+
+             {:ok, _txhash} = Integration.submit_block(block_overclaiming_fees.hash, round(nonce - 1), 20_000_000_000)
              IntegrationTest.wait_for_byzantine_events([%Event.InvalidBlock{}.name], @timeout)
            end) =~ inspect({:tx_execution, :claimed_and_collected_amounts_mismatch})
   end