Merge pull request #3069 from KPrasch/development

Revive Oryx

newsfragments/3069.feature.rst

@@ -0,0 +1,2 @@
+Include inventory entries for oryx.
+

nucypher/blockchain/eth/contract_registry/historical/oryx/contract_registry.json

@@ -1 +0,0 @@
-[["SimplePREApplication", "v0.0.0", "0xb6f98dA65174CE8F50eA0ea4350D96B2d3eFde9a", [{"inputs": [{"internalType": "contract IStaking", "name": "_tStaking", "type": "address"}, {"internalType": "uint256", "name": "_minAuthorization", "type": "uint256"}, {"internalType": "uint256", "name": "_minOperatorSeconds", "type": "uint256"}], "stateMutability": "nonpayable", "type": "constructor"}, {"anonymous": false, "inputs": [{"indexed": true, "internalType": "address", "name": "stakingProvider", "type": "address"}, {"indexed": true, "internalType": "address", "name": "operator", "type": "address"}, {"indexed": false, "internalType": "uint256", "name": "startTimestamp", "type": "uint256"}], "name": "OperatorBonded", "type": "event"}, {"anonymous": false, "inputs": [{"indexed": true, "internalType": "address", "name": "stakingProvider", "type": "address"}, {"indexed": true, "internalType": "address", "name": "operator", "type": "address"}], "name": "OperatorConfirmed", "type": "event"}, {"inputs": [{"internalType": "address", "name": "_stakingProvider", "type": "address"}], "name": "authorizedStake", "outputs": [{"internalType": "uint96", "name": "", "type": "uint96"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_stakingProvider", "type": "address"}, {"internalType": "address", "name": "_operator", "type": "address"}], "name": "bondOperator", "outputs": [], "stateMutability": "nonpayable", "type": "function"}, {"inputs": [], "name": "confirmOperatorAddress", "outputs": [], "stateMutability": "nonpayable", "type": "function"}, {"inputs": [{"internalType": "uint256", "name": "_startIndex", "type": "uint256"}, {"internalType": "uint256", "name": "_maxStakingProviders", "type": "uint256"}], "name": "getActiveStakingProviders", "outputs": [{"internalType": "uint256", "name": "allAuthorizedTokens", "type": "uint256"}, {"internalType": "uint256[2][]", "name": "activeStakingProviders", "type": "uint256[2][]"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_stakingProvider", "type": "address"}], "name": "getBeneficiary", "outputs": [{"internalType": "address payable", "name": "beneficiary", "type": "address"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_stakingProvider", "type": "address"}], "name": "getOperatorFromStakingProvider", "outputs": [{"internalType": "address", "name": "", "type": "address"}], "stateMutability": "view", "type": "function"}, {"inputs": [], "name": "getStakingProvidersLength", "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_stakingProvider", "type": "address"}], "name": "isAuthorized", "outputs": [{"internalType": "bool", "name": "", "type": "bool"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_operator", "type": "address"}], "name": "isOperatorConfirmed", "outputs": [{"internalType": "bool", "name": "", "type": "bool"}], "stateMutability": "view", "type": "function"}, {"inputs": [], "name": "minAuthorization", "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}], "stateMutability": "view", "type": "function"}, {"inputs": [], "name": "minOperatorSeconds", "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "_operator", "type": "address"}], "name": "stakingProviderFromOperator", "outputs": [{"internalType": "address", "name": "", "type": "address"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "address", "name": "", "type": "address"}], "name": "stakingProviderInfo", "outputs": [{"internalType": "address", "name": "operator", "type": "address"}, {"internalType": "bool", "name": "operatorConfirmed", "type": "bool"}, {"internalType": "uint256", "name": "operatorStartTimestamp", "type": "uint256"}], "stateMutability": "view", "type": "function"}, {"inputs": [{"internalType": "uint256", "name": "", "type": "uint256"}], "name": "stakingProviders", "outputs": [{"internalType": "address", "name": "", "type": "address"}], "stateMutability": "view", "type": "function"}, {"inputs": [], "name": "tStaking", "outputs": [{"internalType": "contract IStaking", "name": "", "type": "address"}], "stateMutability": "view", "type": "function"}]]]

nucypher/blockchain/eth/contract_registry/oryx/contract_registry.json

