taler-typescript-core

commit cce3f589dcb35bb9036b513da24b3b8207bc4772
parent bd02776f86604eab5a267b39421d0d444f512f15
Author: Florian Dold <florian.dold@gmail.com>
Date:   Sun, 12 Feb 2017 19:29:47 +0100

remove transaction_id

Diffstat:
M
src/cryptoLib.ts
 | 
1
-
M
src/emscriptif.ts
 | 
2
--
M
src/types.ts
 | 
4
++--
M
src/wallet.ts
 | 
2
--

4 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/cryptoLib.ts b/src/cryptoLib.ts
@@ -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(),
diff --git a/src/emscriptif.ts b/src/emscriptif.ts
@@ -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],
diff --git a/src/types.ts b/src/types.ts
@@ -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;
diff --git a/src/wallet.ts b/src/wallet.ts
@@ -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 = {