Commit Graph
100 Commits
Author SHA1 Message Date
Chris Troutner 4b66305392 fix(production scripts): Added create-wallet.js to scripts folder 2022-03-27 11:00:29 -07:00
Chris Troutner e23f8c2019 Merge pull request #14 from Permissionless-Software-Foundation/ct-unstable
Got Docker containers working
2022-03-27 10:18:11 -07:00
Chris Troutner f9e76a3dfb fix(createOffer()): Prevening duplicate Offers from being created 2022-03-26 20:31:34 -07:00
Chris Troutner 470fa95b74 temporary commenting out failing test 2022-03-26 19:38:23 -07:00
Chris Troutner f2b8ccaa3a fix(acceptCounterOffer()): Appropriately ignoring Counter Offers 2022-03-26 19:35:15 -07:00
Chris Troutner fa834e9114 Fixing typo in webhook 2022-03-26 19:27:32 -07:00
Chris Troutner c45b512fc6 fix(wallet): Throwing error when wallet file not passed in correctly 2022-03-26 19:20:06 -07:00
Chris Troutner e0d1aa24d4 More wallet debugging 2022-03-26 18:56:18 -07:00
Chris Troutner a4faecf56e debugging wallet file issue 2022-03-26 18:36:49 -07:00
Chris Troutner 95e66efc2f Adding more debugging 2022-03-26 18:07:41 -07:00
Chris Troutner 881a882175 fix(bug): Handling counter offer bug 2022-03-26 15:35:26 -07:00
Chris Troutner 80945039b0 Merge branch 'ct-unstable' of https://github.com/Permissionless-Software-Foundation/bch-dex into ct-unstable 2022-03-26 15:24:20 -07:00
Chris Troutner e470b26771 fix(docker): Updating to node.js v16 in all containers 2022-03-26 15:24:12 -07:00
Chris Troutner eb458f1e9f Merge branch 'ct-unstable' of https://github.com/Permissionless-Software-Foundation/bch-dex into ct-unstable 2022-03-26 15:23:15 -07:00
Chris Troutner 21f4bc2f4c Fixing webhook url 2022-03-26 15:23:11 -07:00
Chris Troutner 7e2e28834a Debugging ensureFunds() 2022-03-26 15:15:08 -07:00
Chris Troutner 07551bb693 fix(production): Minor fixes 2022-03-26 13:32:52 -07:00
Chris Troutner 207f00ba81 Merge pull request #13 from Permissionless-Software-Foundation/ct-rpi
feat(rpi): Created customized docker files for RPi4
2022-03-26 12:11:44 -07:00
Chris Troutner 3ccdf40a9c Merge branch 'master' into ct-rpi 2022-03-26 12:06:58 -07:00
Chris Troutner 0b940c797c feat(rpi): Created customized docker files for RPi4 2022-03-26 12:05:11 -07:00
Chris Troutner 04f6dbee54 Merge pull request #12 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2022-03-26 11:59:57 -07:00
Chris Troutner b26160b748 Merge pull request #11 from Permissionless-Software-Foundation/ct-unstable
Got production docker containers running
2022-03-26 08:40:50 -07:00
Chris Troutner 04f45eea6a Adding production/script dir 2022-03-26 08:35:16 -07:00
Chris Troutner 9096db1614 Removing old docker containers 2022-03-26 08:27:53 -07:00
Chris Troutner 369415bf8d fix(production): Got docker containers working 2022-03-26 08:25:43 -07:00
Chris Troutner 7cb536d312 Making webhook target an env var 2022-03-26 07:32:00 -07:00
Chris Troutner 592ea60892 Ported docker containers from avax-dex 2022-03-25 18:45:32 -07:00
Chris Troutner d14270c5b0 Updating package-lock.json 2022-03-25 17:59:56 -07:00
Chris Troutner 2d9a1d7cbf Merge pull request #10 from Permissionless-Software-Foundation/ct-unstable
Update to work better with UI
2022-03-25 17:53:58 -07:00
Chris Troutner e6c942d532 Fixing tests 2022-03-25 12:36:28 -07:00
Chris Troutner 1206b6576e Got first successful take workflow complete 2022-03-25 12:17:13 -07:00
Chris Troutner dbd5845e3a feat(offers): Adding garbage collection 2022-03-24 06:57:39 -07:00
Chris Troutner d14dcae6f5 feat(orders): Added garbage collection 2022-03-24 06:43:51 -07:00
Chris Troutner 6b44aab429 Merge pull request #9 from Permissionless-Software-Foundation/ct-unstable
Updating specifications
2022-03-23 16:20:27 -07:00
Chris Troutner 8cd8086440 Fixing test 2022-03-23 16:17:26 -07:00
Chris Troutner 37e2377113 Editing 2022-03-23 16:05:36 -07:00
Chris Troutner a6949f0e8d fix(docs): Updating dev docs and spec 2022-03-23 15:52:34 -07:00
Chris Troutner 9e14f0a230 Merge pull request #8 from Permissionless-Software-Foundation/ct-unstable
First successful complete trade
2022-03-23 11:26:38 -07:00
Chris Troutner 7e6b76703d Fixing unit tests 2022-03-23 11:23:51 -07:00
Chris Troutner 5910620048 First successful collaborative transaction and token trade 2022-03-23 11:04:48 -07:00
Chris Troutner 4201850389 Added makerAddr to Order and Offer 2022-03-22 11:05:31 -07:00
Chris Troutner 449efd2a98 Fixing unit tests 2022-03-22 10:05:50 -07:00
Chris Troutner 5af8a31242 Successfully deserializing partial tx during acceptance phase 2022-03-22 10:02:00 -07:00
Chris Troutner 65bffe1ef6 Successfully detecting and routing offers and counter-offers 2022-03-22 08:00:08 -07:00
Chris Troutner ceafb2820d Adding 'dataType' to P2WDB data, to distinguish between 'offer' and 'counter-offer' data 2022-03-22 06:46:03 -07:00
Chris Troutner 90d1e68dae Refactored partial transaction creation 2022-03-22 06:13:01 -07:00
Chris Troutner 57dfad9215 Got moveBCH() working in takeOffer() 2022-03-21 17:07:12 -07:00
Chris Troutner 212bc65c7e feat(moveBch): Function to create segregated BCH UTXOs 2022-03-21 16:28:09 -07:00
Chris Troutner 810d386dbc fix(moveTokens): Moved from order use-case to wallet adapter 2022-03-21 14:03:40 -07:00
Chris Troutner 8ed1dbcffe Renamed database model properties 2022-03-21 13:08:14 -07:00
Chris Troutner 1563a740aa fix(offer): Added entity biz logic and unit tests for offer status 2022-03-21 11:39:23 -07:00
Chris Troutner dcaa73a22f Merge pull request #7 from Permissionless-Software-Foundation/ct-unstable
feat(order/offer): Refactored code to switch Order and Offer terminology
2022-03-21 09:56:50 -07:00
Chris Troutner 83c66b363e feat(order/offer): Refactored code to switch Order and Offer terminology 2022-03-21 09:53:58 -07:00
Chris Troutner 8154dd96f9 Merge pull request #83 from Permissionless-Software-Foundation/ct-unstable
fix(deps): Updating bch-js
2022-03-20 07:48:42 -07:00
Chris Troutner e37223cc88 fix(deps): Updating bch-js 2022-03-20 07:46:08 -07:00
Chris Troutner 5002ef2b90 Merge pull request #82 from Permissionless-Software-Foundation/dh-test-coverage-ipfsjs
feat(test): Got ipfs.js to 100% test coverage
2022-03-18 11:27:32 -07:00
Chris Troutner 5d95109ad4 more linting 2022-03-18 11:24:15 -07:00
Chris Troutner 13b3150f62 minor linting 2022-03-18 11:24:04 -07:00
Chris Troutner b857eb9a6d Fixing typo in dev docs 2022-03-15 10:03:36 -07:00
Chris Troutner 7301df1880 Merge pull request #6 from Permissionless-Software-Foundation/ct-unstable
Updating dev docs and specification
2022-03-12 06:10:34 -08:00
Chris Troutner e77dbb16e3 fix(mongo): Aligning models and specification 2022-03-11 18:23:36 -08:00
Chris Troutner 8f7d997b3e Editing dev docs 2022-03-11 16:37:29 -08:00
Chris Troutner 5a4cd8a125 Editing dev docs 2022-03-11 16:30:42 -08:00
Chris Troutner fdaae3f52e Editing dev docs 2022-03-11 16:25:22 -08:00
Chris Troutner afebdc5448 Editing dev docs 2022-03-11 12:52:08 -08:00
Chris Troutner ad744e807f Editing dev docs 2022-03-11 12:48:58 -08:00
Chris Troutner 4fe89a1190 Editing dev docs 2022-03-11 12:47:57 -08:00
Chris Troutner a904cbb473 Merge pull request #5 from Permissionless-Software-Foundation/ct-unstable
Got /order/take to generate a partial TX
2022-03-11 08:29:12 -08:00
Chris Troutner 84dfd56918 Fixing dependencies 2022-03-11 08:25:35 -08:00
Chris Troutner d62fc3b575 Got /order/take mocked up for further development 2022-03-11 08:15:31 -08:00
Chris Troutner a7f8a520a2 Got /order/take to generate a partial TX 2022-03-11 06:35:56 -08:00
Chris Troutner 87b9046af8 fix(offer): Fixing bug. vout = 1 2022-03-10 15:50:13 -08:00
Chris Troutner a6b4677571 Working on take-offer logic 2022-03-10 13:21:25 -08:00
Chris Troutner bf71810974 Adding wallet sweep script for cleaning up test wallets 2022-03-10 10:33:34 -08:00
Chris Troutner 733e8fd405 Merge pull request #81 from Permissionless-Software-Foundation/ct-unstable
fix(ipfs-coord): Updating to v7.1.6
2022-03-10 09:29:32 -08:00
Chris Troutner baee72c1c6 fix(ipfs-coord): Updating to v7.1.6 2022-03-10 09:27:13 -08:00
Chris Troutner 11618a796f Merge pull request #80 from Permissionless-Software-Foundation/ct-unstable
fix(ipfs-coord): Updating to v7.1.5
2022-03-10 08:35:21 -08:00
Chris Troutner 025ae20704 fix(ipfs-coord): Updating to v7.1.5 2022-03-10 08:33:53 -08:00
Chris Troutner e68514f542 linting 2022-03-09 14:25:51 -08:00
Chris Troutner 5fc26dcc7c fix(order): Adding 'orderStatus' to Order model 2022-03-09 14:25:37 -08:00
Chris Troutner fb00c1bc86 Merge pull request #4 from Permissionless-Software-Foundation/ct-unstable
Getting Offer and Order creation working with updated deps.
2022-03-09 13:55:56 -08:00
Chris Troutner 7964bfbae7 fix(tests): Fixing broken unit tests 2022-03-09 13:52:45 -08:00
Chris Troutner a13a1c91e8 Got Offer creation working 2022-03-09 10:08:51 -08:00
Chris Troutner b19d4da345 Added integration tests for offer use case 2022-03-09 09:37:17 -08:00
Chris Troutner 443f405f56 fix(package.json): Updating dependencies 2022-03-09 08:11:20 -08:00
Chris Troutner 61bb5169b3 fix(p2wdb): Refactored p2wdb adapter and unit tests 2022-03-09 07:53:26 -08:00
Chris Troutner f812440555 fix(tests): Updated unit tests for node v16 2022-03-08 15:23:56 -08:00
Chris Troutner 693c98fb15 Merge branch 'master' of https://github.com/Permissionless-Software-Foundation/ipfs-service-provider into ct-unstable 2022-03-08 15:04:53 -08:00
Chris Troutner fdf73610eb Merge pull request #79 from Permissionless-Software-Foundation/ct-unstable
fix(tests): Updating tests for node.js v16
2022-03-08 09:42:42 -08:00
Chris Troutner b09e77c079 fix(tests): Updating tests for node.js v16 2022-03-08 09:39:54 -08:00
Chris Troutner 1a4c602234 Syncing with upstream ipfs-service-provider 2022-03-07 17:58:03 -08:00
Chris Troutner dedc6e2d30 syncing with upstream ipfs-service-provider 2022-03-07 17:56:52 -08:00
Chris Troutner 68ad2561b1 Merge pull request #78 from Permissionless-Software-Foundation/ct-unstable
fix(ipfs-coord): Updating to v7.1.4
2022-03-05 14:22:25 -08:00
Chris Troutner 791d11e597 Merge branch 'master' into ct-unstable 2022-03-05 14:20:19 -08:00
Chris Troutner 5489e76f55 fix(ipfs-coord): Updating to v7.1.4 2022-03-05 14:20:13 -08:00
Chris Troutner 496a1dd07c Merge pull request #77 from Permissionless-Software-Foundation/ct-unstable
fix(ipfs-coord): Updating to v7.1.3
2022-03-05 08:26:32 -08:00
Chris Troutner a7b8ca9ad5 linting 2022-03-05 08:24:50 -08:00
Chris Troutner 6eb16eb11a fix(ipfs-coord): Updating to v7.1.3 2022-03-05 08:24:36 -08:00
Chris Troutner d1fb676a8f Customizing for bch 2022-03-01 18:36:15 -08:00
Chris Troutner 649655c7bb Merge pull request #3 from Permissionless-Software-Foundation/ct-unstable
fix(e2e): Got e2e create-offer.js working
2022-02-23 15:25:47 -08:00