Update validator registration to accept consensus key

Author: aiman

aut/commands/validator.py

@@ -210,6 +210,7 @@ def unbond(
 @tx_aux_options
 @argument("enode")
 @argument("oracle")
+@argument("consensus_key")
 @argument("proof")
 def register(
     rpc_endpoint: Optional[str],
@@ -224,6 +225,7 @@ def register(
     chain_id: Optional[int],
     enode: str,
     oracle: OracleAddress,
+    consensus_key: str,
     proof: str,
 ) -> None:
     """
@@ -238,15 +240,17 @@ def register(
         to_json,
     )
 
-    # Check the "proof" is at least valid hex.
+    consensus_key_bytes = HexBytes(consensus_key)
     proof_bytes = HexBytes(proof)
 
     from_addr = from_address_from_argument(from_str, keyfile)
     # TODO: validate enode string?
 
     aut = autonity_from_endpoint_arg(rpc_endpoint)
     tx = create_contract_tx_from_args(
-        function=aut.register_validator(enode, oracle, proof_bytes),
+        function=aut.register_validator(
+            enode, oracle, consensus_key_bytes, proof_bytes
+        ),
         from_addr=from_addr,
         gas=gas,
         gas_price=gas_price,

scripts/test_validator

@@ -21,11 +21,12 @@ aut validator unclaimed-rewards
 
 ENODE=enode://d9a7297bb3e2fcc292233d2c3f40c5ca398ff5025867a5b60219ed8b22ae6077fb30d5740296d4a513689aaef85dadb29bcc6564863f1594a037b9d6d91b139e@1.2.3.4:30303
 ORACLE=${v1}
+CONSENSUS_KEY=0x0123456789abcdef
 PROOF=0x0123456789abcdef
 
 [ "0xcf5D771f1057294d92c70f3e333B82b420f32914" == `aut validator compute-address $ENODE` ]
 
-aut validator register --gas 1000000000 ${ENODE} ${ORACLE} ${PROOF} > register.tx
+aut validator register --gas 1000000000 ${ENODE} ${ORACLE} ${CONSENSUS_KEY} ${PROOF} > register.tx
 
 aut validator claim-rewards > claim_rewards.tx