diff --git a/manifest/main.ml b/manifest/main.ml index c13800cd703d10a4c22be6d277917d7608972656..6e9af4004f5ddcf245c84c8d4afd263b3ddb9635 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -1018,7 +1018,6 @@ let octez_base = data_encoding |> open_; octez_error_monad |> open_ |> open_ ~m:"TzLwtreslib"; octez_rpc |> open_; - octez_clic |> open_; octez_micheline |> open_; octez_event_logging |> open_; ptime; @@ -2491,6 +2490,7 @@ let octez_client_base = ~deps: [ octez_base |> open_ ~m:"TzPervasives"; + octez_clic; octez_rpc |> open_; octez_shell_services |> open_; octez_sapling; @@ -2587,6 +2587,7 @@ let octez_signer_backends_unix = fmt; octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_stdlib_unix |> open_; octez_stdlib |> open_; octez_client_base |> open_; @@ -2628,6 +2629,7 @@ let octez_client_commands = [ octez_base |> open_ ~m:"TzPervasives"; octez_rpc |> open_; + octez_clic |> open_; octez_clic_unix |> open_; octez_client_base |> open_; octez_shell_services |> open_; @@ -2711,6 +2713,7 @@ let octez_mockup_commands = ~deps: [ octez_base |> open_ ~m:"TzPervasives"; + octez_clic; octez_client_commands; octez_client_base; octez_mockup |> open_; @@ -2823,6 +2826,7 @@ let octez_client_base_unix = [ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_rpc_http |> open_; octez_rpc_http_client_unix |> open_; octez_shell_services |> open_; @@ -4120,6 +4124,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_shell_services |> open_; octez_client_base |> open_; main |> open_; @@ -4229,6 +4234,7 @@ module Protocol = Protocol |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; octez_base |> if_ N.(number >= 15) |> open_ ~m:"TzPervasives"; + octez_clic |> open_; main |> open_; parameters |> if_some |> if_ N.(number >= 013) |> open_; octez_stdlib_unix |> open_; @@ -4260,6 +4266,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_crypto; octez_stdlib_unix |> open_; octez_client_base |> open_; @@ -4284,6 +4291,7 @@ module Protocol = Protocol |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; octez_base |> if_ N.(number >= 15) |> open_ ~m:"TzPervasives"; + octez_clic |> open_; main |> open_; parameters |> if_some |> if_ N.(number >= 013) |> open_; octez_protocol_environment; @@ -4313,6 +4321,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_version; main |> open_; plugin |> if_some |> open_; @@ -4494,6 +4503,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; main |> open_; client |> if_some |> open_; octez_client_commands |> open_; @@ -4575,6 +4585,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_client_base; client |> if_some |> open_; octez_client_commands |> open_; @@ -4599,6 +4610,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; octez_client_commands |> open_; octez_stdlib_unix |> open_; octez_client_base |> open_; @@ -4675,6 +4687,7 @@ module Protocol = Protocol [ octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals"; + octez_clic |> open_; main |> open_ |> open_ ~m:"Protocol"; client |> if_some |> open_; client_commands |> if_some |> open_; @@ -4697,6 +4710,7 @@ module Protocol = Protocol octez_base |> open_ ~m:"TzPervasives" |> open_ ~m:"TzPervasives.Error_monad.Legacy_monad_globals" |> open_; + octez_clic |> open_; main |> open_; client |> if_some |> open_; octez_client_base |> open_; @@ -5361,6 +5375,7 @@ let _octez_client = ([ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic |> open_; octez_rpc_http_client |> open_; octez_stdlib_unix |> open_; octez_shell_services |> open_; @@ -5467,7 +5482,7 @@ let _octez_snoop = octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; octez_stdlib_unix |> open_; - octez_clic; + octez_clic |> open_; octez_benchmark |> open_; octez_benchmark_examples; octez_shell_benchmarks; @@ -5525,6 +5540,7 @@ let _octez_signer = [ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic; octez_client_base |> open_; octez_client_base_unix |> open_; octez_client_commands |> open_; @@ -5619,6 +5635,7 @@ let _octez_dal_node = ([ octez_base |> open_ ~m:"TzPervasives"; octez_base_unix; + octez_clic |> open_; octez_client_base |> open_; octez_client_base_unix |> open_; octez_client_commands |> open_; diff --git a/opam/tezos-accuser-012-Psithaca.opam b/opam/tezos-accuser-012-Psithaca.opam index cc1b488debb0bbb0c7f8e80bc364b968c2660812..bf53d2f57fd81dc50cbb771084e8193111ce9ba5 100644 --- a/opam/tezos-accuser-012-Psithaca.opam +++ b/opam/tezos-accuser-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" "tezos-client-commands" diff --git a/opam/tezos-accuser-013-PtJakart.opam b/opam/tezos-accuser-013-PtJakart.opam index f0e541714fc301f24f8c0f513fd8df7f33c6ca1d..f0de0e36951319963042ba16ee33425b4126c3a7 100644 --- a/opam/tezos-accuser-013-PtJakart.opam +++ b/opam/tezos-accuser-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-accuser-014-PtKathma.opam b/opam/tezos-accuser-014-PtKathma.opam index 7b4a4501c1c5fa681e063d497360ca1d0ea006dd..bbaafccee1943adbd9992206288998581ea04768 100644 --- a/opam/tezos-accuser-014-PtKathma.opam +++ b/opam/tezos-accuser-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-accuser-alpha.opam b/opam/tezos-accuser-alpha.opam index b42cbd44814db5fdbba834558a5dd954166e4b16..06a64fa0510ea679b1c4a100bb80e7a1d608d6f1 100644 --- a/opam/tezos-accuser-alpha.opam +++ b/opam/tezos-accuser-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-baker-012-Psithaca.opam b/opam/tezos-baker-012-Psithaca.opam index 7bff25343f2de1539de0a4541d292976eeac2f78..cd371e6dbd9a70d8143bee179caae94ef05166b6 100644 --- a/opam/tezos-baker-012-Psithaca.opam +++ b/opam/tezos-baker-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-012-Psithaca" "tezos-client-012-Psithaca" "tezos-client-commands" diff --git a/opam/tezos-baker-013-PtJakart.opam b/opam/tezos-baker-013-PtJakart.opam index 76a9e9beea8ceb4ccba173a0145b3a1d6b96f1b5..bf5e598ea375a2982a2bf69797e98653ffa56b0a 100644 --- a/opam/tezos-baker-013-PtJakart.opam +++ b/opam/tezos-baker-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-baker-014-PtKathma.opam b/opam/tezos-baker-014-PtKathma.opam index 5e1a22ce174cb5c2c7ee246985ab4183227fd564..e58771027d094e1b7ff161ff71b49401b8d3da12 100644 --- a/opam/tezos-baker-014-PtKathma.opam +++ b/opam/tezos-baker-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-baker-alpha.opam b/opam/tezos-baker-alpha.opam index 445ea5e2f2b2ddd90b4e912eb0ea4bf180067337..4075a4e0a07831fb054502b1187ae45ec040717f 100644 --- a/opam/tezos-baker-alpha.opam +++ b/opam/tezos-baker-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-baking-012-Psithaca.opam b/opam/tezos-baking-012-Psithaca.opam index a6d519c4d4bec363ed6bba9dec78526b87821c04..403bd0af508fa7eb96308448f8495b85380d2322 100644 --- a/opam/tezos-baking-012-Psithaca.opam +++ b/opam/tezos-baking-012-Psithaca.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-012-Psithaca" "tezos-protocol-plugin-012-Psithaca" diff --git a/opam/tezos-baking-013-PtJakart.opam b/opam/tezos-baking-013-PtJakart.opam index 1327404a02b589d4faa7cc6061e1eedca592f927..ff107cf195ea2db780847164918f4595055b1776 100644 --- a/opam/tezos-baking-013-PtJakart.opam +++ b/opam/tezos-baking-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-013-PtJakart" "tezos-protocol-plugin-013-PtJakart" diff --git a/opam/tezos-baking-014-PtKathma.opam b/opam/tezos-baking-014-PtKathma.opam index e99b86a2d51eda6b38bcde719ba777ef88967a52..6ab6522a89279ed88b698e9b6726080f799e1053 100644 --- a/opam/tezos-baking-014-PtKathma.opam +++ b/opam/tezos-baking-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-014-PtKathma" "tezos-protocol-plugin-014-PtKathma" diff --git a/opam/tezos-baking-alpha.opam b/opam/tezos-baking-alpha.opam index 4d464338071f1e182b7ca44acff6a34229b5d729..bf9db92268335832d9c920e6ecfc77d475e5ce7d 100644 --- a/opam/tezos-baking-alpha.opam +++ b/opam/tezos-baking-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-version" "tezos-protocol-alpha" "tezos-protocol-plugin-alpha" diff --git a/opam/tezos-base.opam b/opam/tezos-base.opam index 12345389ab42c18778a67d2f3bf6928ebf46b42d..790a4f6295980ad032661e351d9be1f466dde7c4 100644 --- a/opam/tezos-base.opam +++ b/opam/tezos-base.opam @@ -14,7 +14,6 @@ depends: [ "data-encoding" { >= "0.6" & < "0.7" } "tezos-error-monad" "tezos-rpc" - "tezos-clic" "tezos-micheline" "tezos-event-logging" "ptime" { >= "1.0.0" } diff --git a/opam/tezos-client-000-Ps9mPmXa.opam b/opam/tezos-client-000-Ps9mPmXa.opam index 177fe2ed48abc18c9ff0405e47b6804a456ab0cf..21083327c7f9cd5c4eac87dea5035ea70624f4bc 100644 --- a/opam/tezos-client-000-Ps9mPmXa.opam +++ b/opam/tezos-client-000-Ps9mPmXa.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-000-Ps9mPmXa" diff --git a/opam/tezos-client-001-PtCJ7pwo.opam b/opam/tezos-client-001-PtCJ7pwo.opam index 990dcddecf4c0c17540ed7671c852de5d9a46d3e..800490404664b12ee02ce30e3c07765271f26915 100644 --- a/opam/tezos-client-001-PtCJ7pwo.opam +++ b/opam/tezos-client-001-PtCJ7pwo.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-001-PtCJ7pwo" diff --git a/opam/tezos-client-002-PsYLVpVv.opam b/opam/tezos-client-002-PsYLVpVv.opam index 4946c312eba453e91fe3ae98a37d68613027dbf9..4129a3fed4505630763a37c4a26a902e94f9a5ba 100644 --- a/opam/tezos-client-002-PsYLVpVv.opam +++ b/opam/tezos-client-002-PsYLVpVv.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-002-PsYLVpVv" diff --git a/opam/tezos-client-003-PsddFKi3.opam b/opam/tezos-client-003-PsddFKi3.opam index 5313da024aa5880198c99fdce462fe1f43e2613c..c240604093603826ef88e2d41f58958bd9abab79 100644 --- a/opam/tezos-client-003-PsddFKi3.opam +++ b/opam/tezos-client-003-PsddFKi3.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-003-PsddFKi3" diff --git a/opam/tezos-client-004-Pt24m4xi.opam b/opam/tezos-client-004-Pt24m4xi.opam index 357defdb512b52417d768ee043ad8c6d61aa0147..cae11a70e1ca524cf3b8025124350b13e984cf11 100644 --- a/opam/tezos-client-004-Pt24m4xi.opam +++ b/opam/tezos-client-004-Pt24m4xi.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-004-Pt24m4xi" diff --git a/opam/tezos-client-005-PsBabyM1.opam b/opam/tezos-client-005-PsBabyM1.opam index 5940d6faf37294d79108024b78f8254583f5f7a5..983381dd9d684272268fbda5ef476bc73e6b7e79 100644 --- a/opam/tezos-client-005-PsBabyM1.opam +++ b/opam/tezos-client-005-PsBabyM1.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-005-PsBabyM1" diff --git a/opam/tezos-client-006-PsCARTHA.opam b/opam/tezos-client-006-PsCARTHA.opam index 21715e3fa5beb46ba6023314e69578a769522c11..2b6580bfba2be4809acc1e17b78b14bf2a37c456 100644 --- a/opam/tezos-client-006-PsCARTHA.opam +++ b/opam/tezos-client-006-PsCARTHA.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-006-PsCARTHA" diff --git a/opam/tezos-client-007-PsDELPH1.opam b/opam/tezos-client-007-PsDELPH1.opam index e8a0c73e77ab4a0970503cc90488e1a63bc54641..b7b0d405820c3c7e42ed3e616336d05d769f2c78 100644 --- a/opam/tezos-client-007-PsDELPH1.opam +++ b/opam/tezos-client-007-PsDELPH1.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-007-PsDELPH1" diff --git a/opam/tezos-client-008-PtEdo2Zk.opam b/opam/tezos-client-008-PtEdo2Zk.opam index a0735ce4af863d2de6e610b0ef77e3d4155287a8..4308eba4d2159c4119653242e2addb56728ac725 100644 --- a/opam/tezos-client-008-PtEdo2Zk.opam +++ b/opam/tezos-client-008-PtEdo2Zk.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-008-PtEdo2Zk" diff --git a/opam/tezos-client-009-PsFLoren.opam b/opam/tezos-client-009-PsFLoren.opam index 26a331bb9ddb1209df0cf126a06d6051120a12b2..dbee6f77f953be53b5352b638b5d43695a8a53b9 100644 --- a/opam/tezos-client-009-PsFLoren.opam +++ b/opam/tezos-client-009-PsFLoren.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-009-PsFLoren" diff --git a/opam/tezos-client-010-PtGRANAD.opam b/opam/tezos-client-010-PtGRANAD.opam index fd2a3fe29e1be2cd64616a00c6e3e603dcdfe90c..c2ca5692e2bc0633b71b5ab50dd59e22f3af8d6b 100644 --- a/opam/tezos-client-010-PtGRANAD.opam +++ b/opam/tezos-client-010-PtGRANAD.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-010-PtGRANAD" diff --git a/opam/tezos-client-011-PtHangz2.opam b/opam/tezos-client-011-PtHangz2.opam index be541410186ace28026cf4ada0d61751a7ba44f5..308e7f9f9661c9911571863ddde036b61882f373 100644 --- a/opam/tezos-client-011-PtHangz2.opam +++ b/opam/tezos-client-011-PtHangz2.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-011-PtHangz2" diff --git a/opam/tezos-client-012-Psithaca.opam b/opam/tezos-client-012-Psithaca.opam index 4d56f0dc548c739ad550fc873fc468062398f5a0..8c2d041ecb593325d1e773b4a76f4adb98154181 100644 --- a/opam/tezos-client-012-Psithaca.opam +++ b/opam/tezos-client-012-Psithaca.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-012-Psithaca" diff --git a/opam/tezos-client-013-PtJakart.opam b/opam/tezos-client-013-PtJakart.opam index db5bab006933432f236af3909cf57aa779602ef3..191d69bf8b7766cd0c4ec4d40c386ff4dcf66e15 100644 --- a/opam/tezos-client-013-PtJakart.opam +++ b/opam/tezos-client-013-PtJakart.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-013-PtJakart" diff --git a/opam/tezos-client-014-PtKathma.opam b/opam/tezos-client-014-PtKathma.opam index 63dcf08d73b50ae304d3193e33f0134e879ffa14..2215a17e03920553527f8ed2e3407330afe748d6 100644 --- a/opam/tezos-client-014-PtKathma.opam +++ b/opam/tezos-client-014-PtKathma.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-014-PtKathma" diff --git a/opam/tezos-client-alpha.opam b/opam/tezos-client-alpha.opam index 59781a3a852a553c56f7bb9ab218ccd238516e0f..c35306b645696bc91e6e04a3c4d6e4aa758d82dc 100644 --- a/opam/tezos-client-alpha.opam +++ b/opam/tezos-client-alpha.opam @@ -11,6 +11,7 @@ depends: [ "dune" { >= "3.0" } "ppx_expect" "tezos-base" + "tezos-clic" "tezos-shell-services" "tezos-client-base" "tezos-protocol-alpha" diff --git a/opam/tezos-client-base-unix.opam b/opam/tezos-client-base-unix.opam index 8e85bb4f19db2e1ed73f7387e97832c55f8dd83e..746f3b5dceddaef9dfdb56eb04901a255e7de07e 100644 --- a/opam/tezos-client-base-unix.opam +++ b/opam/tezos-client-base-unix.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc-http" "tezos-rpc-http-client-unix" "tezos-shell-services" diff --git a/opam/tezos-client-base.opam b/opam/tezos-client-base.opam index c9c68a4f9c519b85256ca931e903e71f22314f28..00cc2df19915d061bc80dd68c7391182d33c7614 100644 --- a/opam/tezos-client-base.opam +++ b/opam/tezos-client-base.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc" "tezos-shell-services" "tezos-sapling" diff --git a/opam/tezos-client.opam b/opam/tezos-client.opam index 2e4da877871d8dd367012f8b8d259a535dd141d4..6ba0a3d6718366c762fb905015669b862e558e18 100644 --- a/opam/tezos-client.opam +++ b/opam/tezos-client.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-rpc-http-client" "tezos-stdlib-unix" "tezos-shell-services" diff --git a/opam/tezos-dal-node.opam b/opam/tezos-dal-node.opam index b63f927979d0121aeb15bb9ab244f6faccb522e3..50398edfe45d111c2de72895cd0c4c39059c6c45 100644 --- a/opam/tezos-dal-node.opam +++ b/opam/tezos-dal-node.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/tezos-mockup-commands.opam b/opam/tezos-mockup-commands.opam index 30eb326226b9ead26e2e751ad3565729a33cb968..83026c24c3945506596686712700d163e9304d40 100644 --- a/opam/tezos-mockup-commands.opam +++ b/opam/tezos-mockup-commands.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-client-base" "tezos-mockup" diff --git a/opam/tezos-sc-rollup-client-013-PtJakart.opam b/opam/tezos-sc-rollup-client-013-PtJakart.opam index e9b8017a4649da17607a644d4a3faf304b2f4367..85aad518a008df9324bbc7363187d34cf59298cd 100644 --- a/opam/tezos-sc-rollup-client-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-client-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-013-PtJakart" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-client-014-PtKathma.opam b/opam/tezos-sc-rollup-client-014-PtKathma.opam index a494404840e5ad7fb153c1cfe4d09cf4e22e99b9..e13af8743b4ba62a12de7c184b1f4dee916eef8f 100644 --- a/opam/tezos-sc-rollup-client-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-client-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-014-PtKathma" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-client-alpha.opam b/opam/tezos-sc-rollup-client-alpha.opam index da8a90ddf86b8f7eba1837cb6c2507f7be5f6e43..40ae0fdff25444787311fd378c1c45941c5d5225 100644 --- a/opam/tezos-sc-rollup-client-alpha.opam +++ b/opam/tezos-sc-rollup-client-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-alpha" "tezos-client-commands" diff --git a/opam/tezos-sc-rollup-node-013-PtJakart.opam b/opam/tezos-sc-rollup-node-013-PtJakart.opam index 4ffc02327e1908f3e1d1401e1c0b08a9276695ea..5a857c62049912b73123b633edd89c1059af47eb 100644 --- a/opam/tezos-sc-rollup-node-013-PtJakart.opam +++ b/opam/tezos-sc-rollup-node-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-sc-rollup-node-014-PtKathma.opam b/opam/tezos-sc-rollup-node-014-PtKathma.opam index c8a33144eb0ac3e0b7a2d128e9e666faab020a8b..afe29f495efb0d39dc46b9a289eb7eb9033f1098 100644 --- a/opam/tezos-sc-rollup-node-014-PtKathma.opam +++ b/opam/tezos-sc-rollup-node-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-sc-rollup-node-alpha.opam b/opam/tezos-sc-rollup-node-alpha.opam index 8e620ad04d7867d0b3543776864c4a9a0e5cbaf4..fc64c63c42b162349b84c997cd4446c0e8f7a138 100644 --- a/opam/tezos-sc-rollup-node-alpha.opam +++ b/opam/tezos-sc-rollup-node-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-commands" "tezos-stdlib-unix" "tezos-client-base" diff --git a/opam/tezos-signer-backends.opam b/opam/tezos-signer-backends.opam index 2d706ec99b73ee3574b6c4b554d0ec9a2167e568..d8c757a1f28df0aae389cd99896ca5dde38da52e 100644 --- a/opam/tezos-signer-backends.opam +++ b/opam/tezos-signer-backends.opam @@ -22,6 +22,7 @@ depends: [ "alcotest-lwt" { with-test & >= "1.5.0" } "ocplib-endian" "fmt" { >= "0.8.7" } + "tezos-clic" "tezos-stdlib-unix" "tezos-rpc-http-client-unix" ] diff --git a/opam/tezos-signer.opam b/opam/tezos-signer.opam index 71e97a48df5d81d9f34dea298540225523648550..5a9cfc1348c68b70f87d49d7c235a9552181b990 100644 --- a/opam/tezos-signer.opam +++ b/opam/tezos-signer.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-client-base" "tezos-client-base-unix" "tezos-client-commands" diff --git a/opam/tezos-tx-rollup-client-013-PtJakart.opam b/opam/tezos-tx-rollup-client-013-PtJakart.opam index 2447b650a9b8ea8b2ccb5efc131b35a47970e5d9..82d2d43e8f61da7458dad33270c03ca137081205 100644 --- a/opam/tezos-tx-rollup-client-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-client-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-client-014-PtKathma.opam b/opam/tezos-tx-rollup-client-014-PtKathma.opam index b0e2af796d23e0acc7939932ffceb3a22d65e5ba..52f57c382665cab62bccf08336b4d807105a669b 100644 --- a/opam/tezos-tx-rollup-client-014-PtKathma.opam +++ b/opam/tezos-tx-rollup-client-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-client-alpha.opam b/opam/tezos-tx-rollup-client-alpha.opam index 8d24f73273125e533e8fbaa9fd7b144027b0ec39..05297480cfab1d7276e641c478cfc40b5b03a61f 100644 --- a/opam/tezos-tx-rollup-client-alpha.opam +++ b/opam/tezos-tx-rollup-client-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-base-unix" diff --git a/opam/tezos-tx-rollup-node-013-PtJakart.opam b/opam/tezos-tx-rollup-node-013-PtJakart.opam index 1c913348e6f6a79a5060baafbfe85e5747aadf44..a1ff80268392d3c04f085828944c8d02a34c9988 100644 --- a/opam/tezos-tx-rollup-node-013-PtJakart.opam +++ b/opam/tezos-tx-rollup-node-013-PtJakart.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-013-PtJakart" "tezos-client-013-PtJakart" "tezos-client-base" diff --git a/opam/tezos-tx-rollup-node-014-PtKathma.opam b/opam/tezos-tx-rollup-node-014-PtKathma.opam index 8b2d15fa0d2204ceda2c8907bf0c512c8a91e7a6..4ed197847f652d2716a9f804860d1b858ade743b 100644 --- a/opam/tezos-tx-rollup-node-014-PtKathma.opam +++ b/opam/tezos-tx-rollup-node-014-PtKathma.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-014-PtKathma" "tezos-client-014-PtKathma" "tezos-client-base" diff --git a/opam/tezos-tx-rollup-node-alpha.opam b/opam/tezos-tx-rollup-node-alpha.opam index 4fdae6e3d18faae7f878e7b5d543347588a68f79..0f7f393bb9cbb8c7a9ea8ad5984b847f49f6952c 100644 --- a/opam/tezos-tx-rollup-node-alpha.opam +++ b/opam/tezos-tx-rollup-node-alpha.opam @@ -10,6 +10,7 @@ license: "MIT" depends: [ "dune" { >= "3.0" } "tezos-base" + "tezos-clic" "tezos-protocol-alpha" "tezos-client-alpha" "tezos-client-base" diff --git a/src/bin_client/dune b/src/bin_client/dune index 75bc6c2678ad7dea0d97811365c28203bbcf03d5..de6a2a48187dc364b69c08a2204e9262dea95b80 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-rpc-http-client tezos-stdlib-unix tezos-shell-services @@ -100,6 +101,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_rpc_http_client -open Tezos_stdlib_unix -open Tezos_shell_services diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index 013a58da9c92ca4bd885c295f56145ebaf80ad64..7054c46c80cc56f8538008c404f88b129f5b742d 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands @@ -34,6 +35,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_client_base -open Tezos_client_base_unix -open Tezos_client_commands diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 8cd676d2cc735ea5afd275ba5df8d0979ca26db4..e71a9371acafbff7a66abb6fd6a106dae9ecb6c9 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -9,6 +9,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-client-base tezos-client-base-unix tezos-client-commands diff --git a/src/bin_signer/main_signer.ml b/src/bin_signer/main_signer.ml index 2d4312228ae76b4f867e81b585b65103353c8203..15a706bfaf9ae36e0a44fd816e38725048213b19 100644 --- a/src/bin_signer/main_signer.ml +++ b/src/bin_signer/main_signer.ml @@ -54,7 +54,7 @@ let default_http_port = | None -> "6732" | Some port -> port -open Clic +open Tezos_clic let group = {Clic.name = "signer"; title = "Commands specific to the signing daemon"} @@ -89,12 +89,12 @@ let high_watermark_switch = () let pidfile_arg = - arg + Clic.arg ~doc:"write process id in file" ~short:'P' ~long:"pidfile" ~placeholder:"filename" - (parameter (fun _ s -> Lwt.return_ok s)) + (Clic.parameter (fun _ s -> Lwt.return_ok s)) let may_setup_pidfile pidfile_opt f = match pidfile_opt with @@ -106,7 +106,8 @@ let may_setup_pidfile pidfile_opt f = ~filename:pidfile f -let commands base_dir require_auth : Client_context.full command list = +let commands base_dir require_auth : Client_context.full Clic.command list = + let open Clic in let open Lwt_result_syntax in Tezos_signer_backends_unix.Ledger.commands () @ Client_keys_commands.commands None @@ -306,11 +307,11 @@ let home = try Sys.getenv "HOME" with Not_found -> "/root" let default_base_dir = Filename.concat home ".tezos-signer" -let string_parameter () : (string, _) parameter = - parameter (fun _ x -> Lwt.return_ok x) +let string_parameter () : (string, _) Clic.parameter = + Clic.parameter (fun _ x -> Lwt.return_ok x) let base_dir_arg () = - arg + Clic.arg ~long:"base-dir" ~short:'d' ~placeholder:"path" @@ -321,14 +322,14 @@ let base_dir_arg () = (string_parameter ()) let require_auth_arg () = - switch + Clic.switch ~long:"require-authentication" ~short:'A' ~doc:"Require a signature from the caller to sign." () let password_filename_arg () = - arg + Clic.arg ~long:"password-filename" ~short:'f' ~placeholder:"filename" @@ -336,7 +337,7 @@ let password_filename_arg () = (string_parameter ()) let global_options () = - args3 (base_dir_arg ()) (require_auth_arg ()) (password_filename_arg ()) + Clic.args3 (base_dir_arg ()) (require_auth_arg ()) (password_filename_arg ()) module Signer_config = struct type t = string option * bool * string option diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 7ec90371ef46e9ee1568a55711650b93215b9975..e0b91cb8dd52eb34a6477987ebf0a4430952a9b1 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -26,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_stdlib_unix + -open Tezos_clic -open Tezos_benchmark)) (cram (deps main_snoop.exe) (package tezos-snoop)) diff --git a/src/lib_base/dune b/src/lib_base/dune index 857d6adae866120ddbca5325484a9b64a5313f92..a3e7da1b08fa0f9f69ada7e62fb0d52d942da935 100644 --- a/src/lib_base/dune +++ b/src/lib_base/dune @@ -13,7 +13,6 @@ data-encoding tezos-error-monad tezos-rpc - tezos-clic tezos-micheline tezos-event-logging ptime @@ -31,7 +30,6 @@ -open Tezos_error_monad -open Tezos_error_monad.TzLwtreslib -open Tezos_rpc - -open Tezos_clic -open Tezos_micheline -open Tezos_event_logging)) diff --git a/src/lib_base/tzPervasives.ml b/src/lib_base/tzPervasives.ml index ed424938e1b9727d4516c67df11c188630ebd574..e668091d7cd488e4996b23e62eacf58276f8f874 100644 --- a/src/lib_base/tzPervasives.ml +++ b/src/lib_base/tzPervasives.ml @@ -26,7 +26,6 @@ include Tezos_stdlib module Error_monad = Tezos_error_monad.Error_monad include Tezos_rpc -include Tezos_clic include Tezos_crypto include Tezos_micheline module Data_encoding = Data_encoding diff --git a/src/lib_base/tzPervasives.mli b/src/lib_base/tzPervasives.mli index 9e42afc69a2ba5af0b8ed0b535d8bd28027a783b..352b6a72a361cc1dcfdad477b4f27fc7ba5ff839 100644 --- a/src/lib_base/tzPervasives.mli +++ b/src/lib_base/tzPervasives.mli @@ -31,8 +31,6 @@ module Error_monad = Tezos_error_monad.Error_monad include module type of Tezos_rpc -include module type of Tezos_clic - include module type of Tezos_crypto module Data_encoding = Data_encoding diff --git a/src/lib_benchmark/registration.ml b/src/lib_benchmark/registration.ml index 0d4f1bb26f76dfd846f88420800ccacb70709220..77605c3815277ecb4e198bcc684f1e0f784801c7 100644 --- a/src/lib_benchmark/registration.ml +++ b/src/lib_benchmark/registration.ml @@ -27,7 +27,7 @@ module String_table = String.Hashtbl let bench_table : Benchmark.t String_table.t = String_table.create 51 -let clic_table : unit Clic.command list ref = ref [] +let clic_table : unit Tezos_clic.Clic.command list ref = ref [] let codegen_table : Model.for_codegen String_table.t = String_table.create 51 diff --git a/src/lib_client_base/client_aliases.ml b/src/lib_client_base/client_aliases.ml index efcbe644febfc366a5ba455d9cb8112aee3b615e..f0d3ace985dda8a301b317d29e09b91325066ec5 100644 --- a/src/lib_client_base/client_aliases.ml +++ b/src/lib_client_base/client_aliases.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (* Tezos Command line interface - Local Storage for Configuration *) let rec try_alternatives input = function @@ -39,8 +41,6 @@ let parse_alternatives alts input = | _ -> assert false (* cannot happen due to String.split's implementation. *) -open Clic - module type Entity = sig type t @@ -113,7 +113,7 @@ module type Alias = sig ('a, (< .. > as 'obj)) Clic.params -> (fresh_param -> 'a, 'obj) Clic.params - val force_switch : unit -> (bool, _) arg + val force_switch : unit -> (bool, _) Clic.arg val of_fresh : #Client_context.wallet -> bool -> fresh_param -> string tzresult Lwt.t @@ -335,17 +335,17 @@ module Alias (Entity : Entity) = struct let alias_parameter () = let open Lwt_result_syntax in - parameter ~autocomplete (fun cctxt s -> + Clic.parameter ~autocomplete (fun cctxt s -> let* v = find cctxt s in return (s, v)) let alias_param ?(name = "name") ?(desc = "existing " ^ Entity.name ^ " alias") next = - param ~name ~desc (alias_parameter ()) next + Clic.param ~name ~desc (alias_parameter ()) next let aliases_parameter () = let open Lwt_result_syntax in - parameter ~autocomplete (fun cctxt s -> + Clic.parameter ~autocomplete (fun cctxt s -> String.split_no_empty ',' s |> List.map_es (fun s -> let* pkh = find cctxt s in @@ -353,7 +353,7 @@ module Alias (Entity : Entity) = struct let aliases_param ?(name = "name") ?(desc = "existing " ^ Entity.name ^ " aliases") next = - param ~name ~desc (aliases_parameter ()) next + Clic.param ~name ~desc (aliases_parameter ()) next type fresh_param = Fresh of string @@ -381,10 +381,10 @@ module Alias (Entity : Entity) = struct let fresh_alias_param ?(name = "new") ?(desc = "new " ^ Entity.name ^ " alias") next = - param + Clic.param ~name ~desc - (parameter (fun (_ : < .. >) s -> Lwt.return_ok (Fresh s))) + (Clic.parameter (fun (_ : < .. >) s -> Lwt.return_ok (Fresh s))) next let parse_source_string cctxt s = @@ -416,7 +416,7 @@ module Alias (Entity : Entity) = struct Entity.name Entity.name in - param ~name ~desc (parameter parse_source_string) next + Clic.param ~name ~desc (Clic.parameter parse_source_string) next let source_arg ?(long = "source " ^ Entity.name) ?(placeholder = "src") ?(doc = "") () = @@ -435,7 +435,7 @@ module Alias (Entity : Entity) = struct Entity.name Entity.name in - arg ~long ~placeholder ~doc (parameter parse_source_string) + Clic.arg ~long ~placeholder ~doc (Clic.parameter parse_source_string) let force_switch () = Clic.switch diff --git a/src/lib_client_base/client_aliases.mli b/src/lib_client_base/client_aliases.mli index 5d49c070a410eb3973e4cb487db9da4f2c03cd9c..2d04fe69e2fc5258204abfd02e4bf6c935291fb7 100644 --- a/src/lib_client_base/client_aliases.mli +++ b/src/lib_client_base/client_aliases.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (** Allows to parse an argument taking one of many forms. Accepts a list of alternative parsers and an input string. Each alternative consists of a string being the name of the format and a function diff --git a/src/lib_client_base/client_keys.ml b/src/lib_client_base/client_keys.ml index d770eb261bee40f5d3f10d1a686e25b1dd48665e..265da26e9e9525a05ee6ee2cd94ce420fed323a5 100644 --- a/src/lib_client_base/client_keys.ml +++ b/src/lib_client_base/client_keys.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + type error += Unregistered_key_scheme of string type error += Wrong_key_scheme of (string * string) diff --git a/src/lib_client_base/client_keys.mli b/src/lib_client_base/client_keys.mli index 8ced7730cd6489f065cb051dde5c97d2a1445d29..9a6d8bc9a7a5dbf3beceea7e94dca2e554ae548f 100644 --- a/src/lib_client_base/client_keys.mli +++ b/src/lib_client_base/client_keys.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + (** {2 Cryptographic keys tables } *) type pk_uri = private Uri.t diff --git a/src/lib_client_base/dune b/src/lib_client_base/dune index 61720a0fe2c82b608e0a47a96ad6695cb91d28e4..c920e690e5ff0963d4fd4cf1f0c8dd18a7e35e6a 100644 --- a/src/lib_client_base/dune +++ b/src/lib_client_base/dune @@ -9,6 +9,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-rpc tezos-shell-services tezos-sapling diff --git a/src/lib_client_base_unix/client_config.ml b/src/lib_client_base_unix/client_config.ml index 9d5418230b69294483bdc20c5090a31f57357977..626141dd15ab6b626db1eaad3d77bf475446e449 100644 --- a/src/lib_client_base_unix/client_config.ml +++ b/src/lib_client_base_unix/client_config.ml @@ -324,7 +324,7 @@ let default_cli_args = client_mode = `Mode_client; } -open Clic +open Tezos_clic.Clic let string_parameter () : (string, #Client_context.full) parameter = parameter (fun _ x -> Lwt.return_ok x) @@ -769,10 +769,10 @@ let config_init_mockup cctxt protocol_hash_opt bootstrap_accounts_file let commands config_file cfg (client_mode : client_mode) (protocol_hash_opt : Protocol_hash.t option) (base_dir : string) = - let open Clic in + let open Tezos_clic.Clic in let group = { - Clic.name = "config"; + name = "config"; title = "Commands for editing and viewing the client's config file"; } in diff --git a/src/lib_client_base_unix/client_main_run.ml b/src/lib_client_base_unix/client_main_run.ml index a4be8f354b2f0f737bf89d9dbf8b1c65b83d1532..3f2aba82bc094face0b96483ad0b830820a14ec4 100644 --- a/src/lib_client_base_unix/client_main_run.ml +++ b/src/lib_client_base_unix/client_main_run.ml @@ -27,6 +27,7 @@ (* Tezos Command line interface - Main Program *) open Client_context_unix +open Tezos_clic let builtin_commands = let open Lwt_syntax in diff --git a/src/lib_client_base_unix/client_main_run.mli b/src/lib_client_base_unix/client_main_run.mli index 183dd2853a522d2cfc1553dee5819ddddc226db1..5c5b08511b305e59e0f67984adf7b91a86c4412b 100644 --- a/src/lib_client_base_unix/client_main_run.mli +++ b/src/lib_client_base_unix/client_main_run.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module type M = (* This module type lists the parameters you can give to the function [run] defined below; most calls use and will use the default value for this module type, which is module diff --git a/src/lib_client_base_unix/dune b/src/lib_client_base_unix/dune index 032172d1d0e167767b49948d7a852bff7b1dd591..f3c98ecc01794038cb69f11d47cf305616901bbf 100644 --- a/src/lib_client_base_unix/dune +++ b/src/lib_client_base_unix/dune @@ -8,6 +8,7 @@ (libraries tezos-base tezos-base.unix + tezos-clic tezos-rpc-http tezos-rpc-http-client-unix tezos-shell-services diff --git a/src/lib_client_commands/dune b/src/lib_client_commands/dune index 0e0e7e690ea9c2c9961e870d4fa9af784cb7e4b1..72ade90d98f32e746ae39e64efb4989706ac08a9 100644 --- a/src/lib_client_commands/dune +++ b/src/lib_client_commands/dune @@ -8,6 +8,7 @@ (libraries tezos-base tezos-rpc + tezos-clic tezos-clic.unix tezos-client-base tezos-shell-services @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_rpc + -open Tezos_clic -open Tezos_clic_unix -open Tezos_client_base -open Tezos_shell_services diff --git a/src/lib_mockup/dune b/src/lib_mockup/dune index 02610de07af48b830d3e9c391c60af6108b9aa6f..e796914cbacb58525853fa1b54e789259618f2dd 100644 --- a/src/lib_mockup/dune +++ b/src/lib_mockup/dune @@ -52,6 +52,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-client-base tezos-mockup diff --git a/src/lib_mockup/mockup_commands.mli b/src/lib_mockup/mockup_commands.mli index 6ae86c8c9e1fac96da5be89bd87ac2d4a66d054b..9a0e53bb6c6d366c051541d3538e5837a572ad01 100644 --- a/src/lib_mockup/mockup_commands.mli +++ b/src/lib_mockup/mockup_commands.mli @@ -25,4 +25,5 @@ val group : Tezos_clic.Clic.group -val commands : unit -> Tezos_client_base.Client_context.full Clic.command list +val commands : + unit -> Tezos_client_base.Client_context.full Tezos_clic.Clic.command list diff --git a/src/lib_proxy/proxy_commands.ml b/src/lib_proxy/proxy_commands.ml index 7086ce7bb526a5023dd3b5eed89b5130a43f7102..4dd8b1f743800819adcb644d69373b99427b41a9 100644 --- a/src/lib_proxy/proxy_commands.ml +++ b/src/lib_proxy/proxy_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + let group : Clic.group = { Clic.name = "proxy"; diff --git a/src/lib_proxy/proxy_commands.mli b/src/lib_proxy/proxy_commands.mli index a80e77c780ae149841185be913ce99a82261e6bb..e893dfd749a3f7cc0da8639f5a106f41ccf52eca 100644 --- a/src/lib_proxy/proxy_commands.mli +++ b/src/lib_proxy/proxy_commands.mli @@ -27,4 +27,5 @@ val group : Tezos_clic.Clic.group (** All provided commands *) -val commands : unit -> Tezos_client_base.Client_context.full Clic.command list +val commands : + unit -> Tezos_client_base.Client_context.full Tezos_clic.Clic.command list diff --git a/src/lib_signer_backends/unix/dune b/src/lib_signer_backends/unix/dune index 834cb6a550aa5b339298435702eadd0aa287d867..93e33b9bfac5bf8c439f883e10029aa727f439af 100644 --- a/src/lib_signer_backends/unix/dune +++ b/src/lib_signer_backends/unix/dune @@ -10,6 +10,7 @@ fmt tezos-base tezos-base.unix + tezos-clic tezos-stdlib-unix tezos-stdlib tezos-client-base diff --git a/src/lib_signer_backends/unix/ledger.available.ml b/src/lib_signer_backends/unix/ledger.available.ml index 2bf526f9229b18ba0491bebaa9854b5e373aa4f0..f04401d828036153252f8e438da9bad22e36d123 100644 --- a/src/lib_signer_backends/unix/ledger.available.ml +++ b/src/lib_signer_backends/unix/ledger.available.ml @@ -486,7 +486,7 @@ module Ledger_uri = struct "An imported ledger alias or a ledger URI (e.g. \ \"ledger://animal/curve/path\")." in - let open Clic in + let open Tezos_clic.Clic in param ~name ~desc @@ -816,7 +816,7 @@ let pp_ledger_chain_id fmt s = (** Commands for both ledger applications. *) let generic_commands group = let open Lwt_result_syntax in - Clic. + Tezos_clic.Clic. [ command ~group @@ -882,7 +882,7 @@ let generic_commands group = return_none) in return_unit); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Display version/public-key/address information for a Ledger URI" (args1 (switch ~doc:"Test signing operation" ~long:"test-sign" ())) @@ -1010,9 +1010,9 @@ let generic_commands group = which get a specific treatment in {!high_water_mark_commands}. *) let baking_commands group = let open Lwt_result_syntax in - Clic. + Tezos_clic.Clic. [ - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Query the path of the authorized key" no_options @@ -1071,7 +1071,7 @@ let baking_commands group = curve Bip32_path.pp_path (Bip32_path.tezos_root @ path)))); - Clic.command + Tezos_clic.Clic.command ~group ~desc: "Authorize a Ledger to bake for a key (deprecated, use `setup ledger \ @@ -1130,7 +1130,7 @@ let baking_commands group = pk in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Setup a Ledger to bake for a key" (let hwm_arg kind = @@ -1265,7 +1265,7 @@ let baking_commands group = pk in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:"Deauthorize Ledger from baking" no_options @@ -1295,9 +1295,9 @@ let high_water_mark_commands group watermark_spelling = desc ^ " (legacy/deprecated spelling)" else desc in - Clic. + Tezos_clic.Clic. [ - Clic.command + Tezos_clic.Clic.command ~group ~desc:(make_desc "Get high water mark of a Ledger") (args1 @@ -1361,7 +1361,7 @@ let high_water_mark_commands group watermark_spelling = tr in return_some ())); - Clic.command + Tezos_clic.Clic.command ~group ~desc:(make_desc "Set high water mark of a Ledger") no_options @@ -1406,7 +1406,7 @@ let high_water_mark_commands group watermark_spelling = let commands = let group = { - Clic.name = "ledger"; + Tezos_clic.Clic.name = "ledger"; title = "Commands for managing the connected Ledger Nano devices"; } in diff --git a/src/lib_signer_backends/unix/ledger.mli b/src/lib_signer_backends/unix/ledger.mli index d3d06973a711d6df1ce6cf54cbfc0ad9740f0aa3..bacd4a12b42c9a7ba65dc3635809ba48b98f9d07 100644 --- a/src/lib_signer_backends/unix/ledger.mli +++ b/src/lib_signer_backends/unix/ledger.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Signer_implementation : Client_keys.SIGNER val commands : unit -> Client_context.full Clic.command list diff --git a/src/proto_000_Ps9mPmXa/lib_client/dune b/src/proto_000_Ps9mPmXa/lib_client/dune index d2dbc3b45d16835ddc9220a0b4875f964a3c6c46..25eb0dab95972ec1401b73f704c4241c07b74153 100644 --- a/src/proto_000_Ps9mPmXa/lib_client/dune +++ b/src/proto_000_Ps9mPmXa/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-000-Ps9mPmXa) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-000-Ps9mPmXa @@ -16,6 +17,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_000_Ps9mPmXa diff --git a/src/proto_001_PtCJ7pwo/lib_client/dune b/src/proto_001_PtCJ7pwo/lib_client/dune index 7270da86ab42dc47faf43a544e3dc52c6baf465e..885c38d953569b963605dd56e916587410f0612b 100644 --- a/src/proto_001_PtCJ7pwo/lib_client/dune +++ b/src/proto_001_PtCJ7pwo/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-001-PtCJ7pwo) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-001-PtCJ7pwo @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_001_PtCJ7pwo diff --git a/src/proto_001_PtCJ7pwo/lib_client_commands/dune b/src/proto_001_PtCJ7pwo/lib_client_commands/dune index ab400514c832b83b99d900e6af2c36aa01eec068..c8199f7c684f054b5732ab11afa11f2652950866 100644 --- a/src/proto_001_PtCJ7pwo/lib_client_commands/dune +++ b/src/proto_001_PtCJ7pwo/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-001-PtCJ7pwo.commands) (libraries tezos-base + tezos-clic tezos-protocol-001-PtCJ7pwo tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_001_PtCJ7pwo -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-001-PtCJ7pwo.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-001-PtCJ7pwo tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_001_PtCJ7pwo -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_002_PsYLVpVv/lib_client/dune b/src/proto_002_PsYLVpVv/lib_client/dune index 935bd38f99fe673e7bc9d37db501083c51642159..d8a152368b2815008aea7aa4d67eb32ad062df9e 100644 --- a/src/proto_002_PsYLVpVv/lib_client/dune +++ b/src/proto_002_PsYLVpVv/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-002-PsYLVpVv) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-002-PsYLVpVv @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_002_PsYLVpVv diff --git a/src/proto_002_PsYLVpVv/lib_client_commands/dune b/src/proto_002_PsYLVpVv/lib_client_commands/dune index f685df1f4a90544db31118a075e6fe387116f83e..4547d4580045f28ea019452fd1067cd46be4a3fd 100644 --- a/src/proto_002_PsYLVpVv/lib_client_commands/dune +++ b/src/proto_002_PsYLVpVv/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-002-PsYLVpVv.commands) (libraries tezos-base + tezos-clic tezos-protocol-002-PsYLVpVv tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_002_PsYLVpVv -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-002-PsYLVpVv.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-002-PsYLVpVv tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_002_PsYLVpVv -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_003_PsddFKi3/lib_client/dune b/src/proto_003_PsddFKi3/lib_client/dune index cd47d933ecc1eaad97e0d2f54379d54bea280797..f3f989ce6c0e2a858416c1cf5f505bee86b31b7d 100644 --- a/src/proto_003_PsddFKi3/lib_client/dune +++ b/src/proto_003_PsddFKi3/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-003-PsddFKi3) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-003-PsddFKi3 @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_003_PsddFKi3 diff --git a/src/proto_003_PsddFKi3/lib_client_commands/dune b/src/proto_003_PsddFKi3/lib_client_commands/dune index f7483368b9f4a872c6dc6117eef73415670d59fd..45d06d83d356f6de9abb7587ab5eb62ef29753ff 100644 --- a/src/proto_003_PsddFKi3/lib_client_commands/dune +++ b/src/proto_003_PsddFKi3/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-003-PsddFKi3.commands) (libraries tezos-base + tezos-clic tezos-protocol-003-PsddFKi3 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_003_PsddFKi3 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-003-PsddFKi3.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-003-PsddFKi3 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_003_PsddFKi3 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_004_Pt24m4xi/lib_client/dune b/src/proto_004_Pt24m4xi/lib_client/dune index 1d015d77b21e22ac1be2080b71a19fed5f6d0196..ecdd2a8f9e3fd1bfd12e658d9b59907a47506998 100644 --- a/src/proto_004_Pt24m4xi/lib_client/dune +++ b/src/proto_004_Pt24m4xi/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-004-Pt24m4xi) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-004-Pt24m4xi @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_004_Pt24m4xi diff --git a/src/proto_004_Pt24m4xi/lib_client_commands/dune b/src/proto_004_Pt24m4xi/lib_client_commands/dune index 44affb9a13de413f0f12ee6c4772a307e5a2b7c1..5c063a8939a97c259e788d10ef5dc20f1fdeea93 100644 --- a/src/proto_004_Pt24m4xi/lib_client_commands/dune +++ b/src/proto_004_Pt24m4xi/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-004-Pt24m4xi.commands) (libraries tezos-base + tezos-clic tezos-protocol-004-Pt24m4xi tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_004_Pt24m4xi -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-004-Pt24m4xi.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-004-Pt24m4xi tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_004_Pt24m4xi -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_005_PsBabyM1/lib_client/dune b/src/proto_005_PsBabyM1/lib_client/dune index 98fed923f200f04e210a288ded429521a1031002..cd95546d8860370895936c96e104de4c24624288 100644 --- a/src/proto_005_PsBabyM1/lib_client/dune +++ b/src/proto_005_PsBabyM1/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-005-PsBabyM1) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-005-PsBabyM1 @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_005_PsBabyM1 diff --git a/src/proto_005_PsBabyM1/lib_client_commands/dune b/src/proto_005_PsBabyM1/lib_client_commands/dune index b02ddcae19056fed75267b78a69a58b0c8a16b34..8cf1e00fdac11f5dcb3c1c4c258de4bc726f758c 100644 --- a/src/proto_005_PsBabyM1/lib_client_commands/dune +++ b/src/proto_005_PsBabyM1/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-005-PsBabyM1.commands) (libraries tezos-base + tezos-clic tezos-protocol-005-PsBabyM1 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_005_PsBabyM1 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-005-PsBabyM1.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-005-PsBabyM1 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_005_PsBabyM1 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_006_PsCARTHA/lib_client/dune b/src/proto_006_PsCARTHA/lib_client/dune index 321f281f35a7d6609fcabe6e6d3b5986b439036c..a11ae69863185e355ad98db233734215d66ece8e 100644 --- a/src/proto_006_PsCARTHA/lib_client/dune +++ b/src/proto_006_PsCARTHA/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-006-PsCARTHA) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-006-PsCARTHA @@ -17,6 +18,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_006_PsCARTHA diff --git a/src/proto_006_PsCARTHA/lib_client_commands/dune b/src/proto_006_PsCARTHA/lib_client_commands/dune index eae98a9a821eaa508b5ff1c03ccbfd883c6fc480..15fe615c999dc62e4ff0b4bb61b11b59e003b419 100644 --- a/src/proto_006_PsCARTHA/lib_client_commands/dune +++ b/src/proto_006_PsCARTHA/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-006-PsCARTHA.commands) (libraries tezos-base + tezos-clic tezos-protocol-006-PsCARTHA tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_006_PsCARTHA -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-006-PsCARTHA.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-006-PsCARTHA tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_006_PsCARTHA -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_007_PsDELPH1/lib_client/dune b/src/proto_007_PsDELPH1/lib_client/dune index 4768293027e7ea97df54fb9bca4df714404316c0..e758e4c47844a736ab23a70a4e25316821d2a6a1 100644 --- a/src/proto_007_PsDELPH1/lib_client/dune +++ b/src/proto_007_PsDELPH1/lib_client/dune @@ -6,6 +6,7 @@ (public_name tezos-client-007-PsDELPH1) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-007-PsDELPH1 @@ -18,6 +19,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_007_PsDELPH1 diff --git a/src/proto_007_PsDELPH1/lib_client_commands/dune b/src/proto_007_PsDELPH1/lib_client_commands/dune index 4f877d212c87dc1da42f7119736e713643442499..af30a7197d84a99ecc111b3a7d2d9a6a795019a2 100644 --- a/src/proto_007_PsDELPH1/lib_client_commands/dune +++ b/src/proto_007_PsDELPH1/lib_client_commands/dune @@ -6,6 +6,7 @@ (public_name tezos-client-007-PsDELPH1.commands) (libraries tezos-base + tezos-clic tezos-protocol-007-PsDELPH1 tezos-stdlib-unix tezos-protocol-environment @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_007_PsDELPH1 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -33,6 +35,7 @@ (public_name tezos-client-007-PsDELPH1.commands-registration) (libraries tezos-base + tezos-clic tezos-protocol-007-PsDELPH1 tezos-protocol-environment tezos-shell-services @@ -46,6 +49,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_007_PsDELPH1 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_008_PtEdo2Zk/lib_client/dune b/src/proto_008_PtEdo2Zk/lib_client/dune index e80b82f6373c8f0d1d23baefdf3e5eea137ddcdc..8be098714a01855afae815476dec002fcef9cb5f 100644 --- a/src/proto_008_PtEdo2Zk/lib_client/dune +++ b/src/proto_008_PtEdo2Zk/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-008-PtEdo2Zk @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_008_PtEdo2Zk diff --git a/src/proto_008_PtEdo2Zk/lib_client_commands/dune b/src/proto_008_PtEdo2Zk/lib_client_commands/dune index 2df48867a7b6c0aeea604dbc8a02ea5a2cd0ee9f..b06d605a6c80af45c79dbf8d9b390adba125179c 100644 --- a/src/proto_008_PtEdo2Zk/lib_client_commands/dune +++ b/src/proto_008_PtEdo2Zk/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-008-PtEdo2Zk tezos-stdlib-unix tezos-protocol-environment @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_008_PtEdo2Zk -open Tezos_stdlib_unix -open Tezos_shell_services @@ -37,6 +39,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-008-PtEdo2Zk tezos-protocol-environment tezos-shell-services @@ -51,6 +54,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_008_PtEdo2Zk -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_009_PsFLoren/lib_client/dune b/src/proto_009_PsFLoren/lib_client/dune index 64bb92a3fdf9707adf25286faec4a54b1f486123..9a5404dc842c74fd1b648b5dfe56f9f90d67c559 100644 --- a/src/proto_009_PsFLoren/lib_client/dune +++ b/src/proto_009_PsFLoren/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-009-PsFLoren @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_009_PsFLoren diff --git a/src/proto_009_PsFLoren/lib_client_commands/dune b/src/proto_009_PsFLoren/lib_client_commands/dune index 2bf1e497003c5cdab737ca6feebd4a6e89bf7936..26b2197627fb9cd53e0565795f3bda8d67f9a033 100644 --- a/src/proto_009_PsFLoren/lib_client_commands/dune +++ b/src/proto_009_PsFLoren/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-009-PsFLoren tezos-stdlib-unix tezos-protocol-environment @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_009_PsFLoren -open Tezos_stdlib_unix -open Tezos_shell_services @@ -39,6 +41,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-009-PsFLoren tezos-protocol-environment tezos-shell-services @@ -53,6 +56,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_009_PsFLoren -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_010_PtGRANAD/lib_client/dune b/src/proto_010_PtGRANAD/lib_client/dune index 04f661a046aa00e9f1c346a8f97e4ca9506b8374..abc3ca6196f483e75c28332166325744b77faa69 100644 --- a/src/proto_010_PtGRANAD/lib_client/dune +++ b/src/proto_010_PtGRANAD/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-010-PtGRANAD @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_010_PtGRANAD diff --git a/src/proto_010_PtGRANAD/lib_client_commands/dune b/src/proto_010_PtGRANAD/lib_client_commands/dune index 454d11459df499ecc9ecfa3f881bf0ade71129ef..a8bdbdf4446b7ad5b68c2a164ac767e3762f7e46 100644 --- a/src/proto_010_PtGRANAD/lib_client_commands/dune +++ b/src/proto_010_PtGRANAD/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-010-PtGRANAD tezos-stdlib-unix tezos-protocol-environment @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_010_PtGRANAD -open Tezos_stdlib_unix -open Tezos_shell_services @@ -39,6 +41,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-010-PtGRANAD tezos-protocol-environment tezos-shell-services @@ -53,6 +56,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_010_PtGRANAD -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_011_PtHangz2/lib_client/dune b/src/proto_011_PtHangz2/lib_client/dune index 0d3fb4005d3f90501c66d8c25010e32902da1eab..5d27530ae457b65271ab45fd64fe7f0f545602b4 100644 --- a/src/proto_011_PtHangz2/lib_client/dune +++ b/src/proto_011_PtHangz2/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-011-PtHangz2 @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_011_PtHangz2 diff --git a/src/proto_011_PtHangz2/lib_client_commands/dune b/src/proto_011_PtHangz2/lib_client_commands/dune index ee9fb55e122870cd18c54aa9a22caf1e2723bd77..aa4e2c4793b5ca732d8a442e6cc391b8e8324cd2 100644 --- a/src/proto_011_PtHangz2/lib_client_commands/dune +++ b/src/proto_011_PtHangz2/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-011-PtHangz2 tezos-stdlib-unix tezos-protocol-environment @@ -26,6 +27,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_011_PtHangz2 -open Tezos_stdlib_unix -open Tezos_shell_services @@ -43,6 +45,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-011-PtHangz2 tezos-protocol-environment tezos-shell-services @@ -58,6 +61,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_011_PtHangz2 -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_011_PtHangz2/lib_client_sapling/dune b/src/proto_011_PtHangz2/lib_client_sapling/dune index 23950c5cd2f751f74204070ff4c0706ecc6de819..9db56da4162cb07cc4ff9f96c4f6c9c42dc2a50c 100644 --- a/src/proto_011_PtHangz2/lib_client_sapling/dune +++ b/src/proto_011_PtHangz2/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_011_PtHangz2 diff --git a/src/proto_012_Psithaca/bin_accuser/dune b/src/proto_012_Psithaca/bin_accuser/dune index 4a7c9ba5761ca3a708228810b05297d322c7c262..bf0ab3e1ec252991069745f32d6bee1212890aa1 100644 --- a/src/proto_012_Psithaca/bin_accuser/dune +++ b/src/proto_012_Psithaca/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-client-012-Psithaca tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_client_012_Psithaca -open Tezos_client_commands diff --git a/src/proto_012_Psithaca/bin_baker/dune b/src/proto_012_Psithaca/bin_baker/dune index 94b726ad423c4c82623b06cc92446dabd0c73f5f..e2cb2efda2f8cb0b6dee42e9a5ea5649030a7d6f 100644 --- a/src/proto_012_Psithaca/bin_baker/dune +++ b/src/proto_012_Psithaca/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-client-012-Psithaca tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_client_012_Psithaca -open Tezos_client_commands diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec9bbbcd1c44d024b914cc0d0d3dc3..887c4bc6b5727e47a798b8ac9063217087afb6ee 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml index 77b42a0b848b339eb887bb5d52fcd87e9a18776d..9576a60cd65f22253073a3ff722116f69e551ca2 100644 --- a/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_012_Psithaca/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_012_Psithaca/lib_client/dune b/src/proto_012_Psithaca/lib_client/dune index 899102c6e176b83c44635f913954d86085ab4014..e43b38c7d0143e831a000d4b2b874874dea60a82 100644 --- a/src/proto_012_Psithaca/lib_client/dune +++ b/src/proto_012_Psithaca/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-012-Psithaca @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_012_Psithaca diff --git a/src/proto_012_Psithaca/lib_client_commands/dune b/src/proto_012_Psithaca/lib_client_commands/dune index ef053c71e6296d8b424714788ee2cc393aeb2421..46b7561905c815b8719a275a689c9d4c11820c03 100644 --- a/src/proto_012_Psithaca/lib_client_commands/dune +++ b/src/proto_012_Psithaca/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-stdlib-unix tezos-protocol-environment @@ -26,6 +27,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_stdlib_unix -open Tezos_shell_services @@ -43,6 +45,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-012-Psithaca tezos-protocol-environment tezos-shell-services @@ -58,6 +61,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_shell_services -open Tezos_client_base diff --git a/src/proto_012_Psithaca/lib_client_sapling/dune b/src/proto_012_Psithaca/lib_client_sapling/dune index dd8ecbadf7caabff88b8816cbff8d4ca1926fb45..8db6210776faee17c4274874669f18aa67948b99 100644 --- a/src/proto_012_Psithaca/lib_client_sapling/dune +++ b/src/proto_012_Psithaca/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -19,6 +20,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_012_Psithaca diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml index 13b41c6971c24284b9535203f1c6114681a5b1ee..1f133c90056d9dae40a7e70e305c5365b7b87251 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands.mli b/src/proto_012_Psithaca/lib_delegate/baking_commands.mli index 8c9f9ea45d06c6ef21db67a8db9ee61ad0a82b34..4bf2dac9ce86fb92411ba1900ff4b9cdfa4249c5 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands.mli +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml b/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml index 1050a6901021cfbcebb626121d556f7cbaedef13..245debeae240b32a964234f1e5b5734a630c4557 100644 --- a/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml +++ b/src/proto_012_Psithaca/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_012_Psithaca/lib_delegate/dune b/src/proto_012_Psithaca/lib_delegate/dune index 74dac18116c9b7e7f65f9ffa5513eff7b66ef665..b8233a5b435e5f38de97eaeee235f8f1feea9b15 100644 --- a/src/proto_012_Psithaca/lib_delegate/dune +++ b/src/proto_012_Psithaca/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-012-Psithaca tezos-protocol-plugin-012-Psithaca @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_012_Psithaca -open Tezos_protocol_plugin_012_Psithaca -open Tezos_shell_services diff --git a/src/proto_013_PtJakart/bin_accuser/dune b/src/proto_013_PtJakart/bin_accuser/dune index 04210c11d41dd327dd6dab714a87da3b823ec0cf..49d3f60e6d10e0c0ccf653a671ccf90e44654f21 100644 --- a/src/proto_013_PtJakart/bin_accuser/dune +++ b/src/proto_013_PtJakart/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_commands diff --git a/src/proto_013_PtJakart/bin_baker/dune b/src/proto_013_PtJakart/bin_baker/dune index ccc4f03888a0b358b3f5a01f8a113cfe7f96faa0..265178210610e6a2308b2863111ecc1a9de2d733 100644 --- a/src/proto_013_PtJakart/bin_baker/dune +++ b/src/proto_013_PtJakart/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_commands diff --git a/src/proto_013_PtJakart/bin_sc_rollup_client/dune b/src/proto_013_PtJakart/bin_sc_rollup_client/dune index d1f27c48852c74b7ea7d50ca691c206361208120..c98739339e4524d813c5904d4b14a1e3c5890c89 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-013-PtJakart tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_013_PtJakart -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_013_PtJakart/bin_sc_rollup_node/dune b/src/proto_013_PtJakart/bin_sc_rollup_node/dune index 124a1238172888acd33c0ec200b034412e8f14ce..264e0e03acd0b5a95b834e3edd2b3918b903405c 100644 --- a/src/proto_013_PtJakart/bin_sc_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -40,6 +41,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_013_PtJakart/bin_tx_rollup_client/dune b/src/proto_013_PtJakart/bin_tx_rollup_client/dune index 2040f0219fc25b3a616661336972e4780b75c5df..b53a77b6826007f6b490ce957b47b518ce123411 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_client/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-013-PtJakart.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart.Protocol -open Tezos_client_013_PtJakart diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/dune b/src/proto_013_PtJakart/bin_tx_rollup_node/dune index aa082bffab662b198cbf08e4f5eef250e4491121..9a414de6efdb8173cb5f00c5d8bfa351f14fd5c4 100644 --- a/src/proto_013_PtJakart/bin_tx_rollup_node/dune +++ b/src/proto_013_PtJakart/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-client-013-PtJakart tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_client_013_PtJakart -open Tezos_client_base diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec9bbbcd1c44d024b914cc0d0d3dc3..887c4bc6b5727e47a798b8ac9063217087afb6ee 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml index 77b42a0b848b339eb887bb5d52fcd87e9a18776d..9576a60cd65f22253073a3ff722116f69e551ca2 100644 --- a/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_013_PtJakart/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_013_PtJakart/lib_client/dune b/src/proto_013_PtJakart/lib_client/dune index 7954f2c5e5c3c31036d768d45817e117ba77751e..2dea9fefd953da5d05421a75ad6529adb6b7a742 100644 --- a/src/proto_013_PtJakart/lib_client/dune +++ b/src/proto_013_PtJakart/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-013-PtJakart @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_013_PtJakart diff --git a/src/proto_013_PtJakart/lib_client_commands/dune b/src/proto_013_PtJakart/lib_client_commands/dune index 01b1390f2891f855e315762b8f4a76d039545201..865454358673e7f14bc9d22fd05f67c02388d251 100644 --- a/src/proto_013_PtJakart/lib_client_commands/dune +++ b/src/proto_013_PtJakart/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-stdlib-unix @@ -27,6 +28,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart_parameters -open Tezos_stdlib_unix @@ -45,6 +47,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-013-PtJakart tezos-protocol-013-PtJakart.parameters tezos-protocol-environment @@ -61,6 +64,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_013_PtJakart_parameters -open Tezos_shell_services diff --git a/src/proto_013_PtJakart/lib_client_sapling/dune b/src/proto_013_PtJakart/lib_client_sapling/dune index affedc828da4efbf9a18ad0307c83a405342061b..0c9efc0782956b3a43005c7751afd9ba8e37122e 100644 --- a/src/proto_013_PtJakart/lib_client_sapling/dune +++ b/src/proto_013_PtJakart/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_013_PtJakart diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands.ml b/src/proto_013_PtJakart/lib_delegate/baking_commands.ml index 89de07ff7c79842d5b131f9f33a76534bb1debbe..54f91377c3dae01e221adc8d4b68ed88bf19283b 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands.ml +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands.mli b/src/proto_013_PtJakart/lib_delegate/baking_commands.mli index 8c9f9ea45d06c6ef21db67a8db9ee61ad0a82b34..4bf2dac9ce86fb92411ba1900ff4b9cdfa4249c5 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands.mli +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml b/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml index 1050a6901021cfbcebb626121d556f7cbaedef13..245debeae240b32a964234f1e5b5734a630c4557 100644 --- a/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml +++ b/src/proto_013_PtJakart/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_013_PtJakart/lib_delegate/dune b/src/proto_013_PtJakart/lib_delegate/dune index ae3ca057f540a9feab099060748d70faefc09955..af83700414a1bd60911cd7a0ad7462a6eb418ec6 100644 --- a/src/proto_013_PtJakart/lib_delegate/dune +++ b/src/proto_013_PtJakart/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-013-PtJakart tezos-protocol-plugin-013-PtJakart @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_013_PtJakart -open Tezos_protocol_plugin_013_PtJakart -open Tezos_shell_services diff --git a/src/proto_014_PtKathma/bin_accuser/dune b/src/proto_014_PtKathma/bin_accuser/dune index d3cf0aa0e6eeb91e621d33959040dc2e52952bbc..57ad0bdbd706030470b17e96cd328764d5b1a6d5 100644 --- a/src/proto_014_PtKathma/bin_accuser/dune +++ b/src/proto_014_PtKathma/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_commands diff --git a/src/proto_014_PtKathma/bin_baker/dune b/src/proto_014_PtKathma/bin_baker/dune index 6730d0f327205f1067a4a93f8261df0fd045d460..d8647ebaaa6b613f546a46c4098e4ad5270db434 100644 --- a/src/proto_014_PtKathma/bin_baker/dune +++ b/src/proto_014_PtKathma/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_commands diff --git a/src/proto_014_PtKathma/bin_sc_rollup_client/dune b/src/proto_014_PtKathma/bin_sc_rollup_client/dune index 758ef1c135e69d29c9e7982d075045f43b8acd8b..40dd3f306c7df41e849f43e15d4c1ac7630889a0 100644 --- a/src/proto_014_PtKathma/bin_sc_rollup_client/dune +++ b/src/proto_014_PtKathma/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-014-PtKathma tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_014_PtKathma -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_014_PtKathma/bin_sc_rollup_node/dune b/src/proto_014_PtKathma/bin_sc_rollup_node/dune index d2e3f873d7ef0abf652e1cdf967dc47ec02651c2..74d892fffa88a89eb352d3c250a7dfd32f4da696 100644 --- a/src/proto_014_PtKathma/bin_sc_rollup_node/dune +++ b/src/proto_014_PtKathma/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -40,6 +41,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_014_PtKathma/bin_tx_rollup_client/dune b/src/proto_014_PtKathma/bin_tx_rollup_client/dune index 71a85e0c90e0f05809fc609b02962edea10b6ad0..42deae7a7bfff94304bc29f103675be12a19b07b 100644 --- a/src/proto_014_PtKathma/bin_tx_rollup_client/dune +++ b/src/proto_014_PtKathma/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-014-PtKathma.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma.Protocol -open Tezos_client_014_PtKathma diff --git a/src/proto_014_PtKathma/bin_tx_rollup_node/dune b/src/proto_014_PtKathma/bin_tx_rollup_node/dune index b0cb2cd5dcba8f96078e63dd41c63976dc12e1d6..5050b63235158ad42f2dca9365fb3b7825bf7f5e 100644 --- a/src/proto_014_PtKathma/bin_tx_rollup_node/dune +++ b/src/proto_014_PtKathma/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-client-014-PtKathma tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_client_014_PtKathma -open Tezos_client_base diff --git a/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml b/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec9bbbcd1c44d024b914cc0d0d3dc3..887c4bc6b5727e47a798b8ac9063217087afb6ee 100644 --- a/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_014_PtKathma/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml b/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml index aab11070300c0e66f79374dfc335729f38f94001..dea4b695ca3a618314cf52bf9e609aee560d466f 100644 --- a/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_014_PtKathma/lib_benchmarks_proto/sapling_commands.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + module Sapling_gen_cmd = struct let lift_opt f opt_arg state = match opt_arg with None -> state | Some arg -> f arg state diff --git a/src/proto_014_PtKathma/lib_client/dune b/src/proto_014_PtKathma/lib_client/dune index 90e7e6ed1790e8da1dfcee5c55e18c2e5e0e0349..81d8c22157fac24ef12a0e2208643b7dbcd06e2d 100644 --- a/src/proto_014_PtKathma/lib_client/dune +++ b/src/proto_014_PtKathma/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-014-PtKathma @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_014_PtKathma diff --git a/src/proto_014_PtKathma/lib_client_commands/dune b/src/proto_014_PtKathma/lib_client_commands/dune index c2ecfac05311241631ec9a847d4c681f753e5e7d..08a4ac03d8c72732f2baffbbc09769bda22cf377 100644 --- a/src/proto_014_PtKathma/lib_client_commands/dune +++ b/src/proto_014_PtKathma/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters tezos-stdlib-unix @@ -27,6 +28,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma_parameters -open Tezos_stdlib_unix @@ -45,6 +47,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-014-PtKathma tezos-protocol-014-PtKathma.parameters tezos-protocol-environment @@ -61,6 +64,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_014_PtKathma_parameters -open Tezos_shell_services diff --git a/src/proto_014_PtKathma/lib_client_sapling/dune b/src/proto_014_PtKathma/lib_client_sapling/dune index 3d08a22bea5d1481cc377cf89a89338a75aa787a..601eebb5d9ceda0330adfb730b56d67d005676c1 100644 --- a/src/proto_014_PtKathma/lib_client_sapling/dune +++ b/src/proto_014_PtKathma/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_014_PtKathma diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands.ml b/src/proto_014_PtKathma/lib_delegate/baking_commands.ml index 2b9258d233bba525c453ba1cf6a086781ac34483..f479dd0d2e2b0541ffce496ab6377411414f9f83 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands.ml +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands.mli b/src/proto_014_PtKathma/lib_delegate/baking_commands.mli index 8c9f9ea45d06c6ef21db67a8db9ee61ad0a82b34..4bf2dac9ce86fb92411ba1900ff4b9cdfa4249c5 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands.mli +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml b/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml index 1050a6901021cfbcebb626121d556f7cbaedef13..245debeae240b32a964234f1e5b5734a630c4557 100644 --- a/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml +++ b/src/proto_014_PtKathma/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_014_PtKathma/lib_delegate/dune b/src/proto_014_PtKathma/lib_delegate/dune index fc71e78fd09bd7900216ec96c80146d5250163c4..249e0ef870a6065c504eb6d095ea9918fe2ef83e 100644 --- a/src/proto_014_PtKathma/lib_delegate/dune +++ b/src/proto_014_PtKathma/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-014-PtKathma tezos-protocol-plugin-014-PtKathma @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_014_PtKathma -open Tezos_protocol_plugin_014_PtKathma -open Tezos_shell_services diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index 224537d64175b3deeb321d1e50256263247515f3..ec075c937079f0163ee96be0f865659f48e190d8 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_commands diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 5d1b3748f549aef9b932d4797de736d8400c1a27..1cf77c3d0d8ad95a8579dc3c9d18df349ba8afb4 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-commands @@ -21,6 +22,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_commands diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index f657b4f98d7366c1f4a2acb14dd46ad74e45595f..9784c7f9233dd8918633c9bcc797a94059dec4dd 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-base tezos-client-alpha tezos-client-commands @@ -25,6 +26,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_alpha -open Tezos_client_commands -open Tezos_stdlib_unix diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 72aa7d93598db95770bf48556e9a71a02225225a..3932b54eee4c727543302ab6cc2250076d9cff26 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-client-commands tezos-stdlib-unix tezos-client-base @@ -41,6 +42,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_client_commands -open Tezos_stdlib_unix -open Tezos_client_base diff --git a/src/proto_alpha/bin_tx_rollup_client/dune b/src/proto_alpha/bin_tx_rollup_client/dune index a6993f75fc9e227d7363d783f98fdfad3f0f5ccf..bf5537c63fa9ab5474833982fecbc98b0c0beed9 100644 --- a/src/proto_alpha/bin_tx_rollup_client/dune +++ b/src/proto_alpha/bin_tx_rollup_client/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-alpha.commands @@ -22,6 +23,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha.Protocol -open Tezos_client_alpha diff --git a/src/proto_alpha/bin_tx_rollup_node/dune b/src/proto_alpha/bin_tx_rollup_node/dune index f9c1cd6b5e2f794298c9e9ba7057cd50d45153f2..3fc9c43d215e647f6b715b76c152d57bb1d7b491 100644 --- a/src/proto_alpha/bin_tx_rollup_node/dune +++ b/src/proto_alpha/bin_tx_rollup_node/dune @@ -8,6 +8,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-client-alpha tezos-client-base @@ -21,6 +22,7 @@ -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals -open Tezos_base + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_client_alpha -open Tezos_client_base diff --git a/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml b/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml index 13cf634827ec9bbbcd1c44d024b914cc0d0d3dc3..887c4bc6b5727e47a798b8ac9063217087afb6ee 100644 --- a/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml +++ b/src/proto_alpha/lib_benchmarks_proto/michelson_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Michelson_generation let group = diff --git a/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml b/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml index aab11070300c0e66f79374dfc335729f38f94001..1f990533fffde67335a206095013245bc986818f 100644 --- a/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml +++ b/src/proto_alpha/lib_benchmarks_proto/sapling_commands.ml @@ -22,6 +22,7 @@ (* DEALINGS IN THE SOFTWARE. *) (* *) (*****************************************************************************) +open Tezos_clic module Sapling_gen_cmd = struct let lift_opt f opt_arg state = diff --git a/src/proto_alpha/lib_client/dune b/src/proto_alpha/lib_client/dune index e41c85e5056fefce61c2e9b4e2856cc89af084ba..ea04eaa77e6db45c9c516264331e6c49b7d79503 100644 --- a/src/proto_alpha/lib_client/dune +++ b/src/proto_alpha/lib_client/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-shell-services tezos-client-base tezos-protocol-alpha @@ -24,6 +25,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_shell_services -open Tezos_client_base -open Tezos_protocol_alpha diff --git a/src/proto_alpha/lib_client_commands/dune b/src/proto_alpha/lib_client_commands/dune index 5282bfdb1dfaf4639dff3c64a32bb8863f136bcd..12928ee10798bc0a4b8bf168800531acaf707aca 100644 --- a/src/proto_alpha/lib_client_commands/dune +++ b/src/proto_alpha/lib_client_commands/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-stdlib-unix @@ -26,6 +27,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha_parameters -open Tezos_stdlib_unix @@ -44,6 +46,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-protocol-environment @@ -59,6 +62,7 @@ (flags (:standard) -open Tezos_base.TzPervasives + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_alpha_parameters -open Tezos_shell_services diff --git a/src/proto_alpha/lib_client_sapling/dune b/src/proto_alpha/lib_client_sapling/dune index 29bac8436d1add7e4afd7bae92baabe56fdd3f29..cb48b5e528434228f1edbdcc3636a58e58eb7dca 100644 --- a/src/proto_alpha/lib_client_sapling/dune +++ b/src/proto_alpha/lib_client_sapling/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-crypto tezos-stdlib-unix tezos-client-base @@ -20,6 +21,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_stdlib_unix -open Tezos_client_base -open Tezos_client_alpha diff --git a/src/proto_alpha/lib_delegate/baking_commands.ml b/src/proto_alpha/lib_delegate/baking_commands.ml index 1874b8f170def1336e260bd3f071b500e1905998..d1779de5787aa3a79e6d6a1604cef4a5b991460b 100644 --- a/src/proto_alpha/lib_delegate/baking_commands.ml +++ b/src/proto_alpha/lib_delegate/baking_commands.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Client_proto_args let pidfile_arg = diff --git a/src/proto_alpha/lib_delegate/baking_commands.mli b/src/proto_alpha/lib_delegate/baking_commands.mli index 8c9f9ea45d06c6ef21db67a8db9ee61ad0a82b34..4bf2dac9ce86fb92411ba1900ff4b9cdfa4249c5 100644 --- a/src/proto_alpha/lib_delegate/baking_commands.mli +++ b/src/proto_alpha/lib_delegate/baking_commands.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val delegate_commands : unit -> Protocol_client_context.full Clic.command list val baker_commands : unit -> Protocol_client_context.full Clic.command list diff --git a/src/proto_alpha/lib_delegate/baking_commands_registration.ml b/src/proto_alpha/lib_delegate/baking_commands_registration.ml index 1050a6901021cfbcebb626121d556f7cbaedef13..245debeae240b32a964234f1e5b5734a630c4557 100644 --- a/src/proto_alpha/lib_delegate/baking_commands_registration.ml +++ b/src/proto_alpha/lib_delegate/baking_commands_registration.ml @@ -25,5 +25,5 @@ let () = Client_commands.register Protocol.hash @@ fun _network -> - List.map (Clic.map_command (new Protocol_client_context.wrap_full)) + List.map (Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full)) @@ Baking_commands.delegate_commands () diff --git a/src/proto_alpha/lib_delegate/dune b/src/proto_alpha/lib_delegate/dune index 0708852df93d33b78eb6e5992b95000fca49e534..d0f83a4e57a28d3e019779c469cf26a4dd1b4d3e 100644 --- a/src/proto_alpha/lib_delegate/dune +++ b/src/proto_alpha/lib_delegate/dune @@ -7,6 +7,7 @@ (instrumentation (backend bisect_ppx)) (libraries tezos-base + tezos-clic tezos-version tezos-protocol-alpha tezos-protocol-plugin-alpha @@ -32,6 +33,7 @@ (:standard) -open Tezos_base.TzPervasives -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals + -open Tezos_clic -open Tezos_protocol_alpha -open Tezos_protocol_plugin_alpha -open Tezos_shell_services diff --git a/src/proto_demo_counter/lib_client/client_proto_args.ml b/src/proto_demo_counter/lib_client/client_proto_args.ml index e4cf25cc585331d54238b7df233ef06ab8e45665..6a683581485130993506bfdc6ee247c23a25c5a2 100644 --- a/src/proto_demo_counter/lib_client/client_proto_args.ml +++ b/src/proto_demo_counter/lib_client/client_proto_args.ml @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + type error += Bad_amount_param of (string * string) let msg_parameter _param = Clic.parameter (fun _ s -> return s) diff --git a/src/proto_demo_counter/lib_client/client_proto_args.mli b/src/proto_demo_counter/lib_client/client_proto_args.mli index 3d5a2992148c981a253e0d787f150ab2fd630a96..3a03ded3675786ab918004a7a5292a196fceb367 100644 --- a/src/proto_demo_counter/lib_client/client_proto_args.mli +++ b/src/proto_demo_counter/lib_client/client_proto_args.mli @@ -23,6 +23,8 @@ (* *) (*****************************************************************************) +open Tezos_clic + val amount_param : name:string -> desc:string -> diff --git a/src/proto_demo_counter/lib_client/client_proto_main.ml b/src/proto_demo_counter/lib_client/client_proto_main.ml index 1d56d9ef23609326dff320248067a0777b95baa5..4a79e838548d9357cfc62693de5ff10834ed56d5 100644 --- a/src/proto_demo_counter/lib_client/client_proto_main.ml +++ b/src/proto_demo_counter/lib_client/client_proto_main.ml @@ -26,8 +26,8 @@ open Protocol module Commands = Client_proto_commands -let commands : Protocol_client_context.full Clic.command list = - let open Clic in +let commands : Protocol_client_context.full Tezos_clic.Clic.command list = + let open Tezos_clic.Clic in let open Client_proto_args in let group = {name = "Demo_counter"; title = "Commands for protocol Demo_counter"} @@ -79,6 +79,6 @@ let commands : Protocol_client_context.full Clic.command list = ] let () = - let f = Clic.map_command (new Protocol_client_context.wrap_full) in + let f = Tezos_clic.Clic.map_command (new Protocol_client_context.wrap_full) in let command_list = List.map f commands in Client_commands.register Protocol.hash (fun _network -> command_list) diff --git a/src/proto_genesis/lib_client/client_proto_main.ml b/src/proto_genesis/lib_client/client_proto_main.ml index 0478fd5f31c2b04bd6305e73612a3e9738d583cb..956fc3346d1ef4ffaed1c8ffc5dedb143ad0fe9c 100644 --- a/src/proto_genesis/lib_client/client_proto_main.ml +++ b/src/proto_genesis/lib_client/client_proto_main.ml @@ -23,6 +23,7 @@ (* *) (*****************************************************************************) +open Tezos_clic open Protocol open Protocol_client_context