Commit Graph

80 Commits

Author SHA1 Message Date
Jay Graber 1c8232ee4d Merge branch 'master' into package-module 2017-08-01 15:34:48 -07:00
Jay Graber ada62d25fa Remove unnecessary 2017-08-01 15:33:49 -07:00
Jay Graber b80f4fb0aa Wording changes 2017-08-01 13:35:11 -07:00
Jay Graber 47a5755ebd Fix spacing readme 2017-08-01 13:33:24 -07:00
Jay Graber 7779ec8ecd Fix spacing readme 2017-08-01 13:33:01 -07:00
Jay Graber 18bf28ba3a Format readme 2017-08-01 13:32:09 -07:00
Jay Graber ae23de70f6 Merge branch 'package-module' of github.com:zcash/ZBXCAT into package-module 2017-08-01 13:27:53 -07:00
Jay Graber 938ee71c97 Update readme 2017-08-01 13:25:50 -07:00
Ariel b540994e6f Delete xcat.json 2017-08-01 22:19:20 +02:00
Jay Graber 6312cd02b0 Reduce dependency on json, down to buyer redeem step 2017-08-01 13:03:10 -07:00
Jay Graber d8fcd7e95b Parse secret for buyer 2017-07-31 19:13:46 -07:00
Jay Graber 0fcad69b06 Fix import/export cli tests 2017-07-31 17:06:58 -07:00
Jay Graber 9bb7b7c0f5 Modify checktrade for tests 2017-07-31 16:25:49 -07:00
Jay Graber 6bb6a9c756 add full workflow to cli test 2017-07-31 15:27:43 -07:00
Jay Graber 7328be0dc2 Lookup by tradeid 2017-07-31 15:15:22 -07:00
Jay Graber 9cc52454c8 Changes to newtrade 2017-07-31 14:01:20 -07:00
Jay Graber f4d68606e1 Fix imports 2017-07-31 13:51:54 -07:00
Jay Graber 4d0b2a169f Add findtrade, rm unnecessary imports 2017-07-31 13:32:51 -07:00
Jay Graber 4bd5ac0bc9 Add tests up to newtrade 2017-07-28 20:45:46 -07:00
Jay Graber 0cab1f7db3 Add tests for database 2017-07-28 19:44:24 -07:00
Jay Graber 94abea7bc2 Repackage as python module 2017-07-28 17:23:32 -07:00
Jay Graber 043958b840 Get working again 2017-07-28 13:57:44 -07:00
Jay Graber 941ef40390 Rename to commitment 2017-07-26 13:23:12 -07:00
Jay Graber 2b7d00b73e Add updated utils 2017-07-26 08:06:39 -07:00
Jay Graber 6861e73472 Add findtrade by txid 2017-07-24 13:40:10 -07:00
Jay Graber 572de939b4 Rm unnecessary files, rename sellContract to sell etc, save trades to leveldb 2017-07-24 13:23:40 -07:00
Jay Graber 0df6fcd04c Add address parsing and initiate newtrade from cli 2017-07-24 07:41:03 -07:00
Jay Graber f9e40d7355 Add comment for refactor of script 2017-07-15 14:20:23 -07:00
Jay Graber ee49e77279 Export xcat.json to hex string on cli 2017-07-12 20:33:56 -07:00
Jay Graber d9ee4d5b99 Add cli functions to check user's role from addrs 2017-07-12 19:45:45 -07:00
Jay Graber 7b80666cc7 Add validateaddress 2017-07-12 19:45:11 -07:00
Jay Graber dc6a9bdb6f Set up redeem test case and refund test case 2017-07-05 13:57:53 -07:00
Jay Graber 15f48b7ad4 Make unittest module a requirement 2017-07-05 13:35:39 -07:00
Jay Graber 3f39382b5d Refactor test.py into unittest framework 2017-07-05 13:35:20 -07: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
Jay Graber 9046d44f4d Add cli for importcontract as hex string, save to leveldb in /tmp with initiating txid as key 2017-07-03 09:48:05 -07: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