diff --git a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml index 9b2452fa0e99838e72b1924cdd4d78fa074dbaaf..f63fcd930472f90d12e562ebf7eb4cf59764e312 100644 --- a/src/proto_alpha/lib_protocol/script_interpreter_defs.ml +++ b/src/proto_alpha/lib_protocol/script_interpreter_defs.ml @@ -582,7 +582,7 @@ let make_transaction_to_sc_rollup ctxt ~destination ~amount ~entrypoint error_unless (Entrypoint.is_default entrypoint) Rollup_invalid_entrypoint in let+ unparsed_parameters, ctxt = - unparse_data ctxt Optimized_legacy parameters_ty parameters + unparse_data ctxt Optimized parameters_ty parameters in ( Transaction_to_sc_rollup {destination; entrypoint; parameters_ty; parameters; unparsed_parameters}, diff --git a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out index 0b5df1b13f4a4434ea2562d15814f5fa694dce00..30abebb16c5919aef13e451089a927d51e3cdb67 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Minting then sending tickets to smart-contract rollup should succeed with.out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 2784.256 units (will add 100 for safety) +Estimated gas: 2783.794 units (will add 100 for safety) Estimated storage: 132 bytes added (will add 20 for safety) Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -14,7 +14,7 @@ This sequence of operations was run: From: [PUBLIC_KEY_HASH] Fee to the baker: ꜩ0.000584 Expected counter: 3 - Gas limit: 2885 + Gas limit: 2884 Storage limit: 152 bytes Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.000584 @@ -28,7 +28,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 197 bytes Paid storage size diff: 132 bytes - Consumed gas: 2674.291 + Consumed gas: 2673.811 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.033 storage fees ........................... +ꜩ0.033 @@ -37,10 +37,10 @@ This sequence of operations was run: Amount: ꜩ0 From: [CONTRACT_HASH] To: [SMART_ROLLUP_HASH] - Parameter: { Pair 0x01f6719dc3bd86b5c531d6551553c467a31a54717800 (Pair "Ticket2" 1) ; - Pair 0x01f6719dc3bd86b5c531d6551553c467a31a54717800 (Pair "Ticket" 1) } + Parameter: { Ticket 0x01f6719dc3bd86b5c531d6551553c467a31a54717800 string "Ticket2" 1 ; + Ticket 0x01f6719dc3bd86b5c531d6551553c467a31a54717800 string "Ticket" 1 } This transaction was successfully applied - Consumed gas: 109.932 + Consumed gas: 109.950 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out index 3f839163ca5f1cc322ebbca60f89d25512b8a6d4..20e981ffa479e156de1ea10f5b80425a57e1a97a 100644 --- a/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out +++ b/tezt/tests/expected/tickets.ml/Alpha- Sending tickets from storage to smart-contract rollup should succeed with.out @@ -49,7 +49,7 @@ This sequence of operations was run: ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1 --entrypoint send --arg '"[SMART_ROLLUP_HASH]"' Node is bootstrapped. -Estimated gas: 3141.953 units (will add 100 for safety) +Estimated gas: 3141.491 units (will add 100 for safety) Estimated storage: no bytes added Operation successfully injected in the node. Operation hash is '[OPERATION_HASH]' @@ -76,7 +76,7 @@ This sequence of operations was run: This transaction was successfully applied Updated storage: {} Storage size: 220 bytes - Consumed gas: 3031.954 + Consumed gas: 3031.474 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string @@ -93,10 +93,10 @@ This sequence of operations was run: Amount: ꜩ0 From: [CONTRACT_HASH] To: [SMART_ROLLUP_HASH] - Parameter: { Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket2" 1) ; - Pair 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 (Pair "Ticket" 1) } + Parameter: { Ticket 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 string "Ticket2" 1 ; + Ticket 0x017a22a4e42f88383dbb327d548e263b53f4f3b91100 string "Ticket" 1 } This transaction was successfully applied - Consumed gas: 109.932 + Consumed gas: 109.950 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string diff --git a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out index 6a4bb0d1e45a7efc8e875f494fb45fe06308e3ed..ad22d475a9f4905e07041d1a2cc0e0dacbcaad3f 100644 --- a/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out +++ b/tezt/tests/expected/tx_sc_rollup.ml/Alpha- wasm_2_0_0 - tx kernel should run e2e (kernel_e2e).out @@ -1,7 +1,7 @@ ./octez-client --wait none transfer 0 from bootstrap1 to '[CONTRACT_HASH]' --burn-cap 1000 --arg 'Pair (Pair "[SMART_ROLLUP_HASH]" "[PUBLIC_KEY_HASH]") (Pair 450 "Hello, Ticket!")' Node is bootstrapped. -Estimated gas: 2329.875 units (will add 100 for safety) +Estimated gas: 2329.644 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 '[OPERATION_HASH]' @@ -29,7 +29,7 @@ This sequence of operations was run: Updated storage: Unit Storage size: 205 bytes Paid storage size diff: 67 bytes - Consumed gas: 2222.857 + Consumed gas: 2222.617 Balance updates: [PUBLIC_KEY_HASH] ... -ꜩ0.01675 storage fees ........................... +ꜩ0.01675 @@ -39,9 +39,9 @@ This sequence of operations was run: From: [CONTRACT_HASH] To: [SMART_ROLLUP_HASH] Parameter: (Pair "[PUBLIC_KEY_HASH]" - (Pair [MICHELINE_KT1_BYTES] (Pair "Hello, Ticket!" 450))) + (Ticket [MICHELINE_KT1_BYTES] string "Hello, Ticket!" 450)) This transaction was successfully applied - Consumed gas: 106.951 + Consumed gas: 106.960 Ticket updates: Ticketer: [CONTRACT_HASH] Content type: string