Commit Graph

  • ee8dac6ee4 Get default addresses from xcatconf.py in top level dir Jay Graber 2017-08-02 19:36:07 -0700
  • 905124f03c Merge pull request #14 from zcash/save-secret arcalinea 2017-08-02 18:50:42 -0700
  • 546a312e0a Some cleaning up save-secret Jay Graber 2017-08-02 18:45:36 -0700
  • e78072d0aa Save secret in key/value store Jay Graber 2017-08-02 18:06:09 -0700
  • 22e4821ca7 Merge pull request #13 from zcash/magic-wormhole arcalinea 2017-08-02 17:18:58 -0700
  • 4ee91cc0f5 Update readme for magic-wormhole magic-wormhole Jay Graber 2017-08-02 17:18:35 -0700
  • 3a61adb157 Modify cli to allow import and export to work with magic-wormhole transfer Jay Graber 2017-08-02 16:10:15 -0700
  • 23e976a7ba Merge pull request #12 from zcash/find-secret arcalinea 2017-08-02 12:55:46 -0700
  • 2a4f082765 Edit readme find-secret Jay Graber 2017-08-02 12:55:24 -0700
  • 06b4711ad2 Merge pull request #11 from zcash/find-secret arcalinea 2017-08-02 12:42:01 -0700
  • 0a36f800a3 Update README Jay Graber 2017-08-02 12:41:39 -0700
  • 6bd8c2f751 Get secret from redeemtx on blockchain; rm redundant auto_redeem function Jay Graber 2017-08-02 12:18:18 -0700
  • 1c8232ee4d Merge branch 'master' into package-module Jay Graber 2017-08-01 15:34:48 -0700
  • ada62d25fa Remove unnecessary Jay Graber 2017-08-01 15:33:49 -0700
  • b80f4fb0aa Wording changes Jay Graber 2017-08-01 13:35:11 -0700
  • 47a5755ebd Fix spacing readme Jay Graber 2017-08-01 13:33:24 -0700
  • 7779ec8ecd Fix spacing readme Jay Graber 2017-08-01 13:33:01 -0700
  • 18bf28ba3a Format readme Jay Graber 2017-08-01 13:32:09 -0700
  • ae23de70f6 Merge branch 'package-module' of github.com:zcash/ZBXCAT into package-module Jay Graber 2017-08-01 13:27:53 -0700
  • 938ee71c97 Update readme Jay Graber 2017-08-01 13:25:50 -0700
  • b540994e6f Delete xcat.json Ariel 2017-08-01 22:19:20 +0200
  • 6312cd02b0 Reduce dependency on json, down to buyer redeem step Jay Graber 2017-08-01 13:03:10 -0700
  • d8fcd7e95b Parse secret for buyer Jay Graber 2017-07-31 19:13:46 -0700
  • 0fcad69b06 Fix import/export cli tests Jay Graber 2017-07-31 17:06:58 -0700
  • 9bb7b7c0f5 Modify checktrade for tests Jay Graber 2017-07-31 16:25:49 -0700
  • 6bb6a9c756 add full workflow to cli test Jay Graber 2017-07-31 15:27:43 -0700
  • 7328be0dc2 Lookup by tradeid Jay Graber 2017-07-31 15:15:22 -0700
  • 9cc52454c8 Changes to newtrade Jay Graber 2017-07-31 14:01:20 -0700
  • f4d68606e1 Fix imports Jay Graber 2017-07-31 13:51:54 -0700
  • 4d0b2a169f Add findtrade, rm unnecessary imports Jay Graber 2017-07-31 13:32:51 -0700
  • 4bd5ac0bc9 Add tests up to newtrade Jay Graber 2017-07-28 20:45:46 -0700
  • 0cab1f7db3 Add tests for database Jay Graber 2017-07-28 19:44:24 -0700
  • 94abea7bc2 Repackage as python module Jay Graber 2017-07-28 17:23:32 -0700
  • 043958b840 Get working again Jay Graber 2017-07-28 13:57:44 -0700
  • 0f0dbf4e69 wip noclientversion Ariel Gabizon 2017-07-26 22:29:42 +0200
  • 2753b3385f wip Ariel Gabizon 2017-07-26 22:24:08 +0200
  • 941ef40390 Rename to commitment Jay Graber 2017-07-26 13:23:12 -0700
  • 6ca26f821c wip Ariel Gabizon 2017-07-26 21:51:03 +0200
  • a780b6abc7 wip Ariel Gabizon 2017-07-26 20:52:44 +0200
  • 15ff860746 wip Ariel Gabizon 2017-07-26 20:35:55 +0200
  • 2b7d00b73e Add updated utils Jay Graber 2017-07-26 08:06:39 -0700
  • 4e100c46c3 wip Ariel Gabizon 2017-07-26 14:20:24 +0200
  • 5615702147 Merge pull request #9 from arielgabizon/twocomputers twocomputers Ariel 2017-07-24 23:30:36 +0200
  • 6861e73472 Add findtrade by txid Jay Graber 2017-07-24 13:40:10 -0700
  • 572de939b4 Rm unnecessary files, rename sellContract to sell etc, save trades to leveldb Jay Graber 2017-07-24 13:23:40 -0700
  • 07e0d2c430 fix Ariel Gabizon 2017-07-24 19:03:20 +0200
  • 0ae56929ba fix Ariel Gabizon 2017-07-24 19:00:26 +0200
  • 8b9299e577 Merge pull request #2 from jasondavies/fix-requirements Ariel 2017-07-24 18:21:13 +0200
  • 3cbc6d46ea Use larger locktimes. Jason Davies 2017-07-24 18:17:47 +0200
  • 02989d24e6 Add missing 'waiting' requirement. Jason Davies 2017-07-24 15:20:33 +0200
  • e233c8a9f6 merge Ariel Gabizon 2017-07-24 17:36:02 +0200
  • 927c4c5a66 fix Ariel Gabizon 2017-07-24 17:35:16 +0200
  • 001225bf2c wip Ariel Gabizon 2017-07-24 17:23:25 +0200
  • a8b78513c3 get addresses from init.json instead of generating them randomly Ariel Gabizon 2017-07-24 16:59:23 +0200
  • 0df6fcd04c Add address parsing and initiate newtrade from cli Jay Graber 2017-07-24 07:41:03 -0700
  • 394373da53 wip Ariel Gabizon 2017-07-24 14:44:24 +0200
  • 99ee0a9ccd comment Ariel Gabizon 2017-07-22 13:30:32 +0200
  • 69aae69d40 add test files Ariel Gabizon 2017-07-22 13:29:49 +0200
  • 991c02f23b basic flow working Ariel Gabizon 2017-07-22 13:15:25 +0200
  • cb607bd168 wip Ariel Gabizon 2017-07-22 12:54:53 +0200
  • df8f74cccb wip Ariel Gabizon 2017-07-22 09:37:29 +0200
  • f39251490a seller init working Ariel Gabizon 2017-07-21 17:24:42 +0200
  • 7a44519e97 wip Ariel Gabizon 2017-07-21 17:21:06 +0200
  • 801adaa824 wip Ariel Gabizon 2017-07-21 17:20:00 +0200
  • 157e293cfe wip Ariel Gabizon 2017-07-21 17:07:28 +0200
  • 19f8339c3d wip Ariel Gabizon 2017-07-21 16:46:20 +0200
  • d2b64920fe fixed it in bitcoin file too Ariel Gabizon 2017-07-16 11:09:10 -0400
  • 9f8073772e fix wrong indent preventing from finding secret Ariel Gabizon 2017-07-16 11:06:22 -0400
  • f9e40d7355 Add comment for refactor of script Jay Graber 2017-07-15 14:20:23 -0700
  • 3dcd20c767 tweaks ethereumxcat Ariel Gabizon 2017-07-14 15:53:47 -0400
  • a6f89fe424 wip Ariel Gabizon 2017-07-14 11:56:06 -0400
  • 0db4fec559 change to shorter names Ariel Gabizon 2017-07-14 10:41:36 -0400
  • 403ecc43e8 changes Ariel Gabizon 2017-07-14 10:33:48 -0400
  • a567a69581 adapt api for ethereum xcat Ariel Gabizon 2017-07-13 21:14:28 -0400
  • ee49e77279 Export xcat.json to hex string on cli Jay Graber 2017-07-12 20:33:56 -0700
  • d9ee4d5b99 Add cli functions to check user's role from addrs Jay Graber 2017-07-12 19:45:45 -0700
  • 7b80666cc7 Add validateaddress Jay Graber 2017-07-12 19:45:11 -0700
  • dc6a9bdb6f Set up redeem test case and refund test case Jay Graber 2017-07-05 13:57:53 -0700
  • 15f48b7ad4 Make unittest module a requirement Jay Graber 2017-07-05 13:35:39 -0700
  • 3f39382b5d Refactor test.py into unittest framework Jay Graber 2017-07-05 13:35:20 -0700
  • 220f55ed7c add api file Ariel Gabizon 2017-07-05 21:09:09 +0200
  • 684f0f30ad fixed test Ariel Gabizon 2017-07-05 21:02:21 +0200
  • e301d36c05 fixed test Ariel Gabizon 2017-07-05 21:00:56 +0200
  • 16ebdcc8e0 have api methods look at trade file themselves instead of expectin parameter Ariel Gabizon 2017-07-05 15:54:40 +0200
  • 5cbed011ea restructuring Ariel Gabizon 2017-07-05 14:28:16 +0200
  • 1ccc09f36f seems to work well in all cases Ariel Gabizon 2017-07-05 12:44:38 +0200
  • 9046d44f4d Add cli for importcontract as hex string, save to leveldb in /tmp with initiating txid as key Jay Graber 2017-07-03 09:48:05 -0700
  • d5821f5ca7 redeem with secret works Ariel Gabizon 2017-07-03 18:38:34 +0200
  • 3a836cf4f5 pasted autoredeem code from bXcat in zXcat Ariel Gabizon 2017-07-03 11:03:13 +0200
  • 158519ae0b Merge pull request #5 from zcash/refactor-automate arcalinea 2017-06-15 11:00:06 -0700
  • d29830c9bf Edit readme for cli workflow Jay Graber 2017-06-15 10:58:22 -0700
  • 84df93782b Add automated test, refund tx functionality Jay Graber 2017-05-31 12:03:16 -0700
  • 3ee8606dcf Remove dead code, rename things Jay Graber 2017-05-26 15:21:23 -0700
  • 2699e76f32 Put user input in separate file, create test file to run through protocol Jay Graber 2017-05-26 15:08:57 -0700
  • 3770a7d700 Rm saving of contracts Jay Graber 2017-05-26 13:16:52 -0700
  • 9a52ebeb57 Rename classesXcat.py to xcat.py Jay Graber 2017-05-26 13:15:52 -0700
  • db111a3325 Add parsing out of redeem/refund address to zXcat Jay Graber 2017-05-26 12:16:15 -0700
  • 31e5761076 Refactor into classes, add automation functions. Unfinished Jay Graber 2017-05-26 09:23:49 -0700
  • eb603b3471 Merge branch 'cli-interface' of github.com:zcash/ZBXCAT into cli-interface Jay Graber 2017-05-24 08:57:24 -0700
  • 64b268b6a0 Start refactoring into classes Jay Graber 2017-05-24 08:57:19 -0700