diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index daf6522e2e712b7158aec3c130456f9c177db95c..be92fd1226baceda3e6fd72468d76c9b3f3c43eb 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -125,12 +125,23 @@ RPC Changes This changes the JSON from the RPC ``/chains/main/blocks/head/context/constants`` and ``/chains/main/blocks/head/context/issuance/expected_issuance``. -- Add RPC to get contract's estimated own pending slashed amount according to the currently available denunciations. +- Add RPC to get contract's estimated own pending slashed amount according to the currently + available denunciations. ``GET /chains//blocks//context/contracts//estimated_own_pending_slashed_amount``. (MR :gl:`!12016`) -- Add RPC to get delegate's estimated shared pending slashed amount according to the currently available denunciations. +- Add RPC to get delegate's estimated shared pending slashed amount according to the + currently available denunciations. ``GET /chains//blocks//context/delegates//estimated_shared_pending_slashed_amount``. (MR :gl:`!12016`) +- Extend the delegate info RPC response by adding a new boolean field named 'pending_denunciations'. + This field is set to true if there are any pending denunciations associated with the + specified delegate, and set to false otherwise. + ``GET /chains//blocks//context/delegates//``. (MR :gl:`!12042`) + +- New RPC to list the pending denunciations of a given delegate. + ``GET /chains//blocks//context/delegates//denunciations``. (MR :gl:`!11885`) + + Operation receipts ------------------ diff --git a/src/proto_alpha/lib_protocol/alpha_context.ml b/src/proto_alpha/lib_protocol/alpha_context.ml index 2b93ccec6ba3142b837c18cd4ded03f83d40e502..f60dd9f9987f65093a8d2f5628ce3272cb35b64d 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.ml +++ b/src/proto_alpha/lib_protocol/alpha_context.ml @@ -582,6 +582,9 @@ module Delegate = struct include Pending_denunciations_storage.For_RPC let pending_denunciations = Pending_denunciations_storage.find + + let has_pending_denunciations = + Pending_denunciations_storage.has_pending_denunciations end end diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 8e0f633b6f7ffcf8fc244b0c50bbbc24c9f2f2ab..bd74853aa9244e1da9a20708b42ef1364ae4f758 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -2497,6 +2497,8 @@ module Delegate : sig val min_delegated_in_current_cycle : context -> public_key_hash -> Tez.t tzresult Lwt.t + val has_pending_denunciations : context -> public_key_hash -> bool Lwt.t + val pending_denunciations : context -> public_key_hash -> Denunciations_repr.t tzresult Lwt.t diff --git a/src/proto_alpha/lib_protocol/delegate_services.ml b/src/proto_alpha/lib_protocol/delegate_services.ml index ddfea5600563fc94a7095511eedb2aa350942fc6..b8e5ac3a68c52faa0e64481a5d412251c261914c 100644 --- a/src/proto_alpha/lib_protocol/delegate_services.ml +++ b/src/proto_alpha/lib_protocol/delegate_services.ml @@ -121,6 +121,7 @@ type info = { staking_denominator : Staking_pseudotoken.t; deactivated : bool; grace_period : Cycle.t; + pending_denunciations : bool; voting_info : Vote.delegate_info; active_consensus_key : Signature.Public_key_hash.t; pending_consensus_keys : (Cycle.t * Signature.Public_key_hash.t) list; @@ -142,6 +143,7 @@ let info_encoding = staking_denominator; deactivated; grace_period; + pending_denunciations; voting_info; active_consensus_key; pending_consensus_keys; @@ -156,7 +158,7 @@ let info_encoding = min_delegated_in_current_cycle, deactivated, grace_period ), - ( (total_delegated_stake, staking_denominator), + ( (pending_denunciations, total_delegated_stake, staking_denominator), (voting_info, (active_consensus_key, pending_consensus_keys)) ) )) (fun ( ( full_balance, current_frozen_deposits, @@ -168,7 +170,7 @@ let info_encoding = min_delegated_in_current_cycle, deactivated, grace_period ), - ( (total_delegated_stake, staking_denominator), + ( (pending_denunciations, total_delegated_stake, staking_denominator), (voting_info, (active_consensus_key, pending_consensus_keys)) ) ) -> { full_balance; @@ -183,6 +185,7 @@ let info_encoding = staking_denominator; deactivated; grace_period; + pending_denunciations; voting_info; active_consensus_key; pending_consensus_keys; @@ -200,7 +203,8 @@ let info_encoding = (req "deactivated" bool) (req "grace_period" Cycle.encoding)) (merge_objs - (obj2 + (obj3 + (req "pending_denunciations" bool) (req "total_delegated_stake" Tez.encoding) (req "staking_denominator" Staking_pseudotoken.For_RPC.encoding)) (merge_objs @@ -617,6 +621,9 @@ let register () = in let* deactivated = Delegate.deactivated ctxt pkh in let* grace_period = Delegate.last_cycle_before_deactivation ctxt pkh in + let*! pending_denunciations = + Delegate.For_RPC.has_pending_denunciations ctxt pkh + in let* voting_info = Vote.get_delegate_info ctxt pkh in let* consensus_key = Delegate.Consensus_key.active_pubkey ctxt pkh in let+ pendings = Delegate.Consensus_key.pending_updates ctxt pkh in @@ -636,6 +643,7 @@ let register () = staking_denominator; deactivated; grace_period; + pending_denunciations; voting_info; active_consensus_key = consensus_key.consensus_pkh; pending_consensus_keys; diff --git a/src/proto_alpha/lib_protocol/delegate_services.mli b/src/proto_alpha/lib_protocol/delegate_services.mli index 3289cf9cd98ad245c6e8a5a5b1b6190add80ebb9..16bdf5f9dd9c02b9f9a03d08f0716df4a550cd83 100644 --- a/src/proto_alpha/lib_protocol/delegate_services.mli +++ b/src/proto_alpha/lib_protocol/delegate_services.mli @@ -66,6 +66,7 @@ type info = { staking_denominator : Staking_pseudotoken.t; deactivated : bool; grace_period : Cycle.t; + pending_denunciations : bool; voting_info : Vote.delegate_info; active_consensus_key : Signature.Public_key_hash.t; pending_consensus_keys : (Cycle.t * Signature.Public_key_hash.t) list; diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.ml b/src/proto_alpha/lib_protocol/test/helpers/context.ml index d36166a0fb9d12bc3e731498f9b5bdfae81b5280..a5f8122cbe842a5334a6e20a86dd81c10cdb3864 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/context.ml @@ -492,6 +492,7 @@ module Delegate = struct staking_denominator : Staking_pseudotoken.t; deactivated : bool; grace_period : Cycle.t; + pending_denunciations : bool; voting_info : Alpha_context.Vote.delegate_info; active_consensus_key : Signature.Public_key_hash.t; pending_consensus_keys : (Cycle.t * Signature.Public_key_hash.t) list; diff --git a/src/proto_alpha/lib_protocol/test/helpers/context.mli b/src/proto_alpha/lib_protocol/test/helpers/context.mli index 3939caf4de83a07368460623ab96d5e05d7228f3..05737069baf78d1b74c3f890445426dd5cdd0389 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/context.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/context.mli @@ -261,6 +261,7 @@ module Delegate : sig staking_denominator : Staking_pseudotoken.t; deactivated : bool; grace_period : Cycle.t; + pending_denunciations : bool; voting_info : Vote.delegate_info; active_consensus_key : Signature.Public_key_hash.t; pending_consensus_keys : (Cycle.t * Signature.Public_key_hash.t) list; diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out index 6b257eca7b6f04c1e62f6fa727c12e9220319c16..c1abbfa75d2ad572971f2855c275b85d972fe115 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- delegates.out @@ -22,9 +22,9 @@ "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 5, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 5, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/full_balance' diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out index a6d3e60d3c920dc9d80279354e713f9801a9e96f..746c00447034f896be4ae2a3e45503fd14740408 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- delegates.out @@ -22,9 +22,9 @@ "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 5, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 5, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client --mode light rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/full_balance' diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out index eb6bf7c4a23e70d62a5865b7552e8dfc84dafb99..71334ef90f47b854c0d57d18f3025c935d09761e 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- delegates.out @@ -22,9 +22,9 @@ "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 5, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 5, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client --mode proxy rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/full_balance' diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- delegates.out index 6b257eca7b6f04c1e62f6fa727c12e9220319c16..c1abbfa75d2ad572971f2855c275b85d972fe115 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- delegates.out @@ -22,9 +22,9 @@ "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 5, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 5, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/full_balance' diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- delegates.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- delegates.out index 6b257eca7b6f04c1e62f6fa727c12e9220319c16..c1abbfa75d2ad572971f2855c275b85d972fe115 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- delegates.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- delegates.out @@ -22,9 +22,9 @@ "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 5, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 5, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]/full_balance' diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out index 704b30d6e9d36149a1e03fc7e84d8f227e5ca2d8..cb0219480fd431e4e399037fd94ea8d5a0e7908d 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus - destination).out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,9 +55,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001595660", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -66,9 +66,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001595660", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' @@ -107,9 +107,9 @@ This sequence of operations was run: "frozen_deposits": "200000083984", "staking_balance": "238000528932", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "4", - "deactivated": false, "grace_period": 4, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "deactivated": false, "grace_period": 4, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out index dbbd212eaff64d2201472b7930aba3b5d8539b3c..2f3c81352c2accb4148fbf0949a05f44cfc8c416 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker - delegate - consensus -- destination).out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,9 +55,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001595660", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -66,9 +66,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001595660", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' @@ -107,9 +107,9 @@ This sequence of operations was run: "frozen_deposits": "200000083984", "staking_balance": "238000528932", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "4", - "deactivated": false, "grace_period": 4, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "deactivated": false, "grace_period": 4, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out index 97a61ff6bc6495defd4bc41fb3f726eaaa10514d..7efa88268e391bb12548c2fee620c3f78d8b456b 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus - destination).out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,9 +55,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001278724", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -66,9 +66,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001278724", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' @@ -107,9 +107,9 @@ This sequence of operations was run: "frozen_deposits": "200000067317", "staking_balance": "238000509096", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "18", - "deactivated": false, "grace_period": 4, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "deactivated": false, "grace_period": 4, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out index 0ae5f6b77c13d5e0d845a01f873daaab28b6a972..44c9111831859d4d2fa8b29728bbf40f36b952bd 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test drain delegate with (baker -- delegate - consensus -- destination).out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,9 +55,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001278724", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -66,9 +66,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001278724", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' @@ -107,9 +107,9 @@ This sequence of operations was run: "frozen_deposits": "200000067317", "staking_balance": "238000509096", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "18", - "deactivated": false, "grace_period": 4, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "deactivated": false, "grace_period": 4, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out index 7bea90479067dab5825f0e773a356203b2061942..668993b15b0e07f5640132105f8f8a0dc2195a25 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test register with consensus key.out @@ -65,8 +65,8 @@ This sequence of operations was run: "frozen_deposits": "0", "staking_balance": "999999999385", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "999999999385", - "deactivated": false, "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", + "deactivated": false, "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -79,6 +79,6 @@ This sequence of operations was run: "frozen_deposits": "0", "staking_balance": "999999999385", "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "949999999415", - "deactivated": false, "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", + "deactivated": false, "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", "active_consensus_key": "[PUBLIC_KEY_HASH]" } diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out index 1eb937a52cbeb48078c4435ba53d9b28ec8f34e4..ce52bbd3718f475ed39cbcbf4c3f0c4d6e395c31 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is delegate.out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,7 +55,7 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001595660", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } diff --git a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out index 4444e752bbec72b1557922adc53c48488324a163..f4f8eb4a0091fcb47fe25e9605a866f38fea432f 100644 --- a/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out +++ b/tezt/tests/expected/consensus_key.ml/Alpha- Test set consensus key - baker is not delegate.out @@ -31,9 +31,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800000000000", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -42,9 +42,9 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3799999999716", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]", "pending_consensus_keys": [ { "cycle": 2, "pkh": "[PUBLIC_KEY_HASH]" } ] } @@ -55,7 +55,7 @@ This sequence of operations was run: "delegated_contracts": [ "[PUBLIC_KEY_HASH]" ], "delegated_balance": "0", "min_delegated_in_current_cycle": "3800001278724", "deactivated": false, - "grace_period": 3, "total_delegated_stake": "0", - "staking_denominator": "0", "voting_power": "4000000000000", - "remaining_proposals": 20, + "grace_period": 3, "pending_denunciations": false, + "total_delegated_stake": "0", "staking_denominator": "0", + "voting_power": "4000000000000", "remaining_proposals": 20, "active_consensus_key": "[PUBLIC_KEY_HASH]" }