From df29df6b892b7fafb2d381522a9726cc63685455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Wed, 17 Nov 2021 11:04:51 +0100 Subject: [PATCH 1/6] Tests/Python client wrapper: record the storage size of origination operations --- tests_python/client/client_output.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests_python/client/client_output.py b/tests_python/client/client_output.py index 33fbaf12317a..d1629d1e58ed 100644 --- a/tests_python/client/client_output.py +++ b/tests_python/client/client_output.py @@ -146,6 +146,11 @@ class OriginationResult: if match is None: raise InvalidClientOutput self.operation_hash = match.groups()[0] + pattern = r"Storage size: (.*) bytes" + match = re.search(pattern, client_output) + if match is None: + raise InvalidClientOutput + self.storage_size = match.groups()[0] class SubmitProposalsResult: -- GitLab From d1e99868ac4d684af20f51ea2844f26705482ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Wed, 17 Nov 2021 11:06:25 +0100 Subject: [PATCH 2/6] Tests/Python: failed test for bug #843 --- .../contracts_alpha/non_regression/bug_843.tz | 10 ++++++ ..._hash[client_regtest_custom_scrubber0].out | 1 + ..._typecheck[non_regression--bug_843.tz].out | 14 ++++++++ tests_python/tests_alpha/test_contract.py | 34 +++++++++++++++++++ 4 files changed, 59 insertions(+) create mode 100644 tests_python/contracts_alpha/non_regression/bug_843.tz create mode 100644 tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out diff --git a/tests_python/contracts_alpha/non_regression/bug_843.tz b/tests_python/contracts_alpha/non_regression/bug_843.tz new file mode 100644 index 000000000000..394b16a4e341 --- /dev/null +++ b/tests_python/contracts_alpha/non_regression/bug_843.tz @@ -0,0 +1,10 @@ +# This script is used to test that the optimized representation is used for everything (the script, expressions in the storage, and lambdas in the storage) at origination. The script itself differs from its optimized representation because it uses a readable address literal. It also stores a lambda so that another address literal appearing as argument to PUSH can also be tested in the storage. + +parameter never; +storage (pair address (lambda unit unit)); +code { + CAR; + PUSH address "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"; + DROP; + NEVER + } diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out index 9f2e7af5325c..ce7d7b6b640c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestScriptHashRegression::test_contract_hash[client_regtest_custom_scrubber0].out @@ -100,6 +100,7 @@ expruaKedvXmhg6wbV361DHykomz5dPqLi473KxBwJwyicEnKMhpb9 [CONTRACT_PATH]/mini_scen exprv9PvyjnsPjPCg5f13WtBiuD3o6idDAVWU6QfPtdWMjCLGRpwTh [CONTRACT_PATH]/mini_scenarios/xcat.tz exprvKm5t6a6LL2d3HjvRiJumGrGei24aRXscJk3zB1hs516Ju4oMZ [CONTRACT_PATH]/mini_scenarios/xcat_dapp.tz exprucvy7NUDPu2yTWEA6WVsusEZgGRmU1WpVzrFnNZV7m2H8BVysF [CONTRACT_PATH]/non_regression/bug_262.tz +exprumT8doqCpoTqPAuJa8dsnrC7giaz6aGnMkJDF9kg8j8mBEafAC [CONTRACT_PATH]/non_regression/bug_843.tz exprv3FvpUYzomvhmzxsQyuR1katpswNnicQZB4jA5uec3MERXk1cB [CONTRACT_PATH]/non_regression/pairk_annot.tz exprujPzkrPVucSvhHc1d9xm6kcs7oggkQyJXN8L2Rj3fteEABAkTe [CONTRACT_PATH]/opcodes/abs.tz expruNtqq51Lm75X61pxUx7P2FyR2uyUKLsZNHMXWx6X5rsyJ5M6WX [CONTRACT_PATH]/opcodes/add.tz diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out new file mode 100644 index 000000000000..f54adc8db41d --- /dev/null +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestTypecheck::test_typecheck[non_regression--bug_843.tz].out @@ -0,0 +1,14 @@ +tests_alpha/test_contract.py::TestTypecheck::test_typecheck[non_regression/bug_843.tz] + +Well typed +Gas remaining: 1039347.149 units remaining +{ parameter never ; + storage (pair address (lambda unit unit)) ; + code { CAR + /* [ never ] */ ; + PUSH address "tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx" + /* [ address : never ] */ ; + DROP + /* [ never ] */ ; + NEVER + /* [] */ } } diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py index c498aacf63be..fb009dc96f7d 100644 --- a/tests_python/tests_alpha/test_contract.py +++ b/tests_python/tests_alpha/test_contract.py @@ -1219,6 +1219,40 @@ class TestNonRegression: def test_issue_242_assert_balance(self, client: Client): assert client.get_balance('bug_262') == 1 + @pytest.mark.xfail( + reason="See issue https://gitlab.com/tezos/tezos/-/issues/843" + ) + def test_issue_843(self, client: Client, session: dict): + """Regression test for the following bug: + https://gitlab.com/tezos/tezos/-/issues/843 + + This test checks that before origination the script, storage, + and the lambdas inside the storage are all normalized. To test + this we define them in readable mode and compare the storage + size of the origination operations when the readable script + and storage are used directly and when they are first + normalized to optimized format before origination. + """ + path = os.path.join(CONTRACT_PATH, 'non_regression', 'bug_843.tz') + addr1 = '"tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx"' + op1 = originate( + client, + session, + path, + f'Pair {addr1} {{PUSH address {addr1}; DROP}}', + 0, + ) + normalized_script = client.normalize_script(path, mode='Optimized') + addr2 = client.normalize(addr1, 'address', mode='Optimized').strip() + op2 = originate( + client, + session, + normalized_script, + f'Pair {addr2} {{PUSH address {addr2}; DROP}}', + 0, + ) + assert op1.storage_size == op2.storage_size + @pytest.mark.incremental @pytest.mark.contract -- GitLab From b58b257ae2c28aec30a526927e468aa596aee9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Tue, 16 Nov 2021 23:00:41 +0100 Subject: [PATCH 3/6] Proto/Apply/Michelson: normalize scripts before origination Fixes #843 --- src/proto_alpha/lib_protocol/apply.ml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index b86d2233a29d..d297f133e201 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -1118,8 +1118,17 @@ let apply_origination ~consume_deserialization_gas ~ctxt ~script ~internal parsed_script.storage_type storage >>=? fun (storage, ctxt) -> + Gas.consume ctxt (Script.strip_locations_cost storage) >>?= fun ctxt -> let storage = Script.lazy_expr (Micheline.strip_locations storage) in - let script = {script with storage} in + (* Normalize code to avoid #843 *) + Script_ir_translator.unparse_code + ctxt + Optimized + (Micheline.root unparsed_code) + >>=? fun (code, ctxt) -> + Gas.consume ctxt (Script.strip_locations_cost code) >>?= fun ctxt -> + let code = Script.lazy_expr (Micheline.strip_locations code) in + let script = {Script.code; storage} in (match preorigination with | Some contract -> assert internal ; -- GitLab From 650fb85933cc8c4b14b1733ee3b3ec9d5dbe94e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Wed, 17 Nov 2021 11:07:21 +0100 Subject: [PATCH 4/6] Tests/Python: test that issue #843 is fixed --- tests_python/tests_alpha/test_contract.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests_python/tests_alpha/test_contract.py b/tests_python/tests_alpha/test_contract.py index fb009dc96f7d..15d011faf98a 100644 --- a/tests_python/tests_alpha/test_contract.py +++ b/tests_python/tests_alpha/test_contract.py @@ -1219,9 +1219,6 @@ class TestNonRegression: def test_issue_242_assert_balance(self, client: Client): assert client.get_balance('bug_262') == 1 - @pytest.mark.xfail( - reason="See issue https://gitlab.com/tezos/tezos/-/issues/843" - ) def test_issue_843(self, client: Client, session: dict): """Regression test for the following bug: https://gitlab.com/tezos/tezos/-/issues/843 -- GitLab From a56d9724efcfab4da1cdba1ba4b6752855ee6326 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Tue, 14 Dec 2021 22:38:35 +0100 Subject: [PATCH 5/6] Tests/Regression: reset regression traces --- ...ate_contract_from_contract_origination.out | 12 +-- ...ginate_contract_from_contract_transfer.out | 6 +- ...::test_self_address_originate_receiver.out | 12 +-- ...er::test_self_address_originate_sender.out | 12 +-- ...tion::test_big_map_origination_literal.out | 12 +-- ...s.TestContractOnchainLevel::test_level.out | 6 +- ...ontractOnchainOpcodes::test_init_proxy.out | 12 +-- ...tractOnchainOpcodes::test_set_delegate.out | 12 +-- ...TestContractOnchainOpcodes::test_slice.out | 12 +-- ...estContractOnchainOpcodes::test_source.out | 12 +-- ...ntractOnchainOpcodes::test_split_bytes.out | 12 +-- ...tractOnchainOpcodes::test_split_string.out | 12 +-- ...ntractOnchainOpcodes::test_store_input.out | 6 +- ...trace_origination[compare_big_type.tz].out | 12 +-- ...race_origination[compare_big_type2.tz].out | 12 +-- ...ctOnchainOpcodes::test_transfer_amount.out | 6 +- ...ctOnchainOpcodes::test_transfer_tokens.out | 18 ++--- tezt/_regressions/run_views.out | 74 +++++++++---------- 18 files changed, 130 insertions(+), 130 deletions(-) diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out index c01527b6015c..a7636f76f7db 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_origination.out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_origination Node is bootstrapped. -Estimated gas: 1418.442 units (will add 100 for safety) +Estimated gas: 1428.712 units (will add 100 for safety) Estimated storage: 350 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000475 + Fee to the baker: ꜩ0.000476 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1519 + Gas limit: 1529 Storage limit: 370 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000475 - payload fees(the block proposer) ....... +ꜩ0.000475 + [CONTRACT_HASH] ... -ꜩ0.000476 + payload fees(the block proposer) ....... +ꜩ0.000476 Origination: From: [CONTRACT_HASH] Credit: ꜩ200 @@ -41,7 +41,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 93 bytes Paid storage size diff: 93 bytes - Consumed gas: 1418.442 + Consumed gas: 1428.712 Balance updates: [CONTRACT_HASH] ... -ꜩ0.02325 storage fees ........................... +ꜩ0.02325 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out index 70b4f2ac88e5..c3db7f879e3b 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestOriginateContractFromContract::test_originate_contract_from_contract_transfer.out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestOriginateContractFromContract::test_originate_contract_from_contract_transfer Node is bootstrapped. -Estimated gas: 3474.835 units (will add 100 for safety) +Estimated gas: 3477.065 units (will add 100 for safety) Estimated storage: 295 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000607 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3575 + Gas limit: 3578 Storage limit: 315 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000607 @@ -40,7 +40,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 38 bytes Paid storage size diff: 38 bytes - Consumed gas: 1405.750 + Consumed gas: 1407.980 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0095 storage fees ........................... +ꜩ0.0095 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out index fa365b28a6a9..aa1af02e6906 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_receiver.out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestSelfAddressTransfer::test_self_address_originate_receiver Node is bootstrapped. -Estimated gas: 1413.588 units (will add 100 for safety) +Estimated gas: 1421.376 units (will add 100 for safety) Estimated storage: 340 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000462 + Fee to the baker: ꜩ0.000463 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1514 + Gas limit: 1522 Storage limit: 360 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000462 - payload fees(the block proposer) ....... +ꜩ0.000462 + [CONTRACT_HASH] ... -ꜩ0.000463 + payload fees(the block proposer) ....... +ꜩ0.000463 Origination: From: [CONTRACT_HASH] Credit: ꜩ0 @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 83 bytes Paid storage size diff: 83 bytes - Consumed gas: 1413.588 + Consumed gas: 1421.376 Balance updates: [CONTRACT_HASH] ... -ꜩ0.02075 storage fees ........................... +ꜩ0.02075 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out index 8b25eaf23ff3..09b8f93a9b5c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract.TestSelfAddressTransfer::test_self_address_originate_sender.out @@ -1,7 +1,7 @@ tests_alpha/test_contract.py::TestSelfAddressTransfer::test_self_address_originate_sender Node is bootstrapped. -Estimated gas: 1413.584 units (will add 100 for safety) +Estimated gas: 1421.372 units (will add 100 for safety) Estimated storage: 339 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000461 + Fee to the baker: ꜩ0.000462 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1514 + Gas limit: 1522 Storage limit: 359 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000461 - payload fees(the block proposer) ....... +ꜩ0.000461 + [CONTRACT_HASH] ... -ꜩ0.000462 + payload fees(the block proposer) ....... +ꜩ0.000462 Origination: From: [CONTRACT_HASH] Credit: ꜩ0 @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 82 bytes Paid storage size diff: 82 bytes - Consumed gas: 1413.584 + Consumed gas: 1421.372 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0205 storage fees ........................... +ꜩ0.0205 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out index b812516e32fa..6310b5a1b939 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractBigMapOrigination::test_big_map_origination_literal.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractBigMapOrigination::test_big_map_origination_literal Node is bootstrapped. -Estimated gas: 1638.345 units (will add 100 for safety) +Estimated gas: 1642.832 units (will add 100 for safety) Estimated storage: 403 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.00046 + Fee to the baker: ꜩ0.000461 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1739 + Gas limit: 1743 Storage limit: 423 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.00046 - payload fees(the block proposer) ....... +ꜩ0.00046 + [CONTRACT_HASH] ... -ꜩ0.000461 + payload fees(the block proposer) ....... +ꜩ0.000461 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -36,7 +36,7 @@ This sequence of operations was run: New map(4) of type (big_map int int) Set map(4)[0] to 0 Paid storage size diff: 146 bytes - Consumed gas: 1638.345 + Consumed gas: 1642.832 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0365 storage fees ........................... +ꜩ0.0365 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out index bb4932d942a4..dbaee1136ade 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainLevel::test_level.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainLevel::test_level Node is bootstrapped. -Estimated gas: 1406.044 units (will add 100 for safety) +Estimated gas: 1409.664 units (will add 100 for safety) Estimated storage: 300 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000424 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1507 + Gas limit: 1510 Storage limit: 320 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000424 @@ -33,7 +33,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 43 bytes Paid storage size diff: 43 bytes - Consumed gas: 1406.044 + Consumed gas: 1409.664 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01075 storage fees ........................... +ꜩ0.01075 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out index 82bab5647501..fc46d0f7f99f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_init_proxy.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_init_proxy Node is bootstrapped. -Estimated gas: 1409.504 units (will add 100 for safety) +Estimated gas: 1414.942 units (will add 100 for safety) Estimated storage: 312 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000437 + Fee to the baker: ꜩ0.000438 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1510 + Gas limit: 1515 Storage limit: 332 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000437 - payload fees(the block proposer) ....... +ꜩ0.000437 + [CONTRACT_HASH] ... -ꜩ0.000438 + payload fees(the block proposer) ....... +ꜩ0.000438 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -39,7 +39,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 55 bytes Paid storage size diff: 55 bytes - Consumed gas: 1409.504 + Consumed gas: 1414.942 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01375 storage fees ........................... +ꜩ0.01375 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out index 43a309e78f7f..2a9be46083b7 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_set_delegate.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_set_delegate Node is bootstrapped. -Estimated gas: 1407.938 units (will add 100 for safety) +Estimated gas: 1412.789 units (will add 100 for safety) Estimated storage: 308 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000433 + Fee to the baker: ꜩ0.000434 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1508 + Gas limit: 1513 Storage limit: 328 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000433 - payload fees(the block proposer) ....... +ꜩ0.000433 + [CONTRACT_HASH] ... -ꜩ0.000434 + payload fees(the block proposer) ....... +ꜩ0.000434 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -33,7 +33,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 51 bytes Paid storage size diff: 51 bytes - Consumed gas: 1407.938 + Consumed gas: 1412.789 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01275 storage fees ........................... +ꜩ0.01275 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out index 4bededd6e4ef..2cc224a5e139 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_slice.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_slice Node is bootstrapped. -Estimated gas: 1825.335 units (will add 100 for safety) +Estimated gas: 1879.474 units (will add 100 for safety) Estimated storage: 835 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.001023 + Fee to the baker: ꜩ0.001028 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1926 + Gas limit: 1980 Storage limit: 855 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.001023 - payload fees(the block proposer) ....... +ꜩ0.001023 + [CONTRACT_HASH] ... -ꜩ0.001028 + payload fees(the block proposer) ....... +ꜩ0.001028 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -73,7 +73,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 578 bytes Paid storage size diff: 578 bytes - Consumed gas: 1825.335 + Consumed gas: 1879.474 Balance updates: [CONTRACT_HASH] ... -ꜩ0.1445 storage fees ........................... +ꜩ0.1445 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out index 85090402923a..0b389ee47465 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_source.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_source Node is bootstrapped. -Estimated gas: 2066.897 units (will add 100 for safety) +Estimated gas: 2070.517 units (will add 100 for safety) Estimated storage: 322 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000527 + Fee to the baker: ꜩ0.000528 Expected counter: [EXPECTED_COUNTER] - Gas limit: 2167 + Gas limit: 2171 Storage limit: 342 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000527 - payload fees(the block proposer) ....... +ꜩ0.000527 + [CONTRACT_HASH] ... -ꜩ0.000528 + payload fees(the block proposer) ....... +ꜩ0.000528 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -33,7 +33,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 65 bytes Paid storage size diff: 65 bytes - Consumed gas: 2066.897 + Consumed gas: 2070.517 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01625 storage fees ........................... +ꜩ0.01625 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out index 74e26fe2f120..cf6a39a01b6d 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_bytes.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_bytes Node is bootstrapped. -Estimated gas: 1446.014 units (will add 100 for safety) +Estimated gas: 1470.552 units (will add 100 for safety) Estimated storage: 511 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.00064 + Fee to the baker: ꜩ0.000643 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1547 + Gas limit: 1571 Storage limit: 531 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.00064 - payload fees(the block proposer) ....... +ꜩ0.00064 + [CONTRACT_HASH] ... -ꜩ0.000643 + payload fees(the block proposer) ....... +ꜩ0.000643 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -55,7 +55,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 254 bytes Paid storage size diff: 254 bytes - Consumed gas: 1446.014 + Consumed gas: 1470.552 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0635 storage fees ........................... +ꜩ0.0635 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out index 74f089bc2d4c..22796d4abeed 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_split_string.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_split_string Node is bootstrapped. -Estimated gas: 1446.014 units (will add 100 for safety) +Estimated gas: 1470.552 units (will add 100 for safety) Estimated storage: 511 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.00064 + Fee to the baker: ꜩ0.000643 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1547 + Gas limit: 1571 Storage limit: 531 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.00064 - payload fees(the block proposer) ....... +ꜩ0.00064 + [CONTRACT_HASH] ... -ꜩ0.000643 + payload fees(the block proposer) ....... +ꜩ0.000643 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -55,7 +55,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 254 bytes Paid storage size diff: 254 bytes - Consumed gas: 1446.014 + Consumed gas: 1470.552 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0635 storage fees ........................... +ꜩ0.0635 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out index b2c45842610c..0817c4707c0f 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_store_input.out @@ -67,7 +67,7 @@ Injected block at minimal timestamp 1000 ꜩ 2000 ꜩ Node is bootstrapped. -Estimated gas: 1405.336 units (will add 100 for safety) +Estimated gas: 1408.666 units (will add 100 for safety) Estimated storage: 298 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -80,7 +80,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000422 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1506 + Gas limit: 1509 Storage limit: 318 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000422 @@ -99,7 +99,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 41 bytes Paid storage size diff: 41 bytes - Consumed gas: 1405.336 + Consumed gas: 1408.666 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01025 storage fees ........................... +ꜩ0.01025 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out index c9d8ecfdfe4a..e8c378794369 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_trace_origination[compare_big_type.tz] Node is bootstrapped. -Estimated gas: 3415.815 units (will add 100 for safety) +Estimated gas: 3432.650 units (will add 100 for safety) Estimated storage: 385 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000711 + Fee to the baker: ꜩ0.000713 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3516 + Gas limit: 3533 Storage limit: 405 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000711 - payload fees(the block proposer) ....... +ꜩ0.000711 + [CONTRACT_HASH] ... -ꜩ0.000713 + payload fees(the block proposer) ....... +ꜩ0.000713 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -78,7 +78,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 128 bytes Paid storage size diff: 128 bytes - Consumed gas: 3415.815 + Consumed gas: 3432.650 Balance updates: [CONTRACT_HASH] ... -ꜩ0.032 storage fees ........................... +ꜩ0.032 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out index 7e1013588c65..e765a4fc0e4c 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz].out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_trace_origination[compare_big_type2.tz] Node is bootstrapped. -Estimated gas: 3740.366 units (will add 100 for safety) +Estimated gas: 3758.394 units (will add 100 for safety) Estimated storage: 393 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -12,13 +12,13 @@ and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: [CONTRACT_HASH] - Fee to the baker: ꜩ0.000752 + Fee to the baker: ꜩ0.000753 Expected counter: [EXPECTED_COUNTER] - Gas limit: 3841 + Gas limit: 3859 Storage limit: 413 bytes Balance updates: - [CONTRACT_HASH] ... -ꜩ0.000752 - payload fees(the block proposer) ....... +ꜩ0.000752 + [CONTRACT_HASH] ... -ꜩ0.000753 + payload fees(the block proposer) ....... +ꜩ0.000753 Origination: From: [CONTRACT_HASH] Credit: ꜩ1000 @@ -82,7 +82,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 136 bytes Paid storage size diff: 136 bytes - Consumed gas: 3740.366 + Consumed gas: 3758.394 Balance updates: [CONTRACT_HASH] ... -ꜩ0.034 storage fees ........................... +ꜩ0.034 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out index c94930aa7ad8..043d22827a2a 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_amount.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_transfer_amount Node is bootstrapped. -Estimated gas: 1405.897 units (will add 100 for safety) +Estimated gas: 1409.517 units (will add 100 for safety) Estimated storage: 297 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000421 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1506 + Gas limit: 1510 Storage limit: 317 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000421 @@ -33,7 +33,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 40 bytes Paid storage size diff: 40 bytes - Consumed gas: 1405.897 + Consumed gas: 1409.517 Balance updates: [CONTRACT_HASH] ... -ꜩ0.01 storage fees ........................... +ꜩ0.01 diff --git a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out index d2b23d3a3c34..10c08220eea0 100644 --- a/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out +++ b/tests_python/tests_alpha/_regtest_outputs/test_contract_onchain_opcodes.TestContractOnchainOpcodes::test_transfer_tokens.out @@ -1,7 +1,7 @@ tests_alpha/test_contract_onchain_opcodes.py::TestContractOnchainOpcodes::test_transfer_tokens Node is bootstrapped. -Estimated gas: 1405.250 units (will add 100 for safety) +Estimated gas: 1408.580 units (will add 100 for safety) Estimated storage: 295 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000419 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1506 + Gas limit: 1509 Storage limit: 315 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000419 @@ -31,7 +31,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 38 bytes Paid storage size diff: 38 bytes - Consumed gas: 1405.250 + Consumed gas: 1408.580 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0095 storage fees ........................... +ꜩ0.0095 @@ -44,7 +44,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as test_transfer_account1. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 1405.250 units (will add 100 for safety) +Estimated gas: 1408.580 units (will add 100 for safety) Estimated storage: 295 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -57,7 +57,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000419 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1506 + Gas limit: 1509 Storage limit: 315 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000419 @@ -74,7 +74,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 38 bytes Paid storage size diff: 38 bytes - Consumed gas: 1405.250 + Consumed gas: 1408.580 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0095 storage fees ........................... +ꜩ0.0095 @@ -87,7 +87,7 @@ New contract [CONTRACT_HASH] originated. Contract memorized as test_transfer_account2. Injected block at minimal timestamp Node is bootstrapped. -Estimated gas: 1411.369 units (will add 100 for safety) +Estimated gas: 1418.057 units (will add 100 for safety) Estimated storage: 323 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[BLOCK_HASH]' @@ -100,7 +100,7 @@ This sequence of operations was run: From: [CONTRACT_HASH] Fee to the baker: ꜩ0.000449 Expected counter: [EXPECTED_COUNTER] - Gas limit: 1512 + Gas limit: 1519 Storage limit: 343 bytes Balance updates: [CONTRACT_HASH] ... -ꜩ0.000449 @@ -127,7 +127,7 @@ This sequence of operations was run: [CONTRACT_HASH] Storage size: 66 bytes Paid storage size diff: 66 bytes - Consumed gas: 1411.369 + Consumed gas: 1418.057 Balance updates: [CONTRACT_HASH] ... -ꜩ0.0165 storage fees ........................... +ꜩ0.0165 diff --git a/tezt/_regressions/run_views.out b/tezt/_regressions/run_views.out index 2431fe641b4b..79ae77fea170 100644 --- a/tezt/_regressions/run_views.out +++ b/tezt/_regressions/run_views.out @@ -14,24 +14,24 @@ view "calls_count" unit nat { CDR ; SIZE }; view "last_caller" unit (option address) { CDR ; IF_CONS { DIP { DROP } ; SOME } { NONE address } }; ' --init '{}' --burn-cap 1 Node is bootstrapped. -Estimated gas: 1416.979 units (will add 100 for safety) +Estimated gas: 1428.389 units (will add 100 for safety) Estimated storage: 409 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'ooc2fqNbndGdD9wZCqr7TX7DvhRbqXytK4D2566peGJCUithWky' +Operation hash is 'opMEqaWvCQxSydDPwdqpsCwjnCmgiLhpouq5LovBLGCvMVpgCpk' NOT waiting for the operation to be included. Use command - tezos-client wait for ooc2fqNbndGdD9wZCqr7TX7DvhRbqXytK4D2566peGJCUithWky to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for opMEqaWvCQxSydDPwdqpsCwjnCmgiLhpouq5LovBLGCvMVpgCpk to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - Fee to the baker: ꜩ0.000531 + Fee to the baker: ꜩ0.000532 Expected counter: 1 - Gas limit: 1517 + Gas limit: 1529 Storage limit: 429 bytes Balance updates: - tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000531 - payload fees(the block proposer) ....... +ꜩ0.000531 + tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000532 + payload fees(the block proposer) ....... +ꜩ0.000532 Origination: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx Credit: ꜩ0 @@ -48,17 +48,17 @@ This sequence of operations was run: No delegate for this contract This origination was successfully applied Originated contracts: - KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu + KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv Storage size: 152 bytes Paid storage size diff: 152 bytes - Consumed gas: 1416.979 + Consumed gas: 1428.389 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.038 storage fees ........................... +ꜩ0.038 tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 -New contract KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu originated. +New contract KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv originated. Contract memorized as register_calls. ./tezos-client --mode mockup --base-dir '' --wait none originate contract check_caller transferring 0 from bootstrap1 running ' @@ -89,24 +89,24 @@ code { } ' --init None --burn-cap 1 Node is bootstrapped. -Estimated gas: 1431.964 units (will add 100 for safety) +Estimated gas: 1450.510 units (will add 100 for safety) Estimated storage: 465 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'op7JLarsoBA5eFWszbVySr14hSoFh7ZtZnM7pA7wZSuDWbnTJhu' +Operation hash is 'ooToBC9P3HGdhPJ1Dhq9gdQFF79cYzJMiYXgvo86DMCMvMknJXg' NOT waiting for the operation to be included. Use command - tezos-client wait for op7JLarsoBA5eFWszbVySr14hSoFh7ZtZnM7pA7wZSuDWbnTJhu to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for ooToBC9P3HGdhPJ1Dhq9gdQFF79cYzJMiYXgvo86DMCMvMknJXg to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - Fee to the baker: ꜩ0.000589 + Fee to the baker: ꜩ0.000591 Expected counter: 2 - Gas limit: 1532 + Gas limit: 1551 Storage limit: 485 bytes Balance updates: - tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000589 - payload fees(the block proposer) ....... +ꜩ0.000589 + tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.000591 + payload fees(the block proposer) ....... +ꜩ0.000591 Origination: From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx Credit: ꜩ0 @@ -131,28 +131,28 @@ This sequence of operations was run: No delegate for this contract This origination was successfully applied Originated contracts: - KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 + KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb Storage size: 208 bytes Paid storage size diff: 208 bytes - Consumed gas: 1431.964 + Consumed gas: 1450.510 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.052 storage fees ........................... +ꜩ0.052 tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.06425 storage fees ........................... +ꜩ0.06425 -New contract KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 originated. +New contract KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb originated. Contract memorized as check_caller. -./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 --burn-cap 1 --arg '"KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu"' +./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb --burn-cap 1 --arg '"KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"' Node is bootstrapped. Estimated gas: 4888.778 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. -Operation hash is 'ooXzTo1H8guT9xpiWE4ucn9d9o1J79Y9p6PPNoSafHSdnb7vqYz' +Operation hash is 'ooKWNQj6RVsDFCJvsHjGrXsUzUS1jecE3iZFN3zNd6HP9aBKzo8' NOT waiting for the operation to be included. Use command - tezos-client wait for ooXzTo1H8guT9xpiWE4ucn9d9o1J79Y9p6PPNoSafHSdnb7vqYz to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for ooKWNQj6RVsDFCJvsHjGrXsUzUS1jecE3iZFN3zNd6HP9aBKzo8 to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: @@ -167,26 +167,26 @@ This sequence of operations was run: Transaction: Amount: ꜩ1 From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - To: KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 - Parameter: "KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu" + To: KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb + Parameter: "KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv" This transaction was successfully applied Updated storage: None Storage size: 208 bytes Consumed gas: 4889.576 Balance updates: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1 - KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 ... +ꜩ1 + KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb ... +ꜩ1 -./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu --burn-cap 1 +./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv --burn-cap 1 Node is bootstrapped. Estimated gas: 2068.289 units (will add 100 for safety) Estimated storage: 27 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'ooWggEMDp7m8EvUUXvCveSQTZhGZto7EM5dGmFG9i4npaSHvPcd' +Operation hash is 'ont8dBoUoexyjc6TFAWPjK4vYwyYHPqY6aoQkuEqs2Y9PjAbLzQ' NOT waiting for the operation to be included. Use command - tezos-client wait for ooWggEMDp7m8EvUUXvCveSQTZhGZto7EM5dGmFG9i4npaSHvPcd to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for ont8dBoUoexyjc6TFAWPjK4vYwyYHPqY6aoQkuEqs2Y9PjAbLzQ to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: @@ -201,7 +201,7 @@ This sequence of operations was run: Transaction: Amount: ꜩ1 From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - To: KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu + To: KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv This transaction was successfully applied Updated storage: { 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78 } Storage size: 179 bytes @@ -211,18 +211,18 @@ This sequence of operations was run: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1 - KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu ... +ꜩ1 + KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv ... +ꜩ1 -./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 --burn-cap 1 --arg '"KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu"' +./tezos-client --mode mockup --base-dir '' --wait none transfer 1 from bootstrap1 to KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb --burn-cap 1 --arg '"KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv"' Node is bootstrapped. Estimated gas: 6201.785 units (will add 100 for safety) Estimated storage: 27 bytes added (will add 20 for safety) Operation successfully injected in the node. -Operation hash is 'opA9apLwUjeEBp137pKgW2HPWWaUPV17ThiK6TFV39KmuBF7kFJ' +Operation hash is 'ooFASM67gHgN4XhEL3aSdGGyocUQtLecdh1iiVqGAFJ6r3YYpE5' NOT waiting for the operation to be included. Use command - tezos-client wait for opA9apLwUjeEBp137pKgW2HPWWaUPV17ThiK6TFV39KmuBF7kFJ to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU + tezos-client wait for ooFASM67gHgN4XhEL3aSdGGyocUQtLecdh1iiVqGAFJ6r3YYpE5 to be included --confirmations 1 --branch BLockGenesisGenesisGenesisGenesisGenesisCCCCCeZiLHU and/or an external block explorer to make sure that it has been included. This sequence of operations was run: Manager signed operations: @@ -237,8 +237,8 @@ This sequence of operations was run: Transaction: Amount: ꜩ1 From: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx - To: KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 - Parameter: "KT1DxqpeVEc9Kn1apiDhQ15SAVLgVgacnKFu" + To: KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb + Parameter: "KT1TLT2cXZCtenEAXzkndiAQGJXWenkwThRv" This transaction was successfully applied Updated storage: (Some 0x000002298c03ed7d454a101eb7022bc95f7e5f41ac78) Storage size: 235 bytes @@ -248,5 +248,5 @@ This sequence of operations was run: tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ0.00675 storage fees ........................... +ꜩ0.00675 tz1KqTpEZ7Yob7QbPE4Hy4Wo8fHG8LhKxZSx ... -ꜩ1 - KT1Ut2jH9cLnfwNuTNyVbuWSDu8ZfdtoyMm8 ... +ꜩ1 + KT1LvTWVW1cc4DeSPCseMsiPdDDkTKvMrNZb ... +ꜩ1 -- GitLab From 72449bb1a80070284c15b7ce909227b543c06fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Cauderlier?= Date: Mon, 21 Feb 2022 12:15:13 +0100 Subject: [PATCH 6/6] Changes/Alpha: mention !3852 --- docs/protocols/alpha.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/protocols/alpha.rst b/docs/protocols/alpha.rst index e79e0626a8e4..d8b4bda8038a 100644 --- a/docs/protocols/alpha.rst +++ b/docs/protocols/alpha.rst @@ -155,6 +155,8 @@ Bug Fixes - Refuse operations with inconsistent counters. (MR :gl:`!4024`) +- Normalize scripts in optimized format during origination. (MR :gl:`!3852`) + Minor Changes ------------- -- GitLab