Commit Graph

73 Commits

Author SHA1 Message Date
Ariel Gabizon 0f0dbf4e69 wip 2017-07-26 22:29:42 +02:00
Ariel Gabizon 2753b3385f wip 2017-07-26 22:24:08 +02:00
Ariel Gabizon 6ca26f821c wip 2017-07-26 21:51:03 +02:00
Ariel Gabizon a780b6abc7 wip 2017-07-26 20:52:44 +02:00
Ariel Gabizon 15ff860746 wip 2017-07-26 20:35:55 +02:00
Ariel Gabizon 4e100c46c3 wip 2017-07-26 14:20:24 +02:00
Ariel Gabizon 07e0d2c430 fix 2017-07-24 19:03:20 +02:00
Ariel Gabizon 0ae56929ba fix 2017-07-24 19:00:26 +02:00
Ariel 8b9299e577 Merge pull request #2 from jasondavies/fix-requirements
Fixes.
2017-07-24 18:21:13 +02:00
Jason Davies 3cbc6d46ea Use larger locktimes. 2017-07-24 18:17:47 +02:00
Jason Davies 02989d24e6 Add missing 'waiting' requirement. 2017-07-24 17:39:20 +02:00
Ariel Gabizon e233c8a9f6 merge 2017-07-24 17:36:02 +02:00
Ariel Gabizon 927c4c5a66 fix 2017-07-24 17:35:16 +02:00
Ariel Gabizon 001225bf2c wip 2017-07-24 17:23:25 +02:00
Ariel Gabizon a8b78513c3 get addresses from init.json instead of generating them randomly 2017-07-24 16:59:23 +02:00
Ariel Gabizon 394373da53 wip 2017-07-24 14:44:24 +02:00
Ariel Gabizon 99ee0a9ccd comment 2017-07-22 13:30:32 +02:00
Ariel Gabizon 69aae69d40 add test files 2017-07-22 13:29:49 +02:00
Ariel Gabizon 991c02f23b basic flow working 2017-07-22 13:15:25 +02:00
Ariel Gabizon cb607bd168 wip 2017-07-22 12:54:53 +02:00
Ariel Gabizon df8f74cccb wip 2017-07-22 09:37:29 +02:00
Ariel Gabizon f39251490a seller init working 2017-07-21 17:24:42 +02:00
Ariel Gabizon 7a44519e97 wip 2017-07-21 17:21:06 +02:00
Ariel Gabizon 801adaa824 wip 2017-07-21 17:20:00 +02:00
Ariel Gabizon 157e293cfe wip 2017-07-21 17:07:28 +02:00
Ariel Gabizon 19f8339c3d wip 2017-07-21 16:46:20 +02:00
Ariel Gabizon d2b64920fe fixed it in bitcoin file too 2017-07-16 11:09:10 -04:00
Ariel Gabizon 9f8073772e fix wrong indent preventing from finding secret 2017-07-16 11:06:22 -04:00
Ariel Gabizon 220f55ed7c add api file 2017-07-05 21:09:09 +02:00
Ariel Gabizon 684f0f30ad fixed test 2017-07-05 21:02:21 +02:00
Ariel Gabizon e301d36c05 fixed test 2017-07-05 21:00:56 +02:00
Ariel Gabizon 16ebdcc8e0 have api methods look at trade file themselves instead of expectin parameter 2017-07-05 15:54:40 +02:00
Ariel Gabizon 5cbed011ea restructuring 2017-07-05 14:28:16 +02:00
Ariel Gabizon 1ccc09f36f seems to work well in all cases 2017-07-05 12:44:38 +02:00
Ariel Gabizon d5821f5ca7 redeem with secret works 2017-07-03 18:38:34 +02:00
Ariel Gabizon 3a836cf4f5 pasted autoredeem code from bXcat in zXcat 2017-07-03 11:03:13 +02:00
arcalinea 158519ae0b Merge pull request #5 from zcash/refactor-automate
Refactor automate
2017-06-15 11:00:06 -07:00
Jay Graber d29830c9bf Edit readme for cli workflow 2017-06-15 10:58:22 -07:00
Jay Graber 84df93782b Add automated test, refund tx functionality 2017-05-31 12:03:16 -07:00
Jay Graber 3ee8606dcf Remove dead code, rename things 2017-05-26 15:21:23 -07:00
Jay Graber 2699e76f32 Put user input in separate file, create test file to run through protocol 2017-05-26 15:08:57 -07:00
Jay Graber 3770a7d700 Rm saving of contracts 2017-05-26 13:16:52 -07:00
Jay Graber 9a52ebeb57 Rename classesXcat.py to xcat.py 2017-05-26 13:15:52 -07:00
Jay Graber db111a3325 Add parsing out of redeem/refund address to zXcat 2017-05-26 12:16:15 -07:00
Jay Graber 31e5761076 Refactor into classes, add automation functions. Unfinished 2017-05-26 09:23:49 -07:00
Jay Graber eb603b3471 Merge branch 'cli-interface' of github.com:zcash/ZBXCAT into cli-interface 2017-05-24 08:57:24 -07:00
Jay Graber 64b268b6a0 Start refactoring into classes 2017-05-24 08:57:19 -07:00
Ariel Gabizon dc06613f70 add functionality 2017-05-24 11:30:48 +03:00
Jay Graber f953907aa5 Changes before demo 2017-05-23 18:15:05 -07:00
Jay Graber 6fec17cd81 Merge pull request #2 from zcash/cli-interface
Cli interface
2017-05-23 14:14:58 -07:00