diff options
author | Florian Dold <florian.dold@gmail.com> | 2017-03-08 17:14:20 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2017-03-08 17:14:20 +0100 |
commit | 5cbe41cf607a998566d4501afa267bcd999794f6 (patch) | |
tree | ac4ae9d364fcd98e998b823f10dd14dabe84de8f | |
parent | 16371276588b34769a09d940e608426b06ec3163 (diff) | |
download | wallet-core-5cbe41cf607a998566d4501afa267bcd999794f6.tar.xz |
update submodules
-rw-r--r-- | src/pages/confirm-create-reserve.tsx | 18 | ||||
-rw-r--r-- | src/types.ts | 6 | ||||
m--------- | web-common | 0 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/pages/confirm-create-reserve.tsx b/src/pages/confirm-create-reserve.tsx index 44dd60d95..6617ed6c3 100644 --- a/src/pages/confirm-create-reserve.tsx +++ b/src/pages/confirm-create-reserve.tsx @@ -325,11 +325,25 @@ class ExchangeSelection extends ImplicitStateComponent<ExchangeSelectionProps> { throw Error("empty response"); } // FIXME: filter out types that bank/exchange don't have in common - let wire_details = rci.wireInfo; + let wireDetails = rci.wireInfo; + let filteredWireDetails: any = {}; + for (let wireType in wireDetails) { + if (this.props.wt_types.findIndex((x) => x.toLowerCase() == wireType.toLowerCase()) < 0) { + continue; + } + let obj = Object.assign({}, wireDetails[wireType]); + // The bank doesn't need to know about fees + delete obj.fees; + // Consequently the bank can't verify signatures anyway, so + // we delete this extra data, to make the request URL shorter. + delete obj.salt; + delete obj.sig; + filteredWireDetails[wireType] = obj; + } if (!rawResp.error) { const resp = CreateReserveResponse.checked(rawResp); let q: {[name: string]: string|number} = { - wire_details: JSON.stringify(wire_details), + wire_details: JSON.stringify(filteredWireDetails), exchange: resp.exchange, reserve_pub: resp.reservePub, amount_value: amount.value, diff --git a/src/types.ts b/src/types.ts index f28cdb411..679c60502 100644 --- a/src/types.ts +++ b/src/types.ts @@ -489,6 +489,12 @@ export class Contract { @Checkable.String fulfillment_url: string; + @Checkable.Number + wire_fee_amortization: number; + + @Checkable.Value(AmountJson) + max_wire_fee: AmountJson; + @Checkable.Any extra: any; diff --git a/web-common b/web-common -Subproject caf5a98114402d057ba08b14279eb8e46481a02 +Subproject fd80260fce96df674111f9100fa2d91c83a9a3b |