diff --git a/examples/finnegans_wake_demo/finnegans-wake-demo-l2.py b/examples/finnegans_wake_demo/finnegans-wake-demo-l2.py index 75b61d471..98bd5ef7a 100644 --- a/examples/finnegans_wake_demo/finnegans-wake-demo-l2.py +++ b/examples/finnegans_wake_demo/finnegans-wake-demo-l2.py @@ -63,7 +63,7 @@ print("\n************** Setup **************\n") # NuCypher Network # #################### -L1_NETWORK = 'mainnet' # or 'ibex' +L1_NETWORK = 'mainnet' # or 'tapir' L2_NETWORK = 'polygon' # or 'mumbai' ##################### diff --git a/examples/heartbeat_demo/alicia.py b/examples/heartbeat_demo/alicia.py index cf8061d74..b152aba47 100644 --- a/examples/heartbeat_demo/alicia.py +++ b/examples/heartbeat_demo/alicia.py @@ -58,7 +58,7 @@ try: except KeyError: raise RuntimeError('Missing environment variables to run demo.') -L1_NETWORK = 'mainnet' # 'ibex' +L1_NETWORK = 'mainnet' # 'tapir' L2_NETWORK = 'polygon' # 'mumbai' diff --git a/examples/heartbeat_demo/doctor.py b/examples/heartbeat_demo/doctor.py index 7b66066b8..f130de16b 100644 --- a/examples/heartbeat_demo/doctor.py +++ b/examples/heartbeat_demo/doctor.py @@ -38,7 +38,7 @@ from nucypher.utilities.logging import GlobalLoggerSettings GlobalLoggerSettings.start_console_logging() -L1_NETWORK = 'mainnet' # 'ibex' +L1_NETWORK = 'mainnet' # 'tapir' # To create a Bob, we need the doctor's private keys previously generated. from doctor_keys import get_doctor_privkeys diff --git a/nucypher/blockchain/eth/networks.py b/nucypher/blockchain/eth/networks.py index 72d4d1d1a..d13bbe8fb 100644 --- a/nucypher/blockchain/eth/networks.py +++ b/nucypher/blockchain/eth/networks.py @@ -19,9 +19,7 @@ along with nucypher. If not, see . class NetworksInventory: # TODO: See #1564 MAINNET = "mainnet" - IBEX = "ibex" LYNX = "lynx" - ORYX = "oryx" ETH = "ethereum" TAPIR = "tapir" @@ -34,8 +32,6 @@ class NetworksInventory: # TODO: See #1564 __to_chain_id_eth = { MAINNET: 1, # Ethereum Mainnet - ORYX: 3, # Ropsten - IBEX: 4, # Rinkeby LYNX: 5, # Goerli TAPIR: 5, # Goerli } diff --git a/nucypher/network/nodes.py b/nucypher/network/nodes.py index 73ab5b16d..b5a25b77f 100644 --- a/nucypher/network/nodes.py +++ b/nucypher/network/nodes.py @@ -68,8 +68,6 @@ TEACHER_NODES = { ), NetworksInventory.LYNX: ("https://lynx.nucypher.network:9151",), NetworksInventory.TAPIR: ("https://tapir.nucypher.network:9151",), - NetworksInventory.IBEX: ("https://ibex.nucypher.network:9151",), - NetworksInventory.ORYX: ("https://oryx.nucypher.network:9151",), } diff --git a/scripts/hooks/nucypher_agents.py b/scripts/hooks/nucypher_agents.py index 9323768b9..2b5509940 100644 --- a/scripts/hooks/nucypher_agents.py +++ b/scripts/hooks/nucypher_agents.py @@ -51,7 +51,7 @@ except IndexError: try: network = sys.argv[1] except IndexError: - network = "ibex" + network = "tapir" BlockchainInterfaceFactory.initialize_interface(eth_provider_uri=eth_provider_uri, light=False, emitter=emitter) blockchain = BlockchainInterfaceFactory.get_interface(eth_provider_uri=eth_provider_uri) diff --git a/tests/metrics/grant_availability.py b/tests/metrics/grant_availability.py index 4332c3064..1d542fb02 100755 --- a/tests/metrics/grant_availability.py +++ b/tests/metrics/grant_availability.py @@ -69,7 +69,7 @@ except KeyError: raise RuntimeError(message) # Alice Configuration -DOMAIN: str = 'mainnet' # ibex +DOMAIN: str = 'mainnet' # tapir DEFAULT_SEEDNODE_URIS: List[str] = [ *TEACHER_NODES[DOMAIN], ]