From 858bdc71c3c2ee91f37e39c4ef2febecf1a57b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=BA=C3=B1ez?= Date: Mon, 8 Jun 2020 17:11:49 +0200 Subject: [PATCH] Reorganization of testnet registries --- MANIFEST.in | 1 + nucypher/blockchain/eth/contract_registry/README.md | 13 +++++++++++-- .../{ => historical}/cassandra/README.md | 0 .../cassandra/contract_registry.json | 0 .../{ => historical}/frances/README.md | 0 .../{ => historical}/frances/contract_registry.json | 0 .../{ => historical}/gemini/README.md | 0 .../{ => historical}/gemini/contract_registry.json | 0 .../{ => historical}/miranda/README.md | 0 .../{ => historical}/miranda/contract_registry.json | 0 .../miranda/individual_allocation_ABI.json | 0 nucypher/blockchain/eth/networks.py | 8 -------- nucypher/network/teachers.py | 3 +-- scripts/hooks/nucypher_agents.py | 2 +- 14 files changed, 14 insertions(+), 13 deletions(-) rename nucypher/blockchain/eth/contract_registry/{ => historical}/cassandra/README.md (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/cassandra/contract_registry.json (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/frances/README.md (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/frances/contract_registry.json (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/gemini/README.md (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/gemini/contract_registry.json (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/miranda/README.md (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/miranda/contract_registry.json (100%) rename nucypher/blockchain/eth/contract_registry/{ => historical}/miranda/individual_allocation_ABI.json (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 5b9fe6d0e..e31be9d2c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -9,5 +9,6 @@ recursive-exclude * __pycache__ global-exclude *.py[cod] recursive-include nucypher/blockchain/eth/contract_registry *.json *.md +prune nucypher/blockchain/eth/contract_registry/historical recursive-include nucypher/network/templates *.html *.j2 recursive-include nucypher/network/nicknames/ *json diff --git a/nucypher/blockchain/eth/contract_registry/README.md b/nucypher/blockchain/eth/contract_registry/README.md index 7d49b9314..0b78e4ece 100644 --- a/nucypher/blockchain/eth/contract_registry/README.md +++ b/nucypher/blockchain/eth/contract_registry/README.md @@ -3,8 +3,17 @@ This repo contains an authorative source of contract registries for several NuCypher networks. -* **Miranda**: Our first decentralized testnet. Not supported anymore. +## Current networks + +* **Mainnet**: (_Coming soon..._) +* **LTS**: Public long-term support testnet (_Coming soon... # TODO: Name this testnet_) +* **Ibex**: Internal testnet. Mainly for development purposes. You're free to join, but note that we may reboot this testnet without prior notice. + +## Historical networks + +Some networks that we used at some point in the past that are currently deprecated. + +* **Miranda**: Our first decentralized testnet. * **Frances**: Our second testnet. Only for development purposes. * **Cassandra**: Incentivized Testnet, supporting our 'Come and Stake It' initiative. * **Gemini**: New version of Incentivized Testnet, supporting Phase 4 of 'Come and Stake It'. -* **Mainnet**: (_Coming soon..._) diff --git a/nucypher/blockchain/eth/contract_registry/cassandra/README.md b/nucypher/blockchain/eth/contract_registry/historical/cassandra/README.md similarity index 100% rename from nucypher/blockchain/eth/contract_registry/cassandra/README.md rename to nucypher/blockchain/eth/contract_registry/historical/cassandra/README.md diff --git a/nucypher/blockchain/eth/contract_registry/cassandra/contract_registry.json b/nucypher/blockchain/eth/contract_registry/historical/cassandra/contract_registry.json similarity index 100% rename from nucypher/blockchain/eth/contract_registry/cassandra/contract_registry.json rename to nucypher/blockchain/eth/contract_registry/historical/cassandra/contract_registry.json diff --git a/nucypher/blockchain/eth/contract_registry/frances/README.md b/nucypher/blockchain/eth/contract_registry/historical/frances/README.md similarity index 100% rename from nucypher/blockchain/eth/contract_registry/frances/README.md rename to nucypher/blockchain/eth/contract_registry/historical/frances/README.md diff --git a/nucypher/blockchain/eth/contract_registry/frances/contract_registry.json b/nucypher/blockchain/eth/contract_registry/historical/frances/contract_registry.json similarity index 100% rename from nucypher/blockchain/eth/contract_registry/frances/contract_registry.json rename to nucypher/blockchain/eth/contract_registry/historical/frances/contract_registry.json diff --git a/nucypher/blockchain/eth/contract_registry/gemini/README.md b/nucypher/blockchain/eth/contract_registry/historical/gemini/README.md similarity index 100% rename from nucypher/blockchain/eth/contract_registry/gemini/README.md rename to nucypher/blockchain/eth/contract_registry/historical/gemini/README.md diff --git a/nucypher/blockchain/eth/contract_registry/gemini/contract_registry.json b/nucypher/blockchain/eth/contract_registry/historical/gemini/contract_registry.json similarity index 100% rename from nucypher/blockchain/eth/contract_registry/gemini/contract_registry.json rename to nucypher/blockchain/eth/contract_registry/historical/gemini/contract_registry.json diff --git a/nucypher/blockchain/eth/contract_registry/miranda/README.md b/nucypher/blockchain/eth/contract_registry/historical/miranda/README.md similarity index 100% rename from nucypher/blockchain/eth/contract_registry/miranda/README.md rename to nucypher/blockchain/eth/contract_registry/historical/miranda/README.md diff --git a/nucypher/blockchain/eth/contract_registry/miranda/contract_registry.json b/nucypher/blockchain/eth/contract_registry/historical/miranda/contract_registry.json similarity index 100% rename from nucypher/blockchain/eth/contract_registry/miranda/contract_registry.json rename to nucypher/blockchain/eth/contract_registry/historical/miranda/contract_registry.json diff --git a/nucypher/blockchain/eth/contract_registry/miranda/individual_allocation_ABI.json b/nucypher/blockchain/eth/contract_registry/historical/miranda/individual_allocation_ABI.json similarity index 100% rename from nucypher/blockchain/eth/contract_registry/miranda/individual_allocation_ABI.json rename to nucypher/blockchain/eth/contract_registry/historical/miranda/individual_allocation_ABI.json diff --git a/nucypher/blockchain/eth/networks.py b/nucypher/blockchain/eth/networks.py index 67a07adf7..f6116fb06 100644 --- a/nucypher/blockchain/eth/networks.py +++ b/nucypher/blockchain/eth/networks.py @@ -19,10 +19,6 @@ along with nucypher. If not, see . class NetworksInventory: # TODO: See #1564 MAINNET = 'mainnet' - MIRANDA = 'miranda' - FRANCES = 'frances' - CASSANDRA = 'cassandra' - GEMINI = 'gemini' IBEX = 'ibex' UNKNOWN = 'unknown' # TODO: Is there a better way to signal an unknown network? @@ -30,10 +26,6 @@ class NetworksInventory: # TODO: See #1564 __to_ethereum_chain_id = { MAINNET: 1, # Ethereum Mainnet - MIRANDA: 5, # Goerli - FRANCES: 5, # Goerli - CASSANDRA: 5, # Goerli - GEMINI: 5, # Goerli IBEX: 4, # Rinkeby } diff --git a/nucypher/network/teachers.py b/nucypher/network/teachers.py index 60848c5b6..eca95cba7 100644 --- a/nucypher/network/teachers.py +++ b/nucypher/network/teachers.py @@ -17,6 +17,5 @@ along with nucypher. If not, see . # Hardcoded bootstrapping teacher nodes keyed by network domain TEACHER_NODES = { - 'cassandra': ('https://cassandra.nucypher.network:9151', ), - 'gemini': ('https://gemini.nucypher.network:9151', ) + 'ibex': ('https://ibex.nucypher.network:9151', ), } diff --git a/scripts/hooks/nucypher_agents.py b/scripts/hooks/nucypher_agents.py index b2cd25101..1f31b685a 100644 --- a/scripts/hooks/nucypher_agents.py +++ b/scripts/hooks/nucypher_agents.py @@ -50,7 +50,7 @@ except IndexError: try: network = sys.argv[1] except IndexError: - network = "gemini" + network = "ibex" BlockchainInterfaceFactory.initialize_interface(provider_uri=provider_uri,