diff --git a/tests/oeth/test_oeth_curve_swap.py b/tests/oeth/test_oeth_curve_swap.py index e3443817..909258fb 100644 --- a/tests/oeth/test_oeth_curve_swap.py +++ b/tests/oeth/test_oeth_curve_swap.py @@ -11,7 +11,7 @@ "curve-router" ) -def test_oeth_curve_swap_from_oeth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_from_oeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange", [ 1, 0, @@ -19,9 +19,9 @@ def test_oeth_curve_swap_from_oeth(backend, firmware, navigator, test_name): Web3.to_wei(0.975, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_to_oeth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_to_oeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange", [ 0, 1, @@ -29,9 +29,9 @@ def test_oeth_curve_swap_to_oeth(backend, firmware, navigator, test_name): Web3.to_wei(0.995, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_multiple_oeth_to_reth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_multiple_oeth_to_reth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_router.encodeABI("exchange_multiple", [ [ bytes.fromhex("856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3"), @@ -54,9 +54,9 @@ def test_oeth_curve_swap_multiple_oeth_to_reth(backend, firmware, navigator, tes Web3.to_wei(0.941, "ether"), ]) - run_test(contract_curve_router, data, backend, firmware, navigator, test_name) + run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_multiple_reth_to_oeth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_multiple_reth_to_oeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_router.encodeABI("exchange_multiple", [ [ bytes.fromhex("ae78736cd615f374d3085123a210448e74fc6393"), @@ -79,9 +79,9 @@ def test_oeth_curve_swap_multiple_reth_to_oeth(backend, firmware, navigator, tes Web3.to_wei(0.941, "ether"), ]) - run_test(contract_curve_router, data, backend, firmware, navigator, test_name) + run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_multiple_eth_to_oeth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_multiple_eth_to_oeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_router.encodeABI("exchange_multiple", [ [ bytes.fromhex("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"), @@ -104,9 +104,9 @@ def test_oeth_curve_swap_multiple_eth_to_oeth(backend, firmware, navigator, test Web3.to_wei(0.941, "ether"), ]) - run_test(contract_curve_router, data, backend, firmware, navigator, test_name) + run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_multiple_oeth_to_eth(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_multiple_oeth_to_eth(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_router.encodeABI("exchange_multiple", [ [ bytes.fromhex("856c4Efb76C1D1AE02e20CEB03A2A6a08b0b8dC3"), @@ -129,9 +129,9 @@ def test_oeth_curve_swap_multiple_oeth_to_eth(backend, firmware, navigator, test Web3.to_wei(0.941, "ether"), ]) - run_test(contract_curve_router, data, backend, firmware, navigator, test_name) + run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_curve_swap_multiple_eth_to_oeth_diff_route(backend, firmware, navigator, test_name): +def test_oeth_curve_swap_multiple_eth_to_oeth_diff_route(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_router.encodeABI("exchange_multiple", [ [ bytes.fromhex("eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"), @@ -154,4 +154,4 @@ def test_oeth_curve_swap_multiple_eth_to_oeth_diff_route(backend, firmware, navi Web3.to_wei(0.941, "ether"), ]) - run_test(contract_curve_router, data, backend, firmware, navigator, test_name) \ No newline at end of file + run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr) \ No newline at end of file diff --git a/tests/oeth/test_oeth_vault.py b/tests/oeth/test_oeth_vault.py index 1d118d16..136a6f89 100644 --- a/tests/oeth/test_oeth_vault.py +++ b/tests/oeth/test_oeth_vault.py @@ -6,46 +6,46 @@ "vault-core" ) -def test_oeth_vault_mint_weth(backend, firmware, navigator, test_name): +def test_oeth_vault_mint_weth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_vault.encodeABI("mint", [ bytes.fromhex("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"), Web3.to_wei(1, "ether"), Web3.to_wei(1, "ether") ]) - run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_vault_mint_reth(backend, firmware, navigator, test_name): +def test_oeth_vault_mint_reth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_vault.encodeABI("mint", [ bytes.fromhex("ae78736cd615f374d3085123a210448e74fc6393"), Web3.to_wei(1, "ether"), Web3.to_wei(1, "ether") ]) - run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_vault_mint_steth(backend, firmware, navigator, test_name): +def test_oeth_vault_mint_steth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_vault.encodeABI("mint", [ bytes.fromhex("ae7ab96520de3a18e5e111b5eaab095312d7fe84"), Web3.to_wei(1, "ether"), Web3.to_wei(1, "ether") ]) - run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_vault_mint_frxeth(backend, firmware, navigator, test_name): +def test_oeth_vault_mint_frxeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_vault.encodeABI("mint", [ bytes.fromhex("5e8422345238f34275888049021821e8e08caa1f"), Web3.to_wei(1, "ether"), Web3.to_wei(1, "ether") ]) - run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_vault_redeem(backend, firmware, navigator, test_name): +def test_oeth_vault_redeem(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_vault.encodeABI("redeem", [ Web3.to_wei(1, "ether"), Web3.to_wei(0.88, "ether") ]) - run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_vault, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/oeth/test_oeth_wrap.py b/tests/oeth/test_oeth_wrap.py index c9bf6a37..eb402dd5 100644 --- a/tests/oeth/test_oeth_wrap.py +++ b/tests/oeth/test_oeth_wrap.py @@ -9,7 +9,7 @@ "4626-vault" ) -def test_oeth_wrap(backend, firmware, navigator, test_name): +def test_oeth_wrap(backend, firmware, navigator, test_name, wallet_addr): client = EthAppClient(backend) with client.get_public_addr(display=False): @@ -21,17 +21,17 @@ def test_oeth_wrap(backend, firmware, navigator, test_name): addr ]) - run_test(contract_woeth, data, backend, firmware, navigator, test_name) + run_test(contract_woeth, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_wrap_different_beneficiary(backend, firmware, navigator, test_name): +def test_oeth_wrap_different_beneficiary(backend, firmware, navigator, test_name, wallet_addr): data = contract_woeth.encodeABI("deposit", [ Web3.to_wei(1, "ether"), bytes.fromhex("000000000000000000000000000000000000dEaD") ]) - run_test(contract_woeth, data, backend, firmware, navigator, test_name) + run_test(contract_woeth, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_unwrap(backend, firmware, navigator, test_name): +def test_oeth_unwrap(backend, firmware, navigator, test_name, wallet_addr): client = EthAppClient(backend) with client.get_public_addr(display=False): @@ -44,13 +44,13 @@ def test_oeth_unwrap(backend, firmware, navigator, test_name): addr ]) - run_test(contract_woeth, data, backend, firmware, navigator, test_name) + run_test(contract_woeth, data, backend, firmware, navigator, test_name, wallet_addr) -def test_oeth_unwrap_different_beneficiary(backend, firmware, navigator, test_name): +def test_oeth_unwrap_different_beneficiary(backend, firmware, navigator, test_name, wallet_addr): data = contract_woeth.encodeABI("redeem", [ Web3.to_wei(1, "ether"), bytes.fromhex("000000000000000000000000000000000000dEaD"), bytes.fromhex("000000000000000000000000000000000002dEaD") ]) - run_test(contract_woeth, data, backend, firmware, navigator, test_name) + run_test(contract_woeth, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/oeth/test_zapper.py b/tests/oeth/test_zapper.py index 794e2f5b..8a6fe44c 100644 --- a/tests/oeth/test_zapper.py +++ b/tests/oeth/test_zapper.py @@ -6,7 +6,7 @@ "zapper" ) -def test_oeth_zapper_deposit_eth(backend, firmware, navigator, test_name): +def test_oeth_zapper_deposit_eth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_zapper.encodeABI("deposit", []) run_test( @@ -16,13 +16,14 @@ def test_oeth_zapper_deposit_eth(backend, firmware, navigator, test_name): firmware, navigator, test_name, + wallet_addr, value=Web3.to_wei(1, "ether") ) -def test_oeth_zapper_deposit_sfrxeth(backend, firmware, navigator, test_name): +def test_oeth_zapper_deposit_sfrxeth(backend, firmware, navigator, test_name, wallet_addr): data = contract_oeth_zapper.encodeABI("depositSFRXETH", [ Web3.to_wei(1, "ether"), Web3.to_wei(0.991, "ether") ]) - run_test(contract_oeth_zapper, data, backend, firmware, navigator, test_name) + run_test(contract_oeth_zapper, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/ousd/test_flipper.py b/tests/ousd/test_flipper.py index 14c0c668..9dbed613 100644 --- a/tests/ousd/test_flipper.py +++ b/tests/ousd/test_flipper.py @@ -6,7 +6,7 @@ "flipper" ) -def test_ousd_flipper_flip_with_usdc(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_with_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("buyOusdWithUsdc", [ Web3.to_wei(10000, "ether") ]) @@ -17,10 +17,11 @@ def test_ousd_flipper_flip_with_usdc(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_flipper_flip_to_usdc(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_to_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("sellOusdForUsdc", [ Web3.to_wei(10000, "ether") ]) @@ -31,10 +32,11 @@ def test_ousd_flipper_flip_to_usdc(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_flipper_flip_with_usdt(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_with_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("buyOusdWithUsdt", [ Web3.to_wei(10000, "ether"), ]) @@ -45,10 +47,11 @@ def test_ousd_flipper_flip_with_usdt(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_flipper_flip_to_usdt(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_to_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("sellOusdForUsdt", [ Web3.to_wei(10000, "ether") ]) @@ -59,10 +62,11 @@ def test_ousd_flipper_flip_to_usdt(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_flipper_flip_with_dai(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_with_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("buyOusdWithDai", [ Web3.to_wei(10000, "ether") ]) @@ -73,10 +77,11 @@ def test_ousd_flipper_flip_with_dai(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_flipper_flip_to_dai(backend, firmware, navigator, test_name): +def test_ousd_flipper_flip_to_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_flipper.encodeABI("sellOusdForDai", [ Web3.to_wei(10000, "ether") ]) @@ -87,5 +92,6 @@ def test_ousd_flipper_flip_to_dai(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) diff --git a/tests/ousd/test_ousd_curve_swap.py b/tests/ousd/test_ousd_curve_swap.py index 1108ea37..a67ce759 100644 --- a/tests/ousd/test_ousd_curve_swap.py +++ b/tests/ousd/test_ousd_curve_swap.py @@ -6,7 +6,7 @@ "ousd-curve-pool" ) -def test_ousd_curve_swap_from_dai(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_from_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 1, 0, @@ -14,9 +14,9 @@ def test_ousd_curve_swap_from_dai(backend, firmware, navigator, test_name): Web3.to_wei(9750, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_curve_swap_to_dai(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_to_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 0, 1, @@ -24,9 +24,9 @@ def test_ousd_curve_swap_to_dai(backend, firmware, navigator, test_name): Web3.to_wei(9750, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_curve_swap_from_usdt(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_from_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 3, 0, @@ -34,9 +34,9 @@ def test_ousd_curve_swap_from_usdt(backend, firmware, navigator, test_name): Web3.to_wei(9750, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_curve_swap_to_usdt(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_to_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 0, 3, @@ -44,9 +44,9 @@ def test_ousd_curve_swap_to_usdt(backend, firmware, navigator, test_name): Web3.to_wei(9750, "mwei") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_curve_swap_from_usdc(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_from_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 2, 0, @@ -54,9 +54,9 @@ def test_ousd_curve_swap_from_usdc(backend, firmware, navigator, test_name): Web3.to_wei(9750, "ether") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_curve_swap_to_usdc(backend, firmware, navigator, test_name): +def test_ousd_curve_swap_to_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_curve_pool.encodeABI("exchange_underlying", [ 0, 2, @@ -64,4 +64,4 @@ def test_ousd_curve_swap_to_usdc(backend, firmware, navigator, test_name): Web3.to_wei(9750, "mwei") ]) - run_test(contract_curve_pool, data, backend, firmware, navigator, test_name) + run_test(contract_curve_pool, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/ousd/test_ousd_univ3.py b/tests/ousd/test_ousd_univ3.py index af7801bb..458f5b46 100644 --- a/tests/ousd/test_ousd_univ3.py +++ b/tests/ousd/test_ousd_univ3.py @@ -6,7 +6,7 @@ "uniswap-v3" ) -def test_ousd_univ3_swap_to_usdc(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_to_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInput", [ [ bytes.fromhex("2a8e1e676ec238d8a992307b495b45b3feaa5e860001f4dac17f958d2ee523a2206206994597c13d831ec7000064a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"), @@ -23,10 +23,11 @@ def test_ousd_univ3_swap_to_usdc(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_univ3_swap_from_usdc(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_from_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInput", [ [ bytes.fromhex("a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480001f46b175474e89094c44da98b954eedeac495271d0f0001f42a8e1e676ec238d8a992307b495b45b3feaa5e86"), @@ -43,10 +44,11 @@ def test_ousd_univ3_swap_from_usdc(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_univ3_swap_to_usdt(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_to_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInputSingle", [ [ bytes.fromhex("2a8e1e676ec238d8a992307b495b45b3feaa5e86"), @@ -66,10 +68,11 @@ def test_ousd_univ3_swap_to_usdt(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_univ3_swap_from_usdt(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_from_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInputSingle", [ [ bytes.fromhex("dac17f958d2ee523a2206206994597c13d831ec7"), @@ -89,10 +92,11 @@ def test_ousd_univ3_swap_from_usdt(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_univ3_swap_to_dai(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_to_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInput", [ [ bytes.fromhex("2a8e1e676ec238d8a992307b495b45b3feaa5e860001f4dac17f958d2ee523a2206206994597c13d831ec70000646b175474e89094c44da98b954eedeac495271d0f"), @@ -109,10 +113,11 @@ def test_ousd_univ3_swap_to_dai(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) -def test_ousd_univ3_swap_from_dai(backend, firmware, navigator, test_name): +def test_ousd_univ3_swap_from_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_univ3_router.encodeABI("exactInput", [ [ bytes.fromhex("6b175474e89094c44da98b954eedeac495271d0f0001f46b175474e89094c44da98b954eedeac495271d0f0001f42a8e1e676ec238d8a992307b495b45b3feaa5e86"), @@ -129,5 +134,6 @@ def test_ousd_univ3_swap_from_dai(backend, firmware, navigator, test_name): backend, firmware, navigator, - test_name + test_name, + wallet_addr ) \ No newline at end of file diff --git a/tests/ousd/test_ousd_vault.py b/tests/ousd/test_ousd_vault.py index cabdd6ef..77df2249 100644 --- a/tests/ousd/test_ousd_vault.py +++ b/tests/ousd/test_ousd_vault.py @@ -6,37 +6,37 @@ "vault-core" ) -def test_ousd_vault_mint_dai(backend, firmware, navigator, test_name): +def test_ousd_vault_mint_dai(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_vault.encodeABI("mint", [ bytes.fromhex("6b175474e89094c44da98b954eedeac495271d0f"), Web3.to_wei(10000, "ether"), Web3.to_wei(9500, "ether") ]) - run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name) + run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_vault_mint_usdc(backend, firmware, navigator, test_name): +def test_ousd_vault_mint_usdc(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_vault.encodeABI("mint", [ bytes.fromhex("a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"), Web3.to_wei(10000, "mwei"), Web3.to_wei(9500, "ether") ]) - run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name) + run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_vault_mint_usdt(backend, firmware, navigator, test_name): +def test_ousd_vault_mint_usdt(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_vault.encodeABI("mint", [ bytes.fromhex("dac17f958d2ee523a2206206994597c13d831ec7"), Web3.to_wei(10000, "mwei"), Web3.to_wei(9500, "ether") ]) - run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name) + run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_vault_redeem(backend, firmware, navigator, test_name): +def test_ousd_vault_redeem(backend, firmware, navigator, test_name, wallet_addr): data = contract_ousd_vault.encodeABI("redeem", [ Web3.to_wei(10000, "ether"), Web3.to_wei(9088, "ether") ]) - run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name) + run_test(contract_ousd_vault, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/ousd/test_ousd_wrap.py b/tests/ousd/test_ousd_wrap.py index a6dec836..b92960f2 100644 --- a/tests/ousd/test_ousd_wrap.py +++ b/tests/ousd/test_ousd_wrap.py @@ -9,7 +9,7 @@ "4626-vault" ) -def test_ousd_wrap(backend, firmware, navigator, test_name): +def test_ousd_wrap(backend, firmware, navigator, test_name, wallet_addr): client = EthAppClient(backend) with client.get_public_addr(display=False): @@ -21,17 +21,17 @@ def test_ousd_wrap(backend, firmware, navigator, test_name): addr ]) - run_test(contract_wousd, data, backend, firmware, navigator, test_name) + run_test(contract_wousd, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_wrap_different_beneficiary(backend, firmware, navigator, test_name): +def test_ousd_wrap_different_beneficiary(backend, firmware, navigator, test_name, wallet_addr): data = contract_wousd.encodeABI("deposit", [ Web3.to_wei(1, "ether"), bytes.fromhex("000000000000000000000000000000000000dEaD") ]) - run_test(contract_wousd, data, backend, firmware, navigator, test_name) + run_test(contract_wousd, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_unwrap(backend, firmware, navigator, test_name): +def test_ousd_unwrap(backend, firmware, navigator, test_name, wallet_addr): client = EthAppClient(backend) with client.get_public_addr(display=False): @@ -44,13 +44,13 @@ def test_ousd_unwrap(backend, firmware, navigator, test_name): addr ]) - run_test(contract_wousd, data, backend, firmware, navigator, test_name) + run_test(contract_wousd, data, backend, firmware, navigator, test_name, wallet_addr) -def test_ousd_unwrap_different_beneficiary(backend, firmware, navigator, test_name): +def test_ousd_unwrap_different_beneficiary(backend, firmware, navigator, test_name, wallet_addr): data = contract_wousd.encodeABI("redeem", [ Web3.to_wei(1, "ether"), bytes.fromhex("000000000000000000000000000000000000dEaD"), bytes.fromhex("000000000000000000000000000000000002dEaD") ]) - run_test(contract_wousd, data, backend, firmware, navigator, test_name) + run_test(contract_wousd, data, backend, firmware, navigator, test_name, wallet_addr) diff --git a/tests/utils.py b/tests/utils.py index f217088b..682b38d2 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -54,7 +54,7 @@ def load_contract(address, abi_file): ) ) -def run_test(contract, data, backend, firmware, navigator, test_name, value=0, gas=300000): +def run_test(contract, data, backend, firmware, navigator, test_name, wallet_addr, value=0, gas=300000): client = EthAppClient(backend) # first setup the external plugin @@ -87,6 +87,10 @@ def run_test(contract, data, backend, firmware, navigator, test_name, value=0, g "Hold to sign", ROOT_SCREENSHOT_PATH, test_name) + # verify signature + vrs = ResponseParser.signature(client.response().data) + addr = recover_transaction(tx_params, vrs) + assert addr == wallet_addr.get() class WalletAddr: client: EthAppClient