From e0330c56f1a8fd5a098d7deb40dedd66798d4399 Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 16 Nov 2017 14:37:44 -0500 Subject: [PATCH 1/3] feat(Recurring Buy): if recurring exists change addr label --- src/exchange-delegate.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/exchange-delegate.js b/src/exchange-delegate.js index 8d9a414d1..f2fc6a71d 100644 --- a/src/exchange-delegate.js +++ b/src/exchange-delegate.js @@ -156,7 +156,9 @@ ExchangeDelegate.prototype.reserveReceiveAddress = function () { } trade._account_index = account.index; trade._receive_index = reservation.receiveIndex; - reservation.commit(`${self.labelBase} #${trade.id}`); + let id = trade.tradeSubscriptionId || trade.id; + let label = trade.tradeSubscriptionId ? 'Recurring Order' : self.labelBase; + reservation.commit(`${label} #${id}`); } }; }; From 6f5cd8c2893e491d8e306031b9a189257a4e5af3 Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 16 Nov 2017 15:20:03 -0500 Subject: [PATCH 2/3] chore(Release): upgrade clients --- yarn.lock | 134 +++++++++++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 72 deletions(-) diff --git a/yarn.lock b/yarn.lock index df9070231..9e9f3e76e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -52,7 +52,7 @@ acorn@^4.0.3: version "4.0.13" resolved "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" -acorn@^5.0.0, acorn@^5.1.1: +acorn@^5.0.0, acorn@^5.2.1: version "5.2.1" resolved "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7" @@ -1064,8 +1064,8 @@ bip66@^1.1.0, bip66@^1.1.3: safe-buffer "^5.0.1" bitcoin-coinify-client@^0.7.3: - version "0.7.3" - resolved "https://registry.npmjs.org/bitcoin-coinify-client/-/bitcoin-coinify-client-0.7.3.tgz#1f44dbee601b1a487096d6d653ef18f0238fdb8e" + version "0.7.4" + resolved "https://registry.npmjs.org/bitcoin-coinify-client/-/bitcoin-coinify-client-0.7.4.tgz#088cbe6821f4e23020fec5840024c84fbd5c917e" dependencies: babel-polyfill "6.16.*" babel-preset-es2015 "6.16.*" @@ -1073,14 +1073,8 @@ bitcoin-coinify-client@^0.7.3: bitcoin-exchange-client "^0.5.0" bitcoin-exchange-client@^0.5.0: - version "0.5.1" - resolved "https://registry.npmjs.org/bitcoin-exchange-client/-/bitcoin-exchange-client-0.5.1.tgz#6206b8039ed61f58f15e0feabb174853e01555e3" - dependencies: - isomorphic-fetch "^2.2.0" - -bitcoin-exchange-client@~0.4.1: - version "0.4.6" - resolved "https://registry.npmjs.org/bitcoin-exchange-client/-/bitcoin-exchange-client-0.4.6.tgz#46ae8eff5275fe49df4b6c6ee01252e8b6e0e224" + version "0.5.2" + resolved "https://registry.npmjs.org/bitcoin-exchange-client/-/bitcoin-exchange-client-0.5.2.tgz#cc0542f264d036cfdabc2e31d69bd2bf34dfe17c" dependencies: isomorphic-fetch "^2.2.0" @@ -1089,8 +1083,8 @@ bitcoin-ops@^1.3.0: resolved "https://registry.npmjs.org/bitcoin-ops/-/bitcoin-ops-1.3.0.tgz#6b126b585537bc679b02ed499f14450cffc37e13" bitcoin-sfox-client@^0.2.1: - version "0.2.1" - resolved "https://registry.npmjs.org/bitcoin-sfox-client/-/bitcoin-sfox-client-0.2.1.tgz#e534b8bf10cdf6e754dc919c166f7e5930c3b3ef" + version "0.2.2" + resolved "https://registry.npmjs.org/bitcoin-sfox-client/-/bitcoin-sfox-client-0.2.2.tgz#8e0c9620dc9070d1060daed30352158002bdd427" dependencies: babel-polyfill "6.16.*" babel-preset-es2015 "6.16.*" @@ -1098,14 +1092,14 @@ bitcoin-sfox-client@^0.2.1: bitcoin-exchange-client "^0.5.0" bitcoin-unocoin-client@^0.3.4: - version "0.3.4" - resolved "https://registry.npmjs.org/bitcoin-unocoin-client/-/bitcoin-unocoin-client-0.3.4.tgz#03bbac1f828ae60b417a2200288788f637e9f8c3" + version "0.3.5" + resolved "https://registry.npmjs.org/bitcoin-unocoin-client/-/bitcoin-unocoin-client-0.3.5.tgz#a12026e51f049fadcc8580efdb3e8c224dcb8a72" dependencies: babel-cli "^6.24.1" babel-polyfill "6.16.*" babel-preset-es2015 "6.16.*" babelify "7.3.*" - bitcoin-exchange-client "~0.4.1" + bitcoin-exchange-client "^0.5.0" "bitcoincashjs-lib@https://github.com/bitcoinjs/bitcoinjs-lib#9ac221c80dbc3462d7a2392cec2045ae2b590461": version "3.1.1" @@ -1299,18 +1293,18 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@^0.1.4, browserify-zlib@~0.1.2: - version "0.1.4" - resolved "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" - dependencies: - pako "~0.2.0" - -browserify-zlib@~0.2.0: +browserify-zlib@^0.2.0, browserify-zlib@~0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" dependencies: pako "~1.0.5" +browserify-zlib@~0.1.2: + version "0.1.4" + resolved "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" + dependencies: + pako "~0.2.0" + browserify@13.*: version "13.3.0" resolved "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz#b5a9c9020243f0c70e4675bec8223bc627e415ce" @@ -1432,8 +1426,8 @@ bs58@^4.0.0: base-x "^3.0.2" bs58check@<3.0.0, bs58check@^2.0.0: - version "2.0.2" - resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.0.2.tgz#06f63b01c2fa6173033c90eb87f1fe3d2e13d89a" + version "2.1.0" + resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.0.tgz#0d378950b49261c807fbe46e5dd2cf5eb2f89513" dependencies: bs58 "^4.0.0" create-hash "^1.1.0" @@ -2493,10 +2487,10 @@ espree@^2.0.1: resolved "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz#df691b9310889402aeb29cc066708c56690b854b" espree@^3.1.6: - version "3.5.1" - resolved "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz#0c988b8ab46db53100a1954ae4ba995ddd27d87e" + version "3.5.2" + resolved "https://registry.npmjs.org/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca" dependencies: - acorn "^5.1.1" + acorn "^5.2.1" acorn-jsx "^3.0.0" esprima@2.7.x, esprima@^2.1, esprima@^2.6.0, esprima@^2.7.1: @@ -2871,19 +2865,19 @@ fs-extra@^1.0.0: klaw "^1.0.0" fs-readdir-recursive@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz#8cd1745c8b4f8a29c8caec392476921ba195f560" + version "1.1.0" + resolved "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" fsevents@^1.0.0: - version "1.1.2" - resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz#3282b713fb3ad80ede0e9fcf4611b5aa6fc033f4" + version "1.1.3" + resolved "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" dependencies: nan "^2.3.0" - node-pre-gyp "^0.6.36" + node-pre-gyp "^0.6.39" fstream-ignore@^1.0.5: version "1.0.5" @@ -3225,14 +3219,14 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@0.0.1, https-browserify@~0.0.0: - version "0.0.1" - resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" +https-browserify@~0.0.0: + version "0.0.1" + resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" + iconv-lite@0.4.19, iconv-lite@~0.4.13: version "0.4.19" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" @@ -3658,8 +3652,8 @@ jsx-ast-utils@^1.2.1: resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1" karma-browserify@5.1.*: - version "5.1.1" - resolved "https://registry.npmjs.org/karma-browserify/-/karma-browserify-5.1.1.tgz#f642d70d776d9ab3b73526c5732abcfea2400319" + version "5.1.2" + resolved "https://registry.npmjs.org/karma-browserify/-/karma-browserify-5.1.2.tgz#48016359d722312a3530aa1dbbab7663e022d779" dependencies: convert-source-map "^1.1.3" hat "^0.0.3" @@ -4087,8 +4081,8 @@ mute-stream@0.0.5: resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0" nan@^2.0.5, nan@^2.0.8, nan@^2.2.1, nan@^2.3.0: - version "2.7.0" - resolved "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" + version "2.8.0" + resolved "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" natives@^1.1.0: version "1.1.0" @@ -4112,28 +4106,28 @@ node-fetch@^1.0.1, node-fetch@^1.3.3: is-stream "^1.0.1" node-libs-browser@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz#a3a59ec97024985b46e958379646f96c4b616646" + version "2.1.0" + resolved "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df" dependencies: assert "^1.1.1" - browserify-zlib "^0.1.4" + browserify-zlib "^0.2.0" buffer "^4.3.0" console-browserify "^1.1.0" constants-browserify "^1.0.0" crypto-browserify "^3.11.0" domain-browser "^1.1.1" events "^1.0.0" - https-browserify "0.0.1" - os-browserify "^0.2.0" + https-browserify "^1.0.0" + os-browserify "^0.3.0" path-browserify "0.0.0" - process "^0.11.0" + process "^0.11.10" punycode "^1.2.4" querystring-es3 "^0.2.0" - readable-stream "^2.0.5" + readable-stream "^2.3.3" stream-browserify "^2.0.1" - stream-http "^2.3.1" - string_decoder "^0.10.25" - timers-browserify "^2.0.2" + stream-http "^2.7.2" + string_decoder "^1.0.0" + timers-browserify "^2.0.4" tty-browserify "0.0.0" url "^0.11.0" util "^0.10.3" @@ -4145,7 +4139,7 @@ node-libs-browser@^2.0.0: dependencies: express "3.0.x" -node-pre-gyp@^0.6.36: +node-pre-gyp@^0.6.39: version "0.6.39" resolved "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: @@ -4311,18 +4305,14 @@ options@>=0.0.5: version "0.0.6" resolved "https://registry.npmjs.org/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" -os-browserify@^0.2.0: - version "0.2.1" - resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f" +os-browserify@^0.3.0, os-browserify@~0.3.0: + version "0.3.0" + resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" os-browserify@~0.1.1: version "0.1.2" resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" -os-browserify@~0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" @@ -4574,7 +4564,7 @@ process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" -process@^0.11.0, process@~0.11.0: +process@^0.11.10, process@~0.11.0: version "0.11.10" resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" @@ -4755,7 +4745,7 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" -readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6: +readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6, readable-stream@^2.3.3: version "2.3.3" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c" dependencies: @@ -5451,7 +5441,7 @@ stream-combiner2@^1.1.1: duplexer2 "~0.1.0" readable-stream "^2.0.2" -stream-http@^2.0.0, stream-http@^2.3.1: +stream-http@^2.0.0, stream-http@^2.7.2: version "2.7.2" resolved "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad" dependencies: @@ -5498,16 +5488,16 @@ string.prototype.endswith@^0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/string.prototype.endswith/-/string.prototype.endswith-0.2.0.tgz#a19c20dee51a98777e9a47e10f09be393b9bba75" -string_decoder@^0.10.25, string_decoder@~0.10.0, string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - -string_decoder@~1.0.0, string_decoder@~1.0.3: +string_decoder@^1.0.0, string_decoder@~1.0.0, string_decoder@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab" dependencies: safe-buffer "~5.1.0" +string_decoder@~0.10.0, string_decoder@~0.10.x: + version "0.10.31" + resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" + stringstream@~0.0.4, stringstream@~0.0.5: version "0.0.5" resolved "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" @@ -5634,8 +5624,8 @@ tar-pack@^3.4.0: uid-number "^0.0.6" tar-stream@^1.1.2: - version "1.5.4" - resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016" + version "1.5.5" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55" dependencies: bl "^1.0.0" end-of-stream "^1.0.0" @@ -5679,7 +5669,7 @@ timers-browserify@^1.0.1: dependencies: process "~0.11.0" -timers-browserify@^2.0.2: +timers-browserify@^2.0.4: version "2.0.4" resolved "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz#96ca53f4b794a5e7c0e1bd7cc88a372298fa01e6" dependencies: @@ -5763,8 +5753,8 @@ typedarray@^0.0.6, typedarray@~0.0.5: resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" typeforce@^1.5.5, typeforce@^1.8.7: - version "1.11.7" - resolved "https://registry.npmjs.org/typeforce/-/typeforce-1.11.7.tgz#7af0d3b017e7e3b46fa0697a96a6829a46a383a5" + version "1.12.0" + resolved "https://registry.npmjs.org/typeforce/-/typeforce-1.12.0.tgz#ca40899919f1466d7819e37be039406beb912a2e" uglify-js@^2.6, uglify-js@^2.8.5: version "2.8.29" From bf23e64c9c2d4a9b9cf0792e7f033875cff0e30e Mon Sep 17 00:00:00 2001 From: plondon Date: Thu, 16 Nov 2017 15:21:55 -0500 Subject: [PATCH 3/3] chore(Release): v3.40.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6df036587..eed578724 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blockchain-wallet-client", - "version": "3.40.0", + "version": "3.40.1", "description": "Blockchain.info JavaScript Wallet", "homepage": "https://github.com/blockchain/my-wallet-v3", "bugs": {