Skip to content

Commit

Permalink
Verify sign
Browse files Browse the repository at this point in the history
  • Loading branch information
@shahthepro
shahthepro committed Apr 9, 2024
1 parent bdbbb57 commit a9ca8e9
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 88 deletions.
28 changes: 14 additions & 14 deletions tests/oeth/test_oeth_curve_swap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,27 @@
"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,
Web3.to_wei(1, "ether"),
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,
Web3.to_wei(1, "ether"),
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"),
Expand All @@ -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"),
Expand All @@ -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"),
Expand All @@ -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"),
Expand All @@ -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"),
Expand All @@ -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)
run_test(contract_curve_router, data, backend, firmware, navigator, test_name, wallet_addr)
20 changes: 10 additions & 10 deletions tests/oeth/test_oeth_vault.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
16 changes: 8 additions & 8 deletions tests/oeth/test_oeth_wrap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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)
7 changes: 4 additions & 3 deletions tests/oeth/test_zapper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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)
30 changes: 18 additions & 12 deletions tests/ousd/test_flipper.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
])
Expand All @@ -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")
])
Expand All @@ -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"),
])
Expand All @@ -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")
])
Expand All @@ -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")
])
Expand All @@ -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")
])
Expand All @@ -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
)
24 changes: 12 additions & 12 deletions tests/ousd/test_ousd_curve_swap.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,62 +6,62 @@
"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,
Web3.to_wei(10000, "ether"),
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,
Web3.to_wei(10000, "ether"),
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,
Web3.to_wei(10000, "mwei"),
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,
Web3.to_wei(10000, "ether"),
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,
Web3.to_wei(10000, "mwei"),
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,
Web3.to_wei(10000, "ether"),
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)
Loading

0 comments on commit a9ca8e9

Please sign in to comment.