Revert "Remove validators registation, rewards voting (#151)" (#153)

This reverts commit e6175d5.
stakewise · Aug 24, 2023 · b315e68 · b315e68
1 parent e6175d5
commit b315e68
Show file tree

Hide file tree

Showing 26 changed files with 1,602 additions and 28 deletions.
diff --git a/oracle/keeper/contracts.py b/oracle/keeper/contracts.py
@@ -46,6 +46,13 @@ def get_oracles_contract(web3_client: Web3) -> Contract:
                 "stateMutability": "view",
                 "type": "function",
             },
+            {
+                "inputs": [],
+                "name": "currentValidatorsNonce",
+                "outputs": [{"internalType": "uint256", "name": "", "type": "uint256"}],
+                "stateMutability": "view",
+                "type": "function",
+            },
             {
                 "inputs": [
                     {"internalType": "address", "name": "account", "type": "address"}
@@ -104,5 +111,83 @@ def get_oracles_contract(web3_client: Web3) -> Contract:
                 "stateMutability": "nonpayable",
                 "type": "function",
             },
+            {
+                "inputs": [
+                    {
+                        "internalType": "uint256",
+                        "name": "totalRewards",
+                        "type": "uint256",
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "activatedValidators",
+                        "type": "uint256",
+                    },
+                    {
+                        "internalType": "bytes[]",
+                        "name": "signatures",
+                        "type": "bytes[]",
+                    },
+                ],
+                "name": "submitRewards",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function",
+            },
+            {
+                "inputs": [
+                    {
+                        "components": [
+                            {
+                                "internalType": "address",
+                                "name": "operator",
+                                "type": "address",
+                            },
+                            {
+                                "internalType": "bytes32",
+                                "name": "withdrawalCredentials",
+                                "type": "bytes32",
+                            },
+                            {
+                                "internalType": "bytes32",
+                                "name": "depositDataRoot",
+                                "type": "bytes32",
+                            },
+                            {
+                                "internalType": "bytes",
+                                "name": "publicKey",
+                                "type": "bytes",
+                            },
+                            {
+                                "internalType": "bytes",
+                                "name": "signature",
+                                "type": "bytes",
+                            },
+                        ],
+                        "internalType": "struct IPoolValidators.DepositData[]",
+                        "name": "depositData",
+                        "type": "tuple[]",
+                    },
+                    {
+                        "internalType": "bytes32[][]",
+                        "name": "merkleProofs",
+                        "type": "bytes32[][]",
+                    },
+                    {
+                        "internalType": "bytes32",
+                        "name": "validatorsDepositRoot",
+                        "type": "bytes32",
+                    },
+                    {
+                        "internalType": "bytes[]",
+                        "name": "signatures",
+                        "type": "bytes[]",
+                    },
+                ],
+                "name": "registerValidators",
+                "outputs": [],
+                "stateMutability": "nonpayable",
+                "type": "function",
+            },
         ],
     )
diff --git a/oracle/keeper/health_server.py b/oracle/keeper/health_server.py
@@ -32,6 +32,7 @@ async def health(request):
         get_oracles_votes(
             web3_client=web3_client,
             rewards_nonce=params.rewards_nonce,
+            validators_nonce=params.validators_nonce,
             oracles=params.oracles,
         )
 

diff --git a/oracle/keeper/typings.py b/oracle/keeper/typings.py
@@ -2,8 +2,19 @@
 
 from eth_typing import ChecksumAddress
 
+from oracle.oracle.distributor.common.types import DistributorVote
+from oracle.oracle.rewards.types import RewardVote
+from oracle.oracle.validators.types import ValidatorsVote
+
 
 class Parameters(NamedTuple):
     rewards_nonce: int
+    validators_nonce: int
     paused: bool
     oracles: List[ChecksumAddress]
+
+
+class OraclesVotes(NamedTuple):
+    rewards: List[RewardVote]
+    distributor: List[DistributorVote]
+    validators: List[ValidatorsVote]