@@ -0,0 +1,342 @@
+[
+    [
+      "SimplePREApplication",
+      "v0.0.0",
+      "0xaF96aa6000ec2B6CF0Fe6B505B6C33fa246967Ca",
+      [
+        {
+          "inputs": [
+            {
+              "internalType": "contract IStaking",
+              "name": "_tStaking",
+              "type": "address"
+            },
+            {
+              "internalType": "uint256",
+              "name": "_minAuthorization",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "_minOperatorSeconds",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "nonpayable",
+          "type": "constructor"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "stakingProvider",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "operator",
+              "type": "address"
+            },
+            {
+              "indexed": false,
+              "internalType": "uint256",
+              "name": "startTimestamp",
+              "type": "uint256"
+            }
+          ],
+          "name": "OperatorBonded",
+          "type": "event"
+        },
+        {
+          "anonymous": false,
+          "inputs": [
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "stakingProvider",
+              "type": "address"
+            },
+            {
+              "indexed": true,
+              "internalType": "address",
+              "name": "operator",
+              "type": "address"
+            }
+          ],
+          "name": "OperatorConfirmed",
+          "type": "event"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_stakingProvider",
+              "type": "address"
+            }
+          ],
+          "name": "authorizedStake",
+          "outputs": [
+            {
+              "internalType": "uint96",
+              "name": "",
+              "type": "uint96"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_stakingProvider",
+              "type": "address"
+            },
+            {
+              "internalType": "address",
+              "name": "_operator",
+              "type": "address"
+            }
+          ],
+          "name": "bondOperator",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "confirmOperatorAddress",
+          "outputs": [],
+          "stateMutability": "nonpayable",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "_startIndex",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256",
+              "name": "_maxStakingProviders",
+              "type": "uint256"
+            }
+          ],
+          "name": "getActiveStakingProviders",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "allAuthorizedTokens",
+              "type": "uint256"
+            },
+            {
+              "internalType": "uint256[2][]",
+              "name": "activeStakingProviders",
+              "type": "uint256[2][]"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_stakingProvider",
+              "type": "address"
+            }
+          ],
+          "name": "getBeneficiary",
+          "outputs": [
+            {
+              "internalType": "address payable",
+              "name": "beneficiary",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_stakingProvider",
+              "type": "address"
+            }
+          ],
+          "name": "getOperatorFromStakingProvider",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "getStakingProvidersLength",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_stakingProvider",
+              "type": "address"
+            }
+          ],
+          "name": "isAuthorized",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_operator",
+              "type": "address"
+            }
+          ],
+          "name": "isOperatorConfirmed",
+          "outputs": [
+            {
+              "internalType": "bool",
+              "name": "",
+              "type": "bool"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "minAuthorization",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "minOperatorSeconds",
+          "outputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "_operator",
+              "type": "address"
+            }
+          ],
+          "name": "stakingProviderFromOperator",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "name": "stakingProviderInfo",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "operator",
+              "type": "address"
+            },
+            {
+              "internalType": "bool",
+              "name": "operatorConfirmed",
+              "type": "bool"
+            },
+            {
+              "internalType": "uint256",
+              "name": "operatorStartTimestamp",
+              "type": "uint256"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [
+            {
+              "internalType": "uint256",
+              "name": "",
+              "type": "uint256"
+            }
+          ],
+          "name": "stakingProviders",
+          "outputs": [
+            {
+              "internalType": "address",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        },
+        {
+          "inputs": [],
+          "name": "tStaking",
+          "outputs": [
+            {
+              "internalType": "contract IStaking",
+              "name": "",
+              "type": "address"
+            }
+          ],
+          "stateMutability": "view",
+          "type": "function"
+        }
+      ]
+    ]
+  ]

nucypher/blockchain/eth/networks.py

@@ -1,12 +1,10 @@
-
-
-
 class NetworksInventory:  # TODO: See #1564
 
     MAINNET = "mainnet"
     LYNX = "lynx"
     ETH = "ethereum"
     TAPIR = "tapir"
+    ORYX = "oryx"
 
     # TODO: Use naming scheme to preserve multiple compatibility with multiple deployments to a single network?
     POLYGON = 'polygon'
@@ -18,7 +16,8 @@ class NetworksInventory:  # TODO: See #1564
     __to_chain_id_eth = {
         MAINNET: 1,  # Ethereum Mainnet
         LYNX: 5,  # Goerli
-        TAPIR: 5,  # Goerli
+        TAPIR: 5,
+        ORYX: 5
     }
     __to_chain_id_polygon = {
         # TODO: Use naming scheme?

nucypher/network/nodes.py

@@ -51,6 +51,7 @@ TEACHER_NODES = {
     ),
     NetworksInventory.LYNX: ("https://lynx.nucypher.network:9151",),
     NetworksInventory.TAPIR: ("https://tapir.nucypher.network:9151",),
+    NetworksInventory.ORYX: ("https://oryx.nucypher.network:9151",),
 }