Rebase cinemarket to merge into master and clean up repo #122
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TimDaub
force-pushed
the
fix/rebase-cinemarket-progress
branch
2 times, most recently
from
43c3374
to
b0b35f7
Compare
TimDaub
changed the title
TimDaub
force-pushed
the
fix/rebase-cinemarket-progress
branch
from
b0b35f7
to
1a5c149
Compare
- Uploads movie to S3 and converts to HLS and MP4 - Uploads poster to IPFS - Uploads token to IPFS and submits it via mint function
This reverts commit ff6a4b9.
This reverts commit 447314d.
- Remove all but absolutely necessary contracts (StableCoin, Bridge, etc.) - Clean up / directory and remove scripts - Remove ERC20 and DenDAI integration - Remove Vendor and Admin integrations - Remove ENS integration - Remove Dapparatus ContractLoader - Remove all unused packages
TimDaub
force-pushed
the
fix/rebase-cinemarket-progress
branch
from
1a5c149
to
820d692
Compare
TimDaub
force-pushed
the
fix/rebase-cinemarket-progress
branch
from
820d692
to
a122529
Compare
iamonuwa
reviewed
May 21, 2019
| @@ -5,17 +5,14 @@ | |||
| "dependencies": { | |||
There was a problem hiding this comment.
ethereumutil-js is required but never part of either the devDependencies or the dependencies.
There was a problem hiding this comment.
Can't resolve 'web3-utils' because of dapparatus version used.
There was a problem hiding this comment.
You're right, we need ethereumutil-js. I didn't get any errors not being able to resolve web3-utils after adding it when doing the following:
$ rm -rf node_modules
$ rm package-lock.json
$ npm i
Can you confirm that adding ethereumutil-js fixed the issue (for npm at least)?
iamonuwa
approved these changes
May 21, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #110
This PR cleans up the cinemarket branch to make it mergeable into master. The cinemarket branch includes the sunDAI branch. Lots of stuff has been deleted as we don't need it anymore. For details see the list below.
For reviewing this PR, I'm not exactly sure what would be a good strategy. I'm sure there's still bugs, but we'll find them in continuing development and I'll fix them for "free" as part of the issue #110. But in other PRs and not this one.
TODOs:
Exchange.js:175 GET https://yxygzjw6s4.execute-api.eu-west-1.amazonaws.com/testnet/exits/0x51ff1fab76079d20418d1c74da65653ffe3fd0aa/1 net::ERR_NAME_NOT_RESOLVEDetc.)