From 5e69f3ecaf9ed8ddfd59a1a2872da994157d0752 Mon Sep 17 00:00:00 2001 From: swrup Date: Sat, 7 Feb 2026 00:11:25 +0100 Subject: [PATCH] wip debug sigs --- .jjconflict-base-0/src/http_management.ml | 1 + .jjconflict-base-0/src/signatures.ml | 6 ++++++ .jjconflict-base-0/tools/offline_sig.ml | 3 ++- .jjconflict-side-0/src/http_management.ml | 1 + .jjconflict-side-0/src/signatures.ml | 6 ++++++ .jjconflict-side-0/tools/offline_sig.ml | 3 ++- .jjconflict-side-1/src/http_management.ml | 1 + .jjconflict-side-1/src/signatures.ml | 6 ++++++ .jjconflict-side-1/tools/offline_sig.ml | 3 ++- 9 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.jjconflict-base-0/src/http_management.ml b/.jjconflict-base-0/src/http_management.ml index 61cb5e5e..4b0aa352 100644 --- a/.jjconflict-base-0/src/http_management.ml +++ b/.jjconflict-base-0/src/http_management.ml @@ -135,6 +135,7 @@ module Keys_post = struct fee_withdraw= denom.fee_withdraw; fee_deposit= denom.fee_deposit; fee_refresh= denom.fee_refresh; + fee_refund= denom.fee_refund; denom_hash= h_denom_pub; } in diff --git a/.jjconflict-base-0/src/signatures.ml b/.jjconflict-base-0/src/signatures.ml index 6a6b67ce..06f44cee 100644 --- a/.jjconflict-base-0/src/signatures.ml +++ b/.jjconflict-base-0/src/signatures.ml @@ -248,6 +248,9 @@ module DenominationKeyValidity = struct fee_withdraw: AmountNBO.t; fee_deposit: AmountNBO.t; fee_refresh: AmountNBO.t; + (* TODO debug sig + missing field from taler doc *) + fee_refund: AmountNBO.t; denom_hash: DenominationHash.t; } @@ -267,6 +270,7 @@ module DenominationKeyValidity = struct fee_withdraw fee_deposit fee_refresh + fee_refund denom_hash -> { @@ -279,6 +283,7 @@ module DenominationKeyValidity = struct fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash; }) |+ Purpose.field purpose @@ -291,6 +296,7 @@ module DenominationKeyValidity = struct |+ field AmountNBO.bin (fun t -> t.fee_withdraw) |+ field AmountNBO.bin (fun t -> t.fee_deposit) |+ field AmountNBO.bin (fun t -> t.fee_refresh) + |+ field AmountNBO.bin (fun t -> t.fee_refund) |+ field DenominationHash.bin (fun t -> t.denom_hash) |> sealr end diff --git a/.jjconflict-base-0/tools/offline_sig.ml b/.jjconflict-base-0/tools/offline_sig.ml index 94675300..f89cca19 100644 --- a/.jjconflict-base-0/tools/offline_sig.ml +++ b/.jjconflict-base-0/tools/offline_sig.ml @@ -87,7 +87,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; - fee_refund= _; + fee_refund; denom_secmod_sig= _; } = let octets = DenominationKey.to_octets denom_pub in @@ -107,6 +107,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash= h_denom_pub; } in diff --git a/.jjconflict-side-0/src/http_management.ml b/.jjconflict-side-0/src/http_management.ml index 61cb5e5e..4b0aa352 100644 --- a/.jjconflict-side-0/src/http_management.ml +++ b/.jjconflict-side-0/src/http_management.ml @@ -135,6 +135,7 @@ module Keys_post = struct fee_withdraw= denom.fee_withdraw; fee_deposit= denom.fee_deposit; fee_refresh= denom.fee_refresh; + fee_refund= denom.fee_refund; denom_hash= h_denom_pub; } in diff --git a/.jjconflict-side-0/src/signatures.ml b/.jjconflict-side-0/src/signatures.ml index 6a6b67ce..06f44cee 100644 --- a/.jjconflict-side-0/src/signatures.ml +++ b/.jjconflict-side-0/src/signatures.ml @@ -248,6 +248,9 @@ module DenominationKeyValidity = struct fee_withdraw: AmountNBO.t; fee_deposit: AmountNBO.t; fee_refresh: AmountNBO.t; + (* TODO debug sig + missing field from taler doc *) + fee_refund: AmountNBO.t; denom_hash: DenominationHash.t; } @@ -267,6 +270,7 @@ module DenominationKeyValidity = struct fee_withdraw fee_deposit fee_refresh + fee_refund denom_hash -> { @@ -279,6 +283,7 @@ module DenominationKeyValidity = struct fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash; }) |+ Purpose.field purpose @@ -291,6 +296,7 @@ module DenominationKeyValidity = struct |+ field AmountNBO.bin (fun t -> t.fee_withdraw) |+ field AmountNBO.bin (fun t -> t.fee_deposit) |+ field AmountNBO.bin (fun t -> t.fee_refresh) + |+ field AmountNBO.bin (fun t -> t.fee_refund) |+ field DenominationHash.bin (fun t -> t.denom_hash) |> sealr end diff --git a/.jjconflict-side-0/tools/offline_sig.ml b/.jjconflict-side-0/tools/offline_sig.ml index 94675300..f89cca19 100644 --- a/.jjconflict-side-0/tools/offline_sig.ml +++ b/.jjconflict-side-0/tools/offline_sig.ml @@ -87,7 +87,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; - fee_refund= _; + fee_refund; denom_secmod_sig= _; } = let octets = DenominationKey.to_octets denom_pub in @@ -107,6 +107,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash= h_denom_pub; } in diff --git a/.jjconflict-side-1/src/http_management.ml b/.jjconflict-side-1/src/http_management.ml index 61cb5e5e..4b0aa352 100644 --- a/.jjconflict-side-1/src/http_management.ml +++ b/.jjconflict-side-1/src/http_management.ml @@ -135,6 +135,7 @@ module Keys_post = struct fee_withdraw= denom.fee_withdraw; fee_deposit= denom.fee_deposit; fee_refresh= denom.fee_refresh; + fee_refund= denom.fee_refund; denom_hash= h_denom_pub; } in diff --git a/.jjconflict-side-1/src/signatures.ml b/.jjconflict-side-1/src/signatures.ml index 6a6b67ce..06f44cee 100644 --- a/.jjconflict-side-1/src/signatures.ml +++ b/.jjconflict-side-1/src/signatures.ml @@ -248,6 +248,9 @@ module DenominationKeyValidity = struct fee_withdraw: AmountNBO.t; fee_deposit: AmountNBO.t; fee_refresh: AmountNBO.t; + (* TODO debug sig + missing field from taler doc *) + fee_refund: AmountNBO.t; denom_hash: DenominationHash.t; } @@ -267,6 +270,7 @@ module DenominationKeyValidity = struct fee_withdraw fee_deposit fee_refresh + fee_refund denom_hash -> { @@ -279,6 +283,7 @@ module DenominationKeyValidity = struct fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash; }) |+ Purpose.field purpose @@ -291,6 +296,7 @@ module DenominationKeyValidity = struct |+ field AmountNBO.bin (fun t -> t.fee_withdraw) |+ field AmountNBO.bin (fun t -> t.fee_deposit) |+ field AmountNBO.bin (fun t -> t.fee_refresh) + |+ field AmountNBO.bin (fun t -> t.fee_refund) |+ field DenominationHash.bin (fun t -> t.denom_hash) |> sealr end diff --git a/.jjconflict-side-1/tools/offline_sig.ml b/.jjconflict-side-1/tools/offline_sig.ml index 94675300..f89cca19 100644 --- a/.jjconflict-side-1/tools/offline_sig.ml +++ b/.jjconflict-side-1/tools/offline_sig.ml @@ -87,7 +87,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; - fee_refund= _; + fee_refund; denom_secmod_sig= _; } = let octets = DenominationKey.to_octets denom_pub in @@ -107,6 +107,7 @@ let mk_future_keys = fee_withdraw; fee_deposit; fee_refresh; + fee_refund; denom_hash= h_denom_pub; } in