From 6f5400d22579e8b89c606e7a7792c211f779a2b0 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Thu, 24 Feb 2022 11:16:51 +0100 Subject: [PATCH 1/3] Proto: generate value of liquidity_baking_subsidy --- src/proto_alpha/lib_parameters/default_parameters.ml | 7 ++++++- src/proto_alpha/lib_protocol/alpha_context.mli | 1 + src/proto_alpha/lib_protocol/constants_repr.ml | 2 ++ src/proto_alpha/lib_protocol/constants_repr.mli | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_parameters/default_parameters.ml b/src/proto_alpha/lib_parameters/default_parameters.ml index af4b89778c34..60b736269b88 100644 --- a/src/proto_alpha/lib_parameters/default_parameters.ml +++ b/src/proto_alpha/lib_parameters/default_parameters.ml @@ -80,6 +80,7 @@ let constants_mainnet = baking_reward_fixed_portion; baking_reward_bonus_per_slot; endorsing_reward_per_slot; + liquidity_baking_subsidy; } = Constants.Generated.generate ~consensus_committee_size @@ -116,7 +117,7 @@ let constants_mainnet = quorum_max = 70_00l; min_proposal_quorum = 5_00l; (* liquidity_baking_subsidy is 1/16th of maximum total rewards for a block *) - liquidity_baking_subsidy = Tez.of_mutez_exn 2_500_000L; + liquidity_baking_subsidy (* 2_500_000 mutez *); (* level after protocol activation when liquidity baking shuts off: about 6 months after first activation on mainnet *) liquidity_baking_sunset_level = 3_063_809l; @@ -245,6 +246,7 @@ let constants_sandbox = baking_reward_fixed_portion; baking_reward_bonus_per_slot; endorsing_reward_per_slot; + liquidity_baking_subsidy; } = Constants.Generated.generate ~consensus_committee_size @@ -262,6 +264,7 @@ let constants_sandbox = proof_of_work_threshold = Int64.of_int (-1); vdf_difficulty = 50_000L; liquidity_baking_sunset_level = 128l; + liquidity_baking_subsidy; minimal_block_delay = Period.of_seconds_exn (Int64.of_int block_time); delay_increment_per_round = Period.one_second; consensus_committee_size = 256; @@ -281,6 +284,7 @@ let constants_test = baking_reward_fixed_portion; baking_reward_bonus_per_slot; endorsing_reward_per_slot; + liquidity_baking_subsidy; } = Constants.Generated.generate ~consensus_committee_size @@ -297,6 +301,7 @@ let constants_test = proof_of_work_threshold = Int64.of_int (-1); vdf_difficulty = 50_000L; liquidity_baking_sunset_level = 4096l; + liquidity_baking_subsidy; consensus_committee_size; consensus_threshold (* 17 slots *); max_slashing_period = 2; diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 35ab2c26cfa0..8b36d8ae7674 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -865,6 +865,7 @@ module Constants : sig baking_reward_fixed_portion : Tez.t; baking_reward_bonus_per_slot : Tez.t; endorsing_reward_per_slot : Tez.t; + liquidity_baking_subsidy : Tez.t; } val generate : diff --git a/src/proto_alpha/lib_protocol/constants_repr.ml b/src/proto_alpha/lib_protocol/constants_repr.ml index 21358c918394..1a4a5e33bb78 100644 --- a/src/proto_alpha/lib_protocol/constants_repr.ml +++ b/src/proto_alpha/lib_protocol/constants_repr.ml @@ -329,6 +329,7 @@ module Generated = struct baking_reward_fixed_portion : Tez_repr.t; baking_reward_bonus_per_slot : Tez_repr.t; endorsing_reward_per_slot : Tez_repr.t; + liquidity_baking_subsidy : Tez_repr.t; } let generate ~consensus_committee_size ~blocks_per_minute = @@ -358,6 +359,7 @@ module Generated = struct else Tez_repr.div_exn rewards_quarter bonus_committee_size); endorsing_reward_per_slot = Tez_repr.div_exn rewards_half consensus_committee_size; + liquidity_baking_subsidy = Tez_repr.div_exn rewards_per_block 16; } end diff --git a/src/proto_alpha/lib_protocol/constants_repr.mli b/src/proto_alpha/lib_protocol/constants_repr.mli index 9572f32d9aca..4cbd13dd9bfb 100644 --- a/src/proto_alpha/lib_protocol/constants_repr.mli +++ b/src/proto_alpha/lib_protocol/constants_repr.mli @@ -103,6 +103,7 @@ module Generated : sig baking_reward_fixed_portion : Tez_repr.t; baking_reward_bonus_per_slot : Tez_repr.t; endorsing_reward_per_slot : Tez_repr.t; + liquidity_baking_subsidy : Tez_repr.t; } (* This function is meant to be used just in lib_parameters and in the -- GitLab From 48b93c0e9af3363782112c5b9a95fa1b69317135 Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Wed, 13 Jul 2022 12:15:03 +0200 Subject: [PATCH 2/3] Tests/Tezt: update regression outputs --- ...a- (mode client) RPC regression tests- misc_protocol.out | 3 +-- ...ha- (mode light) RPC regression tests- misc_protocol.out | 3 +-- ...ha- (mode proxy) RPC regression tests- misc_protocol.out | 3 +-- ...server_data_dir) RPC regression tests- misc_protocol.out | 3 +-- ...roxy_server_rpc) RPC regression tests- misc_protocol.out | 3 +-- ... handling of commitments in the rollup node (no_comm.out | 6 ++---- 6 files changed, 7 insertions(+), 14 deletions(-) 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 b5678a51111b..be3cdd737a28 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 @@ -19,8 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, 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 bdc8e1ec5f6f..7721a40b8d03 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 @@ -19,8 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, 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 34da8ea04e0b..f983510561bd 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 @@ -19,8 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out index 7bda44283143..ff2d2c09aff4 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_data_dir) RPC regression tests- misc_protocol.out @@ -19,8 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out index 7bda44283143..ff2d2c09aff4 100644 --- a/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out +++ b/tezt/tests/expected/RPC_test.ml/Alpha- (mode proxy_server_rpc) RPC regression tests- misc_protocol.out @@ -19,8 +19,7 @@ "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out index a72d01c1a9e2..1163e04b7d79 100644 --- a/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out +++ b/tezt/tests/expected/sc_rollup.ml/Alpha- observing the correct handling of commitments in the rollup node (no_comm.out @@ -76,8 +76,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, @@ -183,8 +182,7 @@ This sequence of operations was run: "endorsing_reward_per_slot": "2604", "cost_per_byte": "250", "hard_storage_limit_per_operation": "60000", "quorum_min": 2000, "quorum_max": 7000, "min_proposal_quorum": 500, - "liquidity_baking_subsidy": "2500000", - "liquidity_baking_sunset_level": 128, + "liquidity_baking_subsidy": "83333", "liquidity_baking_sunset_level": 128, "liquidity_baking_toggle_ema_threshold": 1000000000, "max_operations_time_to_live": 120, "minimal_block_delay": "1", "delay_increment_per_round": "1", "consensus_committee_size": 256, -- GitLab From 9dece2d3a3f1efac5375973d6406b93ba8ae337c Mon Sep 17 00:00:00 2001 From: Eugen Zalinescu Date: Tue, 18 Jan 2022 16:22:09 +0100 Subject: [PATCH 3/3] Tests/Python: update regression traces for liquidity_baking.py --- ...roveTransferRemove::test_add_liquidity.out | 56 +++++++++---------- ...ddApproveTransferRemove::test_approval.out | 8 +-- ...TransferRemove::test_approved_transfer.out | 10 ++-- ...pproveTransferRemove::test_dex_storage.out | 6 +- ...pproveTransferRemove::test_lqt_storage.out | 2 +- ...eTransferRemove::test_remove_liquidity.out | 30 +++++----- ..._baking.TestTrades::test_add_liquidity.out | 56 +++++++++---------- ...uidity_baking.TestTrades::test_buy_tok.out | 32 +++++------ ...ty_baking.TestTrades::test_dex_storage.out | 6 +- ...ty_baking.TestTrades::test_lqt_storage.out | 2 +- ...idity_baking.TestTrades::test_sell_tok.out | 30 +++++----- ...idity_baking.TestTrades::test_transfer.out | 8 +-- 12 files changed, 123 insertions(+), 123 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out index 781ca61eb5e0..93ac7296cb51 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_add_liquidity.out @@ -1,8 +1,8 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_add_liquidity Node is bootstrapped. -Estimated gas: 8553.386 units (will add 100 for safety) -Estimated storage: 141 bytes added (will add 20 for safety) +Estimated gas: 8553.406 units (will add 100 for safety) +Estimated storage: 147 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' NOT waiting for the operation to be included. @@ -15,7 +15,7 @@ This sequence of operations was run: Fee to the baker: ꜩ0.001221 Expected counter: [EXPECTED_COUNTER] Gas limit: 8654 - Storage limit: 161 bytes + Storage limit: 167 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001221 payload fees(the block proposer) ....... +ꜩ0.001221 @@ -27,17 +27,17 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 0 1000000000 "[TIMESTAMP]") This transaction was successfully applied Updated storage: - { 722 ; - 9013500100 ; - 72107 ; + { 21599 ; + 9001416765 ; + 2159830 ; 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } - Storage size: 4633 bytes - Paid storage size diff: 3 bytes - Consumed gas: 2274.737 + Storage size: 4635 bytes + Paid storage size diff: 6 bytes + Consumed gas: 2274.745 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.00075 - storage fees ........................... +ꜩ0.00075 + [CONTRACT_HASH] ... -ꜩ0.0015 + storage fees ........................... +ꜩ0.0015 [CONTRACT_HASH] ... -ꜩ9001 [CONTRACT_HASH] ... +ꜩ9001 Internal operations: @@ -47,37 +47,37 @@ This sequence of operations was run: To: [CONTRACT_HASH] Entrypoint: transfer Parameter: (Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 - (Pair 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 721)) + (Pair 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 21598)) This transaction was successfully applied Updated storage: { 0 ; 1 ; 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 ; 100010000 } Updated big_maps: Set map(1)[(Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 - 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 999999279 - Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 99999279 - Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 - Storage size: 2263 bytes - Paid storage size diff: 68 bytes - Consumed gas: 3065.552 + 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 999978402 + Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 99978402 + Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598 + Storage size: 2264 bytes + Paid storage size diff: 69 bytes + Consumed gas: 3065.556 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.017 - storage fees ........................... +ꜩ0.017 + [CONTRACT_HASH] ... -ꜩ0.01725 + storage fees ........................... +ꜩ0.01725 Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] Entrypoint: mintOrBurn - Parameter: (Pair 72007 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) + Parameter: (Pair 2159730 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) This transaction was successfully applied Updated storage: - { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 72107 } + { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 2159830 } Updated big_maps: - Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007 - Storage size: 2048 bytes - Paid storage size diff: 70 bytes - Consumed gas: 3213.097 + Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730 + Storage size: 2050 bytes + Paid storage size diff: 72 bytes + Consumed gas: 3213.105 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.0175 - storage fees ........................... +ꜩ0.0175 + [CONTRACT_HASH] ... -ꜩ0.018 + storage fees ........................... +ꜩ0.018 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out index f7a5aa87445f..d222920d6be3 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approval.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approval Node is bootstrapped. -Estimated gas: 1679.709 units (will add 100 for safety) +Estimated gas: 1679.713 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -27,13 +27,13 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 1000) This transaction was successfully applied Updated storage: - { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 72107 } + { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 2159830 } Updated big_maps: Set map(3)[(Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] to 1000 - Storage size: 2116 bytes + Storage size: 2118 bytes Paid storage size diff: 68 bytes - Consumed gas: 1679.709 + Consumed gas: 1679.713 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out index 9489d1e04057..8cebc54e182c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_approved_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_approved_transfer Node is bootstrapped. -Estimated gas: 3044.096 units (will add 100 for safety) +Estimated gas: 3044.106 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -29,13 +29,13 @@ This sequence of operations was run: 1000) This transaction was successfully applied Updated storage: - { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 72107 } + { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 2159830 } Updated big_maps: Unset map(3)[(Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c)] - Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 71007 + Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2158730 Set map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 1000 - Storage size: 2116 bytes - Consumed gas: 3044.096 + Storage size: 2118 bytes + Consumed gas: 3044.106 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_dex_storage.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_dex_storage.out index 8fda28039e90..49f671508ebb 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_dex_storage.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_dex_storage.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_dex_storage -Pair 712 - 8895894353 - 71107 +Pair 21589 + 8997498998 + 2158830 "[CONTRACT_HASH]" "[CONTRACT_HASH]" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_lqt_storage.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_lqt_storage.out index bc625ee5600e..f8b481d6c3de 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_lqt_storage.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_lqt_storage.out @@ -1,3 +1,3 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_lqt_storage -Pair 2 3 "[CONTRACT_HASH]" 71107 +Pair 2 3 "[CONTRACT_HASH]" 2158830 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out index 763556d3762b..996b529f8106 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestAddApproveTransferRemove::test_remove_liquidity.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestAddApproveTransferRemove::test_remove_liquidity Node is bootstrapped. -Estimated gas: 7517.418 units (will add 100 for safety) +Estimated gas: 7517.436 units (will add 100 for safety) Estimated storage: 67 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -27,13 +27,13 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 1000 0 0 "[TIMESTAMP]") This transaction was successfully applied Updated storage: - { 712 ; - 8895894353 ; - 71107 ; + { 21589 ; + 8997498998 ; + 2158830 ; 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } - Storage size: 4633 bytes - Consumed gas: 2276.351 + Storage size: 4635 bytes + Consumed gas: 2276.359 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -43,11 +43,11 @@ This sequence of operations was run: Parameter: (Pair -1000 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c) This transaction was successfully applied Updated storage: - { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 71107 } + { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 2158830 } Updated big_maps: Unset map(2)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] - Storage size: 2048 bytes - Consumed gas: 1873.230 + Storage size: 2050 bytes + Consumed gas: 1873.234 Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] @@ -59,22 +59,22 @@ This sequence of operations was run: Updated storage: { 0 ; 1 ; 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 ; 100010000 } Updated big_maps: - Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 711 + Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21588 Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10 - Storage size: 2330 bytes + Storage size: 2331 bytes Paid storage size diff: 67 bytes - Consumed gas: 2367.837 + Consumed gas: 2367.843 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 Internal Transaction: - Amount: ꜩ125.105747 + Amount: ꜩ4.167766 From: [CONTRACT_HASH] To: [CONTRACT_HASH] This transaction was successfully applied Consumed gas: 1000 Balance updates: - [CONTRACT_HASH] ... -ꜩ125.105747 - [CONTRACT_HASH] ... +ꜩ125.105747 + [CONTRACT_HASH] ... -ꜩ4.167766 + [CONTRACT_HASH] ... +ꜩ4.167766 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out index f2f97a201b2e..b9ad3995dbf2 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_add_liquidity.out @@ -1,8 +1,8 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_add_liquidity Node is bootstrapped. -Estimated gas: 8553.386 units (will add 100 for safety) -Estimated storage: 141 bytes added (will add 20 for safety) +Estimated gas: 8553.406 units (will add 100 for safety) +Estimated storage: 147 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' NOT waiting for the operation to be included. @@ -15,7 +15,7 @@ This sequence of operations was run: Fee to the baker: ꜩ0.001221 Expected counter: [EXPECTED_COUNTER] Gas limit: 8654 - Storage limit: 161 bytes + Storage limit: 167 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.001221 payload fees(the block proposer) ....... +ꜩ0.001221 @@ -27,17 +27,17 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 0 1000000000 "[TIMESTAMP]") This transaction was successfully applied Updated storage: - { 722 ; - 9013500100 ; - 72107 ; + { 21599 ; + 9001416765 ; + 2159830 ; 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } - Storage size: 4633 bytes - Paid storage size diff: 3 bytes - Consumed gas: 2274.737 + Storage size: 4635 bytes + Paid storage size diff: 6 bytes + Consumed gas: 2274.745 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.00075 - storage fees ........................... +ꜩ0.00075 + [CONTRACT_HASH] ... -ꜩ0.0015 + storage fees ........................... +ꜩ0.0015 [CONTRACT_HASH] ... -ꜩ9001 [CONTRACT_HASH] ... +ꜩ9001 Internal operations: @@ -47,37 +47,37 @@ This sequence of operations was run: To: [CONTRACT_HASH] Entrypoint: transfer Parameter: (Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 - (Pair 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 721)) + (Pair 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 21598)) This transaction was successfully applied Updated storage: { 0 ; 1 ; 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 ; 100010000 } Updated big_maps: Set map(1)[(Pair 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 - 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 999999279 - Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 99999279 - Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 721 - Storage size: 2263 bytes - Paid storage size diff: 68 bytes - Consumed gas: 3065.552 + 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 999978402 + Set map(0)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 99978402 + Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 21598 + Storage size: 2264 bytes + Paid storage size diff: 69 bytes + Consumed gas: 3065.556 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.017 - storage fees ........................... +ꜩ0.017 + [CONTRACT_HASH] ... -ꜩ0.01725 + storage fees ........................... +ꜩ0.01725 Internal Transaction: Amount: ꜩ0 From: [CONTRACT_HASH] To: [CONTRACT_HASH] Entrypoint: mintOrBurn - Parameter: (Pair 72007 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) + Parameter: (Pair 2159730 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) This transaction was successfully applied Updated storage: - { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 72107 } + { 2 ; 3 ; 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 ; 2159830 } Updated big_maps: - Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 72007 - Storage size: 2048 bytes - Paid storage size diff: 70 bytes - Consumed gas: 3213.097 + Set map(2)[0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78] to 2159730 + Storage size: 2050 bytes + Paid storage size diff: 72 bytes + Consumed gas: 3213.105 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.0175 - storage fees ........................... +ꜩ0.0175 + [CONTRACT_HASH] ... -ꜩ0.018 + storage fees ........................... +ꜩ0.018 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out index 3a325d5c51f2..24fc80467cab 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_buy_tok.out @@ -1,8 +1,8 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_buy_tok Node is bootstrapped. -Estimated gas: 5113.046 units (will add 100 for safety) -Estimated storage: 326 bytes added (will add 20 for safety) +Estimated gas: 5113.064 units (will add 100 for safety) +Estimated storage: 327 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' NOT waiting for the operation to be included. @@ -15,7 +15,7 @@ This sequence of operations was run: Fee to the baker: ꜩ0.000869 Expected counter: [EXPECTED_COUNTER] Gas limit: 5214 - Storage limit: 346 bytes + Storage limit: 347 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000869 payload fees(the block proposer) ....... +ꜩ0.000869 @@ -27,14 +27,14 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 0 "[TIMESTAMP]") This transaction was successfully applied Updated storage: - { 362 ; - 18007999100 ; - 72107 ; + { 10811 ; + 17993499098 ; + 2159830 ; 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } - Storage size: 4634 bytes + Storage size: 4636 bytes Paid storage size diff: 1 bytes - Consumed gas: 1745.205 + Consumed gas: 1745.213 Balance updates: [CONTRACT_HASH] ... -ꜩ0.00025 storage fees ........................... +ꜩ0.00025 @@ -47,19 +47,19 @@ This sequence of operations was run: To: [CONTRACT_HASH] Entrypoint: transfer Parameter: (Pair 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600 - (Pair 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c 360)) + (Pair 0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c 10788)) This transaction was successfully applied Updated storage: { 0 ; 1 ; 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 ; 100010000 } Updated big_maps: - Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 361 - Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 360 - Storage size: 2331 bytes - Paid storage size diff: 68 bytes - Consumed gas: 2367.841 + Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 10810 + Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10788 + Storage size: 2333 bytes + Paid storage size diff: 69 bytes + Consumed gas: 2367.851 Balance updates: - [CONTRACT_HASH] ... -ꜩ0.017 - storage fees ........................... +ꜩ0.017 + [CONTRACT_HASH] ... -ꜩ0.01725 + storage fees ........................... +ꜩ0.01725 Internal Transaction: Amount: ꜩ9.001 From: [CONTRACT_HASH] diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_dex_storage.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_dex_storage.out index 83df705a291c..f36be3f207f6 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_dex_storage.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_dex_storage.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_dex_storage -Pair 462 - 14117137204 - 72107 +Pair 10911 + 17828916091 + 2159830 "[CONTRACT_HASH]" "[CONTRACT_HASH]" diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_lqt_storage.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_lqt_storage.out index 09066a5425bf..6cf0b5c2826e 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_lqt_storage.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_lqt_storage.out @@ -1,3 +1,3 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_lqt_storage -Pair 2 3 "[CONTRACT_HASH]" 72107 +Pair 2 3 "[CONTRACT_HASH]" 2159830 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out index 4659d038264f..70359a03322d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_sell_tok.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_sell_tok Node is bootstrapped. -Estimated gas: 7011.441 units (will add 100 for safety) +Estimated gas: 7011.459 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -27,13 +27,13 @@ This sequence of operations was run: Parameter: (Pair "[CONTRACT_HASH]" 100 0 "[TIMESTAMP]") This transaction was successfully applied Updated storage: - { 462 ; - 14117137204 ; - 72107 ; + { 10911 ; + 17828916091 ; + 2159830 ; 0x01e927f00ef734dfc85919635e9afc9166c83ef9fc00 ; 0x0115eb0104481a6d7921160bc982c5e0a561cd8a3a00 } - Storage size: 4633 bytes - Consumed gas: 1745.853 + Storage size: 4636 bytes + Consumed gas: 1745.865 Internal operations: Internal Transaction: Amount: ꜩ0 @@ -49,26 +49,26 @@ This sequence of operations was run: Set map(1)[(Pair 0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6 0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600)] to 999999900 Unset map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6] - Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 461 - Storage size: 2331 bytes - Consumed gas: 3265.588 + Set map(0)[0x01d496def47a3be89f5d54c6e6bb13cc6645d6e16600] to 10910 + Storage size: 2333 bytes + Consumed gas: 3265.594 Internal Transaction: - Amount: ꜩ3891.966034 + Amount: ꜩ164.584923 From: [CONTRACT_HASH] To: [CONTRACT_HASH] This transaction was successfully applied Consumed gas: 1000 Balance updates: - [CONTRACT_HASH] ... -ꜩ3891.966034 - [CONTRACT_HASH] ... +ꜩ3891.966034 + [CONTRACT_HASH] ... -ꜩ164.584923 + [CONTRACT_HASH] ... +ꜩ164.584923 Internal Transaction: - Amount: ꜩ3.895862 + Amount: ꜩ0.16475 From: [CONTRACT_HASH] To: [CONTRACT_HASH] This transaction was successfully applied Consumed gas: 1000 Balance updates: - [CONTRACT_HASH] ... -ꜩ3.895862 - [CONTRACT_HASH] ... +ꜩ3.895862 + [CONTRACT_HASH] ... -ꜩ0.16475 + [CONTRACT_HASH] ... +ꜩ0.16475 Injected block at minimal timestamp diff --git a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out index 9f7c7516026e..62d7a1af4e1f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_liquidity_baking.TestTrades::test_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_liquidity_baking.py::TestTrades::test_transfer Node is bootstrapped. -Estimated gas: 2376.541 units (will add 100 for safety) +Estimated gas: 2376.547 units (will add 100 for safety) Estimated storage: 68 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -32,10 +32,10 @@ This sequence of operations was run: { 0 ; 1 ; 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 ; 100010000 } Updated big_maps: Set map(0)[0x0000dac9f52543da1aed0bc1d6b46bf7c10db7014cd6] to 100 - Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 260 - Storage size: 2399 bytes + Set map(0)[0x0000e7670f32038107a59a2b9cfefae36ea21f5aa63c] to 10688 + Storage size: 2401 bytes Paid storage size diff: 68 bytes - Consumed gas: 2376.541 + Consumed gas: 2376.547 Balance updates: [CONTRACT_HASH] ... -ꜩ0.017 storage fees ........................... +ꜩ0.017 -- GitLab