diff --git a/erc20/bridge/contracts/foreign_tokenreg.py b/erc20/bridge/contracts/foreign_tokenreg.py index e4ad81f..7ef8f0c 100755 --- a/erc20/bridge/contracts/foreign_tokenreg.py +++ b/erc20/bridge/contracts/foreign_tokenreg.py @@ -15,8 +15,8 @@ try: except: sys.exit(1) -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) _IPC_file = bridge_config['foreign']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/bridge/contracts/get_block_deployed.py b/erc20/bridge/contracts/get_block_deployed.py index 1238ee3..8b87002 100755 --- a/erc20/bridge/contracts/get_block_deployed.py +++ b/erc20/bridge/contracts/get_block_deployed.py @@ -8,8 +8,14 @@ import sys _contractName='ForeignBridge' _abiFile=_contractName+".abi" -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +test_env_db = '/home/koal/parity/bridge/test_env_db.toml' +try: + test_env = load(test_env_db) +except: + sys.exit(1) + +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) def getBlockNumber(_chain): IPC_file = bridge_config[_chain]['ipc'] diff --git a/erc20/bridge/contracts/home_deposit.py b/erc20/bridge/contracts/home_deposit.py index cd379f0..b7c8c92 100755 --- a/erc20/bridge/contracts/home_deposit.py +++ b/erc20/bridge/contracts/home_deposit.py @@ -13,8 +13,8 @@ try: except: sys.exit(1) -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) _IPC_file = bridge_config['home']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/bridge/token/token_balance.py b/erc20/bridge/token/token_balance.py index ac841d8..cfd766d 100755 --- a/erc20/bridge/token/token_balance.py +++ b/erc20/bridge/token/token_balance.py @@ -15,8 +15,8 @@ try: except: sys.exit(1) -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) _IPC_file = bridge_config['foreign']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/bridge/token/token_foreign.py b/erc20/bridge/token/token_foreign.py index 91d949b..fc3d3e0 100755 --- a/erc20/bridge/token/token_foreign.py +++ b/erc20/bridge/token/token_foreign.py @@ -15,10 +15,10 @@ test_env_db = '/home/koal/parity/bridge/test_env_db.toml' try: test_env = load(test_env_db) except: - test_env = {} + sys.exit(1) -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) _IPC_file = bridge_config['foreign']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/bridge/token/token_withdraw.py b/erc20/bridge/token/token_withdraw.py index 21838eb..59a01c4 100755 --- a/erc20/bridge/token/token_withdraw.py +++ b/erc20/bridge/token/token_withdraw.py @@ -16,8 +16,8 @@ try: except: sys.exit(1) -bridge_config = load('/home/koal/parity/bridge/erc20.toml') -bridge_db = load('/home/koal/parity/bridge/erc20_db.toml') +bridge_config = load(test_env['bridge_config']) +bridge_db = load(test_env['bridge_db']) _IPC_file = bridge_config['foreign']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/get_balance_home_ipc.py b/erc20/get_balance_home_ipc.py index 3384cfe..fef6961 100755 --- a/erc20/get_balance_home_ipc.py +++ b/erc20/get_balance_home_ipc.py @@ -1,9 +1,19 @@ #!/opt/anaconda3/bin/python from web3 import Web3 -#from web3.utils.transactions import wait_for_transaction_receipt +from toml import load +import sys -web3 = Web3(Web3.IPCProvider('/home/koal/parity/PoA_home/jsonrpc.ipc')) +test_env_db = '/home/koal/parity/bridge/test_env_db.toml' +try: + test_env = load(test_env_db) +except: + sys.exit(1) + +bridge_config = load(test_env['bridge_config']) + +IPC_file = bridge_config['home']['ipc'] +web3 = Web3(Web3.IPCProvider(IPC_file)) signer = web3.toChecksumAddress("0x842eb2142c5aa1260954f07aae39ddee1640c3a7") sender = web3.toChecksumAddress("0x37a30534da3d53aa1867adde26e114a3161b2b12") diff --git a/erc20/get_transaction_home.py b/erc20/get_transaction_home.py index 1d36940..34b5935 100755 --- a/erc20/get_transaction_home.py +++ b/erc20/get_transaction_home.py @@ -7,7 +7,13 @@ import json import sys import hexbytes -bridge_config = load('/home/koal/parity/bridge/erc20.toml') +test_env_db = '/home/koal/parity/bridge/test_env_db.toml' +try: + test_env = load(test_env_db) +except: + sys.exit(1) + +bridge_config = load(test_env['bridge_config']) _IPC_file = bridge_config['home']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file)) diff --git a/erc20/get_transaction_receipt_home.py b/erc20/get_transaction_receipt_home.py index ef7b275..dd38830 100755 --- a/erc20/get_transaction_receipt_home.py +++ b/erc20/get_transaction_receipt_home.py @@ -7,7 +7,13 @@ import json import sys import hexbytes -bridge_config = load('/home/koal/parity/bridge/erc20.toml') +test_env_db = '/home/koal/parity/bridge/test_env_db.toml' +try: + test_env = load(test_env_db) +except: + sys.exit(1) + +bridge_config = load(test_env['bridge_config']) _IPC_file = bridge_config['home']['ipc'] web3 = Web3(Web3.IPCProvider(_IPC_file))