Merge pull request #43 from rnsdomains/npm

Npm

README.md

@@ -95,6 +95,12 @@ slither .
 > Get truffle: https://www.trufflesuite.com/
 > Get slither:https://github.com/crytic/slither
 
+## Import contracts
+
+```
+npm i @rsksmart/rns-rskregistrar
+```
+
 ## References
 
 1. Strongly based on https://github.com/ensdomains/ethregistrar.

contracts/Dummy.sol

@@ -0,0 +1,8 @@
+pragma solidity ^0.5.3;
+
+import "@rsksmart/rns-registry/contracts/RNS.sol";
+import "@rsksmart/rns-auction-registrar/contracts/TokenRegistrar.sol";
+import "@rsksmart/erc677/contracts/ERC677.sol";
+
+contract Dummy {
+}

contracts/FIFSRegistrar.sol

@@ -2,8 +2,8 @@ pragma solidity ^0.5.3;
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@ensdomains/ethregistrar/contracts/StringUtils.sol";
-import "./testing/ERC677TokenContract.sol";
-import "./testing/ERC677Receiver.sol";
+import "@rsksmart/erc677/contracts/ERC677.sol";
+import "@rsksmart/erc677/contracts/ERC677TransferReceiver.sol";
 import "./NodeOwner.sol";
 import "./PricedContract.sol";
 import "./AbstractNamePrice.sol";
@@ -12,7 +12,7 @@ import "./BytesUtils.sol";
 /// @title First-in first-served registrar.
 /// @notice You can use this contract to register .rsk names in RNS.
 /// @dev This contract has permission to register in RSK Owner.
-contract FIFSRegistrar is PricedContract, ERC677Receiver {
+contract FIFSRegistrar is PricedContract, ERC677TransferReceiver {
     using SafeMath for uint256;
     using StringUtils for string;
     using BytesUtils for bytes;
@@ -22,15 +22,15 @@ contract FIFSRegistrar is PricedContract, ERC677Receiver {
 
     uint public minLength = 5;
 
-    ERC677TokenContract rif;
+    ERC677 rif;
     NodeOwner nodeOwner;
     address pool;
 
     // sha3('register(string,address,bytes32,uint)')
     bytes4 constant REGISTER_SIGNATURE = 0xc2c414c8;
 
     constructor (
-        ERC677TokenContract _rif,
+        ERC677 _rif,
         NodeOwner _nodeOwner,
         address _pool,
         AbstractNamePrice _namePrice

contracts/NamePrice.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.3;
 
-import "./AbstractNamePrice.sol";
 import "@openzeppelin/contracts/math/SafeMath.sol";
+import "./AbstractNamePrice.sol";
 
 /// @title NamePrice contract
 /// @author Javier Esses

contracts/NodeOwner.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.5.3;
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "@openzeppelin/contracts/ownership/Ownable.sol";
 import "@openzeppelin/contracts/access/Roles.sol";
-import "./testing/AbstractRNS.sol";
+import "@rsksmart/rns-registry/contracts/AbstractRNS.sol";
 
 contract NodeOwner is ERC721, Ownable {
     using Roles for Roles.Role;

contracts/PricedContract.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.3;
 
-import "./AbstractNamePrice.sol";
 import "@openzeppelin/contracts/ownership/Ownable.sol";
+import "./AbstractNamePrice.sol";
 
 contract PricedContract is Ownable {
     AbstractNamePrice public namePrice;

contracts/RSKOwner.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.3;
 
-import "./testing/TokenRegistrar.sol";
-import "./testing/TokenDeed.sol";
+import "@rsksmart/rns-auction-registrar/contracts/TokenRegistrar.sol";
+import "@rsksmart/rns-auction-registrar/contracts/TokenDeed.sol";
 import "./NodeOwner.sol";
 
 contract RSKOwner is NodeOwner {
@@ -45,13 +45,15 @@ contract RSKOwner is NodeOwner {
         domain is not transfered and it expires, it might be
         registered by someone else.
     */
+    event Test();
 
     /// @notice Accept domain transfer from previous registrar.
     /// @dev Use it via tokenRegistrar.trnasferRegistrars(label).
     /// All locked tokens in Deed are returned.
     /// @param label Accepted domain label.
     /// @param deed Deed contract address holding tokens.
     function acceptRegistrarTransfer(bytes32 label, TokenDeed deed, uint) external onlyPreviousRegistrar {
+        emit Test();
         uint256 tokenId = uint256(label);
         expirationTime[tokenId] = deed.expirationDate();
         _mint(deed.owner(), tokenId);

contracts/Renewer.sol

@@ -2,8 +2,8 @@ pragma solidity ^0.5.3;
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import "@ensdomains/ethregistrar/contracts/StringUtils.sol";
-import "./testing/ERC677TokenContract.sol";
-import "./testing/ERC677Receiver.sol";
+import "@rsksmart/erc677/contracts/ERC677.sol";
+import "@rsksmart/erc677/contracts/ERC677TransferReceiver.sol";
 import "./NodeOwner.sol";
 import "./PricedContract.sol";
 import "./AbstractNamePrice.sol";
@@ -12,20 +12,20 @@ import "./BytesUtils.sol";
 /// @title Simple renewer.
 /// @notice You can use this contract to renew names registered in Node Owner.
 /// @dev This contract has permission to renew in Node Owner.
-contract Renewer is PricedContract {
+contract Renewer is PricedContract, ERC677TransferReceiver {
     using SafeMath for uint256;
     using StringUtils for string;
     using BytesUtils for bytes;
 
-    ERC677TokenContract rif;
+    ERC677 rif;
     NodeOwner nodeOwner;
     address pool;
 
     // sha3('renew(string,uint)')
     bytes4 constant RENEW_SIGNATURE = 0x14b1a4fc;
 
     constructor (
-        ERC677TokenContract _rif,
+        ERC677 _rif,
         NodeOwner _nodeOwner,
         address _pool,
         AbstractNamePrice _namePrice