From 6d37870846e7e82d725f948ff4c0805b75ade41a Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Tue, 31 Jul 2018 14:45:14 -0400 Subject: [PATCH] Setting up same version of openzeppelin as loom example --- contracts/plasma/RootChain.sol | 9 ++------- package.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/contracts/plasma/RootChain.sol b/contracts/plasma/RootChain.sol index bc455dd..fac12e6 100644 --- a/contracts/plasma/RootChain.sol +++ b/contracts/plasma/RootChain.sol @@ -614,17 +614,12 @@ contract RootChain is ERC721Receiver { /******************** ERC721 ********************/ - function onERC721Received( - address _operator, - address _from, - uint256 _tokenId, - bytes _data - ) + function onERC721Received(address _from, uint256 _uid, bytes) public isTokenApproved(msg.sender) returns(bytes4) { - deposit(_from, uint64(_tokenId), uint32(1)); + deposit(_from, uint64(_uid), uint32(1)); return ERC721_RECEIVED; } diff --git a/package.json b/package.json index 18944e4..fe308bb 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "jquery": "^3.3.1", "lodash": "^4.17.10", "loom-js": "^1.14.0", - "openzeppelin-solidity": "^1.11.0", + "openzeppelin-solidity": "1.10.0", "react": "^16.3.2", "react-blockies": "^1.3.0", "react-bootstrap": "^0.32.1",