diff options
author | Florian Dold <florian@dold.me> | 2022-11-01 11:34:20 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-11-01 11:41:28 +0100 |
commit | dab739a63e032fcf26674dc1bf56533b00c45b6b (patch) | |
tree | 06a5bdadc34ebefb324d867a65bc803952870227 /packages/taler-wallet-core | |
parent | 2f6225f6e7cb70f1fd083a5b26143f5c8c2776c5 (diff) | |
download | wallet-core-dab739a63e032fcf26674dc1bf56533b00c45b6b.tar.xz |
wallet-core: use PeerContractTerms
Diffstat (limited to 'packages/taler-wallet-core')
-rw-r--r-- | packages/taler-wallet-core/src/db.ts | 9 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/deposits.ts | 6 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/pay-merchant.ts | 6 |
3 files changed, 10 insertions, 11 deletions
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts index c3fce6404..3abb76d60 100644 --- a/packages/taler-wallet-core/src/db.ts +++ b/packages/taler-wallet-core/src/db.ts @@ -25,7 +25,7 @@ import { CoinEnvelope, CoinRefreshRequest, CoinStatus, - ContractTerms, + MerchantContractTerms, DenominationInfo, DenominationPubKey, DenomSelectionState, @@ -1572,7 +1572,7 @@ export interface DepositGroupRecord { /** * Verbatim contract terms. */ - contractTermsRaw: ContractTerms; + contractTermsRaw: MerchantContractTerms; contractTermsHash: string; @@ -1707,10 +1707,9 @@ export interface PeerPullPaymentInitiationRecord { /** * Contract terms for the other party. * - * FIXME: Nail down type! - * FIXME: Put in contractTerms store + * FIXME: Put into contract terms store. */ - contractTerms: any; + contractTerms: PeerContractTerms; } /** diff --git a/packages/taler-wallet-core/src/operations/deposits.ts b/packages/taler-wallet-core/src/operations/deposits.ts index 4d617ee13..b2bd18260 100644 --- a/packages/taler-wallet-core/src/operations/deposits.ts +++ b/packages/taler-wallet-core/src/operations/deposits.ts @@ -24,7 +24,7 @@ import { CancellationToken, canonicalJson, codecForDepositSuccess, - ContractTerms, + MerchantContractTerms, CreateDepositGroupRequest, CreateDepositGroupResponse, DepositGroupFees, @@ -310,7 +310,7 @@ export async function prepareDepositGroup( const now = AbsoluteTime.now(); const nowRounded = AbsoluteTime.toTimestamp(now); - const contractTerms: ContractTerms = { + const contractTerms: MerchantContractTerms = { auditors: [], exchanges: exchangeInfos, amount: req.amount, @@ -407,7 +407,7 @@ export async function createDepositGroup( const merchantPair = await ws.cryptoApi.createEddsaKeypair({}); const wireSalt = encodeCrock(getRandomBytes(16)); const wireHash = hashWire(req.depositPaytoUri, wireSalt); - const contractTerms: ContractTerms = { + const contractTerms: MerchantContractTerms = { auditors: [], exchanges: exchangeInfos, amount: req.amount, diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/operations/pay-merchant.ts index b085e3f53..2eb5b18e9 100644 --- a/packages/taler-wallet-core/src/operations/pay-merchant.ts +++ b/packages/taler-wallet-core/src/operations/pay-merchant.ts @@ -44,7 +44,7 @@ import { CoinStatus, ConfirmPayResult, ConfirmPayResultType, - ContractTerms, + MerchantContractTerms, ContractTermsUtil, DenominationInfo, Duration, @@ -298,7 +298,7 @@ export async function expectProposalDownload( } export function extractContractData( - parsedContractTerms: ContractTerms, + parsedContractTerms: MerchantContractTerms, contractTermsHash: string, merchantSig: string, ): WalletContractData { @@ -453,7 +453,7 @@ export async function processDownloadProposal( logger.info(`Contract terms hash: ${contractTermsHash}`); - let parsedContractTerms: ContractTerms; + let parsedContractTerms: MerchantContractTerms; try { parsedContractTerms = codecForContractTerms().decode( |