From 9a197d619c02f7787311b191da3da693380304b6 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Mar 2016 19:39:17 +0100 Subject: mint->exchange --- lib/emscripten/libwrapper.js | 6 +- lib/wallet/cryptoLib.ts | 2 +- lib/wallet/db.ts | 6 +- lib/wallet/helpers.ts | 4 +- lib/wallet/types.ts | 16 ++--- lib/wallet/wallet.ts | 150 +++++++++++++++++++++---------------------- lib/wallet/wxMessaging.ts | 6 +- 7 files changed, 95 insertions(+), 95 deletions(-) (limited to 'lib') diff --git a/lib/emscripten/libwrapper.js b/lib/emscripten/libwrapper.js index 66b78e910..ef2384029 100644 --- a/lib/emscripten/libwrapper.js +++ b/lib/emscripten/libwrapper.js @@ -8472,7 +8472,7 @@ function _TALER_WRALL_sign_deposit_permission($h_contract,$h_wire,$timestamp,$re } return (0)|0; } -function _TALER_WR_verify_confirmation($h_contract,$h_wire,$timestamp,$refund,$0,$1,$amount_minus_fee,$coin_pub,$merchant_pub,$sig,$mint_pub) { +function _TALER_WR_verify_confirmation($h_contract,$h_wire,$timestamp,$refund,$0,$1,$amount_minus_fee,$coin_pub,$merchant_pub,$sig,$exchange_pub) { $h_contract = $h_contract|0; $h_wire = $h_wire|0; $timestamp = $timestamp|0; @@ -8483,7 +8483,7 @@ function _TALER_WR_verify_confirmation($h_contract,$h_wire,$timestamp,$refund,$0 $coin_pub = $coin_pub|0; $merchant_pub = $merchant_pub|0; $sig = $sig|0; - $mint_pub = $mint_pub|0; + $exchange_pub = $exchange_pub|0; var $10 = 0, $11 = 0, $12 = 0, $13 = 0, $14 = 0, $15 = 0, $16 = 0, $17 = 0, $18 = 0, $19 = 0, $2 = 0, $20 = 0, $21 = 0, $22 = 0, $23 = 0, $24 = 0, $25 = 0, $26 = 0, $27 = 0, $28 = 0; var $29 = 0, $3 = 0, $30 = 0, $31 = 0, $32 = 0, $33 = 0, $34 = 0, $35 = 0, $36 = 0, $37 = 0, $38 = 0, $39 = 0, $4 = 0, $40 = 0, $41 = 0, $42 = 0, $43 = 0, $44 = 0, $45 = 0, $46 = 0; var $47 = 0, $48 = 0, $49 = 0, $5 = 0, $50 = 0, $51 = 0, $52 = 0, $53 = 0, $54 = 0, $55 = 0, $56 = 0, $57 = 0, $58 = 0, $59 = 0, $6 = 0, $60 = 0, $61 = 0, $62 = 0, $63 = 0, $64 = 0; @@ -8514,7 +8514,7 @@ function _TALER_WR_verify_confirmation($h_contract,$h_wire,$timestamp,$refund,$0 $9 = $coin_pub; $10 = $merchant_pub; $11 = $sig; - $12 = $mint_pub; + $12 = $exchange_pub; $19 = ((($dc)) + 8|0); $20 = $3; dest=$19; src=$20; stop=dest+64|0; do { HEAP8[dest>>0]=HEAP8[src>>0]|0; dest=dest+1|0; src=src+1|0; } while ((dest|0) < (stop|0)); diff --git a/lib/wallet/cryptoLib.ts b/lib/wallet/cryptoLib.ts index 869ddbaff..5546dcebe 100644 --- a/lib/wallet/cryptoLib.ts +++ b/lib/wallet/cryptoLib.ts @@ -101,7 +101,7 @@ namespace RpcFunctions { coinPub: coinPub.toCrock(), coinPriv: coinPriv.toCrock(), denomPub: denomPub.encode().toCrock(), - mintBaseUrl: reserve.mint_base_url, + exchangeBaseUrl: reserve.exchange_base_url, withdrawSig: sig.toCrock(), coinEv: ev.toCrock(), coinValue: denom.value diff --git a/lib/wallet/db.ts b/lib/wallet/db.ts index c7621c5ff..2503468d5 100644 --- a/lib/wallet/db.ts +++ b/lib/wallet/db.ts @@ -45,12 +45,12 @@ export function openTalerDb(): Promise { console.log("DB: upgrade needed: oldVersion = " + e.oldVersion); switch (e.oldVersion) { case 0: // DB does not exist yet - const mints = db.createObjectStore("mints", {keyPath: "baseUrl"}); - mints.createIndex("pubKey", "masterPublicKey"); + const exchanges = db.createObjectStore("exchanges", {keyPath: "baseUrl"}); + exchanges.createIndex("pubKey", "masterPublicKey"); db.createObjectStore("reserves", {keyPath: "reserve_pub"}); db.createObjectStore("denoms", {keyPath: "denomPub"}); const coins = db.createObjectStore("coins", {keyPath: "coinPub"}); - coins.createIndex("mintBaseUrl", "mintBaseUrl"); + coins.createIndex("exchangeBaseUrl", "exchangeBaseUrl"); const transactions = db.createObjectStore("transactions", {keyPath: "contractHash"}); transactions.createIndex("repurchase", diff --git a/lib/wallet/helpers.ts b/lib/wallet/helpers.ts index 99913e558..a7d164102 100644 --- a/lib/wallet/helpers.ts +++ b/lib/wallet/helpers.ts @@ -36,7 +36,7 @@ export function amountToPretty(amount: AmountJson): string { /** - * Canonicalize a base url, typically for the mint. + * Canonicalize a base url, typically for the exchange. * * See http://api.taler.net/wallet.html#general */ @@ -62,4 +62,4 @@ export function parsePrettyAmount(pretty: string): AmountJson { fraction: res[2] ? (parseFloat(`0.${res[2]}`) * 1e-6) : 0, currency: res[3] } -} \ No newline at end of file +} diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts index 9c7b21b7c..a0e22dbca 100644 --- a/lib/wallet/types.ts +++ b/lib/wallet/types.ts @@ -43,11 +43,11 @@ export class AmountJson { @Checkable.Class export class CreateReserveResponse { /** - * Mint URL where the bank should create the reserve. + * Exchange URL where the bank should create the reserve. * The URL is canonicalized in the response. */ @Checkable.String - mint: string; + exchange: string; @Checkable.String reservePub: string; @@ -95,14 +95,14 @@ export class Denomination { } -export interface IMintInfo { +export interface IExchangeInfo { baseUrl: string; masterPublicKey: string; denoms: Denomination[]; } export interface ReserveCreationInfo { - mintInfo: IMintInfo; + exchangeInfo: IExchangeInfo; selectedDenoms: Denomination[]; withdrawFee: AmountJson; overhead: AmountJson; @@ -117,13 +117,13 @@ export interface PreCoin { blindingKey: string; withdrawSig: string; coinEv: string; - mintBaseUrl: string; + exchangeBaseUrl: string; coinValue: AmountJson; } export interface Reserve { - mint_base_url: string + exchange_base_url: string reserve_priv: string; reserve_pub: string; } @@ -144,7 +144,7 @@ export interface Coin { denomPub: string; denomSig: string; currentAmount: AmountJson; - mintBaseUrl: string; + exchangeBaseUrl: string; } @@ -266,4 +266,4 @@ export interface CheckRepurchaseResult { export interface Notifier { notify(); -} \ No newline at end of file +} diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts index 92fb92a4a..94ac8ee8a 100644 --- a/lib/wallet/wallet.ts +++ b/lib/wallet/wallet.ts @@ -21,7 +21,7 @@ * @author Florian Dold */ -import {AmountJson, CreateReserveResponse, IMintInfo, Denomination, Notifier} from "./types"; +import {AmountJson, CreateReserveResponse, IExchangeInfo, Denomination, Notifier} from "./types"; import {HttpResponse, RequestException} from "./http"; import {Query} from "./query"; import {Checkable} from "./checkable"; @@ -70,7 +70,7 @@ export class KeysJson { } -class MintInfo implements IMintInfo { +class ExchangeInfo implements IExchangeInfo { baseUrl: string; masterPublicKey: string; denoms: Denomination[]; @@ -89,15 +89,15 @@ class MintInfo implements IMintInfo { } } - static fresh(baseUrl: string): MintInfo { - return new MintInfo({baseUrl}); + static fresh(baseUrl: string): ExchangeInfo { + return new ExchangeInfo({baseUrl}); } /** - * Merge new key information into the mint info. + * Merge new key information into the exchange info. * If the new key information is invalid (missing fields, * invalid signatures), an exception is thrown, but the - * mint info is updated with the new information up until + * exchange info is updated with the new information up until * the first error. */ mergeKeys(newKeys: KeysJson, cryptoApi: CryptoApi): Promise { @@ -160,10 +160,10 @@ export class CreateReserveRequest { amount: AmountJson; /** - * Mint URL where the bank should create the reserve. + * Exchange URL where the bank should create the reserve. */ @Checkable.String - mint: string; + exchange: string; static checked: (obj: any) => CreateReserveRequest; } @@ -183,14 +183,14 @@ export class ConfirmReserveRequest { @Checkable.Class -export class MintHandle { +export class ExchangeHandle { @Checkable.String master_pub: string; @Checkable.String url: string; - static checked: (obj: any) => MintHandle; + static checked: (obj: any) => ExchangeHandle; } @@ -220,8 +220,8 @@ export class Contract { @Checkable.String merchant_pub: string; - @Checkable.List(Checkable.Value(MintHandle)) - mints: MintHandle[]; + @Checkable.List(Checkable.Value(ExchangeHandle)) + exchanges: ExchangeHandle[]; @Checkable.List(Checkable.AnyObject) products: any[]; @@ -264,8 +264,8 @@ interface ConfirmPayRequest { offer: Offer; } -interface MintCoins { - [mintUrl: string]: CoinWithDenom[]; +interface ExchangeCoins { + [exchangeUrl: string]: CoinWithDenom[]; } @@ -402,22 +402,22 @@ export class Wallet { /** - * Get mints and associated coins that are still spendable, + * Get exchanges and associated coins that are still spendable, * but only if the sum the coins' remaining value exceeds the payment amount. */ - private getPossibleMintCoins(paymentAmount: AmountJson, + private getPossibleExchangeCoins(paymentAmount: AmountJson, depositFeeLimit: AmountJson, - allowedMints: MintHandle[]): Promise { - // Mapping from mint base URL to list of coins together with their + allowedExchanges: ExchangeHandle[]): Promise { + // Mapping from exchange base URL to list of coins together with their // denomination - let m: MintCoins = {}; + let m: ExchangeCoins = {}; - function storeMintCoin(mc) { - let mint: IMintInfo = mc[0]; + function storeExchangeCoin(mc) { + let exchange: IExchangeInfo = mc[0]; let coin: Coin = mc[1]; let cd = { coin: coin, - denom: mint.denoms.find((e) => e.denom_pub === coin.denomPub) + denom: exchange.denoms.find((e) => e.denom_pub === coin.denomPub) }; if (!cd.denom) { throw Error("denom not found (database inconsistent)"); @@ -426,36 +426,36 @@ export class Wallet { console.warn("same pubkey for different currencies"); return; } - let x = m[mint.baseUrl]; + let x = m[exchange.baseUrl]; if (!x) { - m[mint.baseUrl] = [cd]; + m[exchange.baseUrl] = [cd]; } else { x.push(cd); } } - let ps = allowedMints.map((info) => { - console.log("Checking for merchant's mint", JSON.stringify(info)); + let ps = allowedExchanges.map((info) => { + console.log("Checking for merchant's exchange", JSON.stringify(info)); return Query(this.db) - .iter("mints", {indexName: "pubKey", only: info.master_pub}) - .indexJoin("coins", "mintBaseUrl", (mint) => mint.baseUrl) - .reduce(storeMintCoin); + .iter("exchanges", {indexName: "pubKey", only: info.master_pub}) + .indexJoin("coins", "exchangeBaseUrl", (exchange) => exchange.baseUrl) + .reduce(storeExchangeCoin); }); return Promise.all(ps).then(() => { - let ret: MintCoins = {}; + let ret: ExchangeCoins = {}; if (Object.keys(m).length == 0) { - console.log("not suitable mints found"); + console.log("not suitable exchanges found"); } console.dir(m); - // We try to find the first mint where we have + // We try to find the first exchange where we have // enough coins to cover the paymentAmount with fees // under depositFeeLimit - nextMint: + nextExchange: for (let key in m) { let coins = m[key]; // Sort by ascending deposit fee @@ -479,12 +479,12 @@ export class Wallet { // FIXME: if the fees are too high, we have // to cover them ourselves .... console.log("too much fees"); - continue nextMint; + continue nextExchange; } usableCoins.push(coins[i]); if (Amounts.cmp(accAmount, minAmount) >= 0) { ret[key] = usableCoins; - continue nextMint; + continue nextExchange; } } } @@ -499,14 +499,14 @@ export class Wallet { */ private recordConfirmPay(offer: Offer, payCoinInfo: PayCoinInfo, - chosenMint: string): Promise { + chosenExchange: string): Promise { let payReq = {}; payReq["amount"] = offer.contract.amount; payReq["coins"] = payCoinInfo.map((x) => x.sig); payReq["H_contract"] = offer.H_contract; payReq["max_fee"] = offer.contract.max_fee; payReq["merchant_sig"] = offer.merchant_sig; - payReq["mint"] = URI(chosenMint).href(); + payReq["exchange"] = URI(chosenExchange).href(); payReq["refund_deadline"] = offer.contract.refund_deadline; payReq["timestamp"] = offer.contract.timestamp; payReq["transaction_id"] = offer.contract.transaction_id; @@ -549,9 +549,9 @@ export class Wallet { confirmPay(offer: Offer): Promise { console.log("executing confirmPay"); return Promise.resolve().then(() => { - return this.getPossibleMintCoins(offer.contract.amount, + return this.getPossibleExchangeCoins(offer.contract.amount, offer.contract.max_fee, - offer.contract.mints) + offer.contract.exchanges) }).then((mcs) => { if (Object.keys(mcs).length == 0) { console.log("not confirming payment, insufficient coins"); @@ -559,10 +559,10 @@ export class Wallet { error: "coins-insufficient", }; } - let mintUrl = Object.keys(mcs)[0]; + let exchangeUrl = Object.keys(mcs)[0]; - return this.cryptoApi.signDeposit(offer, mcs[mintUrl]) - .then((ds) => this.recordConfirmPay(offer, ds, mintUrl)) + return this.cryptoApi.signDeposit(offer, mcs[exchangeUrl]) + .then((ds) => this.recordConfirmPay(offer, ds, exchangeUrl)) .then(() => ({})); }); } @@ -599,11 +599,11 @@ export class Wallet { * then deplete the reserve, withdrawing coins until it is empty. */ private initReserve(reserveRecord) { - this.updateMintFromUrl(reserveRecord.mint_base_url) - .then((mint) => - this.updateReserve(reserveRecord.reserve_pub, mint) + this.updateExchangeFromUrl(reserveRecord.exchange_base_url) + .then((exchange) => + this.updateReserve(reserveRecord.reserve_pub, exchange) .then((reserve) => this.depleteReserve(reserve, - mint))) + exchange))) .then(() => { let depleted = { type: "depleted-reserve", @@ -627,12 +627,12 @@ export class Wallet { createReserve(req: CreateReserveRequest): Promise { return this.cryptoApi.createEddsaKeypair().then((keypair) => { const now = (new Date).getTime(); - const canonMint = canonicalizeBaseUrl(req.mint); + const canonExchange = canonicalizeBaseUrl(req.exchange); const reserveRecord = { reserve_pub: keypair.pub, reserve_priv: keypair.priv, - mint_base_url: canonMint, + exchange_base_url: canonExchange, created: now, last_query: null, current_amount: null, @@ -656,7 +656,7 @@ export class Wallet { .finish() .then(() => { let r: CreateReserveResponse = { - mint: canonMint, + exchange: canonExchange, reservePub: keypair.pub, }; return r; @@ -668,7 +668,7 @@ export class Wallet { /** * Mark an existing reserve as confirmed. The wallet will start trying * to withdraw from that reserve. This may not immediately succeed, - * since the mint might not know about the reserve yet, even though the + * since the exchange might not know about the reserve yet, even though the * bank confirmed its creation. * * A confirmed reserve should be shown to the user in the UI, while @@ -708,7 +708,7 @@ export class Wallet { wd.reserve_pub = pc.reservePub; wd.reserve_sig = pc.withdrawSig; wd.coin_ev = pc.coinEv; - let reqUrl = URI("reserve/withdraw").absoluteTo(r.mint_base_url); + let reqUrl = URI("reserve/withdraw").absoluteTo(r.exchange_base_url); return this.http.postJson(reqUrl, wd); }) .then(resp => { @@ -727,7 +727,7 @@ export class Wallet { denomPub: pc.denomPub, denomSig: denomSig, currentAmount: pc.coinValue, - mintBaseUrl: pc.mintBaseUrl, + exchangeBaseUrl: pc.exchangeBaseUrl, }; return coin; @@ -775,8 +775,8 @@ export class Wallet { /** * Withdraw coins from a reserve until it is empty. */ - private depleteReserve(reserve, mint: MintInfo): Promise { - let denomsAvailable: Denomination[] = copy(mint.denoms); + private depleteReserve(reserve, exchange: ExchangeInfo): Promise { + let denomsAvailable: Denomination[] = copy(exchange.denoms); let denomsForWithdraw = getWithdrawDenomList(reserve.current_amount, denomsAvailable); @@ -793,13 +793,13 @@ export class Wallet { /** * Update the information about a reserve that is stored in the wallet - * by quering the reserve's mint. + * by quering the reserve's exchange. */ - private updateReserve(reservePub: string, mint: MintInfo): Promise { + private updateReserve(reservePub: string, exchange: ExchangeInfo): Promise { return Query(this.db) .get("reserves", reservePub) .then((reserve) => { - let reqUrl = URI("reserve/status").absoluteTo(mint.baseUrl); + let reqUrl = URI("reserve/status").absoluteTo(exchange.baseUrl); reqUrl.query({'reserve_pub': reservePub}); return this.http.get(reqUrl).then(resp => { if (resp.status != 200) { @@ -832,10 +832,10 @@ export class Wallet { getReserveCreationInfo(baseUrl: string, amount: AmountJson): Promise { - return this.updateMintFromUrl(baseUrl) - .then((mintInfo: IMintInfo) => { + return this.updateExchangeFromUrl(baseUrl) + .then((exchangeInfo: IExchangeInfo) => { let selectedDenoms = getWithdrawDenomList(amount, - mintInfo.denoms); + exchangeInfo.denoms); let acc = Amounts.getZero(amount.currency); for (let d of selectedDenoms) { @@ -846,7 +846,7 @@ export class Wallet { d.fee_withdraw).amount) .reduce((a, b) => Amounts.add(a, b).amount); let ret: ReserveCreationInfo = { - mintInfo, + exchangeInfo, selectedDenoms, withdrawFee: acc, overhead: Amounts.sub(amount, actualCoinCost).amount, @@ -857,37 +857,37 @@ export class Wallet { /** - * Update or add mint DB entry by fetching the /keys information. + * Update or add exchange DB entry by fetching the /keys information. * Optionally link the reserve entry to the new or existing - * mint entry in then DB. + * exchange entry in then DB. */ - updateMintFromUrl(baseUrl): Promise { + updateExchangeFromUrl(baseUrl): Promise { baseUrl = canonicalizeBaseUrl(baseUrl); let reqUrl = URI("keys").absoluteTo(baseUrl); return this.http.get(reqUrl).then((resp) => { if (resp.status != 200) { throw Error("/keys request failed"); } - let mintKeysJson = KeysJson.checked(JSON.parse(resp.responseText)); + let exchangeKeysJson = KeysJson.checked(JSON.parse(resp.responseText)); - return Query(this.db).get("mints", baseUrl).then((r) => { - let mintInfo; + return Query(this.db).get("exchanges", baseUrl).then((r) => { + let exchangeInfo; console.dir(r); if (!r) { - mintInfo = MintInfo.fresh(baseUrl); - console.log("making fresh mint"); + exchangeInfo = ExchangeInfo.fresh(baseUrl); + console.log("making fresh exchange"); } else { - mintInfo = new MintInfo(r); - console.log("using old mint"); + exchangeInfo = new ExchangeInfo(r); + console.log("using old exchange"); } - return mintInfo.mergeKeys(mintKeysJson, this.cryptoApi) + return exchangeInfo.mergeKeys(exchangeKeysJson, this.cryptoApi) .then(() => { return Query(this.db) - .put("mints", mintInfo) + .put("exchanges", exchangeInfo) .finish() - .then(() => mintInfo); + .then(() => exchangeInfo); }); }); @@ -954,4 +954,4 @@ export class Wallet { } }); } -} \ No newline at end of file +} diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts index 740873d88..a6b3f9d1b 100644 --- a/lib/wallet/wxMessaging.ts +++ b/lib/wallet/wxMessaging.ts @@ -60,7 +60,7 @@ function makeHandlers(db: IDBDatabase, }, ["create-reserve"]: function(detail) { const d = { - mint: detail.mint, + exchange: detail.exchange, amount: detail.amount, }; const req = CreateReserveRequest.checked(d); @@ -96,11 +96,11 @@ function makeHandlers(db: IDBDatabase, ["execute-payment"]: function(detail) { return wallet.executePayment(detail.H_contract); }, - ["mint-info"]: function(detail) { + ["exchange-info"]: function(detail) { if (!detail.baseUrl) { return Promise.resolve({error: "bad url"}); } - return wallet.updateMintFromUrl(detail.baseUrl); + return wallet.updateExchangeFromUrl(detail.baseUrl); }, ["reserve-creation-info"]: function(detail) { if (!detail.baseUrl || typeof detail.baseUrl !== "string") { -- cgit v1.2.3