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 From 5c600904f5d30773f5700f1df934d5235558b2eb Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Mar 2016 19:43:38 +0100 Subject: Add copyright header to mithril.js The version from the official repo (https://github.com/lhorie/mithril.js) has no license header, but its LICENSE file has the MIT license in it. --- lib/vendor/mithril.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'lib') diff --git a/lib/vendor/mithril.js b/lib/vendor/mithril.js index d023ac34c..4b225299e 100644 --- a/lib/vendor/mithril.js +++ b/lib/vendor/mithril.js @@ -1,3 +1,28 @@ +/* + The MIT License (MIT) + + Copyright (c) 2014 Leo Horie + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +*/ + + ;(function (global, factory) { // eslint-disable-line "use strict" /* eslint-disable no-undef */ -- cgit v1.2.3 From 1cca800254bca4b34e911f252223ef0456dd95d7 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Tue, 1 Mar 2016 19:46:20 +0100 Subject: add author --- background/main.ts | 4 +++- content_scripts/notify.ts | 11 +++++++---- gulpfile.js | 2 ++ lib/module-trampoline.js | 4 +++- lib/wallet/cryptoApi.ts | 8 +++++++- lib/wallet/cryptoLib.ts | 2 +- lib/wallet/helpers.ts | 2 ++ lib/wallet/http.ts | 2 +- lib/wallet/types.ts | 2 ++ lib/wallet/wxApi.ts | 3 ++- pages/confirm-contract.tsx | 9 ++++++++- pages/confirm-create-reserve.tsx | 8 ++++++++ pages/show-db.ts | 6 ++++++ pogen/pogen.ts | 2 ++ popup/popup.css | 7 +++++++ popup/popup.tsx | 8 ++++++++ 16 files changed, 69 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/background/main.ts b/background/main.ts index 746d81a60..724c4c978 100644 --- a/background/main.ts +++ b/background/main.ts @@ -16,6 +16,8 @@ /** * Entry point for the background page. + * + * @author Florian Dold */ "use strict"; @@ -34,4 +36,4 @@ System.import("../lib/wallet/wxMessaging") .catch((e) => { console.log("wallet failed"); console.error(e.stack); - }); \ No newline at end of file + }); diff --git a/content_scripts/notify.ts b/content_scripts/notify.ts index 6fa965ba7..afc03c934 100644 --- a/content_scripts/notify.ts +++ b/content_scripts/notify.ts @@ -14,16 +14,19 @@ TALER; see the file COPYING. If not, If not, see */ -/// - -"use strict"; - /** * Script that is injected into (all!) pages to allow them * to interact with the GNU Taler wallet via DOM Events. + * + * @author Florian Dold */ + +/// + +"use strict"; + // Make sure we don't pollute the namespace too much. namespace TalerNotify { const PROTOCOL_VERSION = 1; diff --git a/gulpfile.js b/gulpfile.js index fc0134457..a683e7b17 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,6 +25,8 @@ * development * - package: create Chrome extension zip file in * build/. + * + * @author Florian Dold */ const gulp = require("gulp"); diff --git a/lib/module-trampoline.js b/lib/module-trampoline.js index 22173aa42..1f0247f35 100644 --- a/lib/module-trampoline.js +++ b/lib/module-trampoline.js @@ -17,6 +17,8 @@ /** * Boilerplate to initialize the module system and call main() + * + * @author Florian Dold */ "use strict"; @@ -75,4 +77,4 @@ System.import(me) .catch((e) => { console.log("trampoline failed"); console.error(e.stack); - }); \ No newline at end of file + }); diff --git a/lib/wallet/cryptoApi.ts b/lib/wallet/cryptoApi.ts index 300b928db..3cbed89c3 100644 --- a/lib/wallet/cryptoApi.ts +++ b/lib/wallet/cryptoApi.ts @@ -15,6 +15,12 @@ */ +/** + * API to access the Taler crypto worker thread. + * @author Florian Dold + */ + + import {PreCoin} from "./types"; import {Reserve} from "./types"; import {Denomination} from "./types"; @@ -90,4 +96,4 @@ export class CryptoApi { rsaUnblind(sig: string, bk: string, pk: string): Promise { return this.doRpc("rsaUnblind", sig, bk, pk); } -} \ No newline at end of file +} diff --git a/lib/wallet/cryptoLib.ts b/lib/wallet/cryptoLib.ts index 5546dcebe..769cb3356 100644 --- a/lib/wallet/cryptoLib.ts +++ b/lib/wallet/cryptoLib.ts @@ -14,7 +14,6 @@ TALER; see the file COPYING. If not, If not, see */ -import {Denomination} from "./types"; /** * Web worker for crypto operations. * @author Florian Dold @@ -28,6 +27,7 @@ import create = chrome.alarms.create; import {Offer} from "./wallet"; import {CoinWithDenom} from "./wallet"; import {CoinPaySig} from "./types"; +import {Denomination} from "./types"; export function main(worker: Worker) { diff --git a/lib/wallet/helpers.ts b/lib/wallet/helpers.ts index a7d164102..477fce33f 100644 --- a/lib/wallet/helpers.ts +++ b/lib/wallet/helpers.ts @@ -18,6 +18,8 @@ /** * Smaller helper functions that do not depend * on the emscripten machinery. + * + * @author Florian Dold */ import {AmountJson} from "./types"; diff --git a/lib/wallet/http.ts b/lib/wallet/http.ts index 3f7244e40..3bc80f40a 100644 --- a/lib/wallet/http.ts +++ b/lib/wallet/http.ts @@ -81,4 +81,4 @@ export class RequestException { constructor(detail) { } -} \ No newline at end of file +} diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts index a0e22dbca..748df6f4c 100644 --- a/lib/wallet/types.ts +++ b/lib/wallet/types.ts @@ -21,6 +21,8 @@ * are defined in types.ts are intended to be used by components * that do not depend on the whole wallet implementation (which depends on * emscripten). + * + * @author Florian Dold */ import {Checkable} from "./checkable"; diff --git a/lib/wallet/wxApi.ts b/lib/wallet/wxApi.ts index 9871b6e7f..2b69ff82e 100644 --- a/lib/wallet/wxApi.ts +++ b/lib/wallet/wxApi.ts @@ -19,6 +19,7 @@ import {ReserveCreationInfo} from "./types"; /** * Interface to the wallet through WebExtension messaging. + * @author Florian Dold */ @@ -37,4 +38,4 @@ export function getReserveCreationInfo(baseUrl: string, resolve(resp); }); }); -} \ No newline at end of file +} diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx index ff6ffba64..9ce1b0a5a 100644 --- a/pages/confirm-contract.tsx +++ b/pages/confirm-contract.tsx @@ -14,6 +14,13 @@ TALER; see the file COPYING. If not, If not, see */ +/** + * Page shown to the user to confirm entering + * a contract. + * + * @author Florian Dold + */ + /// "use strict"; @@ -79,4 +86,4 @@ export function main() { offer); }); } -} \ No newline at end of file +} diff --git a/pages/confirm-create-reserve.tsx b/pages/confirm-create-reserve.tsx index 914f58cad..5ed97db04 100644 --- a/pages/confirm-create-reserve.tsx +++ b/pages/confirm-create-reserve.tsx @@ -14,6 +14,14 @@ TALER; see the file COPYING. If not, If not, see */ + +/** + * Page shown to the user to confirm creation + * of a reserve, usually requested by the bank. + * + * @author Florian Dold + */ + /// import {amountToPretty, canonicalizeBaseUrl} from "../lib/wallet/helpers"; diff --git a/pages/show-db.ts b/pages/show-db.ts index 1c414dde7..c99d2f2b3 100644 --- a/pages/show-db.ts +++ b/pages/show-db.ts @@ -15,6 +15,12 @@ */ +/** + * Wallet database dump for debugging. + * + * @author Florian Dold + */ + function replacer(match, pIndent, pKey, pVal, pEnd) { var key = ''; var val = ''; diff --git a/pogen/pogen.ts b/pogen/pogen.ts index 77f7ea3dc..5ff182e7c 100644 --- a/pogen/pogen.ts +++ b/pogen/pogen.ts @@ -20,6 +20,8 @@ * * Note that duplicate message IDs are NOT merged, to get the same output as * you would from xgettext, just run msguniq. + * + * @author Florian Dold */ /// diff --git a/popup/popup.css b/popup/popup.css index 53c9f97ed..7218b7baf 100644 --- a/popup/popup.css +++ b/popup/popup.css @@ -1,3 +1,10 @@ + +/** + * @author Gabor X. Toth + * @author Marcello Stanisci + * @author Florian Dold + */ + body { min-height: 20em; width: 30em; diff --git a/popup/popup.tsx b/popup/popup.tsx index 963556c32..2cd753e4f 100644 --- a/popup/popup.tsx +++ b/popup/popup.tsx @@ -15,6 +15,14 @@ */ +/** + * Popup shown to the user when they click + * the Taler browser action button. + * + * @author Florian Dold + */ + + /// /// -- cgit v1.2.3 From 7c03db9ba0fcbf10da8fc37ff55b6d987aab8541 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Mar 2016 00:47:00 +0100 Subject: db versioning --- content_scripts/notify.js | 6 ++++-- lib/wallet/db.ts | 14 ++++++++++++-- lib/wallet/wallet.ts | 7 +++++-- lib/wallet/wxMessaging.ts | 8 +++++--- popup/popup.tsx | 32 +++++++++++++++++++++++++++----- 5 files changed, 53 insertions(+), 14 deletions(-) (limited to 'lib') diff --git a/content_scripts/notify.js b/content_scripts/notify.js index ee0d96d72..1a8f56b99 100644 --- a/content_scripts/notify.js +++ b/content_scripts/notify.js @@ -13,12 +13,14 @@ You should have received a copy of the GNU General Public License along with TALER; see the file COPYING. If not, If not, see */ -/// -"use strict"; /** * Script that is injected into (all!) pages to allow them * to interact with the GNU Taler wallet via DOM Events. + * + * @author Florian Dold */ +/// +"use strict"; // Make sure we don't pollute the namespace too much. var TalerNotify; (function (TalerNotify) { diff --git a/lib/wallet/db.ts b/lib/wallet/db.ts index 2503468d5..9374aa447 100644 --- a/lib/wallet/db.ts +++ b/lib/wallet/db.ts @@ -25,7 +25,7 @@ */ const DB_NAME = "taler"; -const DB_VERSION = 1; +const DB_VERSION = 5; /** * Return a promise that resolves @@ -45,7 +45,8 @@ export function openTalerDb(): Promise { console.log("DB: upgrade needed: oldVersion = " + e.oldVersion); switch (e.oldVersion) { case 0: // DB does not exist yet - const exchanges = db.createObjectStore("exchanges", {keyPath: "baseUrl"}); + const exchanges = db.createObjectStore("exchanges", + {keyPath: "baseUrl"}); exchanges.createIndex("pubKey", "masterPublicKey"); db.createObjectStore("reserves", {keyPath: "reserve_pub"}); db.createObjectStore("denoms", {keyPath: "denomPub"}); @@ -68,6 +69,15 @@ export function openTalerDb(): Promise { }); history.createIndex("timestamp", "timestamp"); break; + default: + if (e.oldVersion != DB_VERSION) { + window.alert("Incompatible wallet dababase version, please reset" + + " db."); + chrome.browserAction.setBadgeText({text: "R!"}); + chrome.browserAction.setBadgeBackgroundColor({color: "#F00"}); + throw Error("incompatible DB"); + } + break; } }; }); diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts index 94ac8ee8a..3764edfbc 100644 --- a/lib/wallet/wallet.ts +++ b/lib/wallet/wallet.ts @@ -912,7 +912,10 @@ export class Wallet { return Query(this.db) .iter("coins") - .reduce(collectBalances, {}); + .reduce(collectBalances, {}) + .then(byCurrency => { + return {balances: byCurrency}; + }); } @@ -922,7 +925,7 @@ export class Wallet { getHistory(): Promise { function collect(x, acc) { acc.push(x); - return acc; + return {history: acc}; } return Query(this.db) diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts index a6b3f9d1b..d49a80efb 100644 --- a/lib/wallet/wxMessaging.ts +++ b/lib/wallet/wxMessaging.ts @@ -47,9 +47,11 @@ function makeHandlers(db: IDBDatabase, return exportDb(db); }, ["reset"]: function(detail) { - let tx = db.transaction(db.objectStoreNames, 'readwrite'); - for (let i = 0; i < db.objectStoreNames.length; i++) { - tx.objectStore(db.objectStoreNames[i]).clear(); + if (db) { + let tx = db.transaction(db.objectStoreNames, 'readwrite'); + for (let i = 0; i < db.objectStoreNames.length; i++) { + tx.objectStore(db.objectStoreNames[i]).clear(); + } } deleteDb(); diff --git a/popup/popup.tsx b/popup/popup.tsx index 2cd753e4f..be33f870a 100644 --- a/popup/popup.tsx +++ b/popup/popup.tsx @@ -95,6 +95,7 @@ namespace WalletBalance { class Controller { myWallet; + gotError = false; constructor() { this.updateBalance(); @@ -104,9 +105,16 @@ namespace WalletBalance { updateBalance() { m.startComputation(); - chrome.runtime.sendMessage({type: "balances"}, (wallet) => { - console.log("got wallet", wallet); - this.myWallet = wallet; + chrome.runtime.sendMessage({type: "balances"}, (resp) => { + if (resp.error) { + this.gotError = true; + console.error("could not retrieve balances", resp); + m.endComputation(); + return; + } + this.gotError = false; + console.log("got wallet", resp); + this.myWallet = resp.balances; m.endComputation(); }); } @@ -114,6 +122,9 @@ namespace WalletBalance { export function view(ctrl: Controller) { let wallet = ctrl.myWallet; + if (ctrl.gotError) { + return i18n`Error: could not retrieve balance information.`; + } if (!wallet) { throw Error("Could not retrieve wallet"); } @@ -200,6 +211,7 @@ namespace WalletHistory { class Controller { myHistory; + gotError = false; constructor() { this.update(); @@ -209,8 +221,15 @@ namespace WalletHistory { update() { m.startComputation(); chrome.runtime.sendMessage({type: "get-history"}, (resp) => { - console.log("got history", history); - this.myHistory = resp; + if (resp.error) { + this.gotError = true; + console.error("could not retrieve history", resp); + m.endComputation(); + return; + } + this.gotError = false; + console.log("got history", resp.history); + this.myHistory = resp.history; m.endComputation(); }); } @@ -218,6 +237,9 @@ namespace WalletHistory { export function view(ctrl: Controller) { let history = ctrl.myHistory; + if (ctrl.gotError) { + return i18n`Error: could not retrieve event history`; + } if (!history) { throw Error("Could not retrieve history"); } -- cgit v1.2.3 From 8714240c909d9c2f2deeb6ae99f219295f67c708 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Mar 2016 02:16:18 +0100 Subject: show accepted exchanges --- lib/decl/mithril.d.ts | 2 +- lib/wallet/types.ts | 63 +++++++++++++++++++++++++++++++++++++++++++++ lib/wallet/wallet.ts | 64 ++-------------------------------------------- lib/wallet/wxMessaging.ts | 2 +- pages/confirm-contract.tsx | 38 ++++++++++++++++++++++++--- 5 files changed, 102 insertions(+), 67 deletions(-) (limited to 'lib') diff --git a/lib/decl/mithril.d.ts b/lib/decl/mithril.d.ts index c87102260..c45633490 100644 --- a/lib/decl/mithril.d.ts +++ b/lib/decl/mithril.d.ts @@ -608,7 +608,7 @@ declare module _mithril { * * @see m.component */ - controller: MithrilControllerFunction | + controller?: MithrilControllerFunction | MithrilControllerConstructor; /** diff --git a/lib/wallet/types.ts b/lib/wallet/types.ts index 748df6f4c..feab1bcb1 100644 --- a/lib/wallet/types.ts +++ b/lib/wallet/types.ts @@ -150,6 +150,69 @@ export interface Coin { } +@Checkable.Class +export class ExchangeHandle { + @Checkable.String + master_pub: string; + + @Checkable.String + url: string; + + static checked: (obj: any) => ExchangeHandle; +} + + +@Checkable.Class +export class Contract { + @Checkable.String + H_wire: string; + + @Checkable.Value(AmountJson) + amount: AmountJson; + + @Checkable.List(Checkable.AnyObject) + auditors: any[]; + + @Checkable.String + expiry: string; + + @Checkable.Any + locations: any; + + @Checkable.Value(AmountJson) + max_fee: AmountJson; + + @Checkable.Any + merchant: any; + + @Checkable.String + merchant_pub: string; + + @Checkable.List(Checkable.Value(ExchangeHandle)) + exchanges: ExchangeHandle[]; + + @Checkable.List(Checkable.AnyObject) + products: any[]; + + @Checkable.String + refund_deadline: string; + + @Checkable.String + timestamp: string; + + @Checkable.Number + transaction_id: number; + + @Checkable.String + fulfillment_url: string; + + @Checkable.Optional(Checkable.String) + repurchase_correlation_id: string; + + static checked: (obj: any) => Contract; +} + + export type PayCoinInfo = Array<{ updatedCoin: Coin, sig: CoinPaySig }>; diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts index 3764edfbc..0dc232bb0 100644 --- a/lib/wallet/wallet.ts +++ b/lib/wallet/wallet.ts @@ -33,6 +33,8 @@ import {CryptoApi} from "./cryptoApi"; import {Coin} from "./types"; import {PayCoinInfo} from "./types"; import {CheckRepurchaseResult} from "./types"; +import {Contract} from "./types"; +import {ExchangeHandle} from "./types"; "use strict"; @@ -182,68 +184,6 @@ export class ConfirmReserveRequest { } -@Checkable.Class -export class ExchangeHandle { - @Checkable.String - master_pub: string; - - @Checkable.String - url: string; - - static checked: (obj: any) => ExchangeHandle; -} - - -@Checkable.Class -export class Contract { - @Checkable.String - H_wire: string; - - @Checkable.Value(AmountJson) - amount: AmountJson; - - @Checkable.List(Checkable.AnyObject) - auditors: any[]; - - @Checkable.String - expiry: string; - - @Checkable.Any - locations: any; - - @Checkable.Value(AmountJson) - max_fee: AmountJson; - - @Checkable.Any - merchant: any; - - @Checkable.String - merchant_pub: string; - - @Checkable.List(Checkable.Value(ExchangeHandle)) - exchanges: ExchangeHandle[]; - - @Checkable.List(Checkable.AnyObject) - products: any[]; - - @Checkable.String - refund_deadline: string; - - @Checkable.String - timestamp: string; - - @Checkable.Number - transaction_id: number; - - @Checkable.String - fulfillment_url: string; - - @Checkable.Optional(Checkable.String) - repurchase_correlation_id: string; - - static checked: (obj: any) => Contract; -} - @Checkable.Class export class Offer { diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts index d49a80efb..4f496861d 100644 --- a/lib/wallet/wxMessaging.ts +++ b/lib/wallet/wxMessaging.ts @@ -22,7 +22,7 @@ import {Checkable} from "./checkable"; import {AmountJson} from "./types"; import Port = chrome.runtime.Port; import {Notifier} from "./types"; -import {Contract} from "./wallet"; +import {Contract} from "./types"; "use strict"; diff --git a/pages/confirm-contract.tsx b/pages/confirm-contract.tsx index 9ce1b0a5a..0c7419c6c 100644 --- a/pages/confirm-contract.tsx +++ b/pages/confirm-contract.tsx @@ -21,12 +21,14 @@ * @author Florian Dold */ -/// -"use strict"; +/// +import MithrilComponent = _mithril.MithrilComponent; import {substituteFulfillmentUrl} from "../lib/wallet/helpers"; +import m from "mithril"; +import {Contract} from "../lib/wallet/types"; +"use strict"; -declare var m: any; function prettyAmount(amount) { let v = amount.value + amount.fraction / 1e6; @@ -34,6 +36,35 @@ function prettyAmount(amount) { } +const Details = { + controller() { + return {collapsed: m.prop(true)}; + }, + view(ctrl, contract: Contract) { + if (ctrl.collapsed()) { + return m("div", [ + m("button.linky", { + onclick: () => { + ctrl.collapsed(false); + } + }, "show more details") + ]); + } else { + return m("div", [ + m("button.linky", { + onclick: () => { + ctrl.collapsed(true); + } + }, "show less details"), + m("div", [ + "Accepted exchanges:", + m("ul", contract.exchanges.map(e => m("li", `${e.url}: ${e.master_pub}`))) + ]) + ]); + } + } +}; + export function main() { let url = URI(document.location.href); let query: any = URI.parseQuery(url.query()); @@ -58,6 +89,7 @@ export function main() { `${p.description}: ${prettyAmount(p.price)}`))), m("button.confirm-pay", {onclick: doPayment}, i18n`Confirm Payment`), m("p", error ? error : []), + m(Details, contract) ]; } }; -- cgit v1.2.3 From 18904a4a6d7b59f7baaddbe36f68288987a346b2 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Mar 2016 05:23:16 +0100 Subject: type error --- lib/wallet/wallet.ts | 5 +++-- manifest.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/wallet/wallet.ts b/lib/wallet/wallet.ts index 0dc232bb0..8291f653a 100644 --- a/lib/wallet/wallet.ts +++ b/lib/wallet/wallet.ts @@ -862,15 +862,16 @@ export class Wallet { /** * Retrive the full event history for this wallet. */ - getHistory(): Promise { + getHistory(): Promise { function collect(x, acc) { acc.push(x); - return {history: acc}; + return acc; } return Query(this.db) .iter("history", {indexName: "timestamp"}) .reduce(collect, []) + .then(acc => ({history: acc})); } checkRepurchase(contract: Contract): Promise { diff --git a/manifest.json b/manifest.json index 03b15bcdb..54a5585ef 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "description": "Privacy preserving and transparent payments", "manifest_version": 2, "name": "GNU Taler Wallet (git)", - "version": "0.5.12", + "version": "0.5.14", "applications": { "gecko": { -- cgit v1.2.3 From 13a8f36cad4d5d2ffec788ff6b4d5b61ed4ddff9 Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 2 Mar 2016 15:33:23 +0100 Subject: re-inject extension on load --- content_scripts/notify.js | 37 ++++++++++++++++++++++++++----------- content_scripts/notify.ts | 43 ++++++++++++++++++++++++++++++------------- lib/wallet/wxMessaging.ts | 13 +++++++++++++ manifest.json | 3 ++- 4 files changed, 71 insertions(+), 25 deletions(-) (limited to 'lib') diff --git a/content_scripts/notify.js b/content_scripts/notify.js index aa7dee730..2df089719 100644 --- a/content_scripts/notify.js +++ b/content_scripts/notify.js @@ -34,14 +34,29 @@ var TalerNotify; url = url.replace("${$}", "$"); return url; } - var $ = function (x) { return document.getElementById(x); }; - document.addEventListener("DOMContentLoaded", function (e) { - if (document.documentElement.getAttribute("data-taler-requested")) { - console.log("taler requested in html element"); - document.documentElement.setAttribute("data-taler-extension-id", chrome.runtime.id); + var handlers = []; + var port = chrome.runtime.connect(); + port.onDisconnect.addListener(function () { + console.log("chrome runtime disconnected"); + for (var _i = 0, handlers_1 = handlers; _i < handlers_1.length; _i++) { + var handler = handlers_1[_i]; + document.removeEventListener(handler.type, handler.listener); } }); - document.addEventListener("taler-probe", function (e) { + var $ = function (x) { return document.getElementById(x); }; + function addHandler(type, listener) { + document.addEventListener(type, listener); + handlers.push({ type: type, listener: listener }); + } + addHandler("taler-query-id", function (e) { + var evt = new CustomEvent("taler-id", { + detail: { + id: chrome.runtime.id + } + }); + document.dispatchEvent(evt); + }); + addHandler("taler-probe", function (e) { var evt = new CustomEvent("taler-wallet-present", { detail: { walletProtocolVersion: PROTOCOL_VERSION @@ -50,7 +65,7 @@ var TalerNotify; document.dispatchEvent(evt); console.log("handshake done"); }); - document.addEventListener("taler-create-reserve", function (e) { + addHandler("taler-create-reserve", function (e) { console.log("taler-create-reserve with " + JSON.stringify(e.detail)); var params = { amount: JSON.stringify(e.detail.amount), @@ -61,7 +76,7 @@ var TalerNotify; var uri = URI(chrome.extension.getURL("pages/confirm-create-reserve.html")); document.location.href = uri.query(params).href(); }); - document.addEventListener("taler-confirm-reserve", function (e) { + addHandler("taler-confirm-reserve", function (e) { console.log("taler-confirm-reserve with " + JSON.stringify(e.detail)); var msg = { type: "confirm-reserve", @@ -74,7 +89,7 @@ var TalerNotify; }); }); // XXX: remove in a bit, just here for compatibility ... - document.addEventListener("taler-contract", function (e) { + addHandler("taler-contract", function (e) { // XXX: the merchant should just give us the parsed data ... var offer = JSON.parse(e.detail); if (!offer.contract) { @@ -108,7 +123,7 @@ var TalerNotify; } }); }); - document.addEventListener("taler-confirm-contract", function (e) { + addHandler("taler-confirm-contract", function (e) { if (!e.detail.contract_wrapper) { console.error("contract wrapper missing"); return; @@ -151,7 +166,7 @@ var TalerNotify; } }); }); - document.addEventListener('taler-execute-payment', function (e) { + addHandler('taler-execute-payment', function (e) { console.log("got taler-execute-payment in content page"); if (!e.detail.pay_url) { console.log("field 'pay_url' missing in taler-execute-payment event"); diff --git a/content_scripts/notify.ts b/content_scripts/notify.ts index c87c9450e..92c9eee1e 100644 --- a/content_scripts/notify.ts +++ b/content_scripts/notify.ts @@ -43,17 +43,34 @@ namespace TalerNotify { return url; } - let $ = (x) => document.getElementById(x); + let handlers = []; - document.addEventListener("DOMContentLoaded", function(e) { - if (document.documentElement.getAttribute("data-taler-requested")) { - console.log("taler requested in html element"); - document.documentElement.setAttribute("data-taler-extension-id", - chrome.runtime.id); + let port = chrome.runtime.connect(); + port.onDisconnect.addListener(() => { + console.log("chrome runtime disconnected"); + for (let handler of handlers) { + document.removeEventListener(handler.type, handler.listener); } }); - document.addEventListener("taler-probe", function(e) { + let $ = (x) => document.getElementById(x); + + function addHandler(type, listener) { + document.addEventListener(type, listener); + handlers.push({type, listener}); + } + + + addHandler("taler-query-id", function(e) { + let evt = new CustomEvent("taler-id", { + detail: { + id: chrome.runtime.id + } + }); + document.dispatchEvent(evt); + }); + + addHandler("taler-probe", function(e) { let evt = new CustomEvent("taler-wallet-present", { detail: { walletProtocolVersion: PROTOCOL_VERSION @@ -63,7 +80,7 @@ namespace TalerNotify { console.log("handshake done"); }); - document.addEventListener("taler-create-reserve", function(e: CustomEvent) { + addHandler("taler-create-reserve", function(e: CustomEvent) { console.log("taler-create-reserve with " + JSON.stringify(e.detail)); let params = { amount: JSON.stringify(e.detail.amount), @@ -75,7 +92,7 @@ namespace TalerNotify { document.location.href = uri.query(params).href(); }); - document.addEventListener("taler-confirm-reserve", function(e: CustomEvent) { + addHandler("taler-confirm-reserve", function(e: CustomEvent) { console.log("taler-confirm-reserve with " + JSON.stringify(e.detail)); let msg = { type: "confirm-reserve", @@ -90,7 +107,7 @@ namespace TalerNotify { // XXX: remove in a bit, just here for compatibility ... - document.addEventListener("taler-contract", function(e: CustomEvent) { + addHandler("taler-contract", function(e: CustomEvent) { // XXX: the merchant should just give us the parsed data ... let offer = JSON.parse(e.detail); @@ -130,7 +147,7 @@ namespace TalerNotify { }); - document.addEventListener("taler-confirm-contract", function(e: CustomEvent) { + addHandler("taler-confirm-contract", function(e: CustomEvent) { if (!e.detail.contract_wrapper) { console.error("contract wrapper missing"); return; @@ -179,7 +196,7 @@ namespace TalerNotify { }); - document.addEventListener('taler-execute-payment', function(e: CustomEvent) { + addHandler('taler-execute-payment', function(e: CustomEvent) { console.log("got taler-execute-payment in content page"); if (!e.detail.pay_url) { console.log("field 'pay_url' missing in taler-execute-payment event"); @@ -232,4 +249,4 @@ namespace TalerNotify { }; }); }); -} +} \ No newline at end of file diff --git a/lib/wallet/wxMessaging.ts b/lib/wallet/wxMessaging.ts index 4f496861d..daa9ec197 100644 --- a/lib/wallet/wxMessaging.ts +++ b/lib/wallet/wxMessaging.ts @@ -195,6 +195,19 @@ class ChromeNotifier implements Notifier { export function wxMain() { chrome.browserAction.setBadgeText({text: ""}); + chrome.tabs.query({}, function(tabs) { + for (let tab of tabs) { + if (!tab.url) { + return; + } + let uri = URI(tab.url); + if (uri.protocol() == "http" || uri.protocol() == "https") { + console.log("injecting into existing tab", tab.id); + chrome.tabs.executeScript(tab.id, {file: "content_scripts/notify.js"}); + } + } + }); + Promise.resolve() .then(() => { return openTalerDb(); diff --git a/manifest.json b/manifest.json index 54a5585ef..b83a68533 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "description": "Privacy preserving and transparent payments", "manifest_version": 2, "name": "GNU Taler Wallet (git)", - "version": "0.5.14", + "version": "0.5.15", "applications": { "gecko": { @@ -12,6 +12,7 @@ "permissions": [ "storage", + "tabs", "http://*/*", "https://*/*" ], -- cgit v1.2.3