taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

remove transaction_id

Browse Source
This commit is contained in:
Florian Dold 2017-02-12 19:29:47 +01:00
parent bd02776f86
commit cce3f589dc
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cryptoLib.ts
View File

@ -222,7 +222,6 @@ namespace RpcFunctions {
merchant: native.EddsaPublicKey.fromCrock(offer.contract.merchant_pub), merchant: native.EddsaPublicKey.fromCrock(offer.contract.merchant_pub),
refund_deadline: native.AbsoluteTimeNbo.fromTalerString(offer.contract.refund_deadline), refund_deadline: native.AbsoluteTimeNbo.fromTalerString(offer.contract.refund_deadline),
timestamp: native.AbsoluteTimeNbo.fromTalerString(offer.contract.timestamp), timestamp: native.AbsoluteTimeNbo.fromTalerString(offer.contract.timestamp),
transaction_id: native.UInt64.fromNumber(offer.contract.transaction_id),
}); });
let coinSig = native.eddsaSign(d.toPurpose(), let coinSig = native.eddsaSign(d.toPurpose(),

2
src/emscriptif.ts
View File

@ -1064,7 +1064,6 @@ export interface DepositRequestPS_Args {
h_wire: HashCode; h_wire: HashCode;
timestamp: AbsoluteTimeNbo; timestamp: AbsoluteTimeNbo;
refund_deadline: AbsoluteTimeNbo; refund_deadline: AbsoluteTimeNbo;
transaction_id: UInt64;
amount_with_fee: AmountNbo; amount_with_fee: AmountNbo;
deposit_fee: AmountNbo; deposit_fee: AmountNbo;
merchant: EddsaPublicKey; merchant: EddsaPublicKey;
@ -1087,7 +1086,6 @@ export class DepositRequestPS extends SignatureStruct {
["h_wire", HashCode], ["h_wire", HashCode],
["timestamp", AbsoluteTimeNbo], ["timestamp", AbsoluteTimeNbo],
["refund_deadline", AbsoluteTimeNbo], ["refund_deadline", AbsoluteTimeNbo],
["transaction_id", UInt64],
["amount_with_fee", AmountNbo], ["amount_with_fee", AmountNbo],
["deposit_fee", AmountNbo], ["deposit_fee", AmountNbo],
["merchant", EddsaPublicKey], ["merchant", EddsaPublicKey],

4
src/types.ts
View File

@ -483,8 +483,8 @@ export class Contract {
@Checkable.String @Checkable.String
timestamp: string; timestamp: string;
@Checkable.Number @Checkable.String
transaction_id: number; order_id: string;
@Checkable.String @Checkable.String
fulfillment_url: string; fulfillment_url: string;

2
src/wallet.ts
View File

@ -172,7 +172,6 @@ interface PayReq {
exchange: string; exchange: string;
refund_deadline: string; refund_deadline: string;
timestamp: string; timestamp: string;
transaction_id: number;
pay_deadline: string; pay_deadline: string;
/** /**
* Merchant instance identifier that should receive the * Merchant instance identifier that should receive the
@ -562,7 +561,6 @@ export class Wallet {
refund_deadline: offer.contract.refund_deadline, refund_deadline: offer.contract.refund_deadline,
pay_deadline: offer.contract.pay_deadline, pay_deadline: offer.contract.pay_deadline,
timestamp: offer.contract.timestamp, timestamp: offer.contract.timestamp,
transaction_id: offer.contract.transaction_id,
instance: offer.contract.merchant.instance instance: offer.contract.merchant.instance
}; };
let t: TransactionRecord = { let t: TransactionRecord = {