status-im/visual-identity
2
0
Fork 0
mirror of https://github.com/status-im/visual-identity.git synced 2025-02-12 12:38:45 +00:00
Code Issues Projects Releases Wiki Activity

Setting up same version of openzeppelin as loom example

Browse Source
This commit is contained in:
Richard Ramos 2018-07-31 14:45:14 -04:00
parent f0fa6ad043
commit 6d37870846
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/plasma/RootChain.sol
View File

@ -614,17 +614,12 @@ contract RootChain is ERC721Receiver {
/******************** ERC721 ********************/ /******************** ERC721 ********************/
function onERC721Received( function onERC721Received(address _from, uint256 _uid, bytes)
address _operator,
address _from,
uint256 _tokenId,
bytes _data
)
public public
isTokenApproved(msg.sender) isTokenApproved(msg.sender)
returns(bytes4) returns(bytes4)
{ {
deposit(_from, uint64(_tokenId), uint32(1)); deposit(_from, uint64(_uid), uint32(1));
return ERC721_RECEIVED; return ERC721_RECEIVED;
} }

2
package.json
View File

@ -31,7 +31,7 @@
"jquery": "^3.3.1", "jquery": "^3.3.1",
"lodash": "^4.17.10", "lodash": "^4.17.10",
"loom-js": "^1.14.0", "loom-js": "^1.14.0",
"openzeppelin-solidity": "^1.11.0", "openzeppelin-solidity": "1.10.0",
"react": "^16.3.2", "react": "^16.3.2",
"react-blockies": "^1.3.0", "react-blockies": "^1.3.0",
"react-bootstrap": "^0.32.1", "react-bootstrap": "^0.32.1",