diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index ee76af25f06e944e9904e1a9519a502feba73b39..8c7e0cc28e7c95eb34e52fef03baa6e561659e96 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -47,6 +47,12 @@ Breaking Changes destination. The default cases (implicit and smart contracts) are prefixed with the tag ``0``. +- The `consumed_gas` field in the encoding of operations becomes + **deprecated** in favour of `consumed_milligas`, which contains + a more precise readout for the same value. `consumed_milligas` + field was added to the encoding of block metadata for uniformity. + (MR :gl:`!4388`) + Bug Fixes --------- diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index 4fbed7e51c668e36725edff1ca2186362a98284b..6cf254e2004a7ce1f82b603d4ab49c33603a86f2 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -1773,26 +1773,28 @@ let block_metadata_encoding = liquidity_baking_escape_ema; implicit_operations_results; } -> - ( proposer, - baker, - level_info, - voting_period_info, - nonce_hash, - consumed_gas, - deactivated, - balance_updates, - liquidity_baking_escape_ema, - implicit_operations_results )) - (fun ( proposer, - baker, - level_info, - voting_period_info, - nonce_hash, - consumed_gas, - deactivated, - balance_updates, - liquidity_baking_escape_ema, - implicit_operations_results ) -> + ( ( proposer, + baker, + level_info, + voting_period_info, + nonce_hash, + consumed_gas, + deactivated, + balance_updates, + liquidity_baking_escape_ema, + implicit_operations_results ), + consumed_gas )) + (fun ( ( proposer, + baker, + level_info, + voting_period_info, + nonce_hash, + consumed_gas, + deactivated, + balance_updates, + liquidity_baking_escape_ema, + implicit_operations_results ), + _consumed_millgas ) -> { proposer; baker; @@ -1805,19 +1807,21 @@ let block_metadata_encoding = liquidity_baking_escape_ema; implicit_operations_results; }) - (obj10 - (req "proposer" Signature.Public_key_hash.encoding) - (req "baker" Signature.Public_key_hash.encoding) - (req "level_info" Level.encoding) - (req "voting_period_info" Voting_period.info_encoding) - (req "nonce_hash" (option Nonce_hash.encoding)) - (req "consumed_gas" Gas.Arith.n_fp_encoding) - (req "deactivated" (list Signature.Public_key_hash.encoding)) - (dft "balance_updates" Receipt.balance_updates_encoding []) - (req "liquidity_baking_escape_ema" int32) - (req - "implicit_operations_results" - (list successful_manager_operation_result_encoding))) + (merge_objs + (obj10 + (req "proposer" Signature.Public_key_hash.encoding) + (req "baker" Signature.Public_key_hash.encoding) + (req "level_info" Level.encoding) + (req "voting_period_info" Voting_period.info_encoding) + (req "nonce_hash" (option Nonce_hash.encoding)) + (req "consumed_gas" Gas.Arith.n_fp_encoding) + (req "deactivated" (list Signature.Public_key_hash.encoding)) + (dft "balance_updates" Receipt.balance_updates_encoding []) + (req "liquidity_baking_escape_ema" int32) + (req + "implicit_operations_results" + (list successful_manager_operation_result_encoding))) + (obj1 (req "consumed_milligas" Gas.Arith.n_fp_encoding))) type precheck_result = { consumed_gas : Gas.Arith.fp;