Move files for relayers

SecretSaturn · Sep 20, 2024 · e39896e · e39896e
1 parent d95c9dc
commit e39896e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/TNLS-Gateways/public-gateway/script/ChangeAdmin.s.sol b/TNLS-Gateways/public-gateway/script/ChangeAdmin.s.sol
@@ -15,7 +15,7 @@ contract ChangeAdmin is Script {
         vm.startBroadcast();
 
         // Initialize the ProxyAdmin
-        gatewayProxyAdmin = ProxyAdmin(0xb352D4449dC7355d4478784027d7AfAe69843085);
+        gatewayProxyAdmin = ProxyAdmin(0x59D8C9591dB7179c5d592c5bCD42694021885aFC);
 
         // Get the current owner of the ProxyAdmin
         address currentOwner = gatewayProxyAdmin.owner();

diff --git a/TNLS-Gateways/public-gateway/script/UpgradeScript.s.sol b/TNLS-Gateways/public-gateway/script/UpgradeScript.s.sol
@@ -22,8 +22,8 @@ contract UpgradeScript is Script {
         newGatewayLogic = new Gateway(address(0x0));
         //newGatewayLogic = Gateway(0x59D8C9591dB7179c5d592c5bCD42694021885aFC);
 
-        transparentProxy = ITransparentUpgradeableProxy(0x3879E146140b627a5C858a08e507B171D9E43139);
-        gatewayProxyAdmin = ProxyAdmin(0x38476c18226C98C821eE1DFc368D49691d44cE68);
+        transparentProxy = ITransparentUpgradeableProxy(0x874303B788c8A13a39EFA38ab6C3b77cd4578129);
+        gatewayProxyAdmin = ProxyAdmin(0xd3C10BA03470fbD905046705824DeB047B8aAB54);
 
         bytes memory selector = abi.encodeWithSelector(Gateway.upgradeHandler.selector);
         gatewayProxyAdmin.upgradeAndCall(transparentProxy, address(newGatewayLogic),selector);

diff --git a/TNLS-Relayers/base_interface.py b/TNLS-Relayers/base_interface.py
@@ -5,8 +5,9 @@
 from yaml import safe_load
 from pathlib import Path
 
-with open(f'{Path(__file__).parent.absolute()}/../config.yml') as f:
+with open(f'{Path(__file__).parent.absolute()}/config.yml') as f:
     data = safe_load(f)
+
 eth_chains = [info['chain_id'] for key, info in data.items() if info['type'] == 'evm']
 solana_chains = [info['chain_id'] for key, info in data.items() if info['type'] == 'solana']
 scrt_chains = [info['chain_id'] for key, info in data.items() if info['type'] == 'secret']

diff --git a/config.yml → TNLS-Relayers/config.yml b/config.yml → TNLS-Relayers/config.yml
@@ -317,14 +317,6 @@
   contract_address: "0x8EaAB5e8551781F3E8eb745E7fcc7DAeEFd27b1f"
   timeout: 1
 
-"8008135": #Fhenix Helium
-  active: false
-  type: "evm"
-  chain_id: "8008135"
-  api_endpoint: "https://api.helium.fhenix.zone"
-  contract_address: "0x59D8C9591dB7179c5d592c5bCD42694021885aFC"
-  timeout: 1
-
 "1287": #Moonbase Alpha
   active: false
   type: "evm"

diff --git a/TNLS-Relayers/web_app.py b/TNLS-Relayers/web_app.py
@@ -14,7 +14,7 @@
 from dotenv import load_dotenv
 
 load_dotenv()
-with open('Gateway.json', 'r') as file:
+with open(f'{Path(__file__).parent.absolute()}/gateway.json', 'r') as file:
     eth_contract_schema = json.load(file)
 
 
@@ -220,7 +220,7 @@ def keys():
     return str(current_app.config['KEYS'])
 
 
-def app_factory(config_filename=f'{Path(__file__).parent.absolute()}/../config.yml',
+def app_factory(config_filename=f'{Path(__file__).parent.absolute()}/config.yml',
                 config_file_converter=generate_full_config, num_loops=None):
     """
     Creates a Flask app with a relayer running on the backend
@@ -245,5 +245,5 @@ def app_factory(config_filename=f'{Path(__file__).parent.absolute()}/../config.y
 
 
 if __name__ == '__main__':
-    app = app_factory(f'{Path(__file__).parent.absolute()}/../config.yml')
+    app = app_factory(f'{Path(__file__).parent.absolute()}/config.yml')
     app.run()