Commit graph

367 commits

Author SHA1 Message Date
Josh Harvey
591ffcf162 WIP 2016-03-29 17:58:27 +01:00
Josh Harvey
7be7c3f8e6 kraken plugin WIP 2016-03-28 00:52:15 +02:00
Josh Harvey
fd4e5b5f34 WIP 2016-03-27 18:47:08 +02:00
Josh Harvey
9f31b31af8 updated some files to standard formatting 2016-03-27 18:33:21 +02:00
Josh Harvey
ed1376fc6f WIP 2016-03-27 18:13:09 +02:00
Josh Harvey
c8ba96515f WIP 2016-03-27 16:57:18 +02:00
Josh Harvey
668ba7d08c 2.2.12 2016-03-18 11:41:26 +02:00
Josh Harvey
cd88396421 merge upstream 2016-03-18 11:37:06 +02:00
Josh Harvey
496548d8a9 fix tests 2016-03-18 11:33:33 +02:00
Josh Harvey
454306dca0 Merge pull request #60 from naconner/patch-4
2.2.11, add balance and ticker rate logging, snapcard
2016-03-18 11:30:34 +02:00
Neal Conner
79b776ad80 2.2.11, add snapcard, ssu bin, bump bitgo 2016-03-17 18:23:40 +00:00
Neal Conner
1c1ed95c48 Add back wallet balance and ticker rate logging 2016-03-17 17:48:10 +00:00
Josh Harvey
e3e091b873 fix old version bug 2016-03-17 17:11:35 +02:00
Josh Harvey
593bcd6ed0 add local server and reboot functionality 2016-03-17 02:01:13 +02:00
Josh Harvey
bd9cd4f0e9 .gitignore 2016-02-14 19:50:54 +02:00
Josh Harvey
2400504827 2.2.10 2016-02-07 18:51:00 +02:00
Josh Harvey
08b8ab9575 Merge branch 'lock-table'
Merges in fix for double sending
2016-02-07 02:49:51 +02:00
Josh Harvey
30ba92b1dc take out debugging 2016-02-07 02:49:39 +02:00
Josh Harvey
9c51bda97d Revert "support remit on and off"
This reverts commit dfe35b81cb.
2016-02-07 02:44:50 +02:00
Josh Harvey
142ef12bd6 Revert "no more partial transactions"
This reverts commit bf91825495.
2016-02-07 02:44:26 +02:00
Josh Harvey
5b5fc8b810 fix postgres locking issue which could lead to rare double send 2016-02-07 02:40:20 +02:00
Josh Harvey
5cfc2ba491 try locking txs table 2016-02-06 22:57:49 +02:00
Josh Harvey
bf91825495 no more partial transactions 2015-05-31 11:25:42 -04:00
Josh Harvey
dfe35b81cb support remit on and off 2015-05-14 23:10:51 -04:00
Josh Harvey
71e5ec64f5 2.2.9 2015-05-08 18:53:41 -04:00
Josh Harvey
280fe0d6e8 no satoshi rounding, this should be done in lamassu-machine 2015-05-07 14:36:14 -04:00
Josh Harvey
59ea29646d 2.2.8 2015-04-30 18:13:23 -04:00
Josh Harvey
7f14fb3adc reload config on each poll 2015-04-30 18:13:13 -04:00
Josh Harvey
d5c69079d5 update db with bill counts from machine 2015-04-29 17:36:28 -04:00
Josh Harvey
12cc7dab30 fix cartridges bug 2015-04-29 11:49:11 -04:00
Josh Harvey
7f0d0f0758 2.2.7 2015-04-20 13:49:53 -04:00
Josh Harvey
12eefe1082 Merge pull request #57 from naconner/patch-1
2.2.6, fixes wreck to 5.1.0,
2015-04-20 13:49:09 -04:00
Josh Harvey
f9712a7b70 2.2.6 2015-04-20 11:31:48 -04:00
Josh Harvey
62b19f4295 fix err bug 2015-04-20 11:31:37 -04:00
Josh Harvey
6840dcdef3 http connection now gets 'unknown' fingerprint 2015-04-20 11:31:26 -04:00
Josh Harvey
c0659d1373 add parseInt 2015-04-20 11:30:28 -04:00
Josh Harvey
aebdc618bc supply cartridges id; don't update cartridge counts on dispense 2015-04-20 00:20:56 -04:00
Neal Conner
e088e6d935 2.2.6, fixes wreck to 5.1.0,
Resolves issue experienced with lamassu-coinbase module: https://github.com/lamassu/lamassu-coinbase/issues/4
2015-04-11 22:59:34 -04:00
Josh Harvey
668f745a5e 2.2.5 2015-03-19 18:54:38 -04:00
Josh Harvey
2a6c012e8d Merge branch 'master' into upstream-master 2015-03-19 18:54:12 -04:00
Josh Harvey
815f46c6ab 2.2.4 2015-03-19 16:22:53 -04:00
Josh Harvey
5bc47bccc7 add poll request logging back in 2015-03-19 16:22:44 -04:00
Josh Harvey
e8c9da46b6 fix tests 2015-03-19 16:10:57 -04:00
Josh Harvey
0a97cc81cc Merge pull request #56 from naconner/master
Adds new module dependencies, bumps required versions, 2.2.4
2015-03-19 16:10:35 -04:00
Neal Conner
45bb345e66 Update dependency versions 2015-03-19 11:22:37 -04:00
Neal Conner
424df77094 Updates dependency vers reqs
Not to be merged until coinbase, coinapult, coinfloor, and bitgo npm versions have been bumped.
2015-03-15 18:06:36 -04:00
Neal Conner
6646226081 Add new modules, 2.2.4
coinbase, coinapult, coinfloor, bitgo
2015-03-14 17:40:02 -04:00
Josh Harvey
4262e6b274 2.2.3 2015-03-12 17:15:25 -04:00
Josh Harvey
d81046f5f3 handle remit txs correctly, don't do partial sending 2015-02-27 16:47:16 -05:00
Josh Harvey
20b362bf1d Merge pull request #1 from naconner/patch-2
Requires lamassu-bitcoind ^ 1.1.0 / bumps vers
2015-01-31 19:19:13 -05:00