[r2r] update deps and solc version, add ERC721 and ERC1155 support #2
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
laruh
changed the title
laruh
changed the title
artemii235
reviewed
Nov 28, 2023
artemii235
requested changes
Nov 30, 2023
test/EtomicSwap.js
Outdated
| assert.equal(tokenOwnerBeforeReceiverSpend, this.swap.address); | ||
|
|
||
| // Attempt to spend with invalid secret - should fail | ||
| await this.swap.receiverSpendErc721(id, zeroAddr, this.erc721token.address, tokenId, accounts[0], { from: accounts[1] }).should.be.rejectedWith(EVMThrow); |
There was a problem hiding this comment.
zeroAddr is 20 bytes instead of 32, please use 32 bytes argument for 100% correctness 🙂
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.
^0.5.0to^0.8.20Useful links
https://github.com/OpenZeppelin/openzeppelin-contracts/tree/master/contracts/token/ERC1155
https://github.com/OpenZeppelin/openzeppelin-contracts/tree/master/contracts/token/ERC721
Notes:
there are simple erc721 and erc1155 holders that can be inherited by the EtomicSwap contract, but I decided to keep
onERC1155Received,onERC1155BatchReceived,onERC721Receivedfunctions external, as its more gas-efficient.to test changes please follow the setup dev env guide in readme
deps changes
"chai": "^4.1.2"->"chai": "^4.3.10""ganache-cli": "^6.2.5"->"ganache": "^7.9.1""openzeppelin-solidity": "https://github.com/OpenZeppelin/openzeppelin-solidity.git#release-v2.1.0-solc-0.5"->"@openzeppelin/contracts": "^5.0.0""sol-merger": "^0.1.0"->"sol-merger": "^4.4.0""web3": "^1.0.0-beta.27"->"web3": "^4.2.2"