From 5a8931d90320ebc8454969ea133c48b6998ad60a Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Mon, 20 Jul 2020 16:32:45 +0530 Subject: add new fields to signatures --- src/crypto/workers/cryptoImplementation.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/crypto/workers/cryptoImplementation.ts b/src/crypto/workers/cryptoImplementation.ts index e0ba24e47..43def7b6b 100644 --- a/src/crypto/workers/cryptoImplementation.ts +++ b/src/crypto/workers/cryptoImplementation.ts @@ -72,7 +72,7 @@ import { } from "../../util/time"; enum SignaturePurpose { - RESERVE_WITHDRAW = 1200, + WALLET_RESERVE_WITHDRAW = 1200, WALLET_COIN_DEPOSIT = 1201, MASTER_DENOMINATION_KEY_VALIDITY = 1025, MASTER_WIRE_FEES = 1028, @@ -160,10 +160,9 @@ export class CryptoImplementation { const denomPubHash = hash(denomPub); const evHash = hash(ev); - const withdrawRequest = buildSigPS(SignaturePurpose.RESERVE_WITHDRAW) + const withdrawRequest = buildSigPS(SignaturePurpose.WALLET_RESERVE_WITHDRAW) .put(reservePub) .put(amountToBuffer(amountWithFee)) - .put(amountToBuffer(req.feeWithdraw)) .put(denomPubHash) .put(evHash) .build(); @@ -337,6 +336,7 @@ export class CryptoImplementation { const d = buildSigPS(SignaturePurpose.WALLET_COIN_DEPOSIT) .put(decodeCrock(depositInfo.contractTermsHash)) .put(decodeCrock(depositInfo.wireInfoHash)) + .put(hash(decodeCrock(depositInfo.denomPub))) .put(timestampRoundedToBuffer(depositInfo.timestamp)) .put(timestampRoundedToBuffer(depositInfo.refundDeadline)) .put(amountToBuffer(depositInfo.spendAmount)) @@ -441,6 +441,7 @@ export class CryptoImplementation { const confirmData = buildSigPS(SignaturePurpose.WALLET_COIN_MELT) .put(sessionHash) + .put(decodeCrock(meltCoin.denomPubHash)) .put(amountToBuffer(valueWithFee)) .put(amountToBuffer(meltFee)) .put(decodeCrock(meltCoin.coinPub)) -- cgit v1.2.3