diff --git a/src/proto_alpha/lib_client/client_proto_context.mli b/src/proto_alpha/lib_client/client_proto_context.mli index abcfb614768d112267e5054efa937eff6b6b00d5..3d877d23cf0c7602539f03dc6be63547a8fb4536 100644 --- a/src/proto_alpha/lib_client/client_proto_context.mli +++ b/src/proto_alpha/lib_client/client_proto_context.mli @@ -198,7 +198,7 @@ val build_transaction_operation : ?fee:Tez.t -> ?gas_limit:Gas.Arith.integral -> ?storage_limit:Z.t -> - Destination.t -> + Contract.t -> Kind.transaction Annotated_manager_operation.t (** Same as {!transfer}, but takes parameters as {!Script.lazy_expr} instead of @@ -218,7 +218,7 @@ val transfer_with_script : source:public_key_hash -> src_pk:public_key -> src_sk:Client_keys.sk_uri -> - destination:Destination.t -> + destination:Contract.t -> ?entrypoint:Entrypoint.t -> parameters:Script.lazy_expr -> amount:Tez.t -> @@ -246,7 +246,7 @@ val transfer : source:public_key_hash -> src_pk:public_key -> src_sk:Client_keys.sk_uri -> - destination:Destination.t -> + destination:Contract.t -> ?entrypoint:Entrypoint.t -> ?arg:string -> amount:Tez.t -> diff --git a/src/proto_alpha/lib_client/client_proto_fa12.ml b/src/proto_alpha/lib_client/client_proto_fa12.ml index 5659acdc5925f52e3fd3f5b5e32730053836e6e5..b7ec6493502fb721aa65623bd34c2d66151ffafc 100644 --- a/src/proto_alpha/lib_client/client_proto_fa12.ml +++ b/src/proto_alpha/lib_client/client_proto_fa12.ml @@ -778,7 +778,7 @@ let call_contract (cctxt : #Protocol_client_context.full) ~chain ~block ~source ~src_pk ~src_sk - ~destination:(Contract (Originated contract)) + ~destination:(Originated contract) ~parameters ~amount:tez_amount ~entrypoint @@ -907,7 +907,7 @@ let prepare_single_token_transfer cctxt ?default_fee ?default_gas_limit ?fee ?gas_limit ?storage_limit - (Contract (Originated token)) + (Originated token) action in return (Annotated_manager_operation.Annotated_manager_operation operation) diff --git a/src/proto_alpha/lib_client/client_proto_multisig.ml b/src/proto_alpha/lib_client/client_proto_multisig.ml index 8c7815505c2d95a45f19d6322fff5df6db620e0d..45faac04e91d70f3ade06201efd0877c9e2b8fd0 100644 --- a/src/proto_alpha/lib_client/client_proto_multisig.ml +++ b/src/proto_alpha/lib_client/client_proto_multisig.ml @@ -1096,7 +1096,7 @@ let call_multisig (cctxt : #Protocol_client_context.full) ~chain ~block ~source ~src_pk ~src_sk - ~destination:(Contract (Originated multisig_contract)) + ~destination:(Originated multisig_contract) ?entrypoint ~parameters ~amount diff --git a/src/proto_alpha/lib_client/injection.ml b/src/proto_alpha/lib_client/injection.ml index 36ad1384955c6f36a63509d7e5147845edfef507..9ab3b795ef02f57098a25ce8cf292869a126e9e4 100644 --- a/src/proto_alpha/lib_client/injection.ml +++ b/src/proto_alpha/lib_client/injection.ml @@ -780,7 +780,7 @@ let may_patch_limits (type kind) (cctxt : #Protocol_client_context.full) else let safety_guard = match c.operation with - | Transaction {destination = Contract (Implicit _); _} + | Transaction {destination = Implicit _; _} | Reveal _ | Delegation _ | Set_deposits_limit _ -> Gas.Arith.zero | _ -> safety_guard diff --git a/src/proto_alpha/lib_client/managed_contract.ml b/src/proto_alpha/lib_client/managed_contract.ml index a4cb3896dc3c7e20457d99cfd80c77d6125398ea..96294964ec368f76fc3243c99ba8f5e224d2a240 100644 --- a/src/proto_alpha/lib_client/managed_contract.ml +++ b/src/proto_alpha/lib_client/managed_contract.ml @@ -153,7 +153,7 @@ let build_delegate_operation (cctxt : #full) ~chain ~block ?fee ~parameters ~entrypoint ?fee - (Contract (Originated contract))) + (Originated contract)) let set_delegate (cctxt : #full) ~chain ~block ?confirmations ?dry_run ?verbose_signing ?simulation ?branch ~fee_parameter ?fee ~source ~src_pk @@ -284,7 +284,7 @@ let build_transaction_operation (cctxt : #full) ~chain ~block ~contract ?fee ?gas_limit ?storage_limit - (Contract contract)) + contract) let transfer (cctxt : #full) ~chain ~block ?confirmations ?dry_run ?verbose_signing ?simulation ?(force = false) ?branch ~source ~src_pk diff --git a/src/proto_alpha/lib_client/operation_result.ml b/src/proto_alpha/lib_client/operation_result.ml index c12780350e032c79e47a9e8579f0faba88c5db0d..010cc7807b9849c0777633b2860dbe7a71a9d812 100644 --- a/src/proto_alpha/lib_client/operation_result.ml +++ b/src/proto_alpha/lib_client/operation_result.ml @@ -120,7 +120,7 @@ let pp_manager_operation_content (type kind) source pp_result ppf amount Contract.pp source - Destination.pp + Contract.pp destination ; if not (Entrypoint.is_default entrypoint) then Format.fprintf ppf "@,Entrypoint: %a" Entrypoint.pp entrypoint ; diff --git a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml index 36a849a75bd63f9ee55d5623dc86358355882d88..0eb0a727a19805a96129e66c396790a17276ebd6 100644 --- a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml +++ b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml @@ -752,7 +752,6 @@ let transfer_command amount (source : Contract.t) destination () | Implicit source -> Client_keys.get_key cctxt source >>=? fun (_, src_pk, src_sk) -> - let destination : Alpha_context.Destination.t = Contract destination in transfer cctxt ~chain:cctxt#chain @@ -821,7 +820,7 @@ let prepare_batch_operation cctxt ?arg ?fee ?gas_limit ?storage_limit ?fee ?gas_limit ?storage_limit - (Contract destination))) + destination)) >>=? fun operation -> return (Annotated_manager_operation.Annotated_manager_operation operation) diff --git a/src/proto_alpha/lib_client_commands/client_proto_stresstest_commands.ml b/src/proto_alpha/lib_client_commands/client_proto_stresstest_commands.ml index 74576cf7803e3bcf35c49aa1b43726320a69585b..53d69d2af230da908e6109b75625aa1df38de3c6 100644 --- a/src/proto_alpha/lib_client_commands/client_proto_stresstest_commands.ml +++ b/src/proto_alpha/lib_client_commands/client_proto_stresstest_commands.ml @@ -513,7 +513,7 @@ let manager_op_of_transfer parameters | Implicit _ -> Entrypoint.default | Originated x -> x.entrypoint in - let destination = Destination.Contract (destination_to_contract dst) in + let destination = destination_to_contract dst in Transaction {amount; parameters; entrypoint; destination} in match counter with diff --git a/src/proto_alpha/lib_client_sapling/client_sapling_commands.ml b/src/proto_alpha/lib_client_sapling/client_sapling_commands.ml index caa46a48fb84a81cdc3302b78e663c65e2154a41..2006887647e929a401cb15d1946ef00a004199d2 100644 --- a/src/proto_alpha/lib_client_sapling/client_sapling_commands.ml +++ b/src/proto_alpha/lib_client_sapling/client_sapling_commands.ml @@ -205,7 +205,7 @@ let shield_cmd = ~amount ~src_pk ~src_sk - ~destination:(Contract (Originated contract_dst)) + ~destination:(Originated contract_dst) ~source:pkh ~arg ?confirmations:cctxt#confirmations @@ -294,7 +294,7 @@ let unshield_cmd = ~amount:Tez.zero ~src_sk ~src_pk - ~destination:(Contract (Originated contract_dst)) + ~destination:(Originated contract_dst) ~source ~arg ?confirmations:cctxt#confirmations @@ -475,7 +475,7 @@ let submit_shielded_cmd = ~amount:Tez.zero ~src_pk ~src_sk - ~destination:(Contract (Originated destination)) + ~destination:(Originated destination) ~source ~arg:contract_input ?confirmations:cctxt#confirmations diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 631f5b62d7df5f7edb80b4ca26b49b09a263ac2f..acf779d9bf9dbf08955091d61b97639697c2c2ef 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -3062,7 +3062,7 @@ and _ manager_operation = amount : Tez.tez; parameters : Script.lazy_expr; entrypoint : Entrypoint.t; - destination : Destination.t; + destination : Contract.t; } -> Kind.transaction manager_operation | Origination : origination -> Kind.origination manager_operation diff --git a/src/proto_alpha/lib_protocol/apply.ml b/src/proto_alpha/lib_protocol/apply.ml index 7cc78982885a9210f047d0d3c6fc21a3957d3bb6..f0109168a3f403767bbc20e30009ccfd8431e087 100644 --- a/src/proto_alpha/lib_protocol/apply.ml +++ b/src/proto_alpha/lib_protocol/apply.ml @@ -96,7 +96,6 @@ type error += | Empty_transaction of Contract.t | Tx_rollup_feature_disabled | Tx_rollup_invalid_transaction_ticket_amount - | Tx_rollup_non_internal_transaction | Cannot_transfer_ticket_to_implicit | Sc_rollup_feature_disabled | Inconsistent_counters @@ -522,17 +521,6 @@ let () = (function Cannot_transfer_ticket_to_implicit -> Some () | _ -> None) (fun () -> Cannot_transfer_ticket_to_implicit) ; - register_error_kind - `Permanent - ~id:"operation.tx_rollup_non_internal_transaction" - ~title:"Non-internal transaction to a transaction rollup" - ~description:"Non-internal transactions to a tx rollup are forbidden." - ~pp:(fun ppf () -> - Format.fprintf ppf "Transaction to a transaction rollup must be internal.") - Data_encoding.unit - (function Tx_rollup_non_internal_transaction -> Some () | _ -> None) - (fun () -> Tx_rollup_non_internal_transaction) ; - let description = "Smart contract rollups will be enabled in a future proposal." in @@ -1259,8 +1247,7 @@ let apply_external_manager_operation_content : {consumed_gas = Gas.consumed ~since:before_operation ~until:ctxt} : kind successful_manager_operation_result), [] ) - | Transaction - {amount; parameters; destination = Contract (Implicit pkh); entrypoint} -> + | Transaction {amount; parameters; destination = Implicit pkh; entrypoint} -> Script.force_decode_in_context ~consume_deserialization_gas ctxt @@ -1275,12 +1262,8 @@ let apply_external_manager_operation_content : ~entrypoint ~before_operation | Transaction - { - amount; - parameters; - destination = Contract (Originated contract_hash); - entrypoint; - } -> + {amount; parameters; destination = Originated contract_hash; entrypoint} + -> Script.force_decode_in_context ~consume_deserialization_gas ctxt @@ -1298,8 +1281,6 @@ let apply_external_manager_operation_content : ~mode ~internal:false ~parameter:(Untyped_arg parameters) - | Transaction {destination = Tx_rollup _; _} -> - fail Tx_rollup_non_internal_transaction | Tx_rollup_dispatch_tickets { tx_rollup; @@ -1880,13 +1861,7 @@ let precheck_manager_contents (type kind) ctxt (op : kind Kind.manager contents) deserialized before (e.g. when retrieve in JSON format). *) (match operation with | Reveal pk -> Contract.reveal_manager_key ctxt source pk - | Transaction {parameters; destination; _} -> - (* Precheck is only called for non-internal operations - * and rollup transactions must be internal. *) - fail_when - (match destination with Tx_rollup _ -> true | _ -> false) - Tx_rollup_non_internal_transaction - >>=? fun () -> + | Transaction {parameters; _} -> Lwt.return @@ record_trace Gas_quota_exceeded_init_deserialize @@ (* Fail early if not enough gas for complete deserialization diff --git a/src/proto_alpha/lib_protocol/apply.mli b/src/proto_alpha/lib_protocol/apply.mli index 88998b9e3198cf7489badd1c38b115184266883d..3e3a0688450ab544bfa5ac02894a5bd7011eefd7 100644 --- a/src/proto_alpha/lib_protocol/apply.mli +++ b/src/proto_alpha/lib_protocol/apply.mli @@ -41,7 +41,6 @@ type error += | Gas_quota_exceeded_init_deserialize | Tx_rollup_feature_disabled | Tx_rollup_invalid_transaction_ticket_amount - | Tx_rollup_non_internal_transaction | Sc_rollup_feature_disabled | Inconsistent_counters | Forbidden_zero_ticket_quantity diff --git a/src/proto_alpha/lib_protocol/apply_results.ml b/src/proto_alpha/lib_protocol/apply_results.ml index a53e9b1970bfbe65b1637cac88adf24ef6c91f49..558bbbc9a2049725a868af79152085f99b3d45e3 100644 --- a/src/proto_alpha/lib_protocol/apply_results.ml +++ b/src/proto_alpha/lib_protocol/apply_results.ml @@ -73,15 +73,6 @@ type 'kind internal_contents = { type packed_internal_contents = | Internal_contents : 'kind internal_contents -> packed_internal_contents -let manager_operation_of_internal_operation (type kind) - (operation : kind internal_manager_operation) : - kind Alpha_context.manager_operation = - match operation with - | Transaction {amount; parameters; entrypoint; destination} -> - Transaction {amount; parameters; entrypoint; destination} - | Origination origination -> Origination origination - | Delegation delegate -> Delegation delegate - let contents_of_internal_operation (type kind) ({source; operation; nonce} : kind Script_typed_ir.internal_operation) : kind internal_contents = diff --git a/src/proto_alpha/lib_protocol/apply_results.mli b/src/proto_alpha/lib_protocol/apply_results.mli index 2f8558806d52f834523df5e7288512b023c2bceb..4b07cd755660d9be556153cc8402cbc6a7705d1c 100644 --- a/src/proto_alpha/lib_protocol/apply_results.mli +++ b/src/proto_alpha/lib_protocol/apply_results.mli @@ -48,9 +48,6 @@ type 'kind internal_manager_operation = Signature.Public_key_hash.t option -> Kind.delegation internal_manager_operation -val manager_operation_of_internal_operation : - 'kind internal_manager_operation -> 'kind Alpha_context.manager_operation - type 'kind internal_contents = { source : Contract.t; operation : 'kind internal_manager_operation; diff --git a/src/proto_alpha/lib_protocol/operation_repr.ml b/src/proto_alpha/lib_protocol/operation_repr.ml index ea4f9d380fa6fcf686b3d9b5e06c114ceff8a9b5..8ef16e43aa490ffaed7e6814aa5650980539b362 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.ml +++ b/src/proto_alpha/lib_protocol/operation_repr.ml @@ -289,7 +289,7 @@ and _ manager_operation = amount : Tez_repr.tez; parameters : Script_repr.lazy_expr; entrypoint : Entrypoint_repr.t; - destination : Destination_repr.t; + destination : Contract_repr.t; } -> Kind.transaction manager_operation | Origination : origination -> Kind.origination manager_operation @@ -549,7 +549,7 @@ module Encoding = struct encoding = obj3 (req "amount" Tez_repr.encoding) - (req "destination" Destination_repr.encoding) + (req "destination" Contract_repr.encoding) (opt "parameters" (obj2 diff --git a/src/proto_alpha/lib_protocol/operation_repr.mli b/src/proto_alpha/lib_protocol/operation_repr.mli index 47371a1c23bef5b2490198dde1175dcc9099e210..ea7364d46c75ed816f3646b4b342be10649ad708 100644 --- a/src/proto_alpha/lib_protocol/operation_repr.mli +++ b/src/proto_alpha/lib_protocol/operation_repr.mli @@ -319,7 +319,7 @@ and _ manager_operation = amount : Tez_repr.tez; parameters : Script_repr.lazy_expr; entrypoint : Entrypoint_repr.t; - destination : Destination_repr.t; + destination : Contract_repr.t; } -> Kind.transaction manager_operation (* [Origination] of a contract using a smart-contract [script] and diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.ml b/src/proto_alpha/lib_protocol/test/helpers/op.ml index 364a9b1bf10849ab068e41aed2ef02d6af300f8e..a142890b2eae1b5982161ec7abb3f909031bbdfc 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/op.ml @@ -358,28 +358,14 @@ let miss_signed_endorsement ?level ~endorsed_block ctxt = let delegate = Account.find_alternate real_delegate_pkh in endorsement ~delegate:(delegate.pkh, slots) ~level ~endorsed_block ctxt () -let unsafe_transaction ?counter ?fee ?gas_limit ?storage_limit +let transaction ?counter ?fee ?gas_limit ?storage_limit ?(parameters = Script.unit_parameter) ?(entrypoint = Entrypoint.default) - ctxt (src : Contract.t) (destination : Destination.t) (amount : Tez.t) = + ctxt (src : Contract.t) (destination : Contract.t) (amount : Tez.t) = let top = Transaction {amount; parameters; destination; entrypoint} in manager_operation ?counter ?fee ?gas_limit ?storage_limit ~source:src ctxt top >>=? fun sop -> Context.Contract.manager ctxt src >|=? fun account -> sign account.sk ctxt sop -let transaction ?counter ?fee ?gas_limit ?storage_limit ?parameters ?entrypoint - ctxt (src : Contract.t) (dst : Contract.t) (amount : Tez.t) = - unsafe_transaction - ?counter - ?fee - ?gas_limit - ?storage_limit - ?parameters - ?entrypoint - ctxt - src - (Contract dst) - amount - let delegation ?fee ctxt source dst = let top = Delegation dst in manager_operation diff --git a/src/proto_alpha/lib_protocol/test/helpers/op.mli b/src/proto_alpha/lib_protocol/test/helpers/op.mli index 5f060bbfadb8b01f4697a8483b0b71706334006c..ce8a6ce39413f0575e360ce83a84c05f9cf38362 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/op.mli +++ b/src/proto_alpha/lib_protocol/test/helpers/op.mli @@ -69,26 +69,6 @@ val transaction : Tez.t -> Operation.packed tzresult Lwt.t -(** Same as [transaction], but with a more generic destination - parameter. It is said unsafe because it can construct transactions - that will always fail, such as - - {ul {li Transaction to the deposit entrypoint of a transaction rollup, - as these transactions are necessarily internals.}} - *) -val unsafe_transaction : - ?counter:Z.t -> - ?fee:Tez.tez -> - ?gas_limit:Gas.Arith.integral -> - ?storage_limit:Z.t -> - ?parameters:Script.lazy_expr -> - ?entrypoint:Entrypoint.t -> - Context.t -> - Contract.t -> - Destination.t -> - Tez.t -> - Operation.packed tzresult Lwt.t - val delegation : ?fee:Tez.tez -> Context.t -> diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml index 2fe0bd7c3db3bf427395b73a638c371f8f5e68b6..e1dc02698636a1b886a2c2acd6ebf8cac6a4b52b 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml +++ b/src/proto_alpha/lib_protocol/test/integration/operations/test_tx_rollup.ml @@ -1437,22 +1437,6 @@ let test_deposit_too_many_tickets () = ignore i ; return_unit -(** [test_deposit_by_non_internal_operation] checks that a transaction - to the deposit entrypoint of a transaction rollup fails if it is - not internal. *) -let test_deposit_by_non_internal_operation () = - context_init1 () >>=? fun (b, account) -> - originate b account >>=? fun (b, tx_rollup) -> - Op.unsafe_transaction (B b) account (Tx_rollup tx_rollup) Tez.zero - >>=? fun operation -> - Incremental.begin_construction b >>=? fun i -> - Incremental.add_operation i operation >>= function - | Ok _ -> - failwith - "Tx_rollup_non_internal_transaction error expected, but the operation \ - succeeded" - | Error err -> check_proto_error Apply.Tx_rollup_non_internal_transaction err - (** Test that block finalization changes gas rates *) let test_finalization () = context_init2 ~tx_rollup_max_inboxes_count:5_000 () >>=? fun (b, contracts) -> @@ -5748,10 +5732,6 @@ let tests = "Test valid deposit to invalid L2 address" `Quick test_invalid_l2_address; - Tztest.tztest - "Test valid deposit non internal operation" - `Quick - test_deposit_by_non_internal_operation; Tztest.tztest "Test valid deposit with non-zero amount" `Quick diff --git a/tezt/_regressions/rpc/alpha.client.mempool.out b/tezt/_regressions/rpc/alpha.client.mempool.out index cb5d48351978c6f94be7ce1e8244068bf75931f0..fabc37468355381fbf3fab404f4eade37110585b 100644 --- a/tezt/_regressions/rpc/alpha.client.mempool.out +++ b/tezt/_regressions/rpc/alpha.client.mempool.out @@ -1453,7 +1453,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "$ref": "#/definitions/alpha.mutez" }, "destination": { - "$ref": "#/definitions/alpha.transaction_destination" + "$ref": "#/definitions/alpha.contract_id" }, "parameters": { "type": "object", @@ -3556,11 +3556,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ], "additionalProperties": false }, - "alpha.transaction_destination": { - "title": "A destination of a transaction", - "description": "A destination notation compatible with the contract notation as given to an RPC or inside scripts. Can be a base58 implicit contract hash, a base58 originated contract hash, or a base58 originated transaction rollup.", - "$ref": "#/definitions/unistring" - }, "alpha.tx_rollup_id": { "title": "A tx rollup handle", "description": "A tx rollup notation as given to an RPC or inside scripts, is a base58 tx rollup hash", @@ -4531,7 +4526,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' { "name": "destination", "layout": { - "name": "alpha.transaction_destination", + "name": "alpha.contract_id", "kind": "Ref" }, "data_kind": { @@ -7518,7 +7513,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, { "description": { - "title": "alpha.transaction_destination" + "title": "alpha.contract_id" }, "encoding": { "tag_size": "Uint8", @@ -7596,46 +7591,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' } ], "name": "Originated" - }, - { - "tag": 2, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Rollup_hash", - "layout": { - "kind": "Bytes" - }, - "data_kind": { - "size": 20, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "padding", - "layout": { - "kind": "Padding" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Tx_rollup" } ] } @@ -9709,90 +9664,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ] } }, - { - "description": { - "title": "alpha.contract_id" - }, - "encoding": { - "tag_size": "Uint8", - "kind": { - "size": 22, - "kind": "Float" - }, - "cases": [ - { - "tag": 0, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Signature.Public_key_hash", - "layout": { - "name": "public_key_hash", - "kind": "Ref" - }, - "data_kind": { - "size": 21, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Implicit" - }, - { - "tag": 1, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Contract_hash", - "layout": { - "kind": "Bytes" - }, - "data_kind": { - "size": 20, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "padding", - "layout": { - "kind": "Padding" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Originated" - } - ] - } - }, { "description": { "title": "X_9" @@ -11736,7 +11607,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "$ref": "#/definitions/alpha.mutez" }, "destination": { - "$ref": "#/definitions/alpha.transaction_destination" + "$ref": "#/definitions/alpha.contract_id" }, "parameters": { "type": "object", @@ -13839,11 +13710,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ], "additionalProperties": false }, - "alpha.transaction_destination": { - "title": "A destination of a transaction", - "description": "A destination notation compatible with the contract notation as given to an RPC or inside scripts. Can be a base58 implicit contract hash, a base58 originated contract hash, or a base58 originated transaction rollup.", - "$ref": "#/definitions/unistring" - }, "alpha.tx_rollup_id": { "title": "A tx rollup handle", "description": "A tx rollup notation as given to an RPC or inside scripts, is a base58 tx rollup hash", diff --git a/tezt/_regressions/rpc/alpha.proxy.mempool.out b/tezt/_regressions/rpc/alpha.proxy.mempool.out index 91eea241c1a782936c7fb9e8e67bea4a33fe4794..f34f4ae77cc24ac3df3431dd907210f492cac3c8 100644 --- a/tezt/_regressions/rpc/alpha.proxy.mempool.out +++ b/tezt/_regressions/rpc/alpha.proxy.mempool.out @@ -1474,7 +1474,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "$ref": "#/definitions/alpha.mutez" }, "destination": { - "$ref": "#/definitions/alpha.transaction_destination" + "$ref": "#/definitions/alpha.contract_id" }, "parameters": { "type": "object", @@ -3577,11 +3577,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ], "additionalProperties": false }, - "alpha.transaction_destination": { - "title": "A destination of a transaction", - "description": "A destination notation compatible with the contract notation as given to an RPC or inside scripts. Can be a base58 implicit contract hash, a base58 originated contract hash, or a base58 originated transaction rollup.", - "$ref": "#/definitions/unistring" - }, "alpha.tx_rollup_id": { "title": "A tx rollup handle", "description": "A tx rollup notation as given to an RPC or inside scripts, is a base58 tx rollup hash", @@ -4552,7 +4547,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' { "name": "destination", "layout": { - "name": "alpha.transaction_destination", + "name": "alpha.contract_id", "kind": "Ref" }, "data_kind": { @@ -7539,7 +7534,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' }, { "description": { - "title": "alpha.transaction_destination" + "title": "alpha.contract_id" }, "encoding": { "tag_size": "Uint8", @@ -7617,46 +7612,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' } ], "name": "Originated" - }, - { - "tag": 2, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Rollup_hash", - "layout": { - "kind": "Bytes" - }, - "data_kind": { - "size": 20, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "padding", - "layout": { - "kind": "Padding" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Tx_rollup" } ] } @@ -9730,90 +9685,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ] } }, - { - "description": { - "title": "alpha.contract_id" - }, - "encoding": { - "tag_size": "Uint8", - "kind": { - "size": 22, - "kind": "Float" - }, - "cases": [ - { - "tag": 0, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Signature.Public_key_hash", - "layout": { - "name": "public_key_hash", - "kind": "Ref" - }, - "data_kind": { - "size": 21, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Implicit" - }, - { - "tag": 1, - "fields": [ - { - "name": "Tag", - "layout": { - "size": "Uint8", - "kind": "Int" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "Contract_hash", - "layout": { - "kind": "Bytes" - }, - "data_kind": { - "size": 20, - "kind": "Float" - }, - "kind": "named" - }, - { - "name": "padding", - "layout": { - "kind": "Padding" - }, - "data_kind": { - "size": 1, - "kind": "Float" - }, - "kind": "named" - } - ], - "name": "Originated" - } - ] - } - }, { "description": { "title": "X_9" @@ -11757,7 +11628,7 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' "$ref": "#/definitions/alpha.mutez" }, "destination": { - "$ref": "#/definitions/alpha.transaction_destination" + "$ref": "#/definitions/alpha.contract_id" }, "parameters": { "type": "object", @@ -13860,11 +13731,6 @@ curl -s 'http://localhost:[PORT]/describe/chains/main/mempool?recurse=yes' ], "additionalProperties": false }, - "alpha.transaction_destination": { - "title": "A destination of a transaction", - "description": "A destination notation compatible with the contract notation as given to an RPC or inside scripts. Can be a base58 implicit contract hash, a base58 originated contract hash, or a base58 originated transaction rollup.", - "$ref": "#/definitions/unistring" - }, "alpha.tx_rollup_id": { "title": "A tx rollup handle", "description": "A tx rollup notation as given to an RPC or inside scripts, is a base58 tx rollup hash",