diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-02-12 19:29:47 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-02-12 19:29:47 +0100 |
| commit | cce3f589dcb35bb9036b513da24b3b8207bc4772 (patch) | |
| tree | 2cb9d03a5573cc5823e8aafc891639be6f3e975f /src | |
| parent | bd02776f86604eab5a267b39421d0d444f512f15 (diff) | |
| download | wallet-core-cce3f589dcb35bb9036b513da24b3b8207bc4772.tar.xz | |
remove transaction_id
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptoLib.ts | 1 | ||||
| -rw-r--r-- | src/emscriptif.ts | 2 | ||||
| -rw-r--r-- | src/types.ts | 4 | ||||
| -rw-r--r-- | src/wallet.ts | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/src/cryptoLib.ts b/src/cryptoLib.ts index fe1d6f36b..7a363e643 100644 --- 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 index f42bb5546..cf519a366 100644 --- 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 index f3080ec78..f03479895 100644 --- 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 index 971fa6700..988ed32df 100644 --- 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 = { |