balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix client display for “unspecified” chain-id

Browse Source
This commit is contained in:
Sebastien Mondet 2019-02-12 14:03:44 -05:00 committed by Pierre Boutillier
parent f2dd2c5776
commit 3690566b0b
No known key found for this signature in database
GPG Key ID: C2F73508B56A193C
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib_signer_backends/ledger.ml
View File

@ -456,6 +456,12 @@ let curve_of_id = function
| Pkh pkh -> return (curve_of_pkh pkh) | Pkh pkh -> return (curve_of_pkh pkh)
| Animals (a, curve_opt) -> unopt_curve a curve_opt | Animals (a, curve_opt) -> unopt_curve a curve_opt
(* The Ledger uses a special value 0x00000000 for the “any” chain-id: *)
let pp_ledger_chain_id fmt s =
match s with
| "\x00\x00\x00\x00" -> Format.fprintf fmt "'Unspecified'"
| other -> Format.fprintf fmt "%a" Chain_id.pp (Chain_id.of_string_exn other)
let sign ?watermark sk_uri msg = let sign ?watermark sk_uri msg =
id_of_sk_uri sk_uri >>=? fun id -> id_of_sk_uri sk_uri >>=? fun id ->
with_ledger id begin fun ledger { major; minor; patch; _ } _of_curve _of_pkh -> with_ledger id begin fun ledger { major; minor; patch; _ } _of_curve _of_pkh ->
@ -776,7 +782,7 @@ let commands =
* Main chain ID: %a -> %a@.\ * Main chain ID: %a -> %a@.\
* Main chain High Watermark: %ld -> %ld@.\ * Main chain High Watermark: %ld -> %ld@.\
* Test chain High Watermark: %ld -> %ld" * Test chain High Watermark: %ld -> %ld"
Chain_id.pp (Chain_id.of_string_exn current_ci) pp_ledger_chain_id current_ci
Chain_id.pp main_chain_id Chain_id.pp main_chain_id
current_mh main_hwm current_mh main_hwm
current_th test_hwm current_th test_hwm
@ -831,7 +837,7 @@ let commands =
"The high water mark values for@ %a@ are\ "The high water mark values for@ %a@ are\
@ %ld for the main-chain@ (%a)@ \ @ %ld for the main-chain@ (%a)@ \
and@ %ld for the test-chain." and@ %ld for the test-chain."
pp_id id mh Chain_id.pp Chain_id.(of_string_exn ci) th pp_id id mh pp_ledger_chain_id ci th
>>= fun () -> >>= fun () ->
return_unit return_unit
end end