diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index 800049857342fc344e6dcfdff0f0a7206cef67b5..665afb5ae4a4402978fe8997f3e70b397eda9a1f 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -146,3 +146,9 @@ Minor Changes Internal -------- + +- When activating this protocol directly from Genesis (so only in + tests and on some test networks), baking rights of bootstrap + accounts for the first few cycles are now computed with Adaptive + Issuance enabled, meaning that delegated tez are already weighted + less than staked tez. (MR :gl:`!16945`) diff --git a/src/proto_alpha/lib_protocol/init_storage.ml b/src/proto_alpha/lib_protocol/init_storage.ml index 209f77c75fb608ef1995b129966eb0a6a685f4e4..b389c5978ab21bd1eebf3211907a684b8ec3c70c 100644 --- a/src/proto_alpha/lib_protocol/init_storage.ml +++ b/src/proto_alpha/lib_protocol/init_storage.ml @@ -222,6 +222,7 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract param.bootstrap_contracts param.bootstrap_smart_rollups in + let* ctxt = Adaptive_issuance_storage.init_from_genesis ctxt in let* ctxt = Delegate_cycles.init_first_cycles ctxt in let* ctxt = Vote_storage.init @@ -241,7 +242,6 @@ let prepare_first_block chain_id ctxt ~typecheck_smart_contract operation_results in let* ctxt = Sc_rollup_inbox_storage.init_inbox ~predecessor ctxt in - let* ctxt = Adaptive_issuance_storage.init_from_genesis ctxt in let* ctxt = Address_registry_storage.init ctxt in return (ctxt, commitments_balance_updates @ bootstrap_balance_updates) (* Start of Alpha stitching. Comment used for automatic snapshot *) diff --git a/src/proto_alpha/lib_protocol/test/helpers/account.ml b/src/proto_alpha/lib_protocol/test/helpers/account.ml index 049e7f94cc245f6e91925697a48bf388bd410723..ec41cf64c8f859375aa919fb0d55f2a5f6253387 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/account.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/account.ml @@ -85,25 +85,44 @@ let dummy_account = in new_account ~seed () -let default_initial_full_balance = - Default_parameters.Internal_for_tests.bootstrap_balance - -let default_initial_staked_balance = - (* Cf [init_account] in {!Protocol.Bootstrap_storage}. *) - let constants = Default_parameters.constants_test in +let bootstrap_initial_staked_balance ~(constants : Constants.Parametric.t) + ~initial_full_balance = + (* Bootstrap accounts are initialized with just enough staked balance + to meet the [minimal_stake] and [minimal_frozen_stake] + requirements, and to not be over-delegated. See the [init_account] + function in {!Protocol.Bootstrap_storage}. *) let minimal_staked = - Tez.min constants.minimal_stake constants.minimal_frozen_stake + Tez.max constants.minimal_stake constants.minimal_frozen_stake in let minimal_to_not_be_overdelegated = Tez.div_exn - default_initial_full_balance + initial_full_balance (constants.limit_of_delegation_over_baking + 1) in Tez.( min - default_initial_full_balance + initial_full_balance (max minimal_staked minimal_to_not_be_overdelegated)) +let bootstrap_initial_baking_power ~constants ~initial_full_balance = + let initial_staked_balance = + bootstrap_initial_staked_balance ~constants ~initial_full_balance + in + let open Tez in + Tez_helpers.( + initial_staked_balance + +! div_exn + (initial_full_balance -! initial_staked_balance) + constants.adaptive_issuance.edge_of_staking_over_delegation) + +let default_initial_full_balance = + Default_parameters.Internal_for_tests.bootstrap_balance + +let default_initial_staked_balance = + bootstrap_initial_staked_balance + ~constants:Default_parameters.constants_test + ~initial_full_balance:default_initial_full_balance + let default_initial_spendable_balance = Tez_helpers.(default_initial_full_balance -! default_initial_staked_balance) diff --git a/src/proto_alpha/lib_protocol/test/helpers/account.mli b/src/proto_alpha/lib_protocol/test/helpers/account.mli index 4d1dac1317ca17f380d804347825e5149952db53..b2726ba788e016cdcfc2f7116c63911c9b0f5574 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/account.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/account.mli @@ -66,6 +66,17 @@ val default_initial_staked_balance : Tez.t (** Default spendable balance of bootstrap accounts: 3_800_000 tez *) val default_initial_spendable_balance : Tez.t +(** Initial staked balance of a newly created bootstrap account with a + given initial full balance. *) +val bootstrap_initial_staked_balance : + constants:Constants.Parametric.t -> initial_full_balance:Tez.t -> Tez.t + +(** Initial baking power of a newly created bootstrap account, in + weighted tez (that is, staked tez count with weight 1 and + delegated tez with weight 1/edge_of_staking_over_delegation). *) +val bootstrap_initial_baking_power : + constants:Constants.Parametric.t -> initial_full_balance:Tez.t -> Tez.t + (** [generate_accounts ?algo ?rng_state n] first frees the global account state then generates [n] random accounts with [rng_state] to generate the seed and adds them to the global account state. When provided, all accounts key generation diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/test_baking.ml b/src/proto_alpha/lib_protocol/test/integration/consensus/test_baking.ml index 6e2ffa90f1462563c3b6c841e2902778b0b2ff78..7043f5b921e5d7a66c4bbba4d55e61929a408e9d 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/test_baking.ml +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/test_baking.ml @@ -373,104 +373,206 @@ let test_enough_active_stake_to_bake ~has_active_stake () = get_next_baker_by_account fails with "No slots found for pkh1" *) Assert.error ~loc:__LOC__ b1 (fun _ -> true) +type bootstrap_staking_config = Stake_everything | Default_for_bootstrap + let test_committee_sampling () = let open Lwt_result_syntax in - let test_distribution max_round distribution = - let bootstrap_balances, bounds = List.split distribution in + let test_distribution ~staking_config ~committee_size distribution = + (* [committee_size] will be the number of slots available in the + consensus committee, and also the number of rounds over which + we will count the occurrences of each delegate being the + selected baker for a round. *) + let bootstrap_balances, _bounds = List.split distribution in let*? accounts = Account.generate_accounts (List.length bootstrap_balances) in let bootstrap_accounts = Account.make_bootstrap_accounts ~bootstrap_balances accounts in - let consensus_committee_size = max_round in assert ( (* Enforce that we are not mistakenly testing a value for committee_size that violates invariants of module Slot_repr. *) Result.is_ok - (Slot_repr.of_int consensus_committee_size)) ; + (Slot_repr.of_int committee_size)) ; let constants = { Default_parameters.constants_test with - consensus_committee_size; + consensus_committee_size = committee_size; consensus_threshold_size = 0; } in + let constants = + match staking_config with + | Stake_everything -> + (* In the [init_account] function in + {!Protocol.Bootstrap_storage}, bootstrap accounts stake + just enough tez to meet the [minimal_stake] and + [minimal_frozen_stake] requirements, and to not be + over-delegated. Setting [limit_of_delegation_over_baking] + to 0 is a hack that will force them to stake everything + in order to not be over-delegated. *) + {constants with limit_of_delegation_over_baking = 0} + | Default_for_bootstrap -> constants + in let parameters = Default_parameters.parameters_of_constants ~bootstrap_accounts constants in let* genesis = Block.genesis_with_parameters parameters in let+ bakers = - Plugin.RPC.Baking_rights.get Block.rpc_ctxt ~all:true ~max_round genesis + Plugin.RPC.Baking_rights.get + Block.rpc_ctxt + ~all:true + ~max_round:committee_size + genesis in let stats = Stdlib.Hashtbl.create 10 in Stdlib.List.iter2 - (fun acc bounds -> Stdlib.Hashtbl.add stats acc.Account.pkh (bounds, 0)) + (fun acc specs -> Stdlib.Hashtbl.add stats acc.Account.pkh (specs, 0)) accounts - bounds ; + distribution ; List.iter (fun {Plugin.RPC.Baking_rights.delegate = pkh; _} -> - let bounds, n = Stdlib.Hashtbl.find stats pkh in - Stdlib.Hashtbl.replace stats pkh (bounds, n + 1)) + let specs, n = Stdlib.Hashtbl.find stats pkh in + Stdlib.Hashtbl.replace stats pkh (specs, n + 1)) bakers ; let one_failed = ref false in - Format.eprintf - "@[Testing with baker distribution [%a],@ committee size %d.@]@." - (Format.pp_print_list - ~pp_sep:(fun ppf () -> Format.fprintf ppf ",@ ") - (fun ppf (tez, _) -> Format.fprintf ppf "%Ld" tez)) - distribution - max_round ; - - Format.eprintf - "@[@,%a@]@." + Log.info + "@[Testing with %d bakers and committee size %#d (%s):%a@]" + (List.length distribution) + committee_size + (match staking_config with + | Stake_everything -> "accounts stake everything" + | Default_for_bootstrap -> + "default staking behavior for bootstrap accounts") (fun ppf stats -> Stdlib.Hashtbl.iter - (fun pkh ((min_p, max_p), n) -> + (fun pkh ((balance, (min_p, max_p)), n) -> let failed = not (n >= min_p && n <= max_p) in Format.fprintf ppf - "@[- %a %d%a@]@," - Signature.Public_key_hash.pp + "@,\ + - %a init balance: %#Ld mutez, expected #slots: [%d, %d], \ + actual #slots: %d" + Signature.Public_key_hash.pp_short pkh - n - (fun ppf failed -> - if failed then - Format.fprintf ppf " [FAIL] should be in [%d, %d]" min_p max_p - else Format.fprintf ppf "") - failed ; + balance + min_p + max_p + n ; + if failed then Format.fprintf ppf "@, --> FAIL" ; one_failed := failed || !one_failed) stats) stats ; - if !one_failed then - Stdlib.failwith + Test.fail "The proportion of bakers marked as [FAILED] in the log output appear \ in the wrong proportion in the committee." - else Format.eprintf "Test succesful.@." + else Log.info "Test successful.@." in + (* The tests below are not deterministic, but the probability that they fail is infinitesimal. *) - let accounts = - let expected_lower_bound = 6_100 and expected_upper_bound = 6_900 in - let balance = 8_000_000_000L in - let account = (balance, (expected_lower_bound, expected_upper_bound)) in - Array.(make 10 account |> to_list) + let expected_bounds average = + (* TODO: https://gitlab.com/tezos/tezos/-/issues/7979 + Determine a proper margin considering the expected + distribution. *) + let margin = max (average / 20) 50 in + (average - margin, average + margin) in - let* () = test_distribution 65535 accounts in + (* 10 accounts with the same balance *) let* () = + let committee_size = 65_535 in + let accounts = + let n_accounts = 10 in + let account = + (8_000_000_000L, expected_bounds (committee_size / n_accounts)) + in + Array.(make n_accounts account |> to_list) + in test_distribution - 10_000 + ~staking_config:Default_for_bootstrap + (* The staking config doesn't matter: all accounts will behave the + same way and end up with the same baking power as each other. *) + ~committee_size + accounts + in + (* In the following tests, the bootstrap accounts stake everything, + so the average number of baking opportunities received is + directly proportial to the initial balance of each account. *) + let* () = + test_distribution + ~staking_config:Stake_everything + ~committee_size:10_000 [ - (16_000_000_000L, (4_600, 5_400)); - (8_000_000_000L, (2_200, 2_800)); - (8_000_000_000L, (2_200, 2_800)); + (16_000_000_000L, expected_bounds 5_000); + (8_000_000_000L, expected_bounds 2_500); + (8_000_000_000L, expected_bounds 2_500); ] in - test_distribution - 10_000 - [(792_000_000_000L, (9_830, 9_970)); (8_000_000_000L, (40, 160))] + let* () = + test_distribution + ~staking_config:Stake_everything + ~committee_size:10_000 + [ + (792_000_000_000L, expected_bounds 9_900); + (8_000_000_000L, expected_bounds 100); + ] + in + (* Tests with default bootstrap staking behavior. *) + let compute_baking_power initial_balance = + Account.bootstrap_initial_baking_power + ~constants:Default_parameters.constants_test + ~initial_full_balance:(Tez.of_mutez_exn initial_balance) + |> Tez.to_mutez + in + let test_distribution_default_staking ~committee_size initial_balances = + let with_baking_powers = + List.map + (fun initial_balance -> + (initial_balance, compute_baking_power initial_balance)) + initial_balances + in + let total_baking_power = + List.fold_left + (fun acc (_initial_balance, baking_power) -> Int64.add acc baking_power) + 0L + with_baking_powers + in + let committee_size_int = Int64.of_int committee_size in + let distribution = + List.map + (fun (initial_balance, baking_power) -> + let average_baking_opportunities = + Int64.( + to_int + (div (mul baking_power committee_size_int) total_baking_power)) + in + Log.info + "Initial balance: %#Ld mutez, baking power: %#Ld, average #slots: \ + %d" + initial_balance + baking_power + average_baking_opportunities ; + (initial_balance, expected_bounds average_baking_opportunities)) + with_baking_powers + in + test_distribution + ~staking_config:Default_for_bootstrap + ~committee_size + distribution + in + let* () = + test_distribution_default_staking + ~committee_size:10_000 + [16_000_000_000L; 8_000_000_000L; 8_000_000_000L] + in + let* () = + test_distribution_default_staking + ~committee_size:10_000 + [792_000_000_000L; 8_000_000_000L] + in + return_unit let tests = [ diff --git a/src/proto_alpha/lib_protocol/test/integration/test_scenario_rewards.ml b/src/proto_alpha/lib_protocol/test/integration/test_scenario_rewards.ml index d3b93fe2013320d8e4a1f6a81a916d383012c805..5a4483e009151da960776f70a7157bd9ac167f2e 100644 --- a/src/proto_alpha/lib_protocol/test/integration/test_scenario_rewards.ml +++ b/src/proto_alpha/lib_protocol/test/integration/test_scenario_rewards.ml @@ -456,12 +456,12 @@ let test_overstake = begin_test_with_rewards_checks ~init_limit:3. --> next_block_with_check_rewards ~loc:__LOC__ - ~staker_diff:(Q.of_int32 30_503l) - ~delegate_diff:(Q.of_int32 141_060l) + ~staker_diff:(Q.of_int32 30_582l) + ~delegate_diff:(Q.of_int32 142_520l) --> next_block_with_check_rewards ~loc:__LOC__ - ~staker_diff:(Q.of_int32 30_503l) - ~delegate_diff:(Q.of_int32 141_060l) + ~staker_diff:(Q.of_int32 30_582l) + ~delegate_diff:(Q.of_int32 142_520l) --> add_account_with_funds "staker2" ~funder:"faucet" @@ -471,11 +471,9 @@ let test_overstake = --> next_block_with_check_rewards ~loc:__LOC__ ~staker_diff: - (Q.make - (Z.of_int64 494_662_250_000_000L) - (Z.of_int64 27_749_969_497L)) - (* = 17825.68626079 *) - ~delegate_diff:(Q.of_int32 118_086l) + (Q.make (Z.of_int64 82_875_375_000_000L) (Z.of_int64 4_624_994_903L)) + (* = ~17919.01975 *) + ~delegate_diff:(Q.of_int32 119_345l) --> check_overstaked_status ~loc:__LOC__ ~expected:false "delegate" --> stake "staker2" (Amount (Tez.of_mutez 300_000_000_000L)) --> check_overstaked_status ~loc:__LOC__ ~expected:true "delegate" @@ -483,22 +481,22 @@ let test_overstake = ~loc:__LOC__ ~staker_diff: (Q.make - (Z.of_int64 3_570_648_000_000_000L) - (Z.of_int64 316_499_521_483L)) - (* = 11281.68530325 *) - ~delegate_diff:(Q.of_int32 107_227l) + (Z.of_int64 900_667_875_000_000L) + (Z.of_int64 79_124_880_029L)) + (* = ~11382.8656 *) + ~delegate_diff:(Q.of_int32 108_189l) --> set_edge 0.8 --> wait_delegate_parameters_activation --> set_delegate "staker2" (Some "faucet") --> check_overstaked_status ~loc:__LOC__ ~expected:false "delegate" --> next_block_with_check_rewards ~loc:__LOC__ - ~staker_diff:(Q.of_int32 34_634l) - ~delegate_diff:(Q.of_int32 452_382l) + ~staker_diff:(Q.of_int32 34_415l) + ~delegate_diff:(Q.of_int32 452_601l) --> wait_n_cycles_f Test_scenario_stake.unstake_wait --> next_block_with_check_rewards ~loc:__LOC__ - ~staker_diff:(Q.of_int32 17_889l) - ~delegate_diff:(Q.of_int32 233_679l) + ~staker_diff:(Q.of_int32 17_727l) + ~delegate_diff:(Q.of_int32 233_138l) let tests = tests_of_scenarios diff --git a/tezt/tests/adaptive_issuance.ml b/tezt/tests/adaptive_issuance.ml index 84c4bc84aaf7919398070c38b8cc38ac50cead7c..6da1910e8028b39830387dde66378ffc0a465b6e 100644 --- a/tezt/tests/adaptive_issuance.ml +++ b/tezt/tests/adaptive_issuance.ml @@ -151,12 +151,6 @@ let launch_ema_threshold client = Lwt.return @@ JSON.(json |-> "adaptive_issuance_launch_ema_threshold" |> as_int) -let edge_of_staking_over_delegation client = - let* json = - Client.RPC.call client @@ RPC.get_chain_block_context_constants () - in - Lwt.return @@ JSON.(json |-> "edge_of_staking_over_delegation" |> as_int) - let init ?(overrides = default_overrides) protocol = let* sandbox_node = Node.init [Synchronisation_threshold 0; Private_mode] in let sandbox_endpoint = Client.Node sandbox_node in @@ -329,8 +323,6 @@ let test_staking = JSON.(constants |-> "consensus_rights_delay" |> as_int) in - let* eosod = edge_of_staking_over_delegation client_1 in - log_step 1 "Prepare second node for double baking" ; Log.info "Starting second node" ; let* node_2 = @@ -709,12 +701,7 @@ let test_staking = let* bu = Operation_receipt.get_block_metadata client_1 in let* bu = Operation_receipt.Balance_updates.from_result [bu] in let amount_baker_share, amount_delegation, amount_edge, amount_stakers = - match eosod with - | 2 -> (834, 7877, 4, 4) - | 3 -> (1194, 7514, 6, 5) - | _ -> - Log.error "Unexpected edge_of_staking_over_baking value: %d" eosod ; - (0, 0, 0, 0) + (1194, 7514, 6, 5) in (* check rewards *) check_balance_updates @@ -967,9 +954,7 @@ let test_staking = let* bu = Operation_receipt.Balance_updates.from_result [bu] in (* check slashed and rewarded amounts *) - let global_limit_of_staking_over_baking = - if Protocol.(number protocol <= 020) then 5 else 9 - in + let global_limit_of_staking_over_baking = 9 in (* It's critical that the rewarded amount cannot exceed the amount slashed from the baker's own deposits; otherwise, the baker may actually gain tez by purposefully double signing and denuncing @@ -980,10 +965,14 @@ let test_staking = (* slashed stakers (including baker) unstake deposit *) let amount_slashed_from_unstake_stakers_deposits = - match eosod with - | 2 -> 50_000_002 - | 3 -> 50_000_003 - | _ -> Test.fail "Unexpected edge_of_staking_over_baking value: %d" eosod + if Protocol.(number protocol > number S023) then + (* From T on, when activating the protocol from Genesis, the + initialization of consensus rights for the first cycles is + done with AI already in effect, so delegation already counts + less than staking. This slightly skews the balances in the + whole test. *) + 50_000_004 + else 50_000_003 in let amount_rewarded_from_unstake_stakers_deposits = amount_slashed_from_unstake_stakers_deposits / reward_denominator @@ -995,10 +984,7 @@ let test_staking = (* slashed stake *) let amount_slashed_from_stakers_deposits = - match eosod with - | 2 -> 50_248_756 - | 3 -> 50_248_756 - | _ -> Test.fail "Unexpected edge_of_staking_over_baking value: %d" eosod + if Protocol.(number protocol > number S023) then 50_248_757 else 50_248_756 in let amount_rewarded_from_stakers_deposits = amount_slashed_from_stakers_deposits / reward_denominator @@ -1009,10 +995,8 @@ let test_staking = (* slashing baker (bootstrap2) stake*) let amount_slashed_from_baker_deposits = - match eosod with - | 2 -> 10_049_764_326 - | 3 -> if consensus_rights_delay = 1 then 10_049_761_010 else 10_049_764_732 - | _ -> Test.fail "Unexpected edge_of_staking_over_baking value: %d" eosod + if Protocol.(number protocol > number S023) then 10_049_775_146 + else 10_049_764_732 in let amount_rewarded_from_baker_deposits = diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out index 5cbf34264a87a15f74a18781b6a9585beec0a53c..7b4b7de8fe1907fab5c42af320ed9d1fcbb8762a 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode client) RPC regression tests- misc_protocol.out @@ -146,4 +146,4 @@ { "first": 1, "last": 8 } ./octez-client rpc get /chains/main/blocks/head/helpers/total_baking_power -"20000000000000" +"7333333333330" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out index b890df668ad842dcd2f837f302ab8ed194a3ea2c..2b22de0c6078f966e9330b34f616895ec681f9db 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode light) RPC regression tests- misc_protocol.out @@ -146,4 +146,4 @@ { "first": 1, "last": 8 } ./octez-client --mode light rpc get /chains/main/blocks/head/helpers/total_baking_power -"20000000000000" +"7333333333330" diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out index 41aaee3318dfbc2e759fe0413b7b272d177cc0f9..d682b72bf0f3f84e1b92f5cbd01d12f667a34700 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy) RPC regression tests- misc_protocol.out @@ -146,4 +146,4 @@ { "first": 1, "last": 8 } ./octez-client --mode proxy rpc get /chains/main/blocks/head/helpers/total_baking_power -"20000000000000" +"7333333333330" diff --git a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out index 1c88f77fa658432edf4888c21ff09276050f3c01..4513a0f316ce6a70533a329cd93e04bda41d0055 100644 --- a/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out +++ b/tezt/tests/expected/baker_test.ml/Alpha- Baker rewards.out @@ -55,17 +55,17 @@ { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", "change": "3600000000000", "origin": "migration" }, - { "kind": "minted", "category": "baking rewards", "change": "-240009", + { "kind": "minted", "category": "baking rewards", "change": "-600021", "origin": "block" }, { "kind": "freezer", "category": "deposits", "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "240009", "origin": "block" }, - { "kind": "minted", "category": "baking rewards", "change": "-2160073", + "change": "600021", "origin": "block" }, + { "kind": "minted", "category": "baking rewards", "change": "-1800061", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "2160073", "origin": "block" } ], + "change": "1800061", "origin": "block" } ], "liquidity_baking_toggle_ema": 0, "adaptive_issuance_vote_ema": 0, "adaptive_issuance_activation_cycle": 0, "implicit_operations_results": 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 2d5677a5cdba7366df67bba73fe8efd999e4f026..58de931a638102c7c6f60831a725e90cfa4a5ee0 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 @@ -81,15 +81,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666681667", - "total_staked": "200000015001", "total_delegated": "3800000285009", + "pending_staking_parameters": [], "baking_power": "1466666707577", + "total_staked": "200000040911", "total_delegated": "3800000259099", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000300010", "own_staked": "200000015001", - "own_delegated": "3800000285009", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000040911", + "own_delegated": "3800000259099", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", @@ -107,7 +107,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000015001" } ], + "frozen_deposits": "200000040911" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667449490", - "total_staked": "200000153711", "total_delegated": "3800002920354", + "pending_staking_parameters": [], "baking_power": "1466667657786", + "total_staked": "200000419200", "total_delegated": "3800002654865", "min_delegated_in_current_cycle": - { "amount": "3800001887337", + { "amount": "3800001715759", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003074065", "own_staked": "200000153711", - "own_delegated": "3800002920354", "external_staked": "0", + "own_full_balance": "4000003074065", "own_staked": "200000419200", + "own_delegated": "3800002654865", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,7 +149,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000153711" } ], + "frozen_deposits": "200000419200" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -167,15 +167,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667449490", - "total_staked": "200000153711", "total_delegated": "3800002920354", + "pending_staking_parameters": [], "baking_power": "1466667657786", + "total_staked": "200000419200", "total_delegated": "3800002654865", "min_delegated_in_current_cycle": - { "amount": "3800001887337", + { "amount": "3800001715759", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003074065", "own_staked": "200000153711", - "own_delegated": "3800002920354", "external_staked": "0", + "own_full_balance": "4000003074065", "own_staked": "200000419200", + "own_delegated": "3800002654865", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -191,11 +191,11 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000153711" } ], + "frozen_deposits": "200000419200" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002920354" +"3800002654865" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -219,17 +219,17 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.827543 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.827543 - [PUBLIC_KEY_HASH] ... -ꜩ38000.028561 - [PUBLIC_KEY_HASH] ... +ꜩ38000.028561 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.564709 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.564709 + [PUBLIC_KEY_HASH] ... -ꜩ38000.025906 + [PUBLIC_KEY_HASH] ... +ꜩ38000.025906 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info -[ "7333333414212", +[ "7333333553913", [ [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666747548" ], + "1466666887249" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, "1466666666666" ], @@ -258,21 +258,21 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666833227", - "total_staked": "200000154782", "total_delegated": "38000035337", + "pending_staking_parameters": [], "baking_power": "212667097831", + "total_staked": "200000420271", "total_delegated": "38000032682", "min_delegated_in_current_cycle": - { "amount": "38000035337", + { "amount": "38000032682", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000190119", "own_staked": "200000154782", - "own_delegated": "38000035337", "external_staked": "0", + "own_full_balance": "238000452953", "own_staked": "200000420271", + "own_delegated": "38000032682", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000190119", "voting_power": "4000000000000", + "current_voting_power": "238000452953", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -282,14 +282,14 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000154782" } ], + "frozen_deposits": "200000420271" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000035337" +"38000032682" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002827543" +"3762002564709" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002827543" +"3762002564709" 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 c2c5e92c027a2e53cae97ee725fce2aba14df87a..38c1c3aa0c841cfc4902c9692fabe4b2c1421cd8 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 @@ -81,15 +81,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666681667", - "total_staked": "200000015001", "total_delegated": "3800000285009", + "pending_staking_parameters": [], "baking_power": "1466666707577", + "total_staked": "200000040911", "total_delegated": "3800000259099", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000300010", "own_staked": "200000015001", - "own_delegated": "3800000285009", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000040911", + "own_delegated": "3800000259099", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", @@ -107,7 +107,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000015001" } ], + "frozen_deposits": "200000040911" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667449490", - "total_staked": "200000153711", "total_delegated": "3800002920354", + "pending_staking_parameters": [], "baking_power": "1466667657786", + "total_staked": "200000419200", "total_delegated": "3800002654865", "min_delegated_in_current_cycle": - { "amount": "3800001887337", + { "amount": "3800001715759", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003074065", "own_staked": "200000153711", - "own_delegated": "3800002920354", "external_staked": "0", + "own_full_balance": "4000003074065", "own_staked": "200000419200", + "own_delegated": "3800002654865", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,7 +149,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000153711" } ], + "frozen_deposits": "200000419200" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -167,15 +167,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667449490", - "total_staked": "200000153711", "total_delegated": "3800002920354", + "pending_staking_parameters": [], "baking_power": "1466667657786", + "total_staked": "200000419200", "total_delegated": "3800002654865", "min_delegated_in_current_cycle": - { "amount": "3800001887337", + { "amount": "3800001715759", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003074065", "own_staked": "200000153711", - "own_delegated": "3800002920354", "external_staked": "0", + "own_full_balance": "4000003074065", "own_staked": "200000419200", + "own_delegated": "3800002654865", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -191,11 +191,11 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000153711" } ], + "frozen_deposits": "200000419200" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002920354" +"3800002654865" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -219,17 +219,17 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.827543 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.827543 - [PUBLIC_KEY_HASH] ... -ꜩ38000.028561 - [PUBLIC_KEY_HASH] ... +ꜩ38000.028561 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.564709 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.564709 + [PUBLIC_KEY_HASH] ... -ꜩ38000.025906 + [PUBLIC_KEY_HASH] ... +ꜩ38000.025906 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info -[ "7333333414212", +[ "7333333553913", [ [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666747548" ], + "1466666887249" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, "1466666666666" ], @@ -258,21 +258,21 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666833227", - "total_staked": "200000154782", "total_delegated": "38000035337", + "pending_staking_parameters": [], "baking_power": "212667097831", + "total_staked": "200000420271", "total_delegated": "38000032682", "min_delegated_in_current_cycle": - { "amount": "38000035337", + { "amount": "38000032682", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000190119", "own_staked": "200000154782", - "own_delegated": "38000035337", "external_staked": "0", + "own_full_balance": "238000452953", "own_staked": "200000420271", + "own_delegated": "38000032682", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000190119", "voting_power": "4000000000000", + "current_voting_power": "238000452953", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -282,14 +282,14 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000154782" } ], + "frozen_deposits": "200000420271" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000035337" +"38000032682" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002827543" +"3762002564709" 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 72d86c7ea6130143ed2d95a81d2600d387d8bc8d..de18e2d7ea1f853bdf667a130edd691261f5a4d7 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 @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667339391", - "total_staked": "200000138710", "total_delegated": "3800002635060", + "pending_staking_parameters": [], "baking_power": "1466667530414", + "total_staked": "200000378289", "total_delegated": "3800002395481", "min_delegated_in_current_cycle": - { "amount": "3800001602043", + { "amount": "3800001456375", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002773770", "own_staked": "200000138710", - "own_delegated": "3800002635060", "external_staked": "0", + "own_full_balance": "4000002773770", "own_staked": "200000378289", + "own_delegated": "3800002395481", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,7 +149,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000138710" } ], + "frozen_deposits": "200000378289" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -167,15 +167,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667339391", - "total_staked": "200000138710", "total_delegated": "3800002635060", + "pending_staking_parameters": [], "baking_power": "1466667530414", + "total_staked": "200000378289", "total_delegated": "3800002395481", "min_delegated_in_current_cycle": - { "amount": "3800001602043", + { "amount": "3800001456375", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002773770", "own_staked": "200000138710", - "own_delegated": "3800002635060", "external_staked": "0", + "own_full_balance": "4000002773770", "own_staked": "200000378289", + "own_delegated": "3800002395481", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -191,11 +191,11 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000138710" } ], + "frozen_deposits": "200000378289" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002635060" +"3800002395481" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -219,17 +219,17 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.545102 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.545102 - [PUBLIC_KEY_HASH] ... -ꜩ38000.025708 - [PUBLIC_KEY_HASH] ... +ꜩ38000.025708 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.307919 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.307919 + [PUBLIC_KEY_HASH] ... -ꜩ38000.023312 + [PUBLIC_KEY_HASH] ... +ꜩ38000.023312 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info -[ "7333333414117", +[ "7333333553818", [ [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666732452" ], + "1466666846243" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, "1466666666666" ], @@ -241,7 +241,7 @@ This sequence of operations was run: "1466666666666" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666681667" ] ] ] + "1466666707577" ] ] ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' { "deactivated": false, "is_forbidden": false, @@ -258,21 +258,21 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666817275", - "total_staked": "200000139781", "total_delegated": "38000032484", + "pending_staking_parameters": [], "baking_power": "212667056056", + "total_staked": "200000379360", "total_delegated": "38000030088", "min_delegated_in_current_cycle": - { "amount": "38000032484", + { "amount": "38000030088", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000172265", "own_staked": "200000139781", - "own_delegated": "38000032484", "external_staked": "0", + "own_full_balance": "238000409448", "own_staked": "200000379360", + "own_delegated": "38000030088", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000172265", "voting_power": "4000000000000", + "current_voting_power": "238000409448", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -282,14 +282,14 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000139781" } ], + "frozen_deposits": "200000379360" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000032484" +"38000030088" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002545102" +"3762002307919" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002545102" +"3762002307919" 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 8fd030c77be5b2377d3f3c0667226382b1e727de..7e0bf901c137e7aa689a6dd2a65553d0d1ad5a7b 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 @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667339391", - "total_staked": "200000138710", "total_delegated": "3800002635060", + "pending_staking_parameters": [], "baking_power": "1466667530414", + "total_staked": "200000378289", "total_delegated": "3800002395481", "min_delegated_in_current_cycle": - { "amount": "3800001602043", + { "amount": "3800001456375", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002773770", "own_staked": "200000138710", - "own_delegated": "3800002635060", "external_staked": "0", + "own_full_balance": "4000002773770", "own_staked": "200000378289", + "own_delegated": "3800002395481", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,7 +149,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000138710" } ], + "frozen_deposits": "200000378289" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -167,15 +167,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667339391", - "total_staked": "200000138710", "total_delegated": "3800002635060", + "pending_staking_parameters": [], "baking_power": "1466667530414", + "total_staked": "200000378289", "total_delegated": "3800002395481", "min_delegated_in_current_cycle": - { "amount": "3800001602043", + { "amount": "3800001456375", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002773770", "own_staked": "200000138710", - "own_delegated": "3800002635060", "external_staked": "0", + "own_full_balance": "4000002773770", "own_staked": "200000378289", + "own_delegated": "3800002395481", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -191,11 +191,11 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000138710" } ], + "frozen_deposits": "200000378289" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3800002635060" +"3800002395481" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" @@ -219,17 +219,17 @@ This sequence of operations was run: Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 - [PUBLIC_KEY_HASH] ... -ꜩ3762002.545102 - [PUBLIC_KEY_HASH] ... +ꜩ3762002.545102 - [PUBLIC_KEY_HASH] ... -ꜩ38000.025708 - [PUBLIC_KEY_HASH] ... +ꜩ38000.025708 + [PUBLIC_KEY_HASH] ... -ꜩ3762002.307919 + [PUBLIC_KEY_HASH] ... +ꜩ3762002.307919 + [PUBLIC_KEY_HASH] ... -ꜩ38000.023312 + [PUBLIC_KEY_HASH] ... +ꜩ38000.023312 ./octez-client rpc get /chains/main/blocks/head/helpers/stake_info -[ "7333333414117", +[ "7333333553818", [ [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666732452" ], + "1466666846243" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, "1466666666666" ], @@ -241,7 +241,7 @@ This sequence of operations was run: "1466666666666" ], [ { "delegate": "[PUBLIC_KEY_HASH]", "consensus_pkh": "[PUBLIC_KEY_HASH]" }, - "1466666681667" ] ] ] + "1466666707577" ] ] ] ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' { "deactivated": false, "is_forbidden": false, @@ -258,21 +258,21 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "212666817275", - "total_staked": "200000139781", "total_delegated": "38000032484", + "pending_staking_parameters": [], "baking_power": "212667056056", + "total_staked": "200000379360", "total_delegated": "38000030088", "min_delegated_in_current_cycle": - { "amount": "38000032484", + { "amount": "38000030088", "level": { "level": 9, "level_position": 8, "cycle": 2, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "238000172265", "own_staked": "200000139781", - "own_delegated": "38000032484", "external_staked": "0", + "own_full_balance": "238000409448", "own_staked": "200000379360", + "own_delegated": "38000030088", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" }, { "cycle": 2, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", "staking_denominator": "0", - "current_voting_power": "238000172265", "voting_power": "4000000000000", + "current_voting_power": "238000409448", "voting_power": "4000000000000", "voting_info": { "voting_power": "4000000000000", "remaining_proposals": 20 }, "consensus_key": @@ -282,14 +282,14 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000139781" } ], + "frozen_deposits": "200000379360" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"38000032484" +"38000030088" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' "0" ./octez-client rpc get '/chains/main/blocks/head/context/contracts/[PUBLIC_KEY_HASH]/balance' -"3762002545102" +"3762002307919" 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 1e856d8905d5dfa7460b9728bb6efca813ef24bc..20a4e3558d5e2f9c628d008cb39a1035ccb6027f 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 @@ -81,15 +81,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466666681667", - "total_staked": "200000015001", "total_delegated": "3800000285009", + "pending_staking_parameters": [], "baking_power": "1466666707577", + "total_staked": "200000040911", "total_delegated": "3800000259099", "min_delegated_in_current_cycle": { "amount": "3800000000000", "level": { "level": 1, "level_position": 0, "cycle": 0, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000000300010", "own_staked": "200000015001", - "own_delegated": "3800000285009", "external_staked": "0", + "own_full_balance": "4000000300010", "own_staked": "200000040911", + "own_delegated": "3800000259099", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" } ], "denunciations": [], "estimated_shared_pending_slashed_amount": "0", @@ -107,7 +107,7 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000015001" } ], + "frozen_deposits": "200000040911" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } ./octez-client rpc get '/chains/main/blocks/head/context/delegates/[PUBLIC_KEY_HASH]' @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667449490", - "total_staked": "200000153711", "total_delegated": "3800002920354", + "pending_staking_parameters": [], "baking_power": "1466667657786", + "total_staked": "200000419200", "total_delegated": "3800002654865", "min_delegated_in_current_cycle": - { "amount": "3800001887337", + { "amount": "3800001715759", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000003074065", "own_staked": "200000153711", - "own_delegated": "3800002920354", "external_staked": "0", + "own_full_balance": "4000003074065", "own_staked": "200000419200", + "own_delegated": "3800002654865", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,5 +149,5 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000153711" } ], + "frozen_deposits": "200000419200" } ], "delegators": [ "[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 610e14229f986dcf840345b9a79acb5a4e166822..15c31dfa8718ec3323fc0d10359dfb0fd3d364ae 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 @@ -125,15 +125,15 @@ This sequence of operations was run: "active_staking_parameters": { "limit_of_staking_over_baking_millionth": 0, "edge_of_baking_over_staking_billionth": 1000000000 }, - "pending_staking_parameters": [], "baking_power": "1466667339391", - "total_staked": "200000138710", "total_delegated": "3800002635060", + "pending_staking_parameters": [], "baking_power": "1466667530414", + "total_staked": "200000378289", "total_delegated": "3800002395481", "min_delegated_in_current_cycle": - { "amount": "3800001602043", + { "amount": "3800001456375", "level": { "level": 5, "level_position": 4, "cycle": 1, "cycle_position": 0, "expected_commitment": false } }, - "own_full_balance": "4000002773770", "own_staked": "200000138710", - "own_delegated": "3800002635060", "external_staked": "0", + "own_full_balance": "4000002773770", "own_staked": "200000378289", + "own_delegated": "3800002395481", "external_staked": "0", "external_delegated": "0", "total_unstaked_per_cycle": [ { "cycle": 0, "deposit": "0" }, { "cycle": 1, "deposit": "0" } ], @@ -149,5 +149,5 @@ This sequence of operations was run: "companion_key": { "active": null }, "stakers": [ { "staker": "[PUBLIC_KEY_HASH]", - "frozen_deposits": "200000138710" } ], + "frozen_deposits": "200000378289" } ], "delegators": [ "[PUBLIC_KEY_HASH]" ] } diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out index 3a70312dc4631d8016051cff42fca715764c6c53..214deca6d01a63e372713d0567a141de1063ebbe 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL L1 integration (Use all available slots).out @@ -1,6 +1,6 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata 200 OK -{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-15001","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"15001","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-285009","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"285009","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-14989","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"14989","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-284787","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"284787","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"206420","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} +{"protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","next_protocol":"ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK","test_chain_status":{"status":"not_running"},"max_operations_ttl":3,"max_operation_data_length":32768,"max_block_header_length":289,"max_operation_list_length":[{"max_size":4194304,"max_op":2048},{"max_size":32768},{"max_size":135168,"max_op":132},{"max_size":524288}],"proposer":"[PUBLIC_KEY_HASH]","baker":"[PUBLIC_KEY_HASH]","level_info":{"level":3,"level_position":2,"cycle":0,"cycle_position":2,"expected_commitment":false},"voting_period_info":{"voting_period":{"index":0,"kind":"proposal","start_position":0},"position":2,"remaining":61},"nonce_hash":null,"deactivated":[],"balance_updates":[{"kind":"accumulator","category":"block fees","change":"-416000","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"416000","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-40911","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40911","origin":"block"},{"kind":"minted","category":"baking rewards","change":"-259099","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"259099","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-40879","origin":"block"},{"kind":"freezer","category":"deposits","staker":{"baker_own_stake":"[PUBLIC_KEY_HASH]"},"change":"40879","origin":"block"},{"kind":"minted","category":"baking bonuses","change":"-258897","origin":"block"},{"kind":"contract","contract":"[PUBLIC_KEY_HASH]","change":"258897","origin":"block"}],"liquidity_baking_toggle_ema":0,"adaptive_issuance_vote_ema":0,"adaptive_issuance_activation_cycle":0,"implicit_operations_results":[{"kind":"transaction","storage":[{"int":"1"},{"int":"166766"},{"int":"100"},{"bytes":"01e927f00ef734dfc85919635e9afc9166c83ef9fc00"},{"bytes":"0115eb0104481a6d7921160bc982c5e0a561cd8a3a00"}],"balance_updates":[{"kind":"minted","category":"subsidy","change":"-83333","origin":"subsidy"},{"kind":"contract","contract":"[CONTRACT_HASH]","change":"83333","origin":"subsidy"}],"consumed_milligas":"206420","storage_size":"4629"}],"proposer_consensus_key":"[PUBLIC_KEY_HASH]","baker_consensus_key":"[PUBLIC_KEY_HASH]","consumed_milligas":"544000000","dal_attestation":"0"} { "protocol": "ProtoALphaALphaALphaALphaALphaALphaALphaALphaDdp3zK", @@ -63,7 +63,7 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata { "kind": "minted", "category": "baking rewards", - "change": "-15001", + "change": "-40911", "origin": "block" }, { @@ -72,25 +72,25 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "15001", + "change": "40911", "origin": "block" }, { "kind": "minted", "category": "baking rewards", - "change": "-285009", + "change": "-259099", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "285009", + "change": "259099", "origin": "block" }, { "kind": "minted", "category": "baking bonuses", - "change": "-14989", + "change": "-40879", "origin": "block" }, { @@ -99,19 +99,19 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head/metadata "staker": { "baker_own_stake": "[PUBLIC_KEY_HASH]" }, - "change": "14989", + "change": "40879", "origin": "block" }, { "kind": "minted", "category": "baking bonuses", - "change": "-284787", + "change": "-258897", "origin": "block" }, { "kind": "contract", "contract": "[PUBLIC_KEY_HASH]", - "change": "284787", + "change": "258897", "origin": "block" } ], diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out index 48388a8225c45bbfad2bf8b8a3726877b7c71076..cc7bb3117dd83555f497f6663216c6133a7847e5 100644 --- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out +++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL node (attesters receive DAL rewards).out @@ -4,13 +4,13 @@ "staker": { "baker_own_stake": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx", - "change": "202046", + "change": "183678", "origin": "block" } { @@ -19,13 +19,13 @@ "staker": { "baker_own_stake": "tz1b7tUupMgCNw2cCLpKTkSD1NZzB5TkP2sv" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1b7tUupMgCNw2cCLpKTkSD1NZzB5TkP2sv", - "change": "202046", + "change": "183678", "origin": "block" } { @@ -34,13 +34,13 @@ "staker": { "baker_own_stake": "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1ddb9NMYHZi5UzPdzTZMYQQZoMub195zgv", - "change": "202046", + "change": "183678", "origin": "block" } { @@ -49,13 +49,13 @@ "staker": { "baker_own_stake": "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1faswCTDciRzE4oJ9jn2Vm2dvjeyA9fUzU", - "change": "202046", + "change": "183678", "origin": "block" } { @@ -64,13 +64,13 @@ "staker": { "baker_own_stake": "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN", - "change": "202046", + "change": "183678", "origin": "block" } GET http://[HOST]:[PORT]/chains/main/blocks/head/context/issuance/expected_issuance @@ -108,13 +108,13 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head~1/context/delegates/[PUBLIC_KEY "staker": { "baker_own_stake": "tz1b7tUupMgCNw2cCLpKTkSD1NZzB5TkP2sv" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1b7tUupMgCNw2cCLpKTkSD1NZzB5TkP2sv", - "change": "202046", + "change": "183678", "origin": "block" } { @@ -123,13 +123,13 @@ GET http://[HOST]:[PORT]/chains/main/blocks/head~1/context/delegates/[PUBLIC_KEY "staker": { "baker_own_stake": "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN" }, - "change": "10634", + "change": "29002", "origin": "block" } { "kind": "contract", "contract": "tz1gjaF81ZRRvdzjobyfVNsAeSC6PScjfQwN", - "change": "202046", + "change": "183678", "origin": "block" } GET http://[HOST]:[PORT]/chains/main/blocks/head/context/issuance/expected_issuance