remove transaction_id

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

View File

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

View File

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

View File

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

View File

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