update submodules

This commit is contained in:
Florian Dold 2017-03-08 17:14:20 +01:00
parent 1637127658
commit 5cbe41cf60
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
3 changed files with 23 additions and 3 deletions

View File

@ -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,

View File

@ -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;

@ -1 +1 @@
Subproject commit caf5a98114402d057ba08b14279eb8e46481a02c
Subproject commit fd80260fce96df674111f9100fa2d91c83a9a3bc