Enhancements from Kaleido team #13
Merged
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
…ng b/w ERC20 and ERC721 tokens
…ithdraw is possible
|
hi @jimthematrix, apologies for the late reply and thanks a lot for the PR. great to add ERC721s! this PR has a lot of conflicts however. it blows away a lot of the build and docs. I will cherry-pick merge the ERC721 contract and tests when I get a chance or if you want to clean up the PR please do. btw. i'm curious are you using these ERC721 locks in a project? an exchange? |
|
@chatch thanks for the review, I'll find time to clean up the conflicts in the coming days and push an update to the PR. kaleido.io is a blockchain business cloud that offers among other things a toke swap service that can be integrated to build enterprise consortium DApps. |
|
Thanks again @jimthematrix i went ahead and fixed the conflicts so this is finally merged now. |
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.
Changes include: