diff --git a/contrib/kaitai-struct-files/files/alpha__lazy_storage_diff.ksy b/contrib/kaitai-struct-files/files/alpha__lazy_storage_diff.ksy index c33332601a7182213509cf789dca0002ee277f56..ea9b3b3045ec42ad0a78924b9876362d5a3100b6 100644 --- a/contrib/kaitai-struct-files/files/alpha__lazy_storage_diff.ksy +++ b/contrib/kaitai-struct-files/files/alpha__lazy_storage_diff.ksy @@ -341,7 +341,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -356,7 +356,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -509,7 +509,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -560,7 +560,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -707,10 +707,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -721,6 +721,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket bool: 0: false 255: true diff --git a/contrib/kaitai-struct-files/files/alpha__operation.ksy b/contrib/kaitai-struct-files/files/alpha__operation.ksy index a8c35ca63e0b9238d1c7e16be0e2460c67882e72..db94e059e68cedf520c72c2d15d3b668ddb7625f 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation.ksy @@ -1512,7 +1512,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1527,7 +1527,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1680,7 +1680,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1731,7 +1731,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1878,10 +1878,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1892,6 +1892,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation__alpha__contents_or_signature_prefix_tag: 1: seed_nonce_revelation 2: double_attestation_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation__contents.ksy b/contrib/kaitai-struct-files/files/alpha__operation__contents.ksy index aa96f6eb2e10ed11c7af850518504e77d8dce163..35dc30181c0523958f79f1e527a917f275200463 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation__contents.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation__contents.ksy @@ -1489,7 +1489,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1504,7 +1504,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1657,7 +1657,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1708,7 +1708,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1855,10 +1855,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1869,6 +1869,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation_with_legacy_attestation_name__alpha__contents_tag: 1: seed_nonce_revelation 2: double_endorsement_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation__contents_list.ksy b/contrib/kaitai-struct-files/files/alpha__operation__contents_list.ksy index 612fa3b08c13040ea31d9342434c046e67a01ccf..330b84e606e95f0b9eeff89e47a70fe8525ea01b 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation__contents_list.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation__contents_list.ksy @@ -1493,7 +1493,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1508,7 +1508,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1661,7 +1661,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1712,7 +1712,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1859,10 +1859,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1873,6 +1873,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation_with_legacy_attestation_name__alpha__contents_tag: 1: seed_nonce_revelation 2: double_endorsement_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation__internal.ksy b/contrib/kaitai-struct-files/files/alpha__operation__internal.ksy index 3a2da16b43de42e1fbc919e00cc56dacf569dafd..8fa5e3c3e95aada65ecfc4c18b9dd8483e6455b1 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation__internal.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation__internal.ksy @@ -369,7 +369,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -384,7 +384,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -537,7 +537,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -588,7 +588,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -735,10 +735,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -749,6 +749,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__transaction_destination_tag: 0: implicit 1: originated diff --git a/contrib/kaitai-struct-files/files/alpha__operation__protocol_data.ksy b/contrib/kaitai-struct-files/files/alpha__operation__protocol_data.ksy index 18296899f0b7e507260d635c3ca35bd753b2b418..ac36f0e553c4a5a87d8095d6cc048a2656e31dc8 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation__protocol_data.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation__protocol_data.ksy @@ -1512,7 +1512,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1527,7 +1527,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1680,7 +1680,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1731,7 +1731,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1878,10 +1878,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1892,6 +1892,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation__alpha__contents_or_signature_prefix_tag: 1: seed_nonce_revelation 2: double_attestation_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation__unsigned.ksy b/contrib/kaitai-struct-files/files/alpha__operation__unsigned.ksy index 11b3ab049c5fe75e028d494f8a89f2ea79770882..c14bfd12e925b1b27a7b9b423a4a0487353278ea 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation__unsigned.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation__unsigned.ksy @@ -1500,7 +1500,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1515,7 +1515,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1668,7 +1668,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1719,7 +1719,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1866,10 +1866,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1880,6 +1880,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation_with_legacy_attestation_name__alpha__contents_tag: 1: seed_nonce_revelation 2: double_endorsement_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation_with_attestation.ksy b/contrib/kaitai-struct-files/files/alpha__operation_with_attestation.ksy index d95f125c2edccb6389665292672a761cc1b475ab..20168cb6d3eca0e645831da76d775e69b0ba6b51 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation_with_attestation.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation_with_attestation.ksy @@ -1512,7 +1512,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1527,7 +1527,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1680,7 +1680,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1731,7 +1731,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1878,10 +1878,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1892,6 +1892,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation__alpha__contents_or_signature_prefix_tag: 1: seed_nonce_revelation 2: double_attestation_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__operation_with_attestation__unsigned.ksy b/contrib/kaitai-struct-files/files/alpha__operation_with_attestation__unsigned.ksy index 3cb07c64cca28fb3e5c4b4f39058ddff727e3317..ef85f5068f9cc82c4d9b67dba9d77bdaf38f86e1 100644 --- a/contrib/kaitai-struct-files/files/alpha__operation_with_attestation__unsigned.ksy +++ b/contrib/kaitai-struct-files/files/alpha__operation_with_attestation__unsigned.ksy @@ -1500,7 +1500,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -1515,7 +1515,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -1668,7 +1668,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1719,7 +1719,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1866,10 +1866,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1880,6 +1880,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__operation__alpha__contents_tag: 1: seed_nonce_revelation 2: double_attestation_evidence diff --git a/contrib/kaitai-struct-files/files/alpha__script__expr.ksy b/contrib/kaitai-struct-files/files/alpha__script__expr.ksy index d9af959b9fbe7056ed723da2bbd0f5bc5d144cd9..c599d1234d57fd1c76caafe44f3e5ce71376a6be 100644 --- a/contrib/kaitai-struct-files/files/alpha__script__expr.ksy +++ b/contrib/kaitai-struct-files/files/alpha__script__expr.ksy @@ -170,7 +170,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -185,7 +185,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -338,7 +338,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -389,7 +389,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -536,10 +536,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -550,6 +550,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket micheline__alpha__michelson_v1__expression_tag: 0: int 1: string diff --git a/contrib/kaitai-struct-files/files/alpha__script__prim.ksy b/contrib/kaitai-struct-files/files/alpha__script__prim.ksy index b2e15b522375e2a6578ff05f89bd60675bb49aa3..efb1b440d9a2adec77792adf85f2cbe86d8760ce 100644 --- a/contrib/kaitai-struct-files/files/alpha__script__prim.ksy +++ b/contrib/kaitai-struct-files/files/alpha__script__prim.ksy @@ -23,7 +23,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -38,7 +38,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -191,7 +191,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -242,7 +242,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -389,10 +389,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -403,6 +403,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket seq: - id: alpha__michelson__v1__primitives type: alpha__michelson__v1__primitives diff --git a/contrib/kaitai-struct-files/files/alpha__smart_rollup__inbox__message.ksy b/contrib/kaitai-struct-files/files/alpha__smart_rollup__inbox__message.ksy index 9f2c1907da88e9488c475fc91a1f49637b9fcb7f..43cd3631155327c9ddd98e844cac367757c577df 100644 --- a/contrib/kaitai-struct-files/files/alpha__smart_rollup__inbox__message.ksy +++ b/contrib/kaitai-struct-files/files/alpha__smart_rollup__inbox__message.ksy @@ -220,7 +220,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -235,7 +235,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -388,7 +388,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -439,7 +439,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -586,10 +586,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -600,6 +600,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__smart_rollup__inbox__message_tag: 0: internal 1: external diff --git a/contrib/kaitai-struct-files/files/alpha__smart_rollup__outbox__message.ksy b/contrib/kaitai-struct-files/files/alpha__smart_rollup__outbox__message.ksy index a8cefad3cee1b6c85c3e6d3a2e572fcb65d06176..5726928afac97019e18e057d657c848ba69349e6 100644 --- a/contrib/kaitai-struct-files/files/alpha__smart_rollup__outbox__message.ksy +++ b/contrib/kaitai-struct-files/files/alpha__smart_rollup__outbox__message.ksy @@ -283,7 +283,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -298,7 +298,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -451,7 +451,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -502,7 +502,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -649,10 +649,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -663,6 +663,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket alpha__smart_rollup__outbox__message_tag: 0: atomic_transaction_batch 1: atomic_transaction_batch_typed diff --git a/contrib/kaitai-struct-files/files/alpha__smart_rollup__output.ksy b/contrib/kaitai-struct-files/files/alpha__smart_rollup__output.ksy index 6436cc3a74fe24fb60a167f83b5d3b5575e18029..b8df4d08475b6cb1f575ac3cdbd9e84eb120f5cb 100644 --- a/contrib/kaitai-struct-files/files/alpha__smart_rollup__output.ksy +++ b/contrib/kaitai-struct-files/files/alpha__smart_rollup__output.ksy @@ -303,7 +303,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -318,7 +318,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -471,7 +471,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -522,7 +522,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -669,10 +669,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -683,6 +683,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket bool: 0: false 255: true diff --git a/contrib/kaitai-struct-files/files/alpha__smart_rollup__wasm_2_0_0__output__proof.ksy b/contrib/kaitai-struct-files/files/alpha__smart_rollup__wasm_2_0_0__output__proof.ksy index 3bb5de10383924221f621a2825f93e517e759bef..e7f0ed7b287e3ad5deba9688698cdf1f1581138e 100644 --- a/contrib/kaitai-struct-files/files/alpha__smart_rollup__wasm_2_0_0__output__proof.ksy +++ b/contrib/kaitai-struct-files/files/alpha__smart_rollup__wasm_2_0_0__output__proof.ksy @@ -806,7 +806,7 @@ enums: id: left doc: Left 6: - id: none_0 + id: none doc: None 7: id: pair_1 @@ -821,7 +821,7 @@ enums: id: true doc: True 11: - id: unit_0 + id: unit_1 doc: Unit 12: id: pack @@ -974,7 +974,7 @@ enums: id: nil doc: NIL 62: - id: none + id: none_0 doc: NONE 63: id: not @@ -1025,7 +1025,7 @@ enums: id: set_delegate doc: SET_DELEGATE 79: - id: unit_1 + id: unit_0 doc: UNIT 80: id: update @@ -1172,10 +1172,10 @@ enums: id: emit doc: EMIT 152: - id: lambda_rec + id: lambda_rec_0 doc: Lambda_rec 153: - id: lambda_rec_0 + id: lambda_rec doc: LAMBDA_REC 154: id: ticket_0 @@ -1186,6 +1186,9 @@ enums: 156: id: nat_0 doc: NAT + 157: + id: ticket_1 + doc: Ticket bool: 0: false 255: true diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml index 362ec1eb45f2b3b4972ee9425454a1305ac92338..cd6689498404dd2fa05288d8c654f86caec6fba3 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/mikhailsky_prim.ml @@ -2,6 +2,7 @@ (* *) (* Open Source License *) (* Copyright (c) 2021 Nomadic Labs, *) +(* Copyright (c) 2024 Marigold, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -41,6 +42,7 @@ type prim = | D_Some | D_True | D_Unit + | D_Ticket | I_PACK | I_UNPACK | I_BLAKE2B @@ -378,6 +380,7 @@ let string_of_prim prim = | D_Some -> "D_Some" | D_True -> "D_True" | D_Unit -> "D_Unit" + | D_Ticket -> "D_Ticket" | I_PACK -> "I_PACK" | I_UNPACK -> "I_UNPACK" | I_BLAKE2B -> "I_BLAKE2B" @@ -537,7 +540,7 @@ let kind (x : prim) = match x with | K_parameter | K_storage | K_code -> Keyword_kind | D_Hole | D_False | D_Elt | D_Left | D_None | D_Pair | D_Right | D_Some - | D_True | D_Unit -> + | D_True | D_Unit | D_Ticket -> Data_kind | I_PACK | I_UNPACK | I_BLAKE2B | I_SHA256 | I_SHA512 | I_ABS | I_ADD | I_AMOUNT | I_AND | I_BALANCE | I_CAR | I_CDR | I_CHAIN_ID diff --git a/src/proto_alpha/lib_protocol/alpha_context.mli b/src/proto_alpha/lib_protocol/alpha_context.mli index 7ab3ce62372882e7976e82d30a9debd785705203..eeb600498d61b5109163f4919a1407fc109da424 100644 --- a/src/proto_alpha/lib_protocol/alpha_context.mli +++ b/src/proto_alpha/lib_protocol/alpha_context.mli @@ -5,6 +5,7 @@ (* Copyright (c) 2019-2022 Nomadic Labs *) (* Copyright (c) 2022 TriliTech *) (* Copyright (c) 2022 DaiLambda, Inc. *) +(* Copyright (c) 2024 Marigold, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -556,6 +557,7 @@ module Script : sig | D_Some | D_True | D_Unit + | D_Ticket | D_Lambda_rec | I_PACK | I_UNPACK diff --git a/src/proto_alpha/lib_protocol/michelson_v1_primitives.ml b/src/proto_alpha/lib_protocol/michelson_v1_primitives.ml index 8c198be16e91493afd538e56476ac9bdc2e6ac2e..1b370589413ed223ac11c71669e8ca87f0d86a11 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_primitives.ml +++ b/src/proto_alpha/lib_protocol/michelson_v1_primitives.ml @@ -4,6 +4,7 @@ (* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) (* Copyright (c) 2020 Metastate AG *) (* Copyright (c) 2022 DaiLambda, Inc. *) +(* Copyright (c) 2024 Marigold, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -49,6 +50,7 @@ type prim = | D_Some | D_True | D_Unit + | D_Ticket | D_Lambda_rec | I_PACK | I_UNPACK @@ -206,7 +208,7 @@ type namespace = let namespace = function | K_code | K_view | K_parameter | K_storage -> Keyword_namespace | D_Elt | D_False | D_Left | D_None | D_Pair | D_Right | D_Some | D_True - | D_Unit | D_Lambda_rec -> + | D_Unit | D_Lambda_rec | D_Ticket -> Constant_namespace | I_ABS | I_ADD | I_ADDRESS | I_AMOUNT | I_AND | I_APPLY | I_BALANCE | I_BLAKE2B | I_CAR | I_CAST | I_CDR | I_CHAIN_ID | I_CHECK_SIGNATURE @@ -262,6 +264,7 @@ let string_of_prim = function | D_Some -> "Some" | D_True -> "True" | D_Unit -> "Unit" + | D_Ticket -> "Ticket" | D_Lambda_rec -> "Lambda_rec" | I_PACK -> "PACK" | I_UNPACK -> "UNPACK" @@ -423,6 +426,7 @@ let prim_of_string = | "Some" -> return D_Some | "True" -> return D_True | "Unit" -> return D_Unit + | "Ticket" -> return D_Ticket | "Lambda_rec" -> return D_Lambda_rec | "PACK" -> return I_PACK | "UNPACK" -> return I_UNPACK @@ -792,9 +796,11 @@ let prim_encoding = ("LAMBDA_REC", I_LAMBDA_REC); ("TICKET", I_TICKET); ("BYTES", I_BYTES); - ("NAT", I_NAT) + ("NAT", I_NAT); + (* Alpha_019 addition *) + ("Ticket", D_Ticket); (* New instructions must be added here, for backward compatibility of the encoding. *) - (* Keep the comment above at the end of the list *); + (* Keep the comment above at the end of the list *) ] let () = diff --git a/src/proto_alpha/lib_protocol/michelson_v1_primitives.mli b/src/proto_alpha/lib_protocol/michelson_v1_primitives.mli index 761631190abad0277bf956b546bdb0afc6f38448..133edfc06799e4abdb5c088d4aa6f0ce6a95e65d 100644 --- a/src/proto_alpha/lib_protocol/michelson_v1_primitives.mli +++ b/src/proto_alpha/lib_protocol/michelson_v1_primitives.mli @@ -3,6 +3,7 @@ (* Open Source License *) (* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) (* Copyright (c) 2020 Metastate AG *) +(* Copyright (c) 2024 Marigold, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -61,6 +62,7 @@ type prim = | D_Some | D_True | D_Unit + | D_Ticket | D_Lambda_rec | I_PACK | I_UNPACK diff --git a/src/proto_alpha/lib_protocol/test/helpers/test_global_constants.ml b/src/proto_alpha/lib_protocol/test/helpers/test_global_constants.ml index d497a075934ec1a33dfa58f44153acf0f1def69d..c05ae1b804b216f103a2b1433c5ae704ae2cf675 100644 --- a/src/proto_alpha/lib_protocol/test/helpers/test_global_constants.ml +++ b/src/proto_alpha/lib_protocol/test/helpers/test_global_constants.ml @@ -2,6 +2,7 @@ (* *) (* Open Source License *) (* Copyright (c) 2018 Dynamic Ledger Solutions, Inc. *) +(* Copyright (c) 2024 Marigold, *) (* *) (* Permission is hereby granted, free of charge, to any person obtaining a *) (* copy of this software and associated documentation files (the "Software"),*) @@ -85,6 +86,7 @@ module Generators = struct D_Some; D_True; D_Unit; + D_Ticket; I_PACK; I_UNPACK; I_BLAKE2B;