get correct bond size

omgnetwork · Feb 2, 2021 · f9f2467 · f9f2467
1 parent 6024905
commit f9f2467
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -400,11 +400,11 @@ jobs:
             mix test test/omg_watcher/integration/invalid_exit_1_test.exs --include mix_based_child_chain
       - setup_childchain
       - run:
-          name: in_flight_exit_test_1_test.exs
+          name: in_flight_exit_test_3_test.exs
           environment:
             DOCKER_GETH: true
           command: |
-            mix test test/omg_watcher/integration/in_flight_exit_test_1_test.exs --include mix_based_child_chain
+            mix test test/omg_watcher/integration/in_flight_exit_test_3_test.exs --include mix_based_child_chain
       - setup_childchain
       - run:
           name: in_flight_exit_test_2_test.exs
@@ -414,11 +414,11 @@ jobs:
             mix test test/omg_watcher/integration/in_flight_exit_test_2_test.exs --include mix_based_child_chain
       - setup_childchain
       - run:
-          name: in_flight_exit_test_3_test.exs
+          name: in_flight_exit_test_1_test.exs
           environment:
             DOCKER_GETH: true
           command: |
-            mix test test/omg_watcher/integration/in_flight_exit_test_3_test.exs --include mix_based_child_chain
+            mix test test/omg_watcher/integration/in_flight_exit_test_1_test.exs --include mix_based_child_chain
       - setup_childchain
       - run:
           name: in_flight_exit_test_4_test.exs

diff --git a/apps/omg_eth/test/support/root_chain_helper.ex b/apps/omg_eth/test/support/root_chain_helper.ex
@@ -36,11 +36,10 @@ defmodule Support.RootChainHelper do
   @gas_start_in_flight_exit 1_500_000
   @gas_respond_to_non_canonical_challenge 1_000_000
   @gas_challenge_in_flight_exit_not_canonical 1_000_000
-  @gas_piggyback 2_000_000
+  @gas_piggyback 5_000_000
   # https://github.com/omgnetwork/plasma-contracts/blob/68e380dc36c2f9732f21da41c50ad0d527b8b11b/plasma_framework/contracts/src/exits/payment/routers/PaymentInFlightExitRouter.sol#L40
   @standard_exit_bond 23_300_000_000_000_000
   @ife_bond 26_900_000_000_000_000
-  @piggyback_bond 30_900_000_000_000_000
 
   @type in_flight_exit_piggybacked_event() :: %{owner: <<_::160>>, tx_hash: <<_::256>>, output_index: non_neg_integer}
 
@@ -65,7 +64,7 @@ defmodule Support.RootChainHelper do
     opts =
       @tx_defaults
       |> Keyword.put(:gas, @gas_piggyback)
-      |> Keyword.put(:value, @piggyback_bond)
+      |> Keyword.put(:value, get_piggyback_bond_size(Configuration.contracts().payment_exit_game))
 
     contract = from_hex(Configuration.contracts().payment_exit_game, :mixed)
     signature = "piggybackInFlightExitOnInput((bytes,uint16))"
@@ -78,7 +77,7 @@ defmodule Support.RootChainHelper do
     opts =
       @tx_defaults
       |> Keyword.put(:gas, @gas_piggyback)
-      |> Keyword.put(:value, @piggyback_bond)
+      |> Keyword.put(:value, get_piggyback_bond_size(Configuration.contracts().payment_exit_game))
 
     contract = from_hex(Configuration.contracts().payment_exit_game, :mixed)
 
@@ -277,4 +276,23 @@ defmodule Support.RootChainHelper do
 
     deposit_blknum
   end
+
+  defp get_piggyback_bond_size(exit_game_contract_address) do
+    data = ABI.encode("piggybackBondSize()", [])
+
+    {:ok, result} =
+      Ethereumex.HttpClient.eth_call(%{
+        from: exit_game_contract_address,
+        to: exit_game_contract_address,
+        data: to_hex(data)
+      })
+
+    piggyback_bond_size =
+      result
+      |> from_hex(:mixed)
+      |> ABI.TypeDecoder.decode([{:uint, 128}])
+      |> hd()
+
+    piggyback_bond_size
+  end
 